DragonX/hush3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1006 from jl777/jl777

Browse Source 
Jl777
This commit is contained in:
jl777
2018-11-30 12:23:20 -11:00
committed by GitHub
parent 6b5dbcf41c e23cb3e0d2
commit e0ee681019
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/cc/gateways.cpp
View File

@@ -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()));

8
src/wallet/rpcwallet.cpp
View File

@@ -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);
@@ -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)