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

Fix sendmany bug for Alright (#1336)

Browse Source 
* fix sendmany bug, when sending to multiple address diffrent amounts would always use the first seen value.

* Possible fix for multi node musig. Needs to be tested. Was getting stuck at nonce stage, as reported by gcharang.
This commit is contained in:
blackjok3rtt
2019-03-18 15:22:20 +08:00
committed by jl777
parent 05977b8af6
commit d8d7463ea0
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cc/musig.cpp
View File

@@ -538,7 +538,7 @@ UniValue musig_commit(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
for (i=0; i<33; i++) for (i=0; i<33; i++)
sprintf(&str[i<<1],"%02x",((uint8_t *)pk.begin())[i]); sprintf(&str[i<<1],"%02x",((uint8_t *)pk.begin())[i]);
str[66] = 0; str[66] = 0;
if ( n == 5 ) if ( n == 3 )
MUSIG[myind]->numnonces = 1; MUSIG[myind]->numnonces = 1;
result.push_back(Pair("myind",MUSIG[myind]->myind)); result.push_back(Pair("myind",MUSIG[myind]->myind));
result.push_back(Pair("nonce",str)); result.push_back(Pair("nonce",str));
@@ -629,7 +629,7 @@ UniValue musig_nonce(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
result.push_back(Pair("myind",MUSIG[myind]->myind)); result.push_back(Pair("myind",MUSIG[myind]->myind));
result.push_back(Pair("partialsig",str)); result.push_back(Pair("partialsig",str));
result.push_back(Pair("result","success")); result.push_back(Pair("result","success"));
if ( n == 5 ) if ( n == 3 )
MUSIG[myind]->numpartials = 1; MUSIG[myind]->numpartials = 1;
return(result); return(result);
} else return(cclib_error(result,"error serializing partial sig")); } else return(cclib_error(result,"error serializing partial sig"));

10
src/wallet/rpcwallet.cpp
View File

@@ -1457,24 +1457,19 @@ UniValue sendmany(const UniValue& params, bool fHelp)
if (params.size() > 4) if (params.size() > 4)
subtractFeeFromAmount = params[4].get_array(); subtractFeeFromAmount = params[4].get_array();
std::set<CTxDestination> destinations;
std::vector<CRecipient> vecSend; std::vector<CRecipient> vecSend;
CAmount totalAmount = 0; CAmount totalAmount = 0;
std::vector<std::string> keys = sendTo.getKeys(); std::vector<std::string> keys = sendTo.getKeys();
int32_t i = 0;
for (const std::string& name_ : keys) { for (const std::string& name_ : keys) {
CTxDestination dest = DecodeDestination(name_); CTxDestination dest = DecodeDestination(name_);
if (!IsValidDestination(dest)) { if (!IsValidDestination(dest)) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, std::string("Invalid Zcash address: ") + name_); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, std::string("Invalid Zcash address: ") + name_);
} }
/*if (destinations.count(dest)) {
throw JSONRPCError(RPC_INVALID_PARAMETER, std::string("Invalid parameter, duplicated address: ") + name_);
}*/
destinations.insert(dest);
CScript scriptPubKey = GetScriptForDestination(dest); CScript scriptPubKey = GetScriptForDestination(dest);
CAmount nAmount = AmountFromValue(sendTo[name_]); CAmount nAmount = AmountFromValue(sendTo[i]);
if (nAmount <= 0) if (nAmount <= 0)
throw JSONRPCError(RPC_TYPE_ERROR, "Invalid amount for send"); throw JSONRPCError(RPC_TYPE_ERROR, "Invalid amount for send");
totalAmount += nAmount; totalAmount += nAmount;
@@ -1488,6 +1483,7 @@ UniValue sendmany(const UniValue& params, bool fHelp)
CRecipient recipient = {scriptPubKey, nAmount, fSubtractFeeFromAmount}; CRecipient recipient = {scriptPubKey, nAmount, fSubtractFeeFromAmount};
vecSend.push_back(recipient); vecSend.push_back(recipient);
i++;
} }
EnsureWalletIsUnlocked(); EnsureWalletIsUnlocked();