LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge #13927: rpc: Use pushKV in some new PSBT RPCs

Browse source 
227d27e70c Use pushKV in some new PSBT RPCs. (Daniel Kraft)

Pull request description:

  Most of the code uses `UniValue::pushKV` where appropriate, but some new RPC code related to PSBTs did not.  This fixes those places - after this change, there are no remaining source files I could find that contain `push_back(Pair(`.

Tree-SHA512: d6567cf144d05d7e42276bd66ff4cd44413328f985772d11bb9d7339d32ab7c3438d4bb0040a37e75f8d193c610b08fa971073935885e0a178546aa045daf9fa
This commit is contained in:
MarcoFalke 2018-08-10 21:33:08 -04:00
commit bced8ea71a
No known key found for this signature in database
GPG key ID: D2EA4850E7528B25
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/rpc/rawtransaction.cpp
View file

@ -1662,12 +1662,12 @@ UniValue finalizepsbt(const JSONRPCRequest& request)
mtx.vin[i].scriptWitness = psbtx.inputs[i].final_script_witness; mtx.vin[i].scriptWitness = psbtx.inputs[i].final_script_witness;
} }
ssTx << mtx; ssTx << mtx;
result.push_back(Pair("hex", HexStr(ssTx.begin(), ssTx.end()))); result.pushKV("hex", HexStr(ssTx.begin(), ssTx.end()));
} else { } else {
ssTx << psbtx; ssTx << psbtx;
result.push_back(Pair("psbt", EncodeBase64((unsigned char*)ssTx.data(), ssTx.size()))); result.pushKV("psbt", EncodeBase64((unsigned char*)ssTx.data(), ssTx.size()));
} }
result.push_back(Pair("complete", complete)); result.pushKV("complete", complete);
return result; return result;
} }

4
src/wallet/rpcwallet.cpp
View file

@ -4630,8 +4630,8 @@ UniValue walletprocesspsbt(const JSONRPCRequest& request)
UniValue result(UniValue::VOBJ); UniValue result(UniValue::VOBJ);
CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION); CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
ssTx << psbtx; ssTx << psbtx;
result.push_back(Pair("psbt", EncodeBase64((unsigned char*)ssTx.data(), ssTx.size()))); result.pushKV("psbt", EncodeBase64((unsigned char*)ssTx.data(), ssTx.size()));
result.push_back(Pair("complete", complete)); result.pushKV("complete", complete);
return result; return result;
} }