Merge pull request #1305 from mkoura/fix_script_withdrawals

Script withdrawals are no longer listed among normal withdrawals

Author: mkoura

cardano_node_tests/utils/dbsync_utils.py

@@ -767,14 +767,17 @@ def check_tx(
         tx_mint_by_token == db_mint_txouts
     ), f"MA minting outputs don't match ({tx_mint_by_token} != {db_mint_txouts})"
 
-    len_db_withdrawals = len(response.withdrawals)
-    len_out_withdrawals = len(tx_raw_output.withdrawals)
+    tx_withdrawals = sorted(
+        [*tx_raw_output.withdrawals, *[s.txout for s in tx_raw_output.script_withdrawals]]
+    )
+    db_withdrawals = sorted(response.withdrawals)
+    len_tx_withdrawals = len(tx_withdrawals)
+    len_db_withdrawals = len(db_mint_txouts)
+
     assert (
-        len_db_withdrawals == len_out_withdrawals
-    ), f"Number of TX withdrawals doesn't match ({len_db_withdrawals} != {len_out_withdrawals})"
+        len_db_withdrawals == len_tx_withdrawals
+    ), f"Number of TX withdrawals doesn't match ({len_db_withdrawals} != {len_tx_withdrawals})"
 
-    tx_withdrawals = sorted(tx_raw_output.withdrawals)
-    db_withdrawals = sorted(response.withdrawals)
     assert (
         tx_withdrawals == db_withdrawals
     ), f"TX withdrawals don't match ({tx_withdrawals} != {db_withdrawals})"

cardano_node_tests/utils/tx_view.py

@@ -250,8 +250,12 @@ def check_tx_view(  # noqa: C901
             withdrawal_amount = int(withdrawal["amount"].split()[0] or 0)
             loaded_withdrawals.add((withdrawal_key, withdrawal_amount))
 
+    tx_raw_withdrawals_encoded = [
+        *tx_raw_output.withdrawals,
+        *[s.txout for s in tx_raw_output.script_withdrawals],
+    ]
     tx_raw_withdrawals = {
-        (helpers.decode_bech32(r.address)[2:], r.amount) for r in tx_raw_output.withdrawals
+        (helpers.decode_bech32(r.address)[2:], r.amount) for r in tx_raw_withdrawals_encoded
     }
 
     if tx_raw_withdrawals != loaded_withdrawals: