Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-06-02 23:42:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support overriding txn-spk-reused rejections via sendrawtransaction

Browse Source
This commit is contained in:
Luke Dashjr 2017-02-13 10:11:24 +00:00
parent a7112699a0
commit 406243e7c9
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/validation.cpp
View File

@ -842,6 +842,9 @@ bool MemPoolAccept::PreChecks(ATMPArgs& args, Workspace& ws)
} }
auto spk_reuse_mode = SpkReuseMode; auto spk_reuse_mode = SpkReuseMode;
if (ignore_rejects.count("txn-spk-reused")) {
spk_reuse_mode = SRM_ALLOW;
}
SPKStates_t mapSPK; SPKStates_t mapSPK;
// Check for conflicts with in-memory transactions // Check for conflicts with in-memory transactions
@ -897,7 +900,7 @@ bool MemPoolAccept::PreChecks(ATMPArgs& args, Workspace& ws)
} }
} }
if (mapSPK.find(hashSPK) != mapSPK.end()) { if (mapSPK.find(hashSPK) != mapSPK.end()) {
return state.Invalid(TxValidationResult::TX_MEMPOOL_POLICY, "txn-spk-reused-twinoutputs"); MaybeReject(TxValidationResult::TX_MEMPOOL_POLICY, "txn-spk-reused-twinoutputs");
} }
mapSPK[hashSPK] = MemPool_SPK_State(mapSPK[hashSPK] | MSS_CREATED); mapSPK[hashSPK] = MemPool_SPK_State(mapSPK[hashSPK] | MSS_CREATED);
} }
@ -963,7 +966,7 @@ bool MemPoolAccept::PreChecks(ATMPArgs& args, Workspace& ws)
SPKStates_t::iterator mssit = mapSPK.find(hashSPK); SPKStates_t::iterator mssit = mapSPK.find(hashSPK);
if (mssit != mapSPK.end()) { if (mssit != mapSPK.end()) {
if (mssit->second & MSS_CREATED) { if (mssit->second & MSS_CREATED) {
return state.Invalid(TxValidationResult::TX_MEMPOOL_POLICY, "txn-spk-reused-change"); MaybeReject(TxValidationResult::TX_MEMPOOL_POLICY, "txn-spk-reused-change");
} }
} }
const auto& SPKit = m_pool.mapUsedSPK.find(hashSPK); const auto& SPKit = m_pool.mapUsedSPK.find(hashSPK);
@ -1161,7 +1164,7 @@ bool MemPoolAccept::PreChecks(ATMPArgs& args, Workspace& ws)
return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-txns-spends-conflicting-tx", *err_string); return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-txns-spends-conflicting-tx", *err_string);
} }
if (has_policy_conflict) { if (has_policy_conflict) {
return state.Invalid(TxValidationResult::TX_MEMPOOL_POLICY, "txn-spk-reused-chained"); MaybeReject(TxValidationResult::TX_MEMPOOL_POLICY, "txn-spk-reused-chained");
} }
// We want to detect conflicts in any tx in a package to trigger package RBF logic // We want to detect conflicts in any tx in a package to trigger package RBF logic