From b6bcacad206000e83f3f564e6412c4f26dc30483 Mon Sep 17 00:00:00 2001 From: Duke Date: Sun, 22 Sep 2024 12:16:21 -0400 Subject: [PATCH] We do not support coin imports --- src/main.cpp | 6 +++--- src/script/script.cpp | 6 ------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index f76da499b..4e7321130 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1103,8 +1103,8 @@ bool AreInputsStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs, if (tx.IsCoinBase()) return true; // Coinbases don't use vin normally - if (tx.IsCoinImport()) - return tx.vin[0].scriptSig.IsCoinImport(); + //if (tx.IsCoinImport()) + // return tx.vin[0].scriptSig.IsCoinImport(); for (unsigned int i = 0; i < tx.vin.size(); i++) { @@ -1950,7 +1950,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa dFreeCount += nSize; } - if (!tx.IsCoinImport() && fRejectAbsurdFee && nFees > ::minRelayTxFee.GetFee(nSize) * 10000 && nFees > nValueOut/19) + if ( fRejectAbsurdFee && nFees > ::minRelayTxFee.GetFee(nSize) * 10000 && nFees > nValueOut/19) { string errmsg = strprintf("absurdly high fees %s, %d > %d", hash.ToString(), diff --git a/src/script/script.cpp b/src/script/script.cpp index afae6f1d6..532227741 100644 --- a/src/script/script.cpp +++ b/src/script/script.cpp @@ -382,12 +382,6 @@ bool CScript::MayAcceptCryptoCondition() const bool CScript::IsCoinImport() const { - const_iterator pc = this->begin(); - vector data; - opcodetype opcode; - if (this->GetOp(pc, opcode, data)) - if (opcode > OP_0 && opcode <= OP_PUSHDATA4) - return data.begin()[0] == EVAL_IMPORTCOIN; return false; }