Merge pull request #72 from neutron-org/feat/respect-gogoproto-nullable

Feat: respect gogoproto nullable
neutron-org · Nov 18, 2024 · 1baf105 · 1baf105
2 parents f81c62d + be73db3
commit 1baf105
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/dex_grpc/schema/execute_msg.json b/contracts/dex_grpc/schema/execute_msg.json
@@ -133,7 +133,6 @@
           "required": [
             "amount_in",
             "limit_sell_price",
-            "max_amount_out",
             "order_type",
             "receiver",
             "tick_index_in_to_out",
@@ -158,7 +157,10 @@
               "type": "string"
             },
             "max_amount_out": {
-              "type": "string"
+              "type": [
+                "string",
+                "null"
+              ]
             },
             "order_type": {
               "type": "integer",

diff --git a/contracts/dex_grpc/schema/query_msg.json b/contracts/dex_grpc/schema/query_msg.json
@@ -840,9 +840,6 @@
       "required": [
         "amount_in",
         "creator",
-        "limit_sell_price",
-        "max_amount_out",
-        "min_average_sell_price",
         "order_type",
         "receiver",
         "tick_index_in_to_out",
@@ -868,14 +865,23 @@
           ]
         },
         "limit_sell_price": {
-          "type": "string"
+          "type": [
+            "string",
+            "null"
+          ]
         },
         "max_amount_out": {
-          "type": "string"
+          "type": [
+            "string",
+            "null"
+          ]
         },
         "min_average_sell_price": {
           "description": "min_average_sell_price is an optional parameter that sets a required minimum average price for the entire trade. if the min_average_sell_price is not met the trade will fail. If min_average_sell_price is omitted limit_sell_price will be used instead",
-          "type": "string"
+          "type": [
+            "string",
+            "null"
+          ]
         },
         "order_type": {
           "type": "integer",

diff --git a/contracts/dex_grpc/src/contract.rs b/contracts/dex_grpc/src/contract.rs
@@ -88,12 +88,12 @@ pub fn execute(
             token_in,
             token_out,
             tick_index_in_to_out,
-            limit_sell_price,
+            limit_sell_price: Some(limit_sell_price),
             amount_in,
             order_type,
             expiration_time,
             max_amount_out,
-            min_average_sell_price: "".to_string(),
+            min_average_sell_price: None,
         })),
         ExecuteMsg::WithdrawFilledLimitOrder { tranche_key } => {
             Ok(Response::new().add_message(MsgWithdrawFilledLimitOrder {

diff --git a/contracts/dex_grpc/src/msg.rs b/contracts/dex_grpc/src/msg.rs
@@ -39,7 +39,7 @@ pub enum ExecuteMsg {
         amount_in: String,
         order_type: i32,
         expiration_time: Option<Timestamp>,
-        max_amount_out: String,
+        max_amount_out: Option<String>,
         limit_sell_price: String,
     },
     WithdrawFilledLimitOrder {