Merge pull request #62 from neutron-org/feat/unordered-ica

feat: add possibility for unordered ica channels #ntrn-376
neutron-org · Sep 3, 2024 · 2589bbd · 2589bbd
2 parents c819eff + a91ffd4
commit 2589bbd
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/neutron_interchain_txs/schema/execute_msg.json b/contracts/neutron_interchain_txs/schema/execute_msg.json
@@ -20,6 +20,16 @@
             },
             "interchain_account_id": {
               "type": "string"
+            },
+            "ordering": {
+              "anyOf": [
+                {
+                  "$ref": "#/definitions/ChannelOrdering"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             }
           },
           "additionalProperties": false
@@ -242,7 +252,7 @@
       "additionalProperties": false
     },
     {
-      "description": "Used only in integration tests framework to simulate failures. After executing this message, any sudo call to the contract will result in an submessage processing error.",
+      "description": "Used only in integration tests framework to simulate failures. After executing this message, any sudo call to the contract will result in a submessage processing error.",
       "type": "object",
       "required": [
         "integration_tests_set_sudo_submsg_failure_mock"
@@ -256,7 +266,7 @@
       "additionalProperties": false
     },
     {
-      "description": "Used only in integration tests framework to simulate failures. After executing this message, any sudo call to the contract will result in an submessage reply processing error.",
+      "description": "Used only in integration tests framework to simulate failures. After executing this message, any sudo call to the contract will result in a submessage reply processing error.",
       "type": "object",
       "required": [
         "integration_tests_set_sudo_submsg_reply_failure_mock"
@@ -299,6 +309,13 @@
     }
   ],
   "definitions": {
+    "ChannelOrdering": {
+      "type": "string",
+      "enum": [
+        "ORDER_ORDERED",
+        "ORDER_UNORDERED"
+      ]
+    },
     "IntegrationTestsSudoFailureMock": {
       "type": "string",
       "enum": [

diff --git a/contracts/neutron_interchain_txs/src/contract.rs b/contracts/neutron_interchain_txs/src/contract.rs
@@ -34,7 +34,7 @@ use crate::integration_tests_mock_handlers::{
 use crate::msg::{
     AcknowledgementResultsResponse, ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg,
 };
-use neutron_sdk::bindings::msg::{IbcFee, NeutronMsg};
+use neutron_sdk::bindings::msg::{ChannelOrdering, IbcFee, NeutronMsg};
 use neutron_sdk::bindings::query::{NeutronQuery, QueryInterchainAccountAddressResponse};
 use neutron_sdk::bindings::types::ProtobufAny;
 use neutron_sdk::interchain_txs::helpers::{decode_message_response, get_port_id};
@@ -108,7 +108,8 @@ pub fn execute(
         ExecuteMsg::Register {
             connection_id,
             interchain_account_id,
-        } => execute_register_ica(deps, env, connection_id, interchain_account_id),
+            ordering,
+        } => execute_register_ica(deps, env, connection_id, interchain_account_id, ordering),
         ExecuteMsg::Delegate {
             validator,
             interchain_account_id,
@@ -307,12 +308,14 @@ fn execute_register_ica(
     env: Env,
     connection_id: String,
     interchain_account_id: String,
+    ordering: Option<ChannelOrdering>,
 ) -> StdResult<Response<NeutronMsg>> {
     let register_fee = REGISTER_FEE.load(deps.storage)?;
     let register = NeutronMsg::register_interchain_account(
         connection_id,
         interchain_account_id.clone(),
         Option::from(register_fee),
+        ordering,
     );
     let key = get_port_id(env.contract.address.as_str(), &interchain_account_id);
     INTERCHAIN_ACCOUNTS.save(deps.storage, key, &None)?;

diff --git a/contracts/neutron_interchain_txs/src/msg.rs b/contracts/neutron_interchain_txs/src/msg.rs
@@ -1,5 +1,6 @@
 use crate::storage::{AcknowledgementResult, IntegrationTestsSudoFailureMock};
 use cosmwasm_std::Uint128;
+use neutron_sdk::bindings::msg::ChannelOrdering;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
@@ -38,6 +39,7 @@ pub enum ExecuteMsg {
     Register {
         connection_id: String,
         interchain_account_id: String,
+        ordering: Option<ChannelOrdering>,
     },
     SetFees {
         denom: String,
@@ -76,11 +78,11 @@ pub enum ExecuteMsg {
         state: IntegrationTestsSudoFailureMock,
     },
     /// Used only in integration tests framework to simulate failures.
-    /// After executing this message, any sudo call to the contract will result in an submessage
+    /// After executing this message, any sudo call to the contract will result in a submessage
     /// processing error.
     IntegrationTestsSetSudoSubmsgFailureMock {},
     /// Used only in integration tests framework to simulate failures.
-    /// After executing this message, any sudo call to the contract will result in an submessage
+    /// After executing this message, any sudo call to the contract will result in a submessage
     /// reply processing error.
     IntegrationTestsSetSudoSubmsgReplyFailureMock {},
     /// Used only in integration tests framework to simulate failures.

diff --git a/contracts/neutron_validator_test/src/contract.rs b/contracts/neutron_validator_test/src/contract.rs
@@ -32,7 +32,7 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
 use crate::msg::{ExecuteMsg, InstantiateMsg, QueryMsg};
-use neutron_sdk::bindings::msg::{IbcFee, NeutronMsg};
+use neutron_sdk::bindings::msg::{ChannelOrdering, IbcFee, NeutronMsg};
 use neutron_sdk::bindings::query::{
     NeutronQuery, QueryInterchainAccountAddressResponse, QueryRegisteredQueryResponse,
 };
@@ -267,8 +267,12 @@ fn execute_register_ica(
     connection_id: String,
     interchain_account_id: String,
 ) -> NeutronResult<Response<NeutronMsg>> {
-    let register =
-        NeutronMsg::register_interchain_account(connection_id, interchain_account_id.clone(), None);
+    let register = NeutronMsg::register_interchain_account(
+        connection_id,
+        interchain_account_id.clone(),
+        None,
+        Some(ChannelOrdering::OrderOrdered),
+    );
     let key = get_port_id(env.contract.address.as_str(), &interchain_account_id);
     INTERCHAIN_ACCOUNTS.save(deps.storage, key, &None)?;
     Ok(Response::new().add_message(register))

diff --git a/contracts/reflect/schema/execute_msg.json b/contracts/reflect/schema/execute_msg.json
@@ -310,6 +310,13 @@
       },
       "additionalProperties": false
     },
+    "ChannelOrdering": {
+      "type": "string",
+      "enum": [
+        "ORDER_ORDERED",
+        "ORDER_UNORDERED"
+      ]
+    },
     "ClearAdminProposal": {
       "description": "Deprecated. SudoContractProposal defines the struct for clear admin proposal.",
       "deprecated": true,
@@ -1338,6 +1345,17 @@
                   "description": "**interchain_account_id** is an identifier of your new interchain account. Can be any string. This identifier allows contracts to have multiple interchain accounts on remote chains.",
                   "type": "string"
                 },
+                "ordering": {
+                  "description": "**ordering** is an order of channel. Can be ordered or unordered. Set to ordered if not specified.",
+                  "anyOf": [
+                    {
+                      "$ref": "#/definitions/ChannelOrdering"
+                    },
+                    {
+                      "type": "null"
+                    }
+                  ]
+                },
                 "register_fee": {
                   "description": "*register_fee** is a fees required to be payed to register interchain account",
                   "type": [
@@ -1473,7 +1491,7 @@
               ],
               "properties": {
                 "new_keys": {
-                  "description": "*new_keys** is the new query keys to retrive.",
+                  "description": "*new_keys** is the new query keys to retrieve.",
                   "type": [
                     "array",
                     "null"

diff --git a/contracts/reflect/src/contract.rs b/contracts/reflect/src/contract.rs
@@ -74,7 +74,14 @@ pub fn query(deps: Deps<InterchainQueries>, env: Env, msg: QueryMsg) -> StdResul
 pub fn reply(_deps: DepsMut, _env: Env, msg: Reply) -> StdResult<Response> {
     match msg.id {
         REFLECT_REPLY_ID => {
-            Ok(Response::default().set_data(msg.result.unwrap().msg_responses[0].clone().value))
+            let res = Response::default();
+
+            let msg_responses = msg.result.unwrap().msg_responses;
+            if msg_responses.is_empty() {
+                Ok(res)
+            } else {
+                Ok(res.set_data(msg_responses[0].clone().value))
+            }
         }
         _ => {
             unimplemented!()