highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-03-24 22:45:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace CWalletTx::SetConf by Confirmation initialization list

Browse Source
This commit is contained in:
Antoine Riard
2019-10-24 12:53:57 -04:00
parent 5aacc3eff1
commit 9700fcb47f
4 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/wallet/rpcdump.cpp
View File

@@ -382,7 +382,8 @@ UniValue importprunedfunds(const JSONRPCRequest& request)
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Something wrong with merkleblock");
}
wtx.SetConf(CWalletTx::Status::CONFIRMED, merkleBlock.header.GetHash(), txnIndex);
CWalletTx::Confirmation confirm(CWalletTx::Status::CONFIRMED, merkleBlock.header.GetHash(), txnIndex);
wtx.m_confirm = confirm;
auto locked_chain = pwallet->chain().lock();
LOCK(pwallet->cs_wallet);