GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 2f6a8e5e02 into merged_master (Bitcoin PR bitcoin/bitcoin#26695)

Browse source
This commit is contained in:
Byron Hambly 2025-04-01 21:37:29 +02:00
commit bb18aed1c1
6 changed files with 54 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/test/util/setup_common.cpp
View file

@ -422,15 +422,15 @@ std::vector<CTransactionRef> TestChain100Setup::PopulateMempool(FastRandomContex
unspent_prevouts.pop_front();
}
const size_t num_outputs = det_rand.randrange(24) + 1;
// Approximately 1000sat "fee," equal output amounts.
const CAmount amount_per_output = (total_in - 1000) / num_outputs;
const CAmount fee = 100 * det_rand.randrange(30);
const CAmount amount_per_output = (total_in - fee) / num_outputs;
for (size_t n{0}; n < num_outputs; ++n) {
CScript spk = CScript() << CScriptNum(num_transactions + n);
mtx.vout.push_back(CTxOut(CAsset(), CConfidentialValue(amount_per_output), spk));
}
CTransactionRef ptx = MakeTransactionRef(mtx);
mempool_transactions.push_back(ptx);
if (amount_per_output > 2000) {
if (amount_per_output > 3000) {
// If the value is high enough to fund another transaction + fees, keep track of it so
// it can be used to build a more complex transaction graph. Insert randomly into
// unspent_prevouts for extra randomness in the resulting structures.
@ -440,9 +440,11 @@ std::vector<CTransactionRef> TestChain100Setup::PopulateMempool(FastRandomContex
}
}
if (submit) {
LOCK2(m_node.mempool->cs, cs_main);
LOCK2(cs_main, m_node.mempool->cs);
LockPoints lp;
m_node.mempool->addUnchecked(CTxMemPoolEntry(ptx, 1000, 0, 1, false, 4, lp, /*setPeginsSpent=*/{}));
m_node.mempool->addUnchecked(CTxMemPoolEntry(ptx, /*fee=*/(total_in - num_outputs * amount_per_output),
/*time=*/0, /*entry_height=*/1,
/*spends_coinbase=*/false, /*sigops_cost=*/4, lp, /*setPeginsSpent=*/{}));
}
--num_transactions;
}