use tx_id

CounterpartyXCP · Dec 7, 2024 · 828b5d8 · 828b5d8
1 parent b43512b
commit 828b5d8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/counterparty-core/counterpartycore/lib/deserialize.py b/counterparty-core/counterpartycore/lib/deserialize.py
@@ -72,6 +72,7 @@ def read_transaction(vds, use_txid=True):
     data = vds.input[start_pos : vds.read_cursor]
 
     transaction["tx_hash"] = ib2h(double_hash(data))
+    transaction["tx_id"] = transaction["tx_hash"]
     if transaction["segwit"]:
         hash_data = data[:4] + data[6:offset_before_tx_witnesses] + data[-4:]
         transaction["tx_id"] = ib2h(double_hash(hash_data))

diff --git a/counterparty-core/counterpartycore/lib/gettxinfo.py b/counterparty-core/counterpartycore/lib/gettxinfo.py
@@ -236,7 +236,7 @@ class SighashFlagError(Exception):
 
 
 def check_signatures_sighash_flag(decoded_tx):
-    if decoded_tx["tx_hash"] in SIGHASH_FLAG_TRANSACTION_WHITELIST:
+    if decoded_tx["tx_id"] in SIGHASH_FLAG_TRANSACTION_WHITELIST:
         return
 
     script_sig = decoded_tx["vin"][0]["script_sig"]
@@ -247,15 +247,15 @@ def check_signatures_sighash_flag(decoded_tx):
     flags = collect_sighash_flags(script_sig, witnesses)
 
     if len(flags) == 0:
-        error = f"impossible to determine SIGHASH flag for transaction {decoded_tx['tx_hash']}"
+        error = f"impossible to determine SIGHASH flag for transaction {decoded_tx['tx_id']}"
         logger.debug(error)
         raise SighashFlagError(error)
 
     # first input must be signed with SIGHASH_ALL or SIGHASH_ALL|SIGHASH_ANYONECANPAY
     authorized_flags = [b"\x01", b"\x81"]
     for flag in flags:
         if flag not in authorized_flags:
-            error = f"invalid SIGHASH flag for transaction {decoded_tx['tx_hash']}"
+            error = f"invalid SIGHASH flag for transaction {decoded_tx['tx_id']}"
             logger.debug(error)
             raise SighashFlagError(error)