review fixes - handle error in open_ack

neutron-org · Oct 18, 2023 · 21ac5ca · 21ac5ca
1 parent 61fa9bb
commit 21ac5ca
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 27 deletions.
diff --git a/integration-tests/testcases/claimer.test.ts b/integration-tests/testcases/claimer.test.ts
@@ -129,10 +129,6 @@ describe('Test claim artifact', () => {
             airdrop_address: airdropAddress, // incorrect address, migrated below
             channel_id_to_hub: transferChannel.channel_id, // neutron to cosmoshub transfer channel id
             ibc_neutron_denom: ibcDenom,
-            transfer_timeout_height: {
-                revision_number: 1,
-                revision_height: 5000,
-            },
             ica_timeout_seconds: 5000,
         }, 'credits', 'auto', {
             admin: deployer // want to be able to migrate contract for testing purposes (set low timeout values)
@@ -205,21 +201,15 @@ describe('Test claim artifact', () => {
         // pause hermes to test creating ica account two times almost simultaneously
         await context.park.relayers.find(r => r.type() === 'hermes').pause();
 
-        console.log('create first ica account')
-        const first = await client.execute(deployer, claimerAddress, {
+        await client.execute(deployer, claimerAddress, {
             create_hub_i_c_a: {},
         }, 'auto', '', [])
-        console.log('first executed: ' + JSON.stringify(first.logs), null, '\t')
 
         // second transaction should fail right away
-        console.log('create second ica account')
-        const second = await client.execute(deployer, claimerAddress, {
+        await client.execute(deployer, claimerAddress, {
             create_hub_i_c_a: {},
         }, 'auto', '', [])
-        console.log('second executed: ' + JSON.stringify(second.logs), null, '\t')
-
-        console.log('unpaused relayer')
-        // await context.park.relayers.find(r => r.type() === 'hermes').unpause();
+        await context.park.relayers.find(r => r.type() === 'hermes').unpause();
 
         await waitFor(async () => {
             const ica = await client.queryContractSmart(claimerAddress, { interchain_account: {} })

diff --git a/src/contract.rs b/src/contract.rs
@@ -15,6 +15,7 @@ use neutron_sdk::bindings::query::NeutronQuery;
 use neutron_sdk::bindings::types::ProtobufAny;
 use neutron_sdk::sudo::msg::{RequestPacket, RequestPacketTimeoutHeight, SudoMsg};
 use neutron_sdk::{NeutronError, NeutronResult};
+use serde_json_wasm::de::Error;
 
 use crate::error::ContractError;
 use crate::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
@@ -360,28 +361,43 @@ fn sudo_timeout(deps: DepsMut, env: Env, request: RequestPacket) -> StdResult<Re
 
 fn sudo_open_ack(
     deps: DepsMut,
-    _env: Env,
+    env: Env,
     port_id: String,
     channel_id: String,
     counterparty_channel_id: String,
     counterparty_version: String,
 ) -> StdResult<Response> {
-    let parsed_version: Result<OpenAckVersion, _> =
+    let parsed_version: Result<OpenAckVersion, Error> =
         serde_json_wasm::from_str(counterparty_version.as_str());
-    if let Ok(parsed_version) = parsed_version {
-        INTERCHAIN_ACCOUNT.save(
-            deps.storage,
-            &Some(InterchainAccount {
-                address: parsed_version.address,
-                port_id,
-                channel_id,
-                counterparty_channel_id,
-            }),
-        )?;
-        return Ok(Response::default());
+
+    match parsed_version {
+        Ok(version) => {
+            INTERCHAIN_ACCOUNT.save(
+                deps.storage,
+                &Some(InterchainAccount {
+                    address: version.address,
+                    port_id,
+                    channel_id,
+                    counterparty_channel_id,
+                }),
+            )?;
+        }
+        Err(e) => {
+            save_ibc_callback_state(
+                deps.storage,
+                IbcCallbackState::OpenAckError(
+                    e.to_string(),
+                    env.block.height,
+                    port_id,
+                    channel_id,
+                    counterparty_channel_id,
+                    counterparty_version,
+                ),
+            )?;
+        }
     }
 
-    Err(StdError::generic_err("Can't parse counterparty_version"))
+    Ok(Response::default())
 }
 
 fn ibc_fee_from_funds(info: &MessageInfo) -> NeutronResult<(Coin, IbcFee)> {

diff --git a/src/msg.rs b/src/msg.rs
@@ -30,6 +30,7 @@ pub enum ExecuteMsg {
 
     /// Step 2. Requires ICA to be created. Send funds to ICA account.
     SendClaimedTokensToICA {
+        /// timeout_height is block height on the destination chain when timeout happens for IbcTransfer
         timeout_height: RequestPacketTimeoutHeight,
     },
 

diff --git a/src/state.rs b/src/state.rs
@@ -61,4 +61,6 @@ pub enum IbcCallbackState {
     Response(RequestPacket, u64),      // request_packet, block_height
     Timeout(RequestPacket, u64),       // request_packet, block_height
     Error(RequestPacket, String, u64), // error with request_packet, details, block_height
+
+    OpenAckError(String, u64, String, String, String, String), // parse_error, block_height, port_id, channel_id, counterparty_channel_id, counterparty_version
 }