From c9e9081c8ac94144626cecb982d633e36f796396 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 29 Nov 2018 07:00:04 -1100 Subject: [PATCH 1/3] Rebase --- src/cc/gateways.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/cc/gateways.cpp b/src/cc/gateways.cpp index da9b57766..94d662193 100644 --- a/src/cc/gateways.cpp +++ b/src/cc/gateways.cpp @@ -707,7 +707,6 @@ int64_t AddGatewaysInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,CP char str[65],str2[65]; fprintf(stderr,"vout.%d %d:%d (%c) check for refassetid.%s vs %s %.8f\n",vout,evalcode,cp->evalcode,funcid,uint256_str(str,refassetid),uint256_str(str2,assetid),(double)vintx.vout[vout].nValue/COIN); if ( assetid == refassetid && funcid == 't' && (nValue= vintx.vout[vout].nValue) > 0 && myIsutxo_spentinmempool(txid,vout) == 0 ) { - // call IsAssetsVout? //fprintf(stderr,"total %llu maxinputs.%d %.8f\n",(long long)total,maxinputs,(double)it->second.satoshis/COIN); if ( total != 0 && maxinputs != 0 ) mtx.vin.push_back(CTxIn(txid,vout,CScript())); From 800396d7461b67045bc489560266c97966d89f26 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 30 Nov 2018 12:13:03 -1100 Subject: [PATCH 2/3] Allow duplicated destination for sendmany --- src/wallet/rpcwallet.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index f3b344ecd..8f0a692b4 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -1319,9 +1319,9 @@ UniValue sendmany(const UniValue& params, bool fHelp) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, std::string("Invalid Zcash address: ") + name_); } - if (destinations.count(dest)) { + /*if (destinations.count(dest)) { throw JSONRPCError(RPC_INVALID_PARAMETER, std::string("Invalid parameter, duplicated address: ") + name_); - } + }*/ destinations.insert(dest); CScript scriptPubKey = GetScriptForDestination(dest); From e23cb3e0d291e81236be7113db0eb08618fd0b4e Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 30 Nov 2018 12:22:02 -1100 Subject: [PATCH 3/3] Partial revert of heir address to build --- src/wallet/rpcwallet.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 26f56b395..c65bdd746 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -5548,9 +5548,9 @@ UniValue heiraddress(const UniValue& params, bool fHelp) if(params.size() == 4) destPubkey = ParseHex(params[3].get_str().c_str()); - return HeirFundBad(funcid, assetid, funds, destPubkey); + //return HeirFundBad(funcid, assetid, funds, destPubkey); - //return(CCaddress(cp,(char *)"Heir",pubkey)); + return(CCaddress(cp,(char *)"Heir",destPubkey)); } UniValue lottoaddress(const UniValue& params, bool fHelp)