Merge branch 'dev' of https://github.com/jl777/komodo into jl777-dev

merge

src/cc/CCGateways.h

@@ -20,15 +20,18 @@
 #include "CCinclude.h"
 #include "../merkleblock.h"
 
-bool GatewaysValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx);
+bool GatewaysValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn);
 std::string GatewaysBind(uint64_t txfee,std::string coin,uint256 tokenid,int64_t totalsupply,uint256 oracletxid,uint8_t M,uint8_t N,std::vector<CPubKey> pubkeys);
 std::string GatewaysDeposit(uint64_t txfee,uint256 bindtxid,int32_t height,std::string refcoin,uint256 cointxid,int32_t claimvout,std::string deposithex,std::vector<uint8_t>proof,CPubKey destpub,int64_t amount);
 std::string GatewaysClaim(uint64_t txfee,uint256 bindtxid,std::string refcoin,uint256 deposittxid,CPubKey destpub,int64_t amount);
 std::string GatewaysWithdraw(uint64_t txfee,uint256 bindtxid,std::string refcoin,CPubKey withdrawpub,int64_t amount);
+std::string GatewaysPartialSign(uint64_t txfee,uint256 txidaddr,std::string refcoin,std::string hex);
+std::string GatewaysCompleteSigning(uint64_t txfee,uint256 txidaddr,std::string refcoin,std::string hex);
+std::string GatewaysMarkDone(uint64_t txfee,uint256 withdrawtxid,std::string refcoin);
 UniValue GatewaysPendingWithdraws(uint256 bindtxid,std::string refcoin);
-std::string GatewaysMarkdone(uint64_t txfee,uint256 withdrawtxid,std::string refcoin,uint256 cointxid);
+UniValue GatewaysProcessedWithdraws(uint256 bindtxid,std::string refcoin);
 UniValue GatewaysMultisig(char *txidaddr);
-std::string GatewaysPartialSign(uint64_t txfee,uint256 txidaddr,std::string refcoin, std::string hex);
+
 
 // CCcustom
 UniValue GatewaysInfo(uint256 bindtxid);

src/cc/CCHeir.h

@@ -21,7 +21,7 @@
 
 #define EVAL_HEIR 0xea
 
-bool HeirValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx);
+bool HeirValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn);
 
 // CCcustom
 UniValue HeirInfo();

src/cc/CCOracles.h

@@ -19,7 +19,7 @@
 
 #include "CCinclude.h"
 
-bool OraclesValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx);
+bool OraclesValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn);
 std::string OracleCreate(int64_t txfee,std::string name,std::string description,std::string format);
 std::string OracleRegister(int64_t txfee,uint256 oracletxid,int64_t datafee);
 std::string OracleSubscribe(int64_t txfee,uint256 oracletxid,CPubKey publisher,int64_t amount);

src/cc/CCPayments.h

@@ -19,7 +19,7 @@
 
 #include "CCinclude.h"
 
-bool PaymentsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx);
+bool PaymentsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn);
 
 // CCcustom
 UniValue PaymentsInfo();

src/cc/CCPegs.h

@@ -19,7 +19,7 @@
 
 #include "CCinclude.h"
 
-bool PegsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx);
+bool PegsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn);
 
 // CCcustom
 UniValue PegsInfo();

src/cc/CCPrices.h

@@ -19,7 +19,7 @@
 
 #include "CCinclude.h"
 
-bool PricesValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx);
+bool PricesValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn);
 
 // CCcustom
 UniValue PricesList();

src/cc/CCTriggers.h

@@ -19,7 +19,7 @@
 
 #include "CCinclude.h"
 
-bool TriggersValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx);
+bool TriggersValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn);
 
 // CCcustom
 UniValue TriggersInfo();

src/cc/CCassets.h

@@ -26,7 +26,7 @@
 #include "CCinclude.h"
 
 // CCcustom
-bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx);
+bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn);
 
 // CCassetsCore
 //CTxOut MakeAssetsVout(CAmount nValue,CPubKey pk);

src/cc/CCassetstx.cpp

@@ -222,7 +222,7 @@ std::string AssetTransfer(int64_t txfee,uint256 assetid,std::vector<uint8_t> des
     if ( txfee == 0 )
         txfee = 10000;
     mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    if ( AddNormalinputs(mtx,mypk,txfee,3) > 0 )
     {
         /*n = outputs.size();
         if ( n == amounts.size() )
@@ -257,7 +257,7 @@ std::string AssetConvert(int64_t txfee,uint256 assetid,std::vector<uint8_t> dest
     if ( txfee == 0 )
         txfee = 10000;
     mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    if ( AddNormalinputs(mtx,mypk,txfee,3) > 0 )
     {
         if ( (inputs= AddAssetInputs(cp,mtx,mypk,assetid,total,60)) > 0 )
         {
@@ -313,7 +313,7 @@ std::string CreateSell(int64_t txfee,int64_t askamount,uint256 assetid,int64_t p
     if ( txfee == 0 )
         txfee = 10000;
     mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    if ( AddNormalinputs(mtx,mypk,txfee,3) > 0 )
     {
         mask = ~((1LL << mtx.vin.size()) - 1);
         if ( (inputs= AddAssetInputs(cp,mtx,mypk,assetid,askamount,60)) > 0 )
@@ -347,7 +347,7 @@ std::string CreateSwap(int64_t txfee,int64_t askamount,uint256 assetid,uint256 a
     if ( txfee == 0 )
         txfee = 10000;
     mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    if ( AddNormalinputs(mtx,mypk,txfee,3) > 0 )
     {
         mask = ~((1LL << mtx.vin.size()) - 1);
         if ( (inputs= AddAssetInputs(cp,mtx,mypk,assetid,askamount,60)) > 0 )
@@ -379,7 +379,7 @@ std::string CancelBuyOffer(int64_t txfee,uint256 assetid,uint256 bidtxid)
     if ( txfee == 0 )
         txfee = 10000;
     mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    if ( AddNormalinputs(mtx,mypk,txfee,3) > 0 )
     {
         mask = ~((1LL << mtx.vin.size()) - 1);
         if ( GetTransaction(bidtxid,vintx,hashBlock,false) != 0 )
@@ -400,7 +400,7 @@ std::string CancelSell(int64_t txfee,uint256 assetid,uint256 asktxid)
     if ( txfee == 0 )
         txfee = 10000;
     mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    if ( AddNormalinputs(mtx,mypk,txfee,3) > 0 )
     {
         mask = ~((1LL << mtx.vin.size()) - 1);
         if ( GetTransaction(asktxid,vintx,hashBlock,false) != 0 )
@@ -426,7 +426,7 @@ std::string FillBuyOffer(int64_t txfee,uint256 assetid,uint256 bidtxid,int64_t f
     if ( txfee == 0 )
         txfee = 10000;
     mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    if ( AddNormalinputs(mtx,mypk,txfee,3) > 0 )
     {
         mask = ~((1LL << mtx.vin.size()) - 1);
         if ( GetTransaction(bidtxid,vintx,hashBlock,false) != 0 )
@@ -474,7 +474,7 @@ std::string FillSell(int64_t txfee,uint256 assetid,uint256 assetid2,uint256 askt
     if ( txfee == 0 )
         txfee = 10000;
     mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    if ( AddNormalinputs(mtx,mypk,txfee,3) > 0 )
     {
         mask = ~((1LL << mtx.vin.size()) - 1);
         if ( GetTransaction(asktxid,vintx,hashBlock,false) != 0 )

src/cc/CCauction.h

@@ -21,7 +21,7 @@
 
 #define EVAL_AUCTION 0xe8
 
-bool AuctionValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx);
+bool AuctionValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn);
 
 std::string AuctionPost(uint64_t txfee,uint256 itemhash,int64_t minbid,char *title,char *description);
 std::string AuctionBid(uint64_t txfee,uint256 itemhash,int64_t amount);

src/cc/CCchannels.h

@@ -20,7 +20,7 @@
 #include "CCinclude.h"
 #define CHANNELS_MAXPAYMENTS 1000
 
-bool ChannelsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx);
+bool ChannelsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn);
 std::string ChannelOpen(uint64_t txfee,CPubKey destpub,int32_t numpayments,int64_t payment);
 std::string ChannelPayment(uint64_t txfee,uint256 opentxid,int64_t amount, uint256 secret);
 std::string ChannelClose(uint64_t txfee,uint256 opentxid);

src/cc/CCcustom.cpp

@@ -13,6 +13,7 @@
  *                                                                            *
  ******************************************************************************/
 
+#include "key_io.h"
 #include "CCinclude.h"
 #include "CCassets.h"
 #include "CCfaucet.h"
@@ -221,7 +222,7 @@ uint8_t GatewaysCCpriv[32] = { 0xf7, 0x4b, 0x5b, 0xa2, 0x7a, 0x5e, 0x9c, 0xda, 0
 #undef FUNCNAME
 #undef EVALCODE
 
-struct CCcontract_info *CCinit(struct CCcontract_info *cp,uint8_t evalcode)
+struct CCcontract_info *CCinit(struct CCcontract_info *cp, uint8_t evalcode)
 {
     cp->evalcode = evalcode;
     switch ( evalcode )

src/cc/CCdice.h

@@ -21,7 +21,7 @@
 
 #define EVAL_DICE 0xe6
 
-bool DiceValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx);
+bool DiceValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn);
 
 std::string DiceBet(uint64_t txfee,char *planstr,uint256 fundingtxid,int64_t bet,int32_t odds);
 std::string DiceBetFinish(uint8_t &funcid,uint256 &entropyused,int32_t &entropyvout,int32_t *resultp,uint64_t txfee,char *planstr,uint256 fundingtxid,uint256 bettxid,int32_t winlosetimeout,uint256 vin0txid,int32_t vin0vout);

src/cc/CCfaucet.h

@@ -22,7 +22,7 @@
 #define EVAL_FAUCET 0xe4
 #define FAUCETSIZE (COIN / 10)
 
-bool FaucetValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx);
+bool FaucetValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn);
 
 // CCcustom
 std::string FaucetFund(uint64_t txfee,int64_t funds);

src/cc/CCfsm.h

@@ -21,7 +21,7 @@
 
 #define EVAL_FSM 0xe7
 
-bool FSMValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx);
+bool FSMValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn);
 
 std::string FSMList();
 std::string FSMInfo(uint256 fsmtxid);

src/cc/CCinclude.h

@@ -57,9 +57,12 @@ extern char ASSETCHAINS_SYMBOL[];
 extern std::string CCerror;
 
 #define SMALLVAL 0.000000000000001
-#define MIN_NOTARIZATION_CONFIRMS 2
-union _bits256 { uint8_t bytes[32]; uint16_t ushorts[16]; uint32_t uints[8]; uint64_t ulongs[4]; uint64_t txid; };
-typedef union _bits256 bits256;
+#ifndef _BITS256
+#define _BITS256
+    union _bits256 { uint8_t bytes[32]; uint16_t ushorts[16]; uint32_t uints[8]; uint64_t ulongs[4]; uint64_t txid; };
+    typedef union _bits256 bits256;
+#endif
+
 
 struct CC_utxo
 {
@@ -68,13 +71,23 @@ struct CC_utxo
     int32_t vout;
 };
 
+// these are the parameters stored after Verus crypto-condition vouts. new versions may change
+// the format
+struct CC_meta 
+{
+    std::vector<unsigned char> version;
+    uint8_t evalCode;
+    bool is1of2;
+    uint8_t numDestinations;
+    // followed by address destinations
+};
+
 struct CCcontract_info
 {
-    uint256 prevtxid;
     char unspendableCCaddr[64],CChexstr[72],normaladdr[64],unspendableaddr2[64],unspendableaddr3[64];
     uint8_t CCpriv[32],unspendablepriv2[32],unspendablepriv3[32];
     CPubKey unspendablepk2,unspendablepk3;
-    bool (*validate)(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx);
+    bool (*validate)(struct CCcontract_info *cp, Eval* eval, const CTransaction &tx, uint32_t nIn);
     bool (*ismyvin)(CScript const& scriptSig);
     uint8_t evalcode,evalcode2,evalcode3,didinit;
 };
@@ -91,11 +104,12 @@ struct oracleprice_info
 extern CWallet* pwalletMain;
 #endif
 bool GetAddressUnspent(uint160 addressHash, int type,std::vector<std::pair<CAddressUnspentKey,CAddressUnspentValue> > &unspentOutputs);
+CBlockIndex *komodo_getblockindex(uint256 hash);
 
 static const uint256 zeroid;
 bool myGetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock);
 int32_t is_hexstr(char *str,int32_t n);
-bool myAddtomempool(CTransaction &tx);
+bool myAddtomempool(CTransaction &tx, CValidationState *pstate = NULL);
 //uint64_t myGettxout(uint256 hash,int32_t n);
 bool myIsutxo_spentinmempool(uint256 txid,int32_t vout);
 bool mytxid_inmempool(uint256 txid);
@@ -106,6 +120,8 @@ int32_t iguana_rwbignum(int32_t rwflag,uint8_t *serialized,int32_t len,uint8_t *
 CScript GetScriptForMultisig(int nRequired, const std::vector<CPubKey>& keys);
 int64_t CCaddress_balance(char *coinaddr);
 CPubKey CCtxidaddr(char *txidaddr,uint256 txid);
+bool GetCCParams(Eval* eval, const CTransaction &tx, uint32_t nIn,
+                 CTransaction &txOut, std::vector<std::vector<unsigned char>> &preConditions, std::vector<std::vector<unsigned char>> &params);
 
 int64_t OraclePrice(int32_t height,uint256 reforacletxid,char *markeraddr,char *format);
 uint8_t DecodeOraclesCreateOpRet(const CScript &scriptPubKey,std::string &name,std::string &description,std::string &format);
@@ -154,8 +170,9 @@ bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey);
 std::vector<uint8_t> Mypubkey();
 bool Myprivkey(uint8_t myprivkey[]);
 int64_t CCduration(int32_t &numblocks,uint256 txid);
-bool isCCTxNotarizedConfirmed(uint256 txid);
+bool komodo_txnotarizedconfirmed(uint256 txid);
 // CCtx
+bool SignTx(CMutableTransaction &mtx,int32_t vini,int64_t utxovalue,const CScript scriptPubKey);
 std::string FinalizeCCTx(uint64_t skipmask,struct CCcontract_info *cp,CMutableTransaction &mtx,CPubKey mypk,uint64_t txfee,CScript opret);
 void SetCCunspents(std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > &unspentOutputs,char *coinaddr);
 void SetCCtxids(std::vector<std::pair<CAddressIndexKey, CAmount> > &addressIndex,char *coinaddr);

src/cc/CClotto.h

@@ -21,7 +21,7 @@
 
 #define EVAL_LOTTO 0xe9
 
-bool LottoValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx);
+bool LottoValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn);
 
 UniValue LottoInfo(uint256 lottoid);
 UniValue LottoList();

src/cc/CCrewards.h

@@ -22,7 +22,7 @@
 #define EVAL_REWARDS 0xe5
 #define REWARDSCC_MAXAPR (COIN * 25)
 
-bool RewardsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx);
+bool RewardsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn);
 UniValue RewardsInfo(uint256 rewardid);
 UniValue RewardsList();
 

src/cc/CCtx.cpp

@@ -14,6 +14,7 @@
  ******************************************************************************/
 
 #include "CCinclude.h"
+#include "key_io.h"
 
 /*
  FinalizeCCTx is a very useful function that will properly sign both CC and normal inputs, adds normal change and the opreturn.
@@ -348,7 +349,7 @@ int64_t AddNormalinputs(CMutableTransaction &mtx,CPubKey mypk,int64_t total,int3
     LOCK2(cs_main, pwalletMain->cs_wallet);
     pwalletMain->AvailableCoins(vecOutputs, false, NULL, true);
     utxos = (struct CC_utxo *)calloc(maxutxos,sizeof(*utxos));
-    threshold = total/maxinputs;
+    threshold = total/(maxinputs+1);
     if ( maxinputs > maxutxos )
         maxutxos = maxinputs;
     sum = 0;

src/cc/CCutils.cpp

@@ -13,11 +13,20 @@
  *                                                                            *
  ******************************************************************************/
 
-#include "CCinclude.h"
-
 /*
  CCutils has low level functions that are universally useful for all contracts.
  */
+#include "CCinclude.h"
+#include "komodo_structs.h"
+
+#ifdef TESTMODE           
+    #define MIN_NON_NOTARIZED_CONFIRMS 2
+#else
+    #define MIN_NON_NOTARIZED_CONFIRMS 101
+#endif // TESTMODE
+int32_t komodo_dpowconfs(int32_t height,int32_t numconfs);
+struct komodo_state *komodo_stateptr(char *symbol,char *dest);
+extern uint32_t KOMODO_DPOWCONFS;
 
 void endiancpy(uint8_t *dest,uint8_t *src,int32_t len)
 {
@@ -198,6 +207,48 @@ bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey)
     return(false);
 }
 
+bool GetCCParams(Eval* eval, const CTransaction &tx, uint32_t nIn,
+                 CTransaction &txOut, std::vector<std::vector<unsigned char>> &preConditions, std::vector<std::vector<unsigned char>> &params)
+{
+    uint256 blockHash;
+
+    if (myGetTransaction(tx.vin[nIn].prevout.hash, txOut, blockHash) && txOut.vout.size() > tx.vin[nIn].prevout.n)
+    {
+        CBlockIndex index;
+        if (eval->GetBlock(blockHash, index))
+        {
+            // read preconditions
+            CScript subScript = CScript();
+            preConditions.clear();
+            if (txOut.vout[tx.vin[nIn].prevout.n].scriptPubKey.IsPayToCryptoCondition(&subScript, preConditions))
+            {
+                // read any available parameters in the output transaction
+                params.clear();
+                if (tx.vout.size() > 0 && tx.vout[tx.vout.size() - 1].scriptPubKey.IsOpReturn())
+                {
+                    if (tx.vout[tx.vout.size() - 1].scriptPubKey.GetOpretData(params) && params.size() == 1)
+                    {
+                        CScript scr = CScript(params[0].begin(), params[0].end());
+
+                        // printf("Script decoding inner:\n%s\nouter:\n%s\n", scr.ToString().c_str(), tx.vout[tx.vout.size() - 1].scriptPubKey.ToString().c_str());
+
+                        if (!scr.GetPushedData(scr.begin(), params))
+                        {
+                            return false;
+                        }
+                        else return true;
+                    }
+                    else return false;
+                }
+                else return true;
+            }
+        }
+    }
+    return false;
+    //fprintf(stderr,"ExtractDestination failed\n");
+    return(false);
+}
+
 bool pubkey2addr(char *destaddr,uint8_t *pubkey33)
 {
     std::vector<uint8_t>pk; int32_t i;
@@ -368,9 +419,9 @@ bool ProcessCC(struct CCcontract_info *cp,Eval* eval, std::vector<uint8_t> param
     cp->unspendableaddr2[0] = cp->unspendableaddr3[0] = 0;
     if ( paramsNull.size() != 0 ) // Don't expect params
         return eval->Invalid("Cannot have params");
-    else if ( ctx.vout.size() == 0 )
-        return eval->Invalid("no-vouts");
-    else if ( (*cp->validate)(cp,eval,ctx) != 0 )
+    //else if ( ctx.vout.size() == 0 )      // spend can go to z-addresses
+    //    return eval->Invalid("no-vouts");
+    else if ( (*cp->validate)(cp,eval,ctx,nIn) != 0 )
     {
         //fprintf(stderr,"done CC %02x\n",cp->evalcode);
         //cp->prevtxid = txid;
@@ -394,29 +445,60 @@ int64_t CCduration(int32_t &numblocks,uint256 txid)
         //fprintf(stderr,"CCduration no hashBlock for txid %s\n",uint256_str(str,txid));
         return(0);
     }
-    else if ( (pindex= mapBlockIndex[hashBlock]) == 0 || (txtime= pindex->nTime) == 0 || (txheight= pindex->nHeight) <= 0 )
+    else if ( (pindex= komodo_getblockindex(hashBlock)) == 0 || (txtime= pindex->nTime) == 0 || (txheight= pindex->GetHeight()) <= 0 )
     {
         fprintf(stderr,"CCduration no txtime %u or txheight.%d %p for txid %s\n",txtime,txheight,pindex,uint256_str(str,txid));
         return(0);
     }
-    else if ( (pindex= chainActive.LastTip()) == 0 || pindex->nTime < txtime || pindex->nHeight <= txheight )
+    else if ( (pindex= chainActive.LastTip()) == 0 || pindex->nTime < txtime || pindex->GetHeight() <= txheight )
     {
         if ( pindex->nTime < txtime )
-            fprintf(stderr,"CCduration backwards timestamps %u %u for txid %s hts.(%d %d)\n",(uint32_t)pindex->nTime,txtime,uint256_str(str,txid),txheight,(int32_t)pindex->nHeight);
+            fprintf(stderr,"CCduration backwards timestamps %u %u for txid %s hts.(%d %d)\n",(uint32_t)pindex->nTime,txtime,uint256_str(str,txid),txheight,(int32_t)pindex->GetHeight());
         return(0);
     }
-    numblocks = (pindex->nHeight - txheight);
+    numblocks = (pindex->GetHeight() - txheight);
     duration = (pindex->nTime - txtime);
-    //fprintf(stderr,"duration %d (%u - %u) numblocks %d (%d - %d)\n",(int32_t)duration,(uint32_t)pindex->nTime,txtime,numblocks,pindex->nHeight,txheight);
+    //fprintf(stderr,"duration %d (%u - %u) numblocks %d (%d - %d)\n",(int32_t)duration,(uint32_t)pindex->nTime,txtime,numblocks,pindex->GetHeight(),txheight);
     return(duration);
 }
 
-bool isCCTxNotarizedConfirmed(uint256 txid)
+bool komodo_txnotarizedconfirmed(uint256 txid)
 {
-    int32_t confirms;
+    char str[65];
+    uint32_t confirms,notarized=0,txheight;
+    CTransaction tx;
+    uint256 hashBlock;
+    CBlockIndex *pindex;    
+    char symbol[KOMODO_ASSETCHAIN_MAXLEN],dest[KOMODO_ASSETCHAIN_MAXLEN]; struct komodo_state *sp;
 
-    CCduration(confirms,txid);
-    if (confirms >= MIN_NOTARIZATION_CONFIRMS)
+    if ( myGetTransaction(txid,tx,hashBlock) == 0 )
+    {
+        fprintf(stderr,"komodo_txnotarizedconfirmed cant find txid %s\n",txid.ToString().c_str());
+        return(0);
+    }
+    else if ( hashBlock == zeroid )
+    {
+        fprintf(stderr,"komodo_txnotarizedconfirmed no hashBlock for txid %s\n",txid.ToString().c_str());
+        return(0);
+    }
+    else if ( (pindex= mapBlockIndex[hashBlock]) == 0 || (txheight= pindex->GetHeight()) <= 0 )
+    {
+        fprintf(stderr,"komodo_txnotarizedconfirmed no txheight.%d %p for txid %s\n",txheight,pindex,txid.ToString().c_str());
+        return(0);
+    }
+    else if ( (pindex= chainActive.LastTip()) == 0 || pindex->GetHeight() < txheight )
+    {
+        fprintf(stderr,"komodo_txnotarizedconfirmed backwards heights for txid %s hts.(%d %d)\n",txid.ToString().c_str(),txheight,(int32_t)pindex->GetHeight());
+        return(0);
+    }    
+    confirms=1 + pindex->GetHeight() - txheight;        
+    if ((sp= komodo_stateptr(symbol,dest)) != 0 && (notarized=sp->NOTARIZED_HEIGHT) > 0 && txheight > sp->NOTARIZED_HEIGHT)  notarized=0;            
+#ifdef TESTMODE           
+    notarized=0;
+#endif //TESTMODE
+    if (notarized>0 && confirms > 1)
+        return (true);
+    else if (notarized==0 && confirms >= MIN_NON_NOTARIZED_CONFIRMS)
         return (true);
     return (false);
 }

src/cc/assets.cpp

@@ -129,7 +129,7 @@
  vout.n-1: opreturn [EVAL_ASSETS] ['E'] [assetid vin0+1] [assetid vin2] [remaining asset2 required] [origpubkey]
 */
 
-bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx)
+bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn)
 {
     static uint256 zero;
     CTxDestination address; CTransaction vinTx,createTx; uint256 hashBlock,assetid,assetid2; int32_t i,starti,numvins,numvouts,preventCCvins,preventCCvouts; int64_t remaining_price,nValue,assetoshis,outputs,inputs,tmpprice,totalunits,ignore; std::vector<uint8_t> origpubkey,tmporigpubkey,ignorepubkey; uint8_t funcid; char destaddr[64],origaddr[64],CCaddr[64];

src/cc/auction.cpp

@@ -70,7 +70,7 @@ bool AuctionExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransactio
     else return(true);
 }
 
-bool AuctionValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx)
+bool AuctionValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn)
 {
     int32_t numvins,numvouts,preventCCvins,preventCCvouts,i; bool retval;
     return(false); // reject any auction CC for now

src/cc/betprotocol.cpp

@@ -263,7 +263,7 @@ bool Eval::DisputePayout(AppVM &vm, std::vector<uint8_t> params, const CTransact
         if (!GetTxConfirmed(disputeTx.vin[0].prevout.hash, sessionTx, sessionBlock))
             return Error("couldnt-get-parent");
 
-        if (GetCurrentHeight() < sessionBlock.nHeight + waitBlocks)
+        if (GetCurrentHeight() < sessionBlock.GetHeight() + waitBlocks)
             return Invalid("dispute-too-soon");  // Not yet
     }
 

src/cc/betprotocol.h

@@ -29,7 +29,7 @@ public:
     uint256 notarisationHash;
     ADD_SERIALIZE_METHODS;
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(branch);
         READWRITE(notarisationHash);
     }

src/cc/channels.cpp

@@ -151,7 +151,7 @@ bool ChannelsExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransacti
     else return(true);
 }
 
-bool ChannelsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx)
+bool ChannelsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn)
 {
     int32_t numvins,numvouts,preventCCvins,preventCCvouts,i,numpayments,p1,param1; bool retval;
     uint256 txid,hashblock,p3,param3,opentxid,tmp_txid,genhashchain,hashchain;
@@ -199,7 +199,7 @@ bool ChannelsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &
                         //vout.3: normal output of payment amount to receiver pubkey
                         //vout.n-2: normal change
                         //vout.n-1: opreturn - 'P' opentxid senderspubkey receiverspubkey depth numpayments secret
-                        if (isCCTxNotarizedConfirmed(opentxid) == 0)
+                        if (komodo_txnotarizedconfirmed(opentxid) == 0)
                             return eval->Invalid("channelOpen is not yet confirmed(notarised)!");
                         else if ( IsCCInput(tx.vin[0].scriptSig) != 0 )
                             return eval->Invalid("vin.0 is normal for channelPayment!");
@@ -261,7 +261,7 @@ bool ChannelsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &
                         //vout.2: CC vout marker to receiver pubkey
                         //vout.n-2: normal change
                         //vout.n-1: opreturn - 'C' opentxid senderspubkey receiverspubkey 0 0 0
-                        if (isCCTxNotarizedConfirmed(opentxid) == 0)
+                        if (komodo_txnotarizedconfirmed(opentxid) == 0)
                             return eval->Invalid("channelOpen is not yet confirmed(notarised)!");
                         else if ( IsCCInput(tx.vin[0].scriptSig) != 0 )
                             return eval->Invalid("vin.0 is normal for channelClose!");
@@ -304,9 +304,9 @@ bool ChannelsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &
                         //vout.2: normal output of CC input to senders pubkey
                         //vout.n-2: normal change
                         //vout.n-1: opreturn - 'R' opentxid senderspubkey receiverspubkey numpayments payment closetxid
-                        if (isCCTxNotarizedConfirmed(opentxid) == 0)
+                        if (komodo_txnotarizedconfirmed(opentxid) == 0)
                             return eval->Invalid("channelOpen is not yet confirmed(notarised)!");
-                        else if (isCCTxNotarizedConfirmed(param3) == 0)
+                        else if (komodo_txnotarizedconfirmed(param3) == 0)
                             return eval->Invalid("channelClose is not yet confirmed(notarised)!");
                         else if ( IsCCInput(tx.vin[0].scriptSig) != 0 )
                             return eval->Invalid("vin.0 is normal for channelRefund!");
@@ -479,7 +479,7 @@ std::string ChannelPayment(uint64_t txfee,uint256 opentxid,int64_t amount, uint2
         fprintf(stderr, "invalid channel open txid\n");
         return ("");
     }
-    if (AddNormalinputs(mtx,mypk,2*txfee,1) > 0)
+    if (AddNormalinputs(mtx,mypk,2*txfee,3) > 0)
     {
         if ((funds=AddChannelsInputs(cp,mtx,channelOpenTx,prevtxid)) !=0 && (change=funds-amount-txfee)>=0)
         {
@@ -595,7 +595,7 @@ std::string ChannelClose(uint64_t txfee,uint256 opentxid)
         fprintf(stderr,"cannot close, you are not channel owner\n");
         return("");
     }
-    if ( AddNormalinputs(mtx,mypk,2*txfee,1) > 0 )
+    if ( AddNormalinputs(mtx,mypk,2*txfee,3) > 0 )
     {
         if ((funds=AddChannelsInputs(cp,mtx,channelOpenTx,prevtxid)) !=0 && funds-txfee>0)
         {
@@ -658,7 +658,7 @@ std::string ChannelRefund(uint64_t txfee,uint256 opentxid,uint256 closetxid)
         fprintf(stderr,"cannot refund, you are not the channel owenr\n");
         return("");
     }
-    if ( AddNormalinputs(mtx,mypk,2*txfee,1) > 0 )
+    if ( AddNormalinputs(mtx,mypk,2*txfee,3) > 0 )
     {
         if ((funds=AddChannelsInputs(cp,mtx,channelOpenTx,prevtxid)) !=0 && funds-txfee>0)
         {

src/cc/dapps/makedapps

@@ -0,0 +1,2 @@
+gcc -o oraclefeed cc/dapps/oraclefeed.c -lm
+gcc -o zmigrate cc/dapps/zmigrate.c -lm

src/cc/dapps/oraclefeed.c

@@ -328,13 +328,18 @@ cJSON *get_komodocli(char *refcoin,char **retstrp,char *acname,char *method,char
     {
         sprintf(cmdstr,"%s %s %s %s %s %s > %s\n",REFCOIN_CLI,method,arg0,arg1,arg2,arg3,fname);
         printf("ref.(%s) REFCOIN_CLI (%s)\n",refcoin,cmdstr);
-    }
+    }   
+#ifdef TESTMODE    
+    fprintf(stderr,"cmd: %s\n",cmdstr); 
+#endif // TESTMODE
     system(cmdstr);
     *retstrp = 0;
     if ( (jsonstr= filestr(&fsize,fname)) != 0 )
     {       
         jsonstr[strlen(jsonstr)-1]='\0';
-        //fprintf(stderr,"%s -> jsonstr.(%s)\n",cmdstr,jsonstr);
+#ifdef TESTMODE   
+        fprintf(stderr,"jsonstr.(%s)\n",jsonstr);
+#endif // TESTMODE
         if ( (jsonstr[0] != '{' && jsonstr[0] != '[') || (retjson= cJSON_Parse(jsonstr)) == 0 )
             *retstrp = jsonstr;
         else free(jsonstr);
@@ -483,6 +488,22 @@ cJSON *get_gatewayspending(char *refcoin,char *acname,char *bindtxidstr)
     return(0);
 }
 
+cJSON *get_gatewaysprocessed(char *refcoin,char *acname,char *bindtxidstr)
+{
+    cJSON *retjson; char *retstr;
+    if ( (retjson= get_komodocli(refcoin,&retstr,acname,"gatewaysprocessed",bindtxidstr,refcoin,"","")) != 0 )
+    {
+        //printf("pending.(%s)\n",jprint(retjson,0));
+        return(retjson);
+    }
+    else if ( retstr != 0 )
+    {
+        fprintf(stderr,"%s get_gatewaysprocessed.(%s) error.(%s)\n",refcoin,acname,retstr);
+        free(retstr);
+    }
+    return(0);
+}
+
 cJSON *get_rawmempool(char *refcoin,char *acname)
 {
     cJSON *retjson; char *retstr;
@@ -550,10 +571,12 @@ int32_t validateaddress(char *refcoin,char *acname,char *depositaddr, char* comp
     return (res);
 }
 
-void importaddress(char *refcoin,char *acname,char *depositaddr)
+void importaddress(char *refcoin,char *acname,char *depositaddr, char *label,int rescan)
 {
-    cJSON *retjson; char *retstr;
-    if ( (retjson= get_komodocli(refcoin,&retstr,acname,"importaddress",depositaddr,"","true","")) != 0 )
+    cJSON *retjson; char *retstr; char rescanstr[10];
+    if (rescan) strcpy(rescanstr,"true");
+    else strcpy(rescanstr,"false");
+    if ( (retjson= get_komodocli(refcoin,&retstr,acname,"importaddress",depositaddr,label,rescanstr,"")) != 0 )
     {
         printf("importaddress.(%s)\n",jprint(retjson,0));
         free_json(retjson);
@@ -610,7 +633,7 @@ cJSON *getinputarray(int64_t *totalp,cJSON *unspents,int64_t required)
     return(vins);
 }
 
-char *createmultisig(char *refcoin,char *acname,char *depositaddr,char *signeraddr,char *withdrawaddr,int64_t satoshis)
+char *createrawtx(char *refcoin,char *acname,char *depositaddr,char *withdrawaddr,char *txidaddr,int64_t satoshis)
 {
     char *retstr,*retstr2,array[128],*txstr = 0; cJSON *retjson2,*retjson,*vins,*vouts; int64_t txfee,total,change = 0;
     if ( strcmp(refcoin,"BTC") == 0 )
@@ -618,7 +641,7 @@ char *createmultisig(char *refcoin,char *acname,char *depositaddr,char *signerad
     else txfee = 10000;
     if ( satoshis < txfee )
     {
-        printf("createmultisig satoshis %.8f < txfee %.8f\n",(double)satoshis/SATOSHIDEN,(double)txfee/SATOSHIDEN);
+        printf("createrawtx satoshis %.8f < txfee %.8f\n",(double)satoshis/SATOSHIDEN,(double)txfee/SATOSHIDEN);
         return(0);
     }
     satoshis -= txfee;
@@ -631,8 +654,9 @@ char *createmultisig(char *refcoin,char *acname,char *depositaddr,char *signerad
             if ( total >= satoshis )
             {
                 vouts = cJSON_CreateObject();
-                jaddnum(vouts,withdrawaddr,(double)satoshis/SATOSHIDEN);
-                if ( total > satoshis+txfee )
+                jaddnum(vouts,withdrawaddr,(double)(satoshis-2*txfee)/SATOSHIDEN);
+                jaddnum(vouts,txidaddr,(double)txfee/SATOSHIDEN);
+                if ( total > satoshis)
                 {
                     change = (total - satoshis);
                     jaddnum(vouts,depositaddr,(double)change/SATOSHIDEN);
@@ -645,29 +669,30 @@ char *createmultisig(char *refcoin,char *acname,char *depositaddr,char *signerad
                 sprintf(argB,"\'%s\'",tmpB);                
                 if ( (retjson2= get_komodocli(refcoin,&txstr,acname,"createrawtransaction",argA,argB,"","")) != 0 )
                 {
-                    printf("createmultisig: unexpected JSON2.(%s)\n",jprint(retjson2,0));
+                    printf("createrawtx: unexpected JSON2.(%s)\n",jprint(retjson2,0));
                     free_json(retjson2);
                 }
                 else if ( txstr == 0 )
-                    printf("createmultisig: null txstr and JSON2\n");
+                    printf("createrawtx: null txstr and JSON2\n");
                 free(tmpA);
                 free(tmpB);
                 free(argA);
                 free(argB);
             }
+            else printf("not enough funds to create withdraw tx\n");
         }
         free_json(retjson);
     }
     else if ( retstr != 0 )
     {
-        printf("createmultisig: unexpected null JSON, retstr.(%s)\n",retstr);
+        printf("createrawtx: unexpected null JSON, retstr.(%s)\n",retstr);
         free(retstr);
     }
-    else printf("createmultisig: null retstr and JSON\n");
+    else printf("createrawtx: null retstr and JSON\n");
     return(txstr);
 }
 
-cJSON *addmultisignature(char *refcoin,char *acname,char *signeraddr,char *rawtx)
+cJSON *addsignature(char *refcoin,char *acname,char *rawtx)
 {
     char *retstr,*hexstr; cJSON *retjson;
     if ( (retjson= get_komodocli(refcoin,&retstr,acname,"signrawtransaction",rawtx,"","","")) != 0 )
@@ -681,6 +706,11 @@ cJSON *addmultisignature(char *refcoin,char *acname,char *signeraddr,char *rawtx
         }
         free_json(retjson);
     }
+    else if ( retstr != 0 )
+    {
+        printf("error parsing signrawtransaction.(%s)\n",retstr);
+        free(retstr);
+    }
     return(0);
 }
 
@@ -696,6 +726,11 @@ char *get_gatewaysmultisig(char *refcoin,char *acname,char *txidaddr,int32_t *K)
         *K=jint(retjson,"number_of_signs");   
         free_json(retjson);
     }
+    else if ( retstr != 0 )
+    {
+        printf("error parsing gatewaysmultisig.(%s)\n",retstr);
+        free(retstr);
+    }
     return(hex);
 }
 
@@ -714,11 +749,27 @@ bits256 gatewayspartialsign(char *refcoin,char *acname,bits256 txid,char *hex)
     return (zeroid);
 }
 
-void gatewaysmarkdone(char *refcoin,char *acname,bits256 withtxid,char *coin,bits256 cointxid)
+void gatewayscompletesigning(char *refcoin,char *acname,bits256 withtxid,char *coin,char *hex)
 {
     char str[65],str2[65],*retstr; cJSON *retjson;
     printf("spend %s %s/v2 as marker\n",acname,bits256_str(str,withtxid));
-    if ( (retjson= get_komodocli(refcoin,&retstr,acname,"gatewaysmarkdone",bits256_str(str,withtxid),coin,bits256_str(str2,cointxid),"")) != 0 )
+    if ( (retjson= get_komodocli(refcoin,&retstr,acname,"gatewayscompletesigning",bits256_str(str,withtxid),coin,hex,"")) != 0 )
+    {
+        komodobroadcast(refcoin,acname,retjson);
+        free_json(retjson);
+    }
+    else if ( retstr != 0 )
+    {
+        printf("error parsing gatewayscompletesigning.(%s)\n",retstr);
+        free(retstr);
+    }
+}
+
+void gatewaysmarkdone(char *refcoin,char *acname,bits256 withtxid,char *coin)
+{
+    char str[65],str2[65],*retstr; cJSON *retjson;
+    printf("spend %s %s/v2 as marker\n",acname,bits256_str(str,withtxid));
+    if ( (retjson= get_komodocli(refcoin,&retstr,acname,"gatewaysmarkdone",bits256_str(str,withtxid),coin,"","")) != 0 )
     {
         komodobroadcast(refcoin,acname,retjson);
         free_json(retjson);
@@ -771,6 +822,22 @@ int32_t get_gatewaysinfo(char *refcoin,char *acname,char *depositaddr,int32_t *M
     else return(0);
 }
 
+int32_t tx_notarizedconfirmed(char *refcoin,char *acname,bits256 txid)
+{
+    char *retstr,str[65]; cJSON *retjson; int32_t result;
+    if ( (retjson= get_komodocli(refcoin,&retstr,acname,"txnotarizedconfirmed",bits256_str(str,txid),"","","")) != 0 )
+    {
+        if (is_cJSON_True(jobj(retjson,"result")) != 0 ) result=1;
+        else result=0;        
+        free_json(retjson);
+    }
+    else if ( retstr != 0 )
+    {
+        printf("error parsing txnotarizedconfirmed.(%s)\n",retstr);
+        free(retstr);
+    }
+}
+
 int32_t tx_has_voutaddress(char *refcoin,char *acname,bits256 txid,char *coinaddr)
 {
     cJSON *txobj,*vouts,*vout,*vins,*vin,*sobj,*addresses; char *addr,str[65]; int32_t i,j,n,numarray,retval = 0, hasvout=0;
@@ -788,8 +855,7 @@ int32_t tx_has_voutaddress(char *refcoin,char *acname,bits256 txid,char *coinadd
                         {
                             addr = jstri(addresses,j);
                             if ( strcmp(addr,coinaddr) == 0 )
-                            {
-                                //fprintf(stderr,"found %s in %s v%d\n",coinaddr,bits256_str(str,txid),i);
+                            {                                
                                 hasvout = 1;
                                 break;
                             }
@@ -798,23 +864,44 @@ int32_t tx_has_voutaddress(char *refcoin,char *acname,bits256 txid,char *coinadd
                 }
                 if (hasvout==1) break;
             }
-        }
-        // if (hasvout==1 && (vins=jarray(&numarray,txobj,"vin"))!=0)
-        // {                          
-        //     for (int i=0;i<numarray;i++)
-        //     {
-        //         if ((vin=jitem(vins,i))!=0 && validateaddress(refcoin,acname,jstr(vin,"address"),"ismine")!=0)
-        //         {
-        //             retval=1;
-        //             break;
-        //         }
-        //     }                       
-        // }
+        }        
         free_json(txobj);
     }
     return(hasvout);
 }
 
+
+int32_t markerexists(char *refcoin,char *acname,char *coinaddr)
+{
+    cJSON *array; int32_t i,n,num=0; bits256 txid;
+    if ( (array= get_addressutxos(refcoin,acname,coinaddr)) != 0 )
+    {
+        num=cJSON_GetArraySize(array);
+        free_json(array); 
+    }
+    if ( num == 0 )
+    {
+        if ( (array= get_rawmempool(refcoin,acname)) != 0 )
+        {
+            if ( (n= cJSON_GetArraySize(array)) != 0 )
+            {
+                for (i=0; i<n; i++)
+                {
+                    txid = jbits256i(array,i);
+                    if ( tx_has_voutaddress(refcoin,acname,txid,coinaddr) > 0 )
+                    {
+                        num = 1;
+                        break;
+                    }
+                }
+            }
+            free_json(array);
+        } 
+    }
+    fprintf(stderr,"Num=%d\n",num);
+    return(num);
+            
+}
 int32_t markerfromthisnodeorunconfirmed(char *refcoin,char *acname,char *coinaddr)
 {
     cJSON *array,*item,*rawtx,*vins,*vin; bits256 txid,tmptxid; int32_t i,n,m,num=0; char *retstr;
@@ -887,54 +974,42 @@ void update_gatewayspending(char *refcoin,char *acname,char *bindtxidstr,int32_t
                     //process item.0 {"txid":"10ec8f4dad6903df6b249b361b879ac77b0617caad7629b97e10f29fa7e99a9b","txidaddr":"RMbite4TGugVmkGmu76ytPHDEQZQGSUjxz","withdrawaddr":"RNJmgYaFF5DbnrNUX6pMYz9rcnDKC2tuAc","amount":"1.00000000","depositaddr":"RHV2As4rox97BuE3LK96vMeNY8VsGRTmBj","signeraddr":"RHV2As4rox97BuE3LK96vMeNY8VsGRTmBj"}
                     if ( (txidaddr= jstr(item,"txidaddr")) != 0 && (withdrawaddr= jstr(item,"withdrawaddr")) != 0 && (depositaddr= jstr(item,"depositaddr")) != 0 && (signeraddr= jstr(item,"signeraddr")) != 0 )
                     {
-                        if ( (satoshis= jdouble(item,"amount")*SATOSHIDEN) != 0 && markerfromthisnodeorunconfirmed("KMD",acname,txidaddr) == 0)
-                        {   
-                            // the actual withdraw
+                        if ( (satoshis= jdouble(item,"amount")*SATOSHIDEN) != 0 && is_cJSON_True(jobj(item,"confirmed_or_notarized")) != 0 && markerfromthisnodeorunconfirmed("KMD",acname,txidaddr) == 0)
+                        {                               
                             if ( strcmp(depositaddr,signeraddr) == 0 )
-                            {
-                                txid= sendtoaddress("KMD",acname,txidaddr,10000);
-                                if (bits256_nonz(txid) != 0)
+                            {                                
+                                rawtx = createrawtx(refcoin,"",depositaddr,withdrawaddr,txidaddr,satoshis);
+                                if ( rawtx != 0 )
                                 {
-                                    cointxid = sendtoaddress(refcoin,"",withdrawaddr,satoshis);
-                                    if ( bits256_nonz(cointxid) != 0)
-                                    {
-                                        fprintf(stderr,"withdraw %s %s %s %.8f processed\n",refcoin,bits256_str(str,cointxid),withdrawaddr,(double)satoshis/SATOSHIDEN);
-                                        gatewaysmarkdone("KMD",acname,origtxid,refcoin,cointxid);
-                                        processed++;
+                                    if ( (clijson= addsignature(refcoin,"",rawtx)) != 0 && is_cJSON_True(jobj(clijson,"complete")) != 0)
+                                    {                                        
+                                        gatewayscompletesigning("KMD",acname,origtxid,refcoin,jstr(clijson,"hex"));                                        
+                                        fprintf(stderr,"withdraw %.8f %s to %s processed\n",(double)satoshis/SATOSHIDEN,refcoin,withdrawaddr);
+                                        free_json(clijson);
                                     }
-                                    else
-                                    {
-                                        fprintf(stderr,"ERROR withdraw %s %s %s %.8f processed\n",refcoin,bits256_str(str,cointxid),withdrawaddr,(double)satoshis/SATOSHIDEN);
-                                    }
-                                }
-                                else
-                                {
-                                    fprintf(stderr,"ERROR sending withdraw marker %s %s to %s %.8f processed\n",refcoin,bits256_str(str,cointxid),txidaddr,(double)10000/SATOSHIDEN);
-                                }
+                                    processed++;
+                                    free(rawtx);
+                                } else fprintf(stderr,"couldnt create rawtx\n");                               
                             }
                             else
                             {
                                 if ( (rawtx= get_gatewaysmultisig(refcoin,acname,txidaddr,&K)) == 0)
                                 {
-                                    rawtx = createmultisig(refcoin,"",depositaddr,signeraddr,withdrawaddr,satoshis);
+                                    rawtx = createrawtx(refcoin,"",depositaddr,withdrawaddr,txidaddr,satoshis);
                                 }
                                 if ( rawtx != 0 )
                                 {
-                                    if ( (clijson= addmultisignature(refcoin,"",signeraddr,rawtx)) != 0 )
+                                    if ( (clijson= addsignature(refcoin,"",rawtx)) != 0 )
                                     {
                                         if ( is_cJSON_True(jobj(clijson,"complete")) != 0 )
-                                        {
-                                            cointxid = komodobroadcast(refcoin,"",clijson);
-                                            if ( bits256_nonz(cointxid) != 0 )
-                                            {
-                                                fprintf(stderr,"withdraw %s M.%d N.%d %s %s %.8f processed\n",refcoin,M,N,bits256_str(str,cointxid),withdrawaddr,(double)satoshis/SATOSHIDEN);
-                                                gatewaysmarkdone("KMD",acname,origtxid,refcoin,cointxid);
-                                            }
+                                        {   
+                                            gatewayscompletesigning("KMD",acname,origtxid,refcoin,jstr(clijson,"hex"));                                          
+                                            fprintf(stderr,"withdraw %.8f %s M.%d N.%d to %s processed\n",(double)satoshis/SATOSHIDEN,refcoin,M,N,withdrawaddr);
                                         }
                                         else if ( jint(clijson,"partialtx") != 0 )
                                         {
                                             txid=gatewayspartialsign(refcoin,acname,origtxid,jstr(clijson,"hex"));                                            
-                                            fprintf(stderr,"%d of %d partialtx %s sent\n",K+1,N,bits256_str(str,txid));
+                                            fprintf(stderr,"%d sign(s) %dof%d partialtx %s sent\n",K+1,M,N,bits256_str(str,txid));
                                         }
                                         free_json(clijson);
                                     }
@@ -949,6 +1024,33 @@ void update_gatewayspending(char *refcoin,char *acname,char *bindtxidstr,int32_t
         }
         free_json(retjson);
     }
+    if ( (retjson= get_gatewaysprocessed("KMD",acname,bindtxidstr)) != 0 )
+    {
+        if ( jint(retjson,"queueflag") != 0 && (coinstr= jstr(retjson,"coin")) != 0 && strcmp(coinstr,refcoin) == 0 )
+        {            
+            if ( (pending=jarray(&n,retjson,"processed")) != 0 )
+            {                
+                for (i=0; i<n; i++)
+                {
+                    item = jitem(pending,i);
+                    origtxid = jbits256(item,"txid");                    
+                    txidaddr = jstr(item,"withdrawtxidaddr");
+                    if (validateaddress(refcoin,"",txidaddr,"iswatchonly")==0 && validateaddress(refcoin,"",txidaddr,"ismine")==0)
+                        importaddress(refcoin,"",txidaddr,jstr(item,"txid"),0);
+                    if ( txidaddr != 0 && markerexists(refcoin,"",txidaddr)==0)
+                    {   
+                        cointxid = komodobroadcast(refcoin,"",item);
+                        if ( bits256_nonz(cointxid) != 0 )
+                        {
+                            withdrawaddr = jstr(item,"withdrawaddr");
+                            fprintf(stderr,"withdraw %.8f %s to %s - %s broadcasted on %s\n",(double)satoshis/SATOSHIDEN,refcoin,withdrawaddr,bits256_str(str,cointxid),refcoin);   
+                            gatewaysmarkdone("KMD",acname,origtxid,refcoin);
+                        }
+                    }
+                }
+            }
+        }
+    }
 }
 
 int32_t get_oracledata(char *refcoin,char *acname,int32_t prevheight,char *hexstr,int32_t maxsize,char *format)
@@ -1050,9 +1152,9 @@ int32_t main(int32_t argc,char **argv)
                     printf("cant find bindtxid.(%s)\n",bindtxidstr);
                     exit(0);
                 }
-                if (validateaddress(refcoin,"",depositaddr,"iswatchonly")==0)
+                if (validateaddress(refcoin,"",depositaddr,"iswatchonly")==0 && validateaddress(refcoin,"",depositaddr,"ismine")==0)
                 {
-                    if (M==N==1) importaddress(refcoin,"",depositaddr);
+                    if (M==N==1) importaddress(refcoin,"",depositaddr,bindtxidstr,0);
                     else addmultisigaddress(refcoin,"",M,pubkeys,bindtxidstr);
                 }
                 if (pubkeys!=0) free(pubkeys);
@@ -1075,9 +1177,9 @@ int32_t main(int32_t argc,char **argv)
                                 {
                                     prevheight = height;
                                     acheight = get_coinheight(refcoin,"");
-                                    printf("%s ht.%d <- %s\n",refcoin,height,hexstr);
-                                    update_gatewayspending(refcoin,acname,bindtxidstr,M,N);
-                                }
+                                    printf("%s ht.%d <- %s\n",refcoin,height,hexstr);   
+                                    update_gatewayspending(refcoin,acname,bindtxidstr,M,N);                                                                 
+                                }                                
                                 free_json(clijson2);
                             }
                             else if ( retstr2 != 0 )
@@ -1085,7 +1187,7 @@ int32_t main(int32_t argc,char **argv)
                                 printf("error parsing oraclesdata.(%s)\n",retstr2);
                                 free(retstr2);
                             }
-                        }
+                        }                                                    
                         break;
                     }
                 }

src/cc/dapps/zmigrate.c

@@ -0,0 +1,956 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <memory.h>
+#include "cJSON.c"
+
+/*
+z_migrate: the purpose of z_migrate is to make converting of all sprout outputs into sapling. the usage would be for the user to specify a sapling address and call z_migrate zsaddr, until it returns that there is nothing left to be done.
+
+its main functionality is quite similar to a z_mergetoaddress ANY_ZADDR -> onetime_taddr followed by a z_sendmany onetime_taddr -> zsaddr
+
+since the z_mergetoaddress will take time, it would just queue up an async operation. When it starts, it should see if there are any onetime_taddr with 10000.0001 funds in it, that is a signal for it to do the sapling tx and it can just do that without async as it is fast enough, especially with a taddr input. Maybe it limits itself to one,  or it does all possible taddr -> sapling as fast as it can. either is fine as it will be called over and over anyway.
+
+It might be that there is nothing to do, but some operations are pending. in that case it would return such a status. as soon as the operation finishes, there would be more work to do.
+
+the amount sent to the taddr, should be 10000.0001
+
+The GUI or user would be expected to generate a sapling address and then call z_migrate saplingaddr in a loop, until it returns that it is all done. this loop should pause for 10 seconds or so, if z_migrate is just waiting for opid to complete.
+*/
+
+bits256 zeroid;
+
+char hexbyte(int32_t c)
+{
+    c &= 0xf;
+    if ( c < 10 )
+        return('0'+c);
+    else if ( c < 16 )
+        return('a'+c-10);
+    else return(0);
+}
+
+int32_t _unhex(char c)
+{
+    if ( c >= '0' && c <= '9' )
+        return(c - '0');
+    else if ( c >= 'a' && c <= 'f' )
+        return(c - 'a' + 10);
+    else if ( c >= 'A' && c <= 'F' )
+        return(c - 'A' + 10);
+    return(-1);
+}
+
+int32_t is_hexstr(char *str,int32_t n)
+{
+    int32_t i;
+    if ( str == 0 || str[0] == 0 )
+        return(0);
+    for (i=0; str[i]!=0; i++)
+    {
+        if ( n > 0 && i >= n )
+            break;
+        if ( _unhex(str[i]) < 0 )
+            break;
+    }
+    if ( n == 0 )
+        return(i);
+    return(i == n);
+}
+
+int32_t unhex(char c)
+{
+    int32_t hex;
+    if ( (hex= _unhex(c)) < 0 )
+    {
+        //printf("unhex: illegal hexchar.(%c)\n",c);
+    }
+    return(hex);
+}
+
+unsigned char _decode_hex(char *hex) { return((unhex(hex[0])<<4) | unhex(hex[1])); }
+
+int32_t decode_hex(unsigned char *bytes,int32_t n,char *hex)
+{
+    int32_t adjust,i = 0;
+    //printf("decode.(%s)\n",hex);
+    if ( is_hexstr(hex,n) <= 0 )
+    {
+        memset(bytes,0,n);
+        return(n);
+    }
+    if ( hex[n-1] == '\n' || hex[n-1] == '\r' )
+        hex[--n] = 0;
+    if ( hex[n-1] == '\n' || hex[n-1] == '\r' )
+        hex[--n] = 0;
+    if ( n == 0 || (hex[n*2+1] == 0 && hex[n*2] != 0) )
+    {
+        if ( n > 0 )
+        {
+            bytes[0] = unhex(hex[0]);
+            printf("decode_hex n.%d hex[0] (%c) -> %d hex.(%s) [n*2+1: %d] [n*2: %d %c] len.%ld\n",n,hex[0],bytes[0],hex,hex[n*2+1],hex[n*2],hex[n*2],(long)strlen(hex));
+        }
+        bytes++;
+        hex++;
+        adjust = 1;
+    } else adjust = 0;
+    if ( n > 0 )
+    {
+        for (i=0; i<n; i++)
+            bytes[i] = _decode_hex(&hex[i*2]);
+    }
+    //bytes[i] = 0;
+    return(n + adjust);
+}
+
+int32_t init_hexbytes_noT(char *hexbytes,unsigned char *message,long len)
+{
+    int32_t i;
+    if ( len <= 0 )
+    {
+        hexbytes[0] = 0;
+        return(1);
+    }
+    for (i=0; i<len; i++)
+    {
+        hexbytes[i*2] = hexbyte((message[i]>>4) & 0xf);
+        hexbytes[i*2 + 1] = hexbyte(message[i] & 0xf);
+        //printf("i.%d (%02x) [%c%c]\n",i,message[i],hexbytes[i*2],hexbytes[i*2+1]);
+    }
+    hexbytes[len*2] = 0;
+    //printf("len.%ld\n",len*2+1);
+    return((int32_t)len*2+1);
+}
+
+long _stripwhite(char *buf,int accept)
+{
+    int32_t i,j,c;
+    if ( buf == 0 || buf[0] == 0 )
+        return(0);
+    for (i=j=0; buf[i]!=0; i++)
+    {
+        buf[j] = c = buf[i];
+        if ( c == accept || (c != ' ' && c != '\n' && c != '\r' && c != '\t' && c != '\b') )
+            j++;
+    }
+    buf[j] = 0;
+    return(j);
+}
+
+char *clonestr(char *str)
+{
+    char *clone;
+    if ( str == 0 || str[0]==0)
+    {
+        printf("warning cloning nullstr.%p\n",str);
+        //#ifdef __APPLE__
+        //        while ( 1 ) sleep(1);
+        //#endif
+        str = (char *)"<nullstr>";
+    }
+    clone = (char *)malloc(strlen(str)+16);
+    strcpy(clone,str);
+    return(clone);
+}
+
+int32_t safecopy(char *dest,char *src,long len)
+{
+    int32_t i = -1;
+    if ( src != 0 && dest != 0 && src != dest )
+    {
+        if ( dest != 0 )
+            memset(dest,0,len);
+        for (i=0; i<len&&src[i]!=0; i++)
+            dest[i] = src[i];
+        if ( i == len )
+        {
+            printf("safecopy: %s too long %ld\n",src,len);
+            //printf("divide by zero! %d\n",1/zeroval());
+#ifdef __APPLE__
+            //getchar();
+#endif
+            return(-1);
+        }
+        dest[i] = 0;
+    }
+    return(i);
+}
+
+char *bits256_str(char hexstr[65],bits256 x)
+{
+    init_hexbytes_noT(hexstr,x.bytes,sizeof(x));
+    return(hexstr);
+}
+
+int64_t conv_floatstr(char *numstr)
+{
+    double val,corr;
+    val = atof(numstr);
+    corr = (val < 0.) ? -0.50000000001 : 0.50000000001;
+    return((int64_t)(val * SATOSHIDEN + corr));
+}
+
+char *nonportable_path(char *str)
+{
+    int32_t i;
+    for (i=0; str[i]!=0; i++)
+        if ( str[i] == '/' )
+            str[i] = '\\';
+    return(str);
+}
+
+char *portable_path(char *str)
+{
+#ifdef _WIN32
+    return(nonportable_path(str));
+#else
+#ifdef __PNACL
+    /*int32_t i,n;
+     if ( str[0] == '/' )
+     return(str);
+     else
+     {
+     n = (int32_t)strlen(str);
+     for (i=n; i>0; i--)
+     str[i] = str[i-1];
+     str[0] = '/';
+     str[n+1] = 0;
+     }*/
+#endif
+    return(str);
+#endif
+}
+
+void *loadfile(char *fname,uint8_t **bufp,long *lenp,long *allocsizep)
+{
+    FILE *fp;
+    long  filesize,buflen = *allocsizep;
+    uint8_t *buf = *bufp;
+    *lenp = 0;
+    if ( (fp= fopen(portable_path(fname),"rb")) != 0 )
+    {
+        fseek(fp,0,SEEK_END);
+        filesize = ftell(fp);
+        if ( filesize == 0 )
+        {
+            fclose(fp);
+            *lenp = 0;
+            printf("loadfile null size.(%s)\n",fname);
+            return(0);
+        }
+        if ( filesize > buflen )
+        {
+            *allocsizep = filesize;
+            *bufp = buf = (uint8_t *)realloc(buf,(long)*allocsizep+64);
+        }
+        rewind(fp);
+        if ( buf == 0 )
+            printf("Null buf ???\n");
+        else
+        {
+            if ( fread(buf,1,(long)filesize,fp) != (unsigned long)filesize )
+                printf("error reading filesize.%ld\n",(long)filesize);
+            buf[filesize] = 0;
+        }
+        fclose(fp);
+        *lenp = filesize;
+        //printf("loaded.(%s)\n",buf);
+    } //else printf("OS_loadfile couldnt load.(%s)\n",fname);
+    return(buf);
+}
+
+void *filestr(long *allocsizep,char *_fname)
+{
+    long filesize = 0; char *fname,*buf = 0; void *retptr;
+    *allocsizep = 0;
+    fname = malloc(strlen(_fname)+1);
+    strcpy(fname,_fname);
+    retptr = loadfile(fname,(uint8_t **)&buf,&filesize,allocsizep);
+    free(fname);
+    return(retptr);
+}
+
+char *send_curl(char *url,char *fname)
+{
+    long fsize; char curlstr[1024];
+    sprintf(curlstr,"curl --url \"%s\" > %s",url,fname);
+    system(curlstr);
+    return(filestr(&fsize,fname));
+}
+
+cJSON *get_urljson(char *url,char *fname)
+{
+    char *jsonstr; cJSON *json = 0;
+    if ( (jsonstr= send_curl(url,fname)) != 0 )
+    {
+        //printf("(%s) -> (%s)\n",url,jsonstr);
+        json = cJSON_Parse(jsonstr);
+        free(jsonstr);
+    }
+    return(json);
+}
+
+//////////////////////////////////////////////
+// start of dapp
+//////////////////////////////////////////////
+
+char *REFCOIN_CLI;
+
+cJSON *get_komodocli(char *refcoin,char **retstrp,char *acname,char *method,char *arg0,char *arg1,char *arg2,char *arg3)
+{
+    long fsize; cJSON *retjson = 0; char cmdstr[32768],*jsonstr,fname[256];
+    sprintf(fname,"/tmp/zmigrate.%s",method);
+    if ( acname[0] != 0 )
+    {
+        if ( refcoin[0] != 0 && strcmp(refcoin,"KMD") != 0 )
+            printf("unexpected: refcoin.(%s) acname.(%s)\n",refcoin,acname);
+        sprintf(cmdstr,"./komodo-cli -ac_name=%s %s %s %s %s %s > %s\n",acname,method,arg0,arg1,arg2,arg3,fname);
+    }
+    else if ( strcmp(refcoin,"KMD") == 0 )
+        sprintf(cmdstr,"./komodo-cli %s %s %s %s %s > %s\n",method,arg0,arg1,arg2,arg3,fname);
+    else if ( REFCOIN_CLI != 0 && REFCOIN_CLI[0] != 0 )
+    {
+        sprintf(cmdstr,"%s %s %s %s %s %s > %s\n",REFCOIN_CLI,method,arg0,arg1,arg2,arg3,fname);
+        //printf("ref.(%s) REFCOIN_CLI (%s)\n",refcoin,cmdstr);
+    }
+    system(cmdstr);
+    *retstrp = 0;
+    if ( (jsonstr= filestr(&fsize,fname)) != 0 )
+    {       
+        jsonstr[strlen(jsonstr)-1]='\0';
+        //fprintf(stderr,"%s -> jsonstr.(%s)\n",cmdstr,jsonstr);
+        if ( (jsonstr[0] != '{' && jsonstr[0] != '[') || (retjson= cJSON_Parse(jsonstr)) == 0 )
+            *retstrp = jsonstr;
+        else free(jsonstr);
+    }
+    return(retjson);
+}
+
+bits256 komodobroadcast(char *refcoin,char *acname,cJSON *hexjson)
+{
+    char *hexstr,*retstr,str[65]; cJSON *retjson; bits256 txid;
+    memset(txid.bytes,0,sizeof(txid));
+    if ( (hexstr= jstr(hexjson,"hex")) != 0 )
+    {
+        if ( (retjson= get_komodocli(refcoin,&retstr,acname,"sendrawtransaction",hexstr,"","","")) != 0 )
+        {
+            //fprintf(stderr,"broadcast.(%s)\n",jprint(retjson,0));
+            free_json(retjson);
+        }
+        else if ( retstr != 0 )
+        {
+            if ( strlen(retstr) >= 64 )
+            {
+                retstr[64] = 0;
+                decode_hex(txid.bytes,32,retstr);
+            }
+            fprintf(stderr,"broadcast %s txid.(%s)\n",strlen(acname)>0?acname:refcoin,bits256_str(str,txid));
+            free(retstr);
+        }
+    }
+    return(txid);
+}
+
+bits256 sendtoaddress(char *refcoin,char *acname,char *destaddr,int64_t satoshis)
+{
+    char numstr[32],*retstr,str[65]; cJSON *retjson; bits256 txid;
+    memset(txid.bytes,0,sizeof(txid));
+    sprintf(numstr,"%.8f",(double)satoshis/SATOSHIDEN);
+    if ( (retjson= get_komodocli(refcoin,&retstr,acname,"sendtoaddress",destaddr,numstr,"","")) != 0 )
+    {
+        fprintf(stderr,"unexpected sendrawtransaction json.(%s)\n",jprint(retjson,0));
+        free_json(retjson);
+    }
+    else if ( retstr != 0 )
+    {
+        if ( strlen(retstr) >= 64 )
+        {
+            retstr[64] = 0;
+            decode_hex(txid.bytes,32,retstr);
+        }
+        fprintf(stderr,"sendtoaddress %s %.8f txid.(%s)\n",destaddr,(double)satoshis/SATOSHIDEN,bits256_str(str,txid));
+        free(retstr);
+    }
+    return(txid);
+}
+
+int32_t get_coinheight(char *refcoin,char *acname)
+{
+    cJSON *retjson; char *retstr; int32_t height=0;
+    if ( (retjson= get_komodocli(refcoin,&retstr,acname,"getblockchaininfo","","","","")) != 0 )
+    {
+        height = jint(retjson,"blocks");
+        free_json(retjson);
+    }
+    else if ( retstr != 0 )
+    {
+        fprintf(stderr,"%s get_coinheight.(%s) error.(%s)\n",refcoin,acname,retstr);
+        free(retstr);
+    }
+    return(height);
+}
+
+bits256 get_coinblockhash(char *refcoin,char *acname,int32_t height)
+{
+    cJSON *retjson; char *retstr,heightstr[32]; bits256 hash;
+    memset(hash.bytes,0,sizeof(hash));
+    sprintf(heightstr,"%d",height);
+    if ( (retjson= get_komodocli(refcoin,&retstr,acname,"getblockhash",heightstr,"","","")) != 0 )
+    {
+        fprintf(stderr,"unexpected blockhash json.(%s)\n",jprint(retjson,0));
+        free_json(retjson);
+    }
+    else if ( retstr != 0 )
+    {
+        if ( strlen(retstr) >= 64 )
+        {
+            retstr[64] = 0;
+            decode_hex(hash.bytes,32,retstr);
+        }
+        free(retstr);
+    }
+    return(hash);
+}
+
+bits256 get_coinmerkleroot(char *refcoin,char *acname,bits256 blockhash)
+{
+    cJSON *retjson; char *retstr,str[65]; bits256 merkleroot;
+    memset(merkleroot.bytes,0,sizeof(merkleroot));
+    if ( (retjson= get_komodocli(refcoin,&retstr,acname,"getblockheader",bits256_str(str,blockhash),"","","")) != 0 )
+    {
+        merkleroot = jbits256(retjson,"merkleroot");
+        //fprintf(stderr,"got merkleroot.(%s)\n",bits256_str(str,merkleroot));
+        free_json(retjson);
+    }
+    else if ( retstr != 0 )
+    {
+        fprintf(stderr,"%s %s get_coinmerkleroot error.(%s)\n",refcoin,acname,retstr);
+        free(retstr);
+    }
+    return(merkleroot);
+}
+
+int32_t get_coinheader(char *refcoin,char *acname,bits256 *blockhashp,bits256 *merklerootp,int32_t prevheight)
+{
+    int32_t height = 0; char str[65];
+    if ( prevheight == 0 )
+        height = get_coinheight(refcoin,acname) - 20;
+    else height = prevheight + 1;
+    if ( height > 0 )
+    {
+        *blockhashp = get_coinblockhash(refcoin,acname,height);
+        if ( bits256_nonz(*blockhashp) != 0 )
+        {
+            *merklerootp = get_coinmerkleroot(refcoin,acname,*blockhashp);
+            if ( bits256_nonz(*merklerootp) != 0 )
+                return(height);
+        }
+    }
+    memset(blockhashp,0,sizeof(*blockhashp));
+    memset(merklerootp,0,sizeof(*merklerootp));
+    return(0);
+}
+
+cJSON *get_rawmempool(char *refcoin,char *acname)
+{
+    cJSON *retjson; char *retstr;
+    if ( (retjson= get_komodocli(refcoin,&retstr,acname,"getrawmempool","","","","")) != 0 )
+    {
+        //printf("mempool.(%s)\n",jprint(retjson,0));
+        return(retjson);
+    }
+    else if ( retstr != 0 )
+    {
+        fprintf(stderr,"get_rawmempool.(%s) error.(%s)\n",acname,retstr);
+        free(retstr);
+    }
+    return(0);
+}
+
+cJSON *get_addressutxos(char *refcoin,char *acname,char *coinaddr)
+{
+    cJSON *retjson; char *retstr,jsonbuf[256];
+    if ( refcoin[0] != 0 && strcmp(refcoin,"KMD") != 0 )
+        printf("warning: assumes %s has addressindex enabled\n",refcoin);
+    sprintf(jsonbuf,"{\\\"addresses\\\":[\\\"%s\\\"]}",coinaddr);
+    if ( (retjson= get_komodocli(refcoin,&retstr,acname,"getaddressutxos",jsonbuf,"","","")) != 0 )
+    {
+        //printf("addressutxos.(%s)\n",jprint(retjson,0));
+        return(retjson);
+    }
+    else if ( retstr != 0 )
+    {
+        fprintf(stderr,"get_addressutxos.(%s) error.(%s)\n",acname,retstr);
+        free(retstr);
+    }
+    return(0);
+}
+
+cJSON *get_rawtransaction(char *refcoin,char *acname,bits256 txid)
+{
+    cJSON *retjson; char *retstr,str[65];
+    if ( (retjson= get_komodocli(refcoin,&retstr,acname,"getrawtransaction",bits256_str(str,txid),"1","","")) != 0 )
+    {
+        return(retjson);
+    }
+    else if ( retstr != 0 )
+    {
+        fprintf(stderr,"get_rawtransaction.(%s) %s error.(%s)\n",refcoin,acname,retstr);
+        free(retstr);
+    }
+    return(0);
+}
+
+cJSON *get_listunspent(char *refcoin,char *acname)
+{
+    cJSON *retjson; char *retstr,str[65];
+    if ( (retjson= get_komodocli(refcoin,&retstr,acname,"listunspent","","","","")) != 0 )
+    {
+        return(retjson);
+    }
+    else if ( retstr != 0 )
+    {
+        fprintf(stderr,"get_listunspent.(%s) %s error.(%s)\n",refcoin,acname,retstr);
+        free(retstr);
+    }
+    return(0);
+}
+
+cJSON *z_listunspent(char *refcoin,char *acname)
+{
+    cJSON *retjson; char *retstr,str[65];
+    if ( (retjson= get_komodocli(refcoin,&retstr,acname,"z_listunspent","","","","")) != 0 )
+    {
+        return(retjson);
+    }
+    else if ( retstr != 0 )
+    {
+        fprintf(stderr,"z_listunspent.(%s) %s error.(%s)\n",refcoin,acname,retstr);
+        free(retstr);
+    }
+    return(0);
+}
+
+cJSON *z_listoperationids(char *refcoin,char *acname)
+{
+    cJSON *retjson; char *retstr,str[65];
+    if ( (retjson= get_komodocli(refcoin,&retstr,acname,"z_listoperationids","","","","")) != 0 )
+    {
+        return(retjson);
+    }
+    else if ( retstr != 0 )
+    {
+        fprintf(stderr,"z_listoperationids.(%s) %s error.(%s)\n",refcoin,acname,retstr);
+        free(retstr);
+    }
+    return(0);
+}
+
+cJSON *z_getoperationstatus(char *refcoin,char *acname,char *opid)
+{
+    cJSON *retjson; char *retstr,str[65],params[512];
+    sprintf(params,"'[\"%s\"]'",opid);
+    if ( (retjson= get_komodocli(refcoin,&retstr,acname,"z_getoperationstatus",params,"","","")) != 0 )
+    {
+        //printf("got status (%s)\n",jprint(retjson,0));
+        return(retjson);
+    }
+    else if ( retstr != 0 )
+    {
+        fprintf(stderr,"z_getoperationstatus.(%s) %s error.(%s)\n",refcoin,acname,retstr);
+        free(retstr);
+    }
+    return(0);
+}
+
+cJSON *z_getoperationresult(char *refcoin,char *acname,char *opid)
+{
+    cJSON *retjson; char *retstr,str[65],params[512];
+    sprintf(params,"'[\"%s\"]'",opid);
+    if ( (retjson= get_komodocli(refcoin,&retstr,acname,"z_getoperationresult",params,"","","")) != 0 )
+    {
+        return(retjson);
+    }
+    else if ( retstr != 0 )
+    {
+        fprintf(stderr,"z_getoperationresult.(%s) %s error.(%s)\n",refcoin,acname,retstr);
+        free(retstr);
+    }
+    return(0);
+}
+
+int32_t validateaddress(char *refcoin,char *acname,char *depositaddr, char* compare)
+{
+    cJSON *retjson; char *retstr; int32_t res=0;
+    if ( (retjson= get_komodocli(refcoin,&retstr,acname,"validateaddress",depositaddr,"","","")) != 0 )
+    {
+        if (is_cJSON_True(jobj(retjson,compare)) != 0 ) res=1;        
+        free_json(retjson);
+    }
+    else if ( retstr != 0 )
+    {
+        fprintf(stderr,"validateaddress.(%s) %s error.(%s)\n",refcoin,acname,retstr);
+        free(retstr);        
+    }
+    return (res);
+}
+
+int32_t z_validateaddress(char *refcoin,char *acname,char *depositaddr, char *compare)
+{
+    cJSON *retjson; char *retstr; int32_t res=0;
+    if ( (retjson= get_komodocli(refcoin,&retstr,acname,"z_validateaddress",depositaddr,"","","")) != 0 )
+    {
+        if (is_cJSON_True(jobj(retjson,compare)) != 0 )
+            res=1;
+        free_json(retjson);
+    }
+    else if ( retstr != 0 )
+    {
+        fprintf(stderr,"z_validateaddress.(%s) %s error.(%s)\n",refcoin,acname,retstr);
+        free(retstr);
+    }
+    return (res);
+}
+
+int64_t z_getbalance(char *refcoin,char *acname,char *coinaddr)
+{
+    cJSON *retjson; char *retstr,cmpstr[64]; int64_t amount=0;
+    if ( (retjson= get_komodocli(refcoin,&retstr,acname,"z_getbalance",coinaddr,"","","")) != 0 )
+    {
+        fprintf(stderr,"z_getbalance.(%s) %s returned json!\n",refcoin,acname);
+        free_json(retjson);
+    }
+    else if ( retstr != 0 )
+    {
+        amount = atof(retstr) * SATOSHIDEN;
+        sprintf(cmpstr,"%.8f",dstr(amount));
+        if ( strcmp(retstr,cmpstr) != 0 )
+            amount++;
+        //printf("retstr %s -> %.8f\n",retstr,dstr(amount));
+        free(retstr);
+    }
+    return (amount);
+}
+
+int32_t getnewaddress(char *coinaddr,char *refcoin,char *acname)
+{
+    cJSON *retjson; char *retstr; int64_t amount=0;
+    if ( (retjson= get_komodocli(refcoin,&retstr,acname,"getnewaddress","","","","")) != 0 )
+    {
+        fprintf(stderr,"getnewaddress.(%s) %s returned json!\n",refcoin,acname);
+        free_json(retjson);
+        return(-1);
+    }
+    else if ( retstr != 0 )
+    {
+        strcpy(coinaddr,retstr);
+        free(retstr);
+        return(0);
+    }
+}
+
+int64_t find_onetime_amount(char *coinstr,char *coinaddr)
+{
+    cJSON *array,*item; int32_t i,n; char *addr; int64_t amount = 0;
+    coinaddr[0] = 0;
+    if ( (array= get_listunspent(coinstr,"")) != 0 )
+    {
+        if ( (n= cJSON_GetArraySize(array)) > 0 )
+        {
+            for (i=0; i<n; i++)
+            {
+                item = jitem(array,i);
+                if ( (addr= jstr(item,"address")) != 0 )
+                {
+                    strcpy(coinaddr,addr);
+                    amount = z_getbalance(coinstr,"",coinaddr);
+                    printf("found address.(%s) with amount %.8f\n",coinaddr,dstr(amount));
+                    break;
+                }
+            }
+        }
+        free_json(array);
+    }
+    return(amount);
+}
+
+int64_t find_sprout_amount(char *coinstr,char *zcaddr)
+{
+    cJSON *array,*item; int32_t i,n; char *addr; int64_t amount = 0;
+    zcaddr[0] = 0;
+    if ( (array= z_listunspent(coinstr,"")) != 0 )
+    {
+        if ( (n= cJSON_GetArraySize(array)) > 0 )
+        {
+            for (i=0; i<n; i++)
+            {
+                item = jitem(array,i);
+                if ( (addr= jstr(item,"address")) != 0 && addr[0] == 'z' && addr[1] == 'c' )
+                {
+                    strcpy(zcaddr,addr);
+                    amount = z_getbalance(coinstr,"",zcaddr);
+                    printf("found address.(%s) with amount %.8f\n",zcaddr,dstr(amount));
+                    break;
+                }
+            }
+        }
+        free_json(array);
+    }
+    return(amount);
+}
+
+void importaddress(char *refcoin,char *acname,char *depositaddr)
+{
+    cJSON *retjson; char *retstr;
+    if ( (retjson= get_komodocli(refcoin,&retstr,acname,"importaddress",depositaddr,"","true","")) != 0 )
+    {
+        printf("importaddress.(%s)\n",jprint(retjson,0));
+        free_json(retjson);
+    }
+    else if ( retstr != 0 )
+    {
+        fprintf(stderr,"importaddress.(%s) %s error.(%s)\n",refcoin,acname,retstr);
+        free(retstr);
+    }
+}
+
+int32_t z_sendmany(char *opidstr,char *coinstr,char *acname,char *srcaddr,char *destaddr,int64_t amount)
+{
+    cJSON *retjson; char *retstr,params[1024],addr[128];
+    sprintf(params,"'[{\"address\":\"%s\",\"amount\":%.8f}]'",destaddr,dstr(amount));
+    sprintf(addr,"\"%s\"",srcaddr);
+    if ( (retjson= get_komodocli(coinstr,&retstr,acname,"z_sendmany",addr,params,"","")) != 0 )
+    {
+        printf("unexpected json z_sendmany.(%s)\n",jprint(retjson,0));
+        free_json(retjson);
+        return(-1);
+    }
+    else if ( retstr != 0 )
+    {
+        fprintf(stderr,"z_sendmany.(%s) -> opid.(%s)\n",coinstr,retstr);
+        strcpy(opidstr,retstr);
+        free(retstr);
+        return(0);
+    }
+}
+
+int32_t empty_mempool(char *coinstr,char *acname)
+{
+    cJSON *array; int32_t n;
+    if ( (array= get_rawmempool(coinstr,acname)) != 0 )
+    {
+        if ( (n= cJSON_GetArraySize(array)) > 0 )
+            return(0);
+        free_json(array);
+        return(1);
+    }
+    return(-1);
+}
+
+cJSON *getinputarray(int64_t *totalp,cJSON *unspents,int64_t required)
+{
+    cJSON *vin,*item,*vins = cJSON_CreateArray(); int32_t i,n,v; int64_t satoshis; bits256 txid;
+    *totalp = 0;
+    if ( (n= cJSON_GetArraySize(unspents)) > 0 )
+    {
+        for (i=0; i<n; i++)
+        {
+            item = jitem(unspents,i);
+            satoshis = jdouble(item,"amount") * SATOSHIDEN;
+            txid = jbits256(item,"txid");
+            v = jint(item,"vout");
+            if ( bits256_nonz(txid) != 0 )
+            {
+                vin = cJSON_CreateObject();
+                jaddbits256(vin,"txid",txid);
+                jaddnum(vin,"vout",v);
+                jaddi(vins,vin);
+                *totalp += satoshis;
+                if ( (*totalp) >= required )
+                    break;
+            }
+        }
+    }
+    return(vins);
+}
+
+int32_t tx_has_voutaddress(char *refcoin,char *acname,bits256 txid,char *coinaddr)
+{
+    cJSON *txobj,*vouts,*vout,*vins,*vin,*sobj,*addresses; char *addr,str[65]; int32_t i,j,n,numarray,retval = 0, hasvout=0;
+    if ( (txobj= get_rawtransaction(refcoin,acname,txid)) != 0 )
+    {
+        if ( (vouts= jarray(&numarray,txobj,"vout")) != 0 )
+        {
+            for (i=0; i<numarray; i++)
+            {            
+                if ((vout = jitem(vouts,i)) !=0 && (sobj= jobj(vout,"scriptPubKey")) != 0 )
+                {
+                    if ( (addresses= jarray(&n,sobj,"addresses")) != 0 )
+                    {
+                        for (j=0; j<n; j++)
+                        {
+                            addr = jstri(addresses,j);
+                            if ( strcmp(addr,coinaddr) == 0 )
+                            {
+                                //fprintf(stderr,"found %s in %s v%d\n",coinaddr,bits256_str(str,txid),i);
+                                hasvout = 1;
+                                break;
+                            }
+                        }
+                    }
+                }
+                if (hasvout==1) break;
+            }
+        }
+        // if (hasvout==1 && (vins=jarray(&numarray,txobj,"vin"))!=0)
+        // {                          
+        //     for (int i=0;i<numarray;i++)
+        //     {
+        //         if ((vin=jitem(vins,i))!=0 && validateaddress(refcoin,acname,jstr(vin,"address"),"ismine")!=0)
+        //         {
+        //             retval=1;
+        //             break;
+        //         }
+        //     }                       
+        // }
+        free_json(txobj);
+    }
+    return(hasvout);
+}
+
+int32_t have_pending_opid(char *coinstr,int32_t clearresults)
+{
+    cJSON *array,*status,*result; int32_t i,n,j,m,pending = 0; char *statusstr;
+    if ( (array= z_listoperationids(coinstr,"")) != 0 )
+    {
+        if ( (n= cJSON_GetArraySize(array)) > 0 )
+        {
+            for (i=0; i<n; i++)
+            {
+                if ( (status= z_getoperationstatus(coinstr,"",jstri(array,i))) != 0 )
+                {
+                    if ( (m= cJSON_GetArraySize(status)) > 0 )
+                    {
+                        for (j=0; j<m; j++)
+                        {
+                            if ( (statusstr= jstr(jitem(status,j),"status")) != 0 )
+                            {
+                                if ( strcmp(statusstr,"executing") == 0 )
+                                {
+                                    pending++;
+                                    //printf("pending.%d\n",pending);
+                                }
+                                else if ( clearresults != 0 )
+                                {
+                                    if ( (result= z_getoperationresult(coinstr,"",jstri(array,i))) != 0 )
+                                    {
+                                        free_json(result);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    free_json(status);
+                }
+            }
+        }
+        free_json(array);
+    }
+    return(pending);
+}
+
+int32_t main(int32_t argc,char **argv)
+{
+    char buf[1024],*zsaddr,*coinstr;
+    if ( argc != 3 )
+    {
+        printf("argc needs to be 3\n");
+        return(-1);
+    }
+    if ( strcmp(argv[1],"KMD") == 0 )
+    {
+        REFCOIN_CLI = "./komodo-cli";
+        coinstr = clonestr("KMD");
+    }
+    else
+    {
+        sprintf(buf,"./komodo-cli -ac_name=%s",argv[1]);
+        REFCOIN_CLI = clonestr(buf);
+        coinstr = clonestr(argv[1]);
+    }
+    if ( argv[2][0] != 'z' || argv[2][1] != 's' )
+    {
+        printf("invalid sapling address (%s)\n",argv[2]);
+        return(-2);
+    }
+    if ( z_validateaddress(coinstr,"",argv[2],"ismine") == 0 )
+    {
+        printf("invalid sapling address (%s)\n",argv[2]);
+        return(-3);
+    }
+    zsaddr = clonestr(argv[2]);
+    printf("%s: %s %s\n",REFCOIN_CLI,coinstr,zsaddr);
+    uint32_t lastopid; char coinaddr[64],zcaddr[128],opidstr[128]; int32_t finished; int64_t amount,stdamount,txfee;
+    stdamount = 10000 * SATOSHIDEN;
+    txfee = 10000;
+again:
+    printf("start processing zmigrate\n");
+    lastopid = (uint32_t)time(NULL);
+    finished = 0;
+    while ( 1 )
+    {
+        if ( have_pending_opid(coinstr,0) != 0 )
+        {
+            sleep(60);
+            continue;
+        }
+        if ( (amount= find_onetime_amount(coinstr,coinaddr)) > txfee )
+        {
+            // find taddr with funds and send all to zsaddr
+            z_sendmany(opidstr,coinstr,"",coinaddr,zsaddr,amount-txfee);
+            lastopid = (uint32_t)time(NULL);
+            sleep(1);
+            continue;
+        }
+        if ( (amount= find_sprout_amount(coinstr,zcaddr)) > txfee )
+        {
+            // generate taddr, send max of 10000.0001
+            if ( amount > stdamount+txfee )
+                amount = stdamount + txfee;
+            if ( getnewaddress(coinaddr,coinstr,"") == 0 )
+            {
+                z_sendmany(opidstr,coinstr,"",zcaddr,coinaddr,amount-txfee);
+                lastopid = (uint32_t)time(NULL);
+            } else printf("couldnt getnewaddress!\n");
+            sleep(30);
+            continue;
+        }
+        if ( time(NULL) > lastopid+600 )
+            break;
+    }
+    sleep(3);
+    printf("%s %s ALLDONE! taddr %.8f sprout %.8f mempool empty.%d\n",coinstr,zsaddr,dstr(find_onetime_amount(coinstr,coinaddr)),dstr(find_sprout_amount(coinstr,zcaddr)),empty_mempool(coinstr,""));
+    sleep(3);
+    if ( find_onetime_amount(coinstr,coinaddr) == 0 && find_sprout_amount(coinstr,zcaddr) == 0 )
+    {
+        printf("about to purge all opid results!. ctrl-C to abort, <enter> to proceed\n");
+        getchar();
+        have_pending_opid(coinstr,1);
+    } else goto again;
+    return(0);
+}

src/cc/dice.cpp

@@ -540,10 +540,9 @@ CPubKey DiceFundingPk(CScript scriptPubKey)
     CPubKey pk; uint8_t *ptr,*dest; int32_t i;
     if ( scriptPubKey.size() == 35 )
     {
-        ptr = (uint8_t *)scriptPubKey.data();
         dest = (uint8_t *)pk.begin();
         for (i=0; i<33; i++)
-            dest[i] = ptr[i+1];
+            dest[i] = scriptPubKey[i+1];
     } else fprintf(stderr,"DiceFundingPk invalid size.%d\n",(int32_t)scriptPubKey.size());
     return(pk);
 }
@@ -831,7 +830,7 @@ bool DiceVerifyTimeout(CTransaction &betTx,int32_t timeoutblocks)
     return(numblocks >= timeoutblocks);
 }
 
-bool DiceValidate(struct CCcontract_info *cp,Eval *eval,const CTransaction &tx)
+bool DiceValidate(struct CCcontract_info *cp,Eval *eval,const CTransaction &tx, uint32_t nIn)
 {
     uint256 txid,fundingtxid,vinfundingtxid,vinhentropy,vinproof,hashBlock,hash,proof,entropy; int64_t minbet,maxbet,maxodds,timeoutblocks,odds,winnings; uint64_t vinsbits,refsbits=0,sbits,amount,inputs,outputs,txfee=10000; int32_t numvins,entropyvout,numvouts,preventCCvins,preventCCvouts,i,iswin; uint8_t funcid; CScript fundingPubKey; CTransaction fundingTx,vinTx,vinofvinTx; char CCaddr[64];
     numvins = tx.vin.size();
@@ -917,8 +916,8 @@ bool DiceValidate(struct CCcontract_info *cp,Eval *eval,const CTransaction &tx)
                                 fprintf(stderr,"%s != %s betTx.%s\n",addr0,addr1,uint256_str(str,txid));
                                 fprintf(stderr,"entropyTx.%s v%d\n",uint256_str(str,tx.vin[0].prevout.hash),(int32_t)tx.vin[0].prevout.n);
                                 fprintf(stderr,"entropyTx vin0 %s v%d\n",uint256_str(str,vinTx.vin[0].prevout.hash),(int32_t)vinTx.vin[0].prevout.n);
-                                ptr0 = (uint8_t *)vinofvinTx.vout[vinTx.vin[0].prevout.n].scriptPubKey.data();
-                                ptr1 = (uint8_t *)fundingPubKey.data();
+                                ptr0 = (uint8_t *)&vinofvinTx.vout[vinTx.vin[0].prevout.n].scriptPubKey[0];
+                                ptr1 = (uint8_t *)&fundingPubKey[0];
                                 for (i=0; i<vinofvinTx.vout[vinTx.vin[0].prevout.n].scriptPubKey.size(); i++)
                                     fprintf(stderr,"%02x",ptr0[i]);
                                 fprintf(stderr," script vs ");
@@ -972,7 +971,7 @@ bool DiceValidate(struct CCcontract_info *cp,Eval *eval,const CTransaction &tx)
                             return eval->Invalid("vout[0] != inputs-txfee for loss");
                         else if ( tx.vout[2].scriptPubKey != fundingPubKey )
                         {
-                            if ( tx.vout[2].scriptPubKey.size() == 0 || ((uint8_t *)tx.vout[2].scriptPubKey.data())[0] != 0x6a )
+                            if ( tx.vout[2].scriptPubKey.size() == 0 || tx.vout[2].scriptPubKey[0] != 0x6a )
                                 return eval->Invalid("vout[2] not send to fundingPubKey for loss");
                         }
                         iswin = -1;
@@ -996,7 +995,7 @@ bool DiceValidate(struct CCcontract_info *cp,Eval *eval,const CTransaction &tx)
                         }
                         else if ( tx.vout[3].scriptPubKey != fundingPubKey )
                         {
-                            if ( tx.vout[3].scriptPubKey.size() == 0 || ((uint8_t *)tx.vout[3].scriptPubKey.data())[0] != 0x6a )
+                            if ( tx.vout[3].scriptPubKey.size() == 0 || tx.vout[3].scriptPubKey[0] != 0x6a )
                                 return eval->Invalid("vout[3] not send to fundingPubKey for win/timeout");
                         }
                         iswin = (funcid == 'W');
@@ -1162,8 +1161,8 @@ int64_t DicePlanFunds(uint64_t &entropyval,uint256 &entropytxid,uint64_t refsbit
                                     Getscriptaddress(addr1,fundingPubKey);
                                     if ( strcmp(addr0,addr1) != 0 )
                                     {
-                                        ptr0 = (uint8_t *)vinTx.vout[1].scriptPubKey.data();
-                                        ptr1 = (uint8_t *)fundingPubKey.data();
+                                        ptr0 = (uint8_t *)&vinTx.vout[1].scriptPubKey[0];
+                                        ptr1 = (uint8_t *)&fundingPubKey[0];
                                         for (i=0; i<vinTx.vout[1].scriptPubKey.size(); i++)
                                             fprintf(stderr,"%02x",ptr0[i]);
                                         fprintf(stderr," script vs ");
@@ -1187,13 +1186,12 @@ int64_t DicePlanFunds(uint64_t &entropyval,uint256 &entropytxid,uint64_t refsbit
                             else
                             {
                                 uint8_t *ptr0,*ptr1; int32_t i; char str[65];
-                                ptr0 = (uint8_t *)tx.vout[1].scriptPubKey.data();
-                                ptr1 = (uint8_t *)fundingPubKey.data();
+                                const CScript &s0 = tx.vout[1].scriptPubKey;
                                 for (i=0; i<tx.vout[1].scriptPubKey.size(); i++)
-                                    fprintf(stderr,"%02x",ptr0[i]);
+                                    fprintf(stderr,"%02x",s0[i]);
                                 fprintf(stderr," script vs ");
                                 for (i=0; i<fundingPubKey.size(); i++)
-                                    fprintf(stderr,"%02x",ptr1[i]);
+                                    fprintf(stderr,"%02x",fundingPubKey[i]);
                                 fprintf(stderr," (%c) tx vin.%d fundingPubKey mismatch %s\n",funcid,tx.vin[0].prevout.n,uint256_str(str,tx.vin[0].prevout.hash));
                             }
                         }
@@ -1383,13 +1381,11 @@ std::string DiceAddfunding(uint64_t txfee,char *planstr,uint256 fundingtxid,int6
     if ( 0 )
     {
         uint8_t *ptr0,*ptr1; int32_t i;
-        ptr0 = (uint8_t *)scriptPubKey.data();
-        ptr1 = (uint8_t *)fundingPubKey.data();
         for (i=0; i<35; i++)
-            fprintf(stderr,"%02x",ptr0[i]);
+            fprintf(stderr,"%02x",scriptPubKey[i]);
         fprintf(stderr," script vs ");
         for (i=0; i<35; i++)
-            fprintf(stderr,"%02x",ptr1[i]);
+            fprintf(stderr,"%02x",fundingPubKey[i]);
         fprintf(stderr," funding\n");
     }
     if ( scriptPubKey == fundingPubKey )
@@ -1471,7 +1467,7 @@ std::string DiceBet(uint64_t txfee,char *planstr,uint256 fundingtxid,int64_t bet
 
 std::string DiceBetFinish(uint8_t &funcid,uint256 &entropyused,int32_t &entropyvout,int32_t *resultp,uint64_t txfee,char *planstr,uint256 fundingtxid,uint256 bettxid,int32_t winlosetimeout,uint256 vin0txid,int32_t vin0vout)
 {
-    CMutableTransaction mtx; CScript scriptPubKey,fundingPubKey; CTransaction oldbetTx,betTx,entropyTx; uint256 hentropyproof,entropytxid,hashBlock,bettorentropy,entropy,hentropy,oldbettxid; CPubKey mypk,dicepk,fundingpk; struct CCcontract_info *cp,C; int64_t inputs=0,CCchange=0,odds,fundsneeded,minbet,maxbet,maxodds,timeoutblocks; int32_t oldentropyvout,retval=0,iswin=0; uint64_t entropyval,sbits;
+    CMutableTransaction mtx,savemtx; CScript scriptPubKey,fundingPubKey; CTransaction oldbetTx,betTx,entropyTx; uint256 hentropyproof,entropytxid,hashBlock,bettorentropy,entropy,hentropy,oldbettxid; CPubKey mypk,dicepk,fundingpk; struct CCcontract_info *cp,C; int64_t inputs=0,CCchange=0,odds,fundsneeded,minbet,maxbet,maxodds,timeoutblocks; int32_t oldentropyvout,retval=0,iswin=0; uint64_t entropyval,sbits;
     entropyused = zeroid;
     *resultp = 0;
     funcid = 0;
@@ -1482,9 +1478,9 @@ std::string DiceBetFinish(uint8_t &funcid,uint256 &entropyused,int32_t &entropyv
         return("");
     }
     fundingpk = DiceFundingPk(fundingPubKey);
+    scriptPubKey = CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG;
     if ( winlosetimeout != 0 ) // must be dealernode
     {
-        scriptPubKey = CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG;
         if ( scriptPubKey != fundingPubKey )
         {
             //fprintf(stderr,"only dice fund creator can submit winner or loser\n");
@@ -1505,7 +1501,7 @@ std::string DiceBetFinish(uint8_t &funcid,uint256 &entropyused,int32_t &entropyv
         {
             if ( vin0txid == zeroid || vin0vout < 0 )
             {
-                if ( AddNormalinputs(mtx,mypk,2*txfee,1) == 0 ) // must be a single vin!!
+                if ( AddNormalinputs(mtx,mypk,2*txfee,3) == 0 ) // must be a single vin!!
                 {
                     CCerror = "no txfee inputs for win/lose";
                     fprintf(stderr,"%s\n", CCerror.c_str() );
@@ -1586,6 +1582,7 @@ std::string DiceBetFinish(uint8_t &funcid,uint256 &entropyused,int32_t &entropyv
                     }
                     CCchange = betTx.vout[0].nValue + betTx.vout[1].nValue;
                     fundsneeded = txfee + (odds+1)*betTx.vout[1].nValue;
+                    savemtx = mtx;
                     if ( CCchange >= fundsneeded )
                         CCchange -= fundsneeded;
                     else if ( (inputs= AddDiceInputs(cp,mtx,dicepk,fundsneeded,1,sbits,fundingtxid)) >= fundsneeded )
@@ -1595,6 +1592,7 @@ std::string DiceBetFinish(uint8_t &funcid,uint256 &entropyused,int32_t &entropyv
                     }
                     else
                     {
+                        mtx = savemtx;
                         if ( (inputs= AddDiceInputs(cp,mtx,dicepk,fundsneeded,60,sbits,fundingtxid)) > 0 )
                         {
                             if ( inputs > fundsneeded )
@@ -1620,6 +1618,15 @@ std::string DiceBetFinish(uint8_t &funcid,uint256 &entropyused,int32_t &entropyv
                 //fprintf(stderr,"make tx.%c\n",funcid);
                 if ( funcid == 'L' || funcid == 'W' ) // dealernode only
                     hentropy = DiceHashEntropy(entropy,mtx.vin[0].prevout.hash,mtx.vin[0].prevout.n,1);
+                else
+                {
+                    if ( scriptPubKey != betTx.vout[2].scriptPubKey )
+                    {
+                        CCerror = strprintf("can only finish your own bettxid\n");
+                        fprintf(stderr,"%s\n", CCerror.c_str() );
+                        return("");
+                    }
+                }
                 *resultp = 1;
                 //char str[65],str2[65];
                 //fprintf(stderr,"iswin.%d house entropy %s vs bettor %s\n",iswin,uint256_str(str,hentropyproof),uint256_str(str2,bettorentropy));
@@ -1715,6 +1722,12 @@ double DiceStatus(uint64_t txfee,char *planstr,uint256 fundingtxid,uint256 bettx
     GetCCaddress(cp,coinaddr,dicepk);
     if ( bettxid == zeroid ) // scan
     {
+        if ( fundingpk != mypk )
+        {
+            CCerror = "Diceinit error in status, non-dealer must provide bettxid";
+            fprintf(stderr,"%s\n", CCerror.c_str() );
+            return(0.);
+        }
         std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
         SetCCunspents(unspentOutputs,coinaddr);
         for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)

src/cc/disputepayout.cpp

@@ -46,7 +46,7 @@ bool Eval::DisputePayout(AppVM &vm, std::vector<uint8_t> params, const CTransact
         if (!GetTxConfirmed(disputeTx.vin[0].prevout.hash, sessionTx, sessionBlock))
             return Error("couldnt-get-parent");
 
-        if (GetCurrentHeight() < sessionBlock.nHeight + waitBlocks)
+        if (GetCurrentHeight() < sessionBlock.GetHeight() + waitBlocks)
             return Invalid("dispute-too-soon");  // Not yet
     }
 

src/cc/eval.cpp

@@ -74,11 +74,11 @@ bool Eval::Dispatch(const CC *cond, const CTransaction &txTo, unsigned int nIn)
     switch ( ecode )
     {
         case EVAL_IMPORTPAYOUT:
-            return ImportPayout(vparams, txTo, nIn);
+            //return ImportPayout(vparams, txTo, nIn);
             break;
 
         case EVAL_IMPORTCOIN:
-            return ImportCoin(vparams, txTo, nIn);
+            //return ImportCoin(vparams, txTo, nIn);
             break;
 
         default:
@@ -98,9 +98,10 @@ bool Eval::GetSpendsConfirmed(uint256 hash, std::vector<CTransaction> &spends) c
 
 bool Eval::GetTxUnconfirmed(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock) const
 {
-    if (!myGetTransaction(hash, txOut,hashBlock)) {
+    return(myGetTransaction(hash, txOut,hashBlock));
+    /*if (!myGetTransaction(hash, txOut,hashBlock)) {
         return(GetTransaction(hash, txOut,hashBlock));
-    } else return(true);
+    } else return(true);*/
 }
 
 
@@ -156,7 +157,8 @@ bool Eval::CheckNotaryInputs(const CTransaction &tx, uint32_t height, uint32_t t
         if (tx.vout.size() < txIn.prevout.n) return false;
         CScript spk = tx.vout[txIn.prevout.n].scriptPubKey;
         if (spk.size() != 35) return false;
-        const unsigned char *pk = spk.data();
+        std::vector<unsigned char> scriptVec = std::vector<unsigned char>(spk.begin(),spk.end());
+        const unsigned char *pk = scriptVec.data();
         if (pk++[0] != 33) return false;
         if (pk[33] != OP_CHECKSIG) return false;
 
@@ -185,7 +187,7 @@ bool Eval::GetNotarisationData(const uint256 notaryHash, NotarisationData &data)
     CTransaction notarisationTx;
     CBlockIndex block;
     if (!GetTxConfirmed(notaryHash, notarisationTx, block)) return false;
-    if (!CheckNotaryInputs(notarisationTx, block.nHeight, block.nTime)) return false;
+    if (!CheckNotaryInputs(notarisationTx, block.GetHeight(), block.nTime)) return false;
     if (!ParseNotarisationOpReturn(notarisationTx, data)) return false;
     return true;
 }

src/cc/eval.h

@@ -36,6 +36,7 @@
  * there should be a code identifying it. For example,
  * a possible code is EVAL_BITCOIN_SCRIPT, where the entire binary
  * after the code is interpreted as a bitcoin script.
+ * Verus EVAL_STAKEGUARD is 0x01
  */
 #define FOREACH_EVAL(EVAL)             \
         EVAL(EVAL_IMPORTPAYOUT, 0xe1)  \
@@ -174,7 +175,7 @@ public:
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
 
         bool IsBack = IsBackNotarisation;
         if (2 == IsBackNotarisation) IsBack = DetectBackNotarisation(s, ser_action);
@@ -270,7 +271,7 @@ public:
     ADD_SERIALIZE_METHODS;
     
     template <typename Stream, typename Operation>
-    inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+    inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(VARINT(nIndex));
         READWRITE(branch);
     }

src/cc/faucet.cpp

@@ -77,7 +77,7 @@ bool FaucetExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransaction
     else return(true);
 }
 
-bool FaucetValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx)
+bool FaucetValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn)
 {
     int32_t numvins,numvouts,preventCCvins,preventCCvouts,i,numblocks; bool retval; uint256 txid; uint8_t hash[32]; char str[65],destaddr[64];
     std::vector<std::pair<CAddressIndexKey, CAmount> > txids;
@@ -146,7 +146,7 @@ int64_t AddFaucetInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,CPub
     std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
     GetCCaddress(cp,coinaddr,pk);
     SetCCunspents(unspentOutputs,coinaddr);
-    threshold = total/maxinputs;
+    threshold = total/(maxinputs+1);
     for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
     {
         txid = it->first.txhash;

src/cc/fsm.cpp

@@ -72,7 +72,7 @@ bool FSMExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransaction &t
     else return(true);
 }
 
-bool FSMValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx)
+bool FSMValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn)
 {
     int32_t numvins,numvouts,preventCCvins,preventCCvouts,i; bool retval;
     return(false); // reject any FSM CC for now

src/cc/heir.cpp

@@ -71,7 +71,7 @@ bool HeirExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransaction &
     else return(true);
 }
 
-bool HeirValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx)
+bool HeirValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn)
 {
     int32_t numvins,numvouts,preventCCvins,preventCCvouts,i,numblocks; bool retval; uint256 txid; uint8_t hash[32]; char str[65],destaddr[64];
     return(false);

src/cc/lotto.cpp

@@ -112,7 +112,7 @@ bool LottoExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransaction
     else return(true);
 }
 
-bool LottoValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx)
+bool LottoValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn)
 {
     int32_t numvins,numvouts,preventCCvins,preventCCvouts,i; bool retval;
     return(false); // reject any lotto CC for now

src/cc/oracles.cpp

@@ -233,6 +233,10 @@ int64_t OracleDatafee(CScript &scriptPubKey,uint256 oracletxid,CPubKey publisher
             CCtxidaddr(markeraddr,oracletxid);
             datafee = OracleCurrentDatafee(oracletxid,markeraddr,publisher);
         }
+        else
+        {
+            fprintf(stderr,"Could not decode op_ret from transaction %s\nscriptPubKey: %s\n", oracletxid.GetHex().c_str(), oracletx.vout[numvouts-1].scriptPubKey.ToString().c_str());
+        }
     }
     return(datafee);
 }
@@ -593,7 +597,7 @@ bool OraclesDataValidate(struct CCcontract_info *cp,Eval* eval,const CTransactio
     else return(true);
 }
 
-bool OraclesValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx)
+bool OraclesValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn)
 {
     uint256 txid,oracletxid,batontxid; uint64_t txfee=10000; int32_t numvins,numvouts,preventCCvins,preventCCvouts; uint8_t *script; std::vector<uint8_t> vopret,data; CScript scriptPubKey; CPubKey publisher;
     numvins = tx.vin.size();
@@ -735,7 +739,7 @@ std::string OracleCreate(int64_t txfee,std::string name,std::string description,
         txfee = 10000;
     mypk = pubkey2pk(Mypubkey());
     Oraclespk = GetUnspendable(cp,0);
-    if ( AddNormalinputs(mtx,mypk,2*txfee,1) > 0 )
+    if ( AddNormalinputs(mtx,mypk,2*txfee,3) > 0 )
     {
         mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(HexStr(Oraclespk)) << OP_CHECKSIG));
         return(FinalizeCCTx(0,cp,mtx,mypk,txfee,EncodeOraclesCreateOpRet('C',name,description,format)));
@@ -774,7 +778,7 @@ std::string OracleSubscribe(int64_t txfee,uint256 oracletxid,CPubKey publisher,i
         txfee = 10000;
     mypk = pubkey2pk(Mypubkey());
     markerpubkey = CCtxidaddr(markeraddr,oracletxid);
-    if ( AddNormalinputs(mtx,mypk,amount + 2*txfee,1) > 0 )
+    if ( AddNormalinputs(mtx,mypk,amount + 2*txfee,64) > 0 )
     {
         mtx.vout.push_back(MakeCC1vout(cp->evalcode,amount,publisher));
         mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(HexStr(markerpubkey)) << OP_CHECKSIG));
@@ -790,12 +794,14 @@ std::string OracleData(int64_t txfee,uint256 oracletxid,std::vector <uint8_t> da
     mypk = pubkey2pk(Mypubkey());
     if ( data.size() > 8192 )
     {
-        fprintf(stderr,"datasize %d is too big\n",(int32_t)data.size());
+        CCerror = strprintf("datasize %d is too big",(int32_t)data.size());
+        fprintf(stderr,"%s\n", CCerror.c_str() );
         return("");
     }
     if ( (datafee= OracleDatafee(pubKey,oracletxid,mypk)) <= 0 )
     {
-        fprintf(stderr,"datafee %.8f is illegal\n",(double)datafee/COIN);
+        CCerror = strprintf("datafee %.8f is illegal",(double)datafee/COIN);
+        fprintf(stderr,"%s\n", CCerror.c_str() );
         return("");
     }
     if ( txfee == 0 )
@@ -816,8 +822,14 @@ std::string OracleData(int64_t txfee,uint256 oracletxid,std::vector <uint8_t> da
             mtx.vout.push_back(MakeCC1vout(cp->evalcode,txfee,batonpk));
             mtx.vout.push_back(CTxOut(datafee,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
             return(FinalizeCCTx(0,cp,mtx,mypk,txfee,EncodeOraclesData('D',oracletxid,batontxid,mypk,data)));
-        } else fprintf(stderr,"couldnt find enough oracle inputs %s, limit 1 per utxo\n",coinaddr);
-    } else fprintf(stderr,"couldnt add normal inputs\n");
+        } else {
+            CCerror = strprintf("couldnt find enough oracle inputs %s, limit 1 per utxo\n",coinaddr);
+            fprintf(stderr,"%s\n", CCerror.c_str() );
+        }
+    } else {
+        CCerror = strprintf("couldnt add normal inputs\n");
+        fprintf(stderr,"%s\n", CCerror.c_str() );
+    }
     return("");
 }
 

src/cc/payments.cpp

@@ -72,7 +72,7 @@ bool PaymentsExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransacti
     else return(true);
 }
 
-bool PaymentsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx)
+bool PaymentsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn)
 {
     int32_t numvins,numvouts,preventCCvins,preventCCvouts,i,numblocks; bool retval; uint256 txid; uint8_t hash[32]; char str[65],destaddr[64];
     return(false);

src/cc/pegs.cpp

@@ -79,7 +79,7 @@ bool PegsExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransaction &
     else return(true);
 }
 
-bool PegsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx)
+bool PegsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn)
 {
     int32_t numvins,numvouts,preventCCvins,preventCCvouts,i,numblocks; bool retval; uint256 txid; uint8_t hash[32]; char str[65],destaddr[64];
     return(false);

src/cc/prices.cpp

@@ -86,7 +86,7 @@ uint8_t DecodePricesFundingOpRet(CScript scriptPubKey,CPubKey &planpk,uint256 &o
     return(0);
 }
 
-bool PricesValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx)
+bool PricesValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn)
 {
     int32_t numvins,numvouts,preventCCvins,preventCCvouts,i,numblocks; bool retval; uint256 txid; uint8_t hash[32]; char str[65],destaddr[64];
     return(false);
@@ -229,7 +229,7 @@ std::string PricesCreateFunding(uint64_t txfee,uint256 bettoken,uint256 oracletx
         return("");
     }
     fprintf(stderr,"error check bettoken\n");
-    if ( AddNormalinputs(mtx,mypk,3*txfee,3) > 0 )
+    if ( AddNormalinputs(mtx,mypk,3*txfee,4) > 0 )
     {
         mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
         mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(HexStr(pricespk)) << OP_CHECKSIG));

src/cc/rewards.cpp

@@ -192,7 +192,7 @@ bool RewardsExactAmounts(struct CCcontract_info *cp,Eval *eval,const CTransactio
     else return(true);
 }
 
-bool RewardsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx)
+bool RewardsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn)
 {
     uint256 txid,fundingtxid,hashBlock,vinfundingtxid; uint64_t vinsbits,sbits,APR,minseconds,maxseconds,mindeposit,amount,reward,txfee=10000; int32_t numvins,numvouts,preventCCvins,preventCCvouts,i; uint8_t funcid; CScript scriptPubKey; CTransaction fundingTx,vinTx;
     numvins = tx.vin.size();
@@ -333,7 +333,7 @@ int64_t AddRewardsInputs(CScript &scriptPubKey,uint64_t maxseconds,struct CCcont
     std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
     GetCCaddress(cp,coinaddr,pk);
     SetCCunspents(unspentOutputs,coinaddr);
-    threshold = total/maxinputs;
+    threshold = total/(maxinputs+1);
     for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
     {
         txid = it->first.txhash;

src/cc/triggers.cpp

@@ -71,7 +71,7 @@ bool TriggersExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransacti
     else return(true);
 }
 
-bool TriggersValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx)
+bool TriggersValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn)
 {
     int32_t numvins,numvouts,preventCCvins,preventCCvouts,i,numblocks; bool retval; uint256 txid; uint8_t hash[32]; char str[65],destaddr[64];
     return(false);