mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-17 13:07:54 +02:00
Merge cf24152596 into merged_master (Bitcoin PR bitcoin/bitcoin#21206)
This commit is contained in:
commit
e6cdd99eec
17 changed files with 260 additions and 177 deletions
|
|
@ -20,7 +20,7 @@ static void addCoin(const CAmount& nValue, const CWallet& wallet, std::vector<st
|
|||
tx.nLockTime = nextLockTime++; // so all transactions get different hashes
|
||||
tx.vout.resize(1);
|
||||
tx.vout[0].nValue = nValue;
|
||||
wtxs.push_back(std::make_unique<CWalletTx>(MakeTransactionRef(std::move(tx))));
|
||||
wtxs.push_back(std::make_unique<CWalletTx>(MakeTransactionRef(std::move(tx)), TxStateInactive{}));
|
||||
}
|
||||
|
||||
// Simple benchmark for wallet coin selection. Note that it maybe be necessary
|
||||
|
|
@ -87,7 +87,7 @@ static void add_coin(const CAmount& nValue, int nInput, std::vector<OutputGroup>
|
|||
CMutableTransaction tx;
|
||||
tx.vout.resize(nInput + 1);
|
||||
tx.vout[nInput].nValue = nValue;
|
||||
CWalletTx wtx(MakeTransactionRef(tx));
|
||||
CWalletTx wtx(MakeTransactionRef(tx), TxStateInactive{});
|
||||
CInputCoin coin(testWallet, &wtx, nInput);
|
||||
set.emplace_back();
|
||||
set.back().Insert(coin, 0, true, 0, 0, false);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue