fix: take has_genesis_hash and has_genesis_id into account for transactions in an algod Block

Author: daniel-makerx

api/oas-generator/src/oas_generator/renderer/templates/models/block.py.j2

@@ -336,6 +336,23 @@ class Block:
         ),
     )
 
+    def __post_init__(self) -> None:
+        # populates genesis id and hash on transactions if required to ensure
+        # tx id's are correct
+        genesis_id = self.header.genesis_id
+        genesis_hash = self.header.genesis_hash
+        set_frozen_field = object.__setattr__
+        for txn_in_block in self.payset or []:
+            txn = txn_in_block.signed_transaction.signed_transaction.txn
+
+            if txn_in_block.has_genesis_id and txn.genesis_id is None:
+                set_frozen_field(txn, "genesis_id", genesis_id)
+
+            # the following assumes that Consensus.RequireGenesisHash is true
+            # so assigns genesis hash unless explicitly set to False
+            if txn_in_block.has_genesis_hash is not False and txn.genesis_hash is None:
+                set_frozen_field(txn, "genesis_hash", genesis_hash)
+
 
 @dataclass(slots=True)
 class BlockResponse:

src/algokit_algod_client/models/_block.py

@@ -337,6 +337,23 @@ class Block:
         ),
     )
 
+    def __post_init__(self) -> None:
+        # populates genesis id and hash on transactions if required to ensure
+        # tx id's are correct
+        genesis_id = self.header.genesis_id
+        genesis_hash = self.header.genesis_hash
+        set_frozen_field = object.__setattr__
+        for txn_in_block in self.payset or []:
+            txn = txn_in_block.signed_transaction.signed_transaction.txn
+
+            if txn_in_block.has_genesis_id and txn.genesis_id is None:
+                set_frozen_field(txn, "genesis_id", genesis_id)
+
+            # the following assumes that Consensus.RequireGenesisHash is true
+            # so assigns genesis hash unless explicitly set to False
+            if txn_in_block.has_genesis_hash is not False and txn.genesis_hash is None:
+                set_frozen_field(txn, "genesis_hash", genesis_hash)
+
 
 @dataclass(slots=True)
 class BlockResponse:

tests/modules/algod_client/manual/test_tx_id.py

@@ -0,0 +1,29 @@
+import algokit_algod_client
+import algokit_indexer_client
+
+_ROUND = 24098947
+
+
+def test_algod_tx_id_matches_indexer() -> None:
+    algod_client = algokit_algod_client.AlgodClient(
+        algokit_algod_client.ClientConfig(
+            base_url="https://mainnet-api.algonode.cloud",
+            token=None,
+        )
+    )
+    indexer_client = algokit_indexer_client.IndexerClient(
+        algokit_indexer_client.ClientConfig(
+            base_url="https://mainnet-idx.algonode.cloud",
+            token=None,
+        )
+    )
+
+    algod_txns = algod_client.get_block(_ROUND).block.payset
+    assert algod_txns is not None
+    algod_txn = algod_txns[0].signed_transaction.signed_transaction.txn
+
+    idx_txns = indexer_client.lookup_block(_ROUND).transactions
+    assert idx_txns is not None
+    idx_txn = idx_txns[0]
+
+    assert algod_txn.tx_id() == idx_txn.id_