From f6b42fe3a34085f1770ac3973378ad2ee87c7d1b Mon Sep 17 00:00:00 2001 From: Duke Date: Sun, 22 Sep 2024 12:12:22 -0400 Subject: [PATCH] We do not support coin imports --- src/primitives/transaction.h | 5 +++-- src/rpc/rawtransaction.cpp | 26 +------------------------- 2 files changed, 4 insertions(+), 27 deletions(-) diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h index 3741e0d96..a2584ca64 100644 --- a/src/primitives/transaction.h +++ b/src/primitives/transaction.h @@ -693,7 +693,7 @@ public: bool IsMint() const { - return IsCoinImport() || IsCoinBase(); + return IsCoinBase(); // || IsCoinImport(); } bool IsCoinBase() const @@ -705,7 +705,8 @@ public: bool IsCoinImport() const { - return (vin.size() == 1 && vin[0].prevout.n == 10e8); + return false; + //return (vin.size() == 1 && vin[0].prevout.n == 10e8); } bool IsPegsImport() const diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index 4de29bd4c..4c9de7c95 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -146,31 +146,7 @@ void TxToJSONExpanded(const CTransaction& tx, const uint256 hashBlock, UniValue& UniValue in(UniValue::VOBJ); if (tx.IsCoinBase()) { in.push_back(Pair("coinbase", HexStr(txin.scriptSig.begin(), txin.scriptSig.end()))); - } - /* else if (tx.IsCoinImport() && txin.prevout.n==10e8) { - in.push_back(Pair("is_import", "1")); - ImportProof proof; CTransaction burnTx; std::vector payouts; CTxDestination importaddress; - if (UnmarshalImportTx(tx, proof, burnTx, payouts)) - { - if (burnTx.vout.size() == 0) - continue; - in.push_back(Pair("txid", burnTx.GetHash().ToString())); - in.push_back(Pair("value", ValueFromAmount(burnTx.vout.back().nValue))); - in.push_back(Pair("valueSat", burnTx.vout.back().nValue)); - // extract op_return to get burn source chain. - std::vector burnOpret; std::string targetSymbol; uint32_t targetCCid; uint256 payoutsHash; std::vectorrawproof; - if (UnmarshalBurnTx(burnTx, targetSymbol, &targetCCid, payoutsHash, rawproof)) - { - if (rawproof.size() > 0) - { - std::string sourceSymbol; - E_UNMARSHAL(rawproof, ss >> sourceSymbol); - in.push_back(Pair("address", "IMP-" + sourceSymbol + "-" + burnTx.GetHash().ToString())); - } - } - } - } */ - else { + } else { in.push_back(Pair("txid", txin.prevout.hash.GetHex())); in.push_back(Pair("vout", (int64_t)txin.prevout.n)); {