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 b5a271334c into merged_master (Bitcoin PR bitcoin/bitcoin#28922)

Browse source
This commit is contained in:
Byron Hambly 2025-11-10 15:40:17 +02:00
commit 26b9abc2f2
No known key found for this signature in database
GPG key ID: DE8F6EA20A661697
59 changed files with 161 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/validation.cpp
View file

@ -715,7 +715,7 @@ bool MemPoolAccept::PreChecks(ATMPArgs& args, Workspace& ws)
AssertLockHeld(m_pool.cs);
const CTransactionRef& ptx = ws.m_ptx;
const CTransaction& tx = *ws.m_ptx;
const uint256& hash = ws.m_hash;
const Txid& hash = ws.m_hash;
// Copy/alias what we need out of args
const int64_t nAcceptTime = args.m_accept_time;
@ -2183,7 +2183,7 @@ DisconnectResult Chainstate::DisconnectBlock(const CBlock& block, const CBlockIn
// undo transactions in reverse order
for (int i = block.vtx.size() - 1; i >= 0; i--) {
const CTransaction &tx = *(block.vtx[i]);
uint256 hash = tx.GetHash();
Txid hash = tx.GetHash();
bool is_coinbase = tx.IsCoinBase();
bool is_bip30_exception = (is_coinbase && !fEnforceBIP30);