Merge pull request #162 from neutron-org/feat/add_simulateXXQueries

Feat: Add SimulateXX queries
neutron-org · Sep 24, 2024 · 38197fb · 38197fb
2 parents 59e441f + f3aa326
commit 38197fb
Show file tree

Hide file tree

Showing 7 changed files with 352 additions and 17 deletions.
diff --git a/contracts/neutron_interchain_txs/schema/execute_msg.json b/contracts/neutron_interchain_txs/schema/execute_msg.json
@@ -22,6 +22,16 @@
             "interchain_account_id": {
               "type": "string"
             },
+            "ordering": {
+              "anyOf": [
+                {
+                  "$ref": "#/definitions/ChannelOrdering"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
             "register_fee": {
               "type": "array",
               "items": {
@@ -122,6 +132,13 @@
     }
   ],
   "definitions": {
+    "ChannelOrdering": {
+      "type": "string",
+      "enum": [
+        "ORDER_ORDERED",
+        "ORDER_UNORDERED"
+      ]
+    },
     "Coin": {
       "type": "object",
       "required": [

diff --git a/packages/neutron-sdk/schema/neutron_msg.json b/packages/neutron-sdk/schema/neutron_msg.json
@@ -25,6 +25,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": [
@@ -160,7 +171,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"
@@ -810,6 +821,13 @@
       },
       "additionalProperties": false
     },
+    "ChannelOrdering": {
+      "type": "string",
+      "enum": [
+        "ORDER_ORDERED",
+        "ORDER_UNORDERED"
+      ]
+    },
     "ClearAdminProposal": {
       "description": "Deprecated. SudoContractProposal defines the struct for clear admin proposal.",
       "deprecated": true,
@@ -907,14 +925,20 @@
       },
       "additionalProperties": false
     },
-    "DepositOption": {
+    "DepositOptions": {
       "type": "object",
-      "required": [
-        "disable_swap"
-      ],
       "properties": {
-        "disable_swap": {
-          "type": "boolean"
+        "disable_autoswap": {
+          "type": [
+            "boolean",
+            "null"
+          ]
+        },
+        "fail_tx_on_bel": {
+          "type": [
+            "boolean",
+            "null"
+          ]
         }
       },
       "additionalProperties": false
@@ -968,7 +992,7 @@
                   "description": "Additional deposit options",
                   "type": "array",
                   "items": {
-                    "$ref": "#/definitions/DepositOption"
+                    "$ref": "#/definitions/DepositOptions"
                   }
                 },
                 "receiver": {

diff --git a/packages/neutron-sdk/src/bindings/dex/msg.rs b/packages/neutron-sdk/src/bindings/dex/msg.rs
@@ -3,7 +3,7 @@ use cosmwasm_std::Uint128;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use super::types::{DepositOption, MultiHopRoute, PrecDec};
+use super::types::{DepositOptions, MultiHopRoute, PrecDec};
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
@@ -26,7 +26,7 @@ pub enum DexMsg {
         /// Fees to use for each deposit
         fees: Vec<u64>,
         /// Additional deposit options
-        options: Vec<DepositOption>,
+        options: Vec<DepositOptions>,
     },
     /// Withdraw is used to redeem PoolShares for the user’s pro-rata
     /// portion of tokens within a liquidity pool. Users can withdraw from a pool at any time

diff --git a/packages/neutron-sdk/src/bindings/dex/types.rs b/packages/neutron-sdk/src/bindings/dex/types.rs
@@ -78,6 +78,13 @@ pub struct TradePairID {
     pub taker_denom: String,
 }
 
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema, Default)]
+#[serde(rename_all = "snake_case")]
+pub struct FailedDeposit {
+    pub deposit_idx: Option<u64>,
+    pub error: Option<String>,
+}
+
 // TODO implement math for PrecDec
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
@@ -102,8 +109,9 @@ impl From<String> for PrecDec {
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
-pub struct DepositOption {
-    pub disable_swap: bool,
+pub struct DepositOptions {
+    pub disable_autoswap: Option<bool>,
+    pub fail_tx_on_bel: Option<bool>,
 }
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]

diff --git a/packages/neutron-sdk/src/proto_types/NEUTRON_COMMIT b/packages/neutron-sdk/src/proto_types/NEUTRON_COMMIT
@@ -1 +1 @@
-1bf83371924e7f3f5a756c8a9ea35e2d607a984e
+6bef62c6d9182b51fd5facc41088689c809b96d5
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		1bf83371924e7f3f5a756c8a9ea35e2d607a984e
		6bef62c6d9182b51fd5facc41088689c809b96d5