From e0bea5459efeeeeef0e72c190be56086d565f612 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 10 Sep 2018 08:07:10 -1100
Subject: [PATCH] Test

---
 src/cc/gateways.cpp | 7 +++++--
 src/cc/oracles.cpp  | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/cc/gateways.cpp b/src/cc/gateways.cpp
index b22360642..4293eb066 100644
--- a/src/cc/gateways.cpp
+++ b/src/cc/gateways.cpp
@@ -560,7 +560,9 @@ std::string GatewaysClaim(uint64_t txfee,uint256 bindtxid,std::string refcoin,ui
     gatewayspk = GetUnspendable(cp,0);
     _GetCCaddress(cp->unspendableaddr2,EVAL_ASSETS,gatewayspk);
     memcpy(cp->unspendablepriv2,cp->CCpriv,32);
-    cp->evalcode2 = EVAL_ASSETS;
+    assetscp->evalcode2 = cp->evalcode2 = EVAL_ASSETS;
+    memcpy(assetscp->unspendablepriv2,cp->CCpriv,32);
+    strcpy(assets->unspendableaddr2,cp->unspendableaddr2);
     if ( GetTransaction(bindtxid,tx,hashBlock,false) == 0 || (numvouts= tx.vout.size()) <= 0 )
     {
         fprintf(stderr,"cant find bindtxid %s\n",uint256_str(str,bindtxid));
@@ -581,9 +583,10 @@ std::string GatewaysClaim(uint64_t txfee,uint256 bindtxid,std::string refcoin,ui
         fprintf(stderr,"invalid Gateways deposittxid %s %.8f != %.8f\n",uint256_str(str,deposittxid),(double)depositamount/COIN,(double)amount/COIN);
         return("");
     }
+    fprintf(stderr,"depositaddr.(%s) vs %s\n",depositaddr,cp->unspendableaddr2);
     if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
     {
-        if ( (inputs= AddAssetInputs(cp,mtx,gatewayspk,assetid,amount,60)) > 0 )
+        if ( (inputs= AddAssetInputs(assetscp,mtx,gatewayspk,assetid,amount,60)) > 0 )
         {
             if ( inputs > amount )
                 CCchange = (inputs - amount);
diff --git a/src/cc/oracles.cpp b/src/cc/oracles.cpp
index a5337e636..2fa5e5815 100644
--- a/src/cc/oracles.cpp
+++ b/src/cc/oracles.cpp
@@ -169,6 +169,7 @@ CPubKey OracleBatonPk(char *batonaddr,struct CCcontract_info *cp)
     if ( ctx == 0 )
         ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN);
     Myprivkey(priv);
+    cp->evalcode2 = EVAL_ORACLES;
     for (i=0; i<32; i++)
         cp->unspendablepriv2[i] = (priv[i] ^ cp->CCpriv[i]);
     while ( secp256k1_ec_seckey_verify(ctx,cp->unspendablepriv2) == 0 )