Skip to content

Commit

Permalink
Merge de94251 into merged_master (Elements PR ElementsProject#1239)
Browse files Browse the repository at this point in the history
bitcoin/bitcoin#23381 refactored PolicyScriptChecks to store the
precomputed txdata in the workspace, so I have added the genesis hash to
the transform of the workspaces in AcceptMultipleTransactions.

I don't think there was a specific test for this, so during review it
may be worth checking this thoroughly. We also need a test to cover
this.
  • Loading branch information
delta1 committed Jul 3, 2023
2 parents 3cae952 + de94251 commit 88d211d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/validation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1284,7 +1284,7 @@ PackageMempoolAcceptResult MemPoolAccept::AcceptMultipleTransactions(const std::
std::vector<Workspace> workspaces{};
workspaces.reserve(txns.size());
std::transform(txns.cbegin(), txns.cend(), std::back_inserter(workspaces),
[](const auto& tx) { return Workspace(tx); });
[&](const auto& tx) { return Workspace(tx, args.m_chainparams.HashGenesisBlock()); });
std::map<const uint256, const MempoolAcceptResult> results;

LOCK(m_pool.cs);
Expand Down

0 comments on commit 88d211d

Please sign in to comment.