diff options
| author | Russell Yanofsky <russ@yanofsky.org> | 2017-02-02 17:34:22 -0500 |
|---|---|---|
| committer | Russell Yanofsky <russ@yanofsky.org> | 2017-02-02 17:34:22 -0500 |
| commit | 4ec057dfa72fbb910fec69305af1ff6d5e03ca30 (patch) | |
| tree | 5af99d42db58e14be8b403783411c0af67dfd3c3 /src/wallet | |
| parent | 1c2edd9f6707d16c03ecfba094b1cfec2ddc4dce (diff) | |
| download | bitcoin-4ec057dfa72fbb910fec69305af1ff6d5e03ca30.tar.xz | |
[wallet] Set correct metadata on bumpfee wallet transactions
Preserve comment, order form, and account strings from the original wallet
transaction. Also set fTimeReceivedIsTxTime and fFromMe fields for consistency
with CWallet::CreateTransaction. The latter two fields don't influence current
wallet behavior, but do record that the transaction originated in the wallet
instead of coming from the network or sendrawtransaction.
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/rpcwallet.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 36753d1116..45b572aa2e 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. |