aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2017-02-06 12:48:41 +0100
committerWladimir J. van der Laan <[email protected]>2017-02-06 12:48:55 +0100
commit8d6447ecf79cd9a875552f0940098394085345e1 (patch)
tree1e424e221dbf4e8cf8f3cf8a651dcb8457576baf /src
parentMerge #9691: Init ECC context for test_bitcoin_fuzzy. (diff)
parent[wallet] Set correct metadata on bumpfee wallet transactions (diff)
downloaddiscoin-8d6447ecf79cd9a875552f0940098394085345e1.tar.xz
discoin-8d6447ecf79cd9a875552f0940098394085345e1.zip
Merge #9673: Set correct metadata on bumpfee wallet transactions
4ec057d [wallet] Set correct metadata on bumpfee wallet transactions (Russell Yanofsky)
Diffstat (limited to 'src')
-rw-r--r--src/wallet/rpcwallet.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 36753d111..45b572aa2 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2944,7 +2944,12 @@ UniValue bumpfee(const JSONRPCRequest& request)
// commit/broadcast the tx
CReserveKey reservekey(pwalletMain);
CWalletTx wtxBumped(pwalletMain, MakeTransactionRef(std::move(tx)));
+ wtxBumped.mapValue = wtx.mapValue;
wtxBumped.mapValue["replaces_txid"] = hash.ToString();
+ wtxBumped.vOrderForm = wtx.vOrderForm;
+ wtxBumped.strFromAccount = wtx.strFromAccount;
+ wtxBumped.fTimeReceivedIsTxTime = true;
+ wtxBumped.fFromMe = true;
CValidationState state;
if (!pwalletMain->CommitTransaction(wtxBumped, reservekey, g_connman.get(), state)) {
// NOTE: CommitTransaction never returns false, so this should never happen.