chore: merge changes from main

Author: fabianbormann

cardano/gateway/.env.example

@@ -12,7 +12,7 @@ OGMIOS_ENDPOINT=http://127.0.0.1:1337
 CARDANO_CHAIN_HOST=127.0.0.1
 CARDANO_CHAIN_PORT=3001
 CARDANO_NETWORK_MAGIC=42
-CARDANO_EPOCH_NONCE_GENESIS="fc316b611e5233f92233b416010376dc01e296fbd9d3eb244a493ce1e0c69c4e"
+CARDANO_EPOCH_NONCE_GENESIS="6a79f9874589fec907f9e51d7d9203147a1ab2d8ad8d59c17c6a38459a836bb8"
 
 HANDLER_JSON_PATH=/usr/src/app/cardano/offchain/deployments/handler.json
 

cardano/onchain/lib/ibc/core/ics-004/channel_datum.ak

@@ -1,5 +1,6 @@
 use aiken/collection/list
 use aiken/collection/pairs
+use aiken/primitive/int
 use ibc/auth.{AuthToken}
 use ibc/core/ics_004/types/channel.{Channel}
 use ibc/core/ics_004/types/counterparty.{ChannelCounterparty}
@@ -222,10 +223,12 @@ pub fn validate_recv_packet(
         ..input_datum.state,
         next_sequence_recv: expected_next_sequence_recv,
         packet_receipt: expected_packet_receipt,
-        packet_acknowledgement: [
-          Pair(packet.sequence, ack),
-          ..input_datum.state.packet_acknowledgement
-        ],
+        packet_acknowledgement: pairs.insert_by_ascending_key(
+          input_datum.state.packet_acknowledgement,
+          packet.sequence,
+          ack,
+          int.compare,
+        ),
       },
     }
 
@@ -238,20 +241,36 @@ pub fn validate_send_packet(
   packet: Packet,
   commitment: ByteArray,
 ) -> Bool {
+  // WORKAROUND: cloned output_datum required to "replace" an "apparently" unbounded list to a bounded one, or it would fail
+  // to pass the equality check. This will make the validator to correctly pass
+  let cloned_output_datum =
+    ChannelDatum {
+      ..output_datum,
+      state: ChannelDatumState {
+        ..output_datum.state,
+        packet_commitment: pairs.map(
+          output_datum.state.packet_commitment,
+          fn(_k, v) { v },
+        ),
+      },
+    }
+
   let expected_datum =
     ChannelDatum {
       ..input_datum,
       state: ChannelDatumState {
         ..input_datum.state,
         next_sequence_send: input_datum.state.next_sequence_send + 1,
-        packet_commitment: [
-          Pair(packet.sequence, commitment),
-          ..input_datum.state.packet_commitment
-        ],
+        packet_commitment: pairs.insert_by_ascending_key(
+          input_datum.state.packet_commitment,
+          packet.sequence,
+          commitment,
+          int.compare,
+        ),
       },
     }
 
-  expected_datum == output_datum
+  (expected_datum == cloned_output_datum)?
 }
 
 pub fn validate_timeout_packet(

cardano/onchain/lib/ibc/core/ics-004/channel_datum_test/validate_send_packet.ak

@@ -55,28 +55,103 @@ fn setup() -> (ChannelDatum, ChannelDatum, Packet, ByteArray) {
 
   let output_channel_datum =
     ChannelDatum {
-      ..input_channel_datum,
       state: ChannelDatumState {
-        ..input_channel_datum.state,
+        channel: input_channel,
         next_sequence_send: input_channel_datum.state.next_sequence_send + 1,
-        packet_commitment: [
-          Pair(packet.sequence, commitment),
-          ..input_channel_datum.state.packet_commitment
-        ],
+        next_sequence_recv: 1,
+        next_sequence_ack: 1,
+        packet_commitment: [Pair(packet.sequence, commitment)],
+        packet_receipt: [],
+        packet_acknowledgement: [],
       },
+      port_id: "port-1",
+      token: mock_auth_token,
     }
 
   (input_channel_datum, output_channel_datum, packet, commitment)
 }
 
 test succeed() {
-  let (input_datum, output_datum, packet, commitment) = setup()
+  let input_datum_2 =
+    ChannelDatum {
+      state: ChannelDatumState {
+        channel: channel_mod.new(
+          Open,
+          Unordered,
+          counterparty: ChannelCounterparty {
+            port_id: "transfer",
+            channel_id: "channel-3",
+          },
+          connection_hops: ["connection-1"],
+          version: "ics20-1",
+        ),
+        next_sequence_send: 1,
+        next_sequence_recv: 1,
+        next_sequence_ack: 1,
+        packet_commitment: [],
+        packet_receipt: [],
+        packet_acknowledgement: [],
+      },
+      port_id: "port-100",
+      token: AuthToken {
+        policy_id: #"0151eb42845171292d1342cdcf9ccd2a4e6236244e00dd6ccd4e826c",
+        name: #"5217438dba7f0c1bedaeae4c467cbd01ff45d62c239b722031",
+      },
+    }
+
+  let output_datum_2 =
+    ChannelDatum {
+      state: ChannelDatumState {
+        channel: channel_mod.new(
+          Open,
+          Unordered,
+          counterparty: ChannelCounterparty {
+            port_id: "transfer",
+            channel_id: "channel-3",
+          },
+          connection_hops: ["connection-1"],
+          version: "ics20-1",
+        ),
+        next_sequence_send: 2,
+        next_sequence_recv: 1,
+        next_sequence_ack: 1,
+        packet_commitment: [
+          Pair(
+            1,
+            #"cf05032bc48756bdcb33b75937b4462a313732794b9573c6fd40e0690dd35d26",
+          ),
+        ],
+        packet_receipt: [],
+        packet_acknowledgement: [],
+      },
+      port_id: "port-100",
+      token: AuthToken {
+        policy_id: #"0151eb42845171292d1342cdcf9ccd2a4e6236244e00dd6ccd4e826c",
+        name: #"5217438dba7f0c1bedaeae4c467cbd01ff45d62c239b722031",
+      },
+    }
+
+  let packet_2 =
+    Packet {
+      sequence: 1,
+      source_port: #"706f72742d313030",
+      source_channel: #"6368616e6e656c2d31",
+      destination_port: "transfer",
+      destination_channel: "channel-3",
+      data: #"7b22616d6f756e74223a2231303030222c2264656e6f6d223a2234363532303931393566323763393964666566646362373235653933396164333236323333396139623135303939326236363637336265383664366636333662222c227265636569766572223a22636f736d6f73317963656c353361356439786b3839713376647237766d383339743276776c3038706c367a6b36222c2273656e646572223a223234373537306238626137646337323565396666333765393735376238313438623464356131323539353865646163326664343431376238227d",
+      timeout_height: height_mod.zero_height(),
+      timeout_timestamp: 1749555153208041341,
+    }
+
+  trace @"input_datum_2": input_datum_2
+  trace @"output_datum_2": output_datum_2
+  trace @"packet_2": packet_2
 
   channel_datum_mod.validate_send_packet(
-    input_datum,
-    output_datum,
-    packet,
-    commitment,
+    input_datum_2,
+    output_datum_2,
+    packet_2,
+    #"cf05032bc48756bdcb33b75937b4462a313732794b9573c6fd40e0690dd35d26",
   )
 }
 

cardano/onchain/validators/spending_channel/send_packet.ak

@@ -136,19 +136,18 @@ validator send_packet(
       )
     expect Operator(_) = ibc_module_redeemer
     trace @"send_packet: tx spends module utxo"
-
     and {
-      channel_token == datum.token,
-      auth.contain_auth_token(updated_output, datum.token),
-      packet_mod.validate_basic(packet),
-      is_valid_packet,
-      packet.timeout_timestamp == 0 || latest_timestamp < packet.timeout_timestamp,
+      (channel_token == datum.token)?,
+      auth.contain_auth_token(updated_output, datum.token)?,
+      packet_mod.validate_basic(packet)?,
+      is_valid_packet?,
+      (packet.timeout_timestamp == 0 || latest_timestamp < packet.timeout_timestamp)?,
       channel_datum_mod.validate_send_packet(
         datum,
         updated_datum,
         packet,
         commitment,
-      ),
+      )?,
     }
   }
 
@@ -261,17 +260,17 @@ validator send_packet(
     trace @"send_packet: tx spends module utxo"
 
     and {
-      channel_token == datum.token,
-      auth.contain_auth_token(updated_output, datum.token),
-      packet_mod.validate_basic(packet),
-      is_valid_packet,
-      packet.timeout_timestamp == 0 || latest_timestamp < packet.timeout_timestamp,
+      (channel_token == datum.token)?,
+      auth.contain_auth_token(updated_output, datum.token)?,
+      packet_mod.validate_basic(packet)?,
+      is_valid_packet?,
+      (packet.timeout_timestamp == 0 || latest_timestamp < packet.timeout_timestamp)?,
       channel_datum_mod.validate_send_packet(
         datum,
         updated_datum,
         packet,
         commitment,
-      ),
+      )?,
     }
   }