Merge pull request #59 from neutron-org/feat/remove-stargate

feat: rewrite dex_stargate and stargate_querier to use new helpers #NTRN-326
neutron-org · Aug 13, 2024 · 0821807 · 0821807
2 parents fc8e99a + cf48964
commit 0821807
Show file tree

Hide file tree

Showing 70 changed files with 2,040 additions and 1,248 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,17 +17,20 @@ neutron-sdk = { package = "neutron-sdk", git = "https://github.com/neutron-org/n
 prost = "0.12.4"
 prost-types = "0.12.4"
 cosmos-sdk-proto = { version = "0.20.0", default-features = false }
-cosmwasm-std = { version = "2.0.4", features = [
+cosmwasm-std = { version = "2.1.0", features = [
     "stargate",
     "staking",
     "cosmwasm_1_1",
     "cosmwasm_1_2",
+    "cosmwasm_1_3",
+    "cosmwasm_1_4",
+    "cosmwasm_2_0",
 ] }
 cw2 = "2.0.0"
 cw-storage-plus = "2.0.0"
 schemars = "0.8.15"
 serde = { version = "1.0.189", default-features = false }
-cosmwasm-schema = { version = "2.0.4", default-features = false }
+cosmwasm-schema = { version = "2.1.0", default-features = false }
 serde-json-wasm = "1.0.0"
 base64 = "0.21.7"
 thiserror = "1.0.49"
diff --git a/Makefile b/Makefile
@@ -20,6 +20,6 @@ compile:
 
 check_contracts:
 	@cargo install cosmwasm-check --version 2.0.4 --locked
-	@cosmwasm-check --available-capabilities iterator,staking,stargate,neutron,cosmwasm_1_1,cosmwasm_1_2 artifacts/*.wasm
+	@cosmwasm-check --available-capabilities iterator,staking,stargate,neutron,cosmwasm_1_1,cosmwasm_1_2,cosmwasm_1_3,cosmwasm_1_4,cosmwasm_2_0 artifacts/*.wasm
 
 build: schema clippy test fmt compile check_contracts
diff --git a/README.md b/README.md
@@ -10,11 +10,11 @@ The following contracts are maintained here:
 
 | Contract                                         | Reference                                                                                       | Description                                                                                                                                                                                                                                                                                                                            |
 |--------------------------------------------------|-------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Neutron Interchain Queries Example Contract      | https://github.com/neutron-org/neutron-contracts/tree/main/contracts/neutron-interchain-queries | The contract shows how to properly work with [Interchain Queries Module](https://github.com/neutron-org/neutron/tree/master/x/interchainqueries) using [Interchain Queries SDK package](https://github.com/neutron-org/neutron-contracts/tree/main/packages/neutron-sdk/src/interchain_queries) via CosmWasm smart-contract.           |
-| Neutron Interchain Transactions Example Contract | https://github.com/neutron-org/neutron-contracts/tree/main/contracts/neutron_interchain_txs     | The contract shows how to properly work with [Neutron Interchain Transactions Module](https://github.com/neutron-org/neutron/tree/master/x/interchaintxs) using [Interchain Transactions SDK package](https://github.com/neutron-org/neutron-contracts/tree/main/packages/neutron-sdk/src/interchain_txs) via CosmWasm smart-contract. |
-| Neutron IBC Transfer Example Contract            | https://github.com/neutron-org/neutron-contracts/tree/main/contracts/ibc_transfer               | The contract shows how to properly work with [Neutron Sudo Package](https://github.com/neutron-org/neutron-contracts/tree/main/packages/neutron_sudo) to handle a callback from IBC transfer.                                                                                                                                          |
-| Neutron dex module + Stargate Example Contract   | https://github.com/neutron-org/neutron-contracts/tree/main/contracts/dex_stargate               | The contract shows a way to use [Neutron SDK's Stargate package](https://github.com/neutron-org/neutron-sdk/tree/main/packages/neutron-sdk/src/stargate) to interact with Neutron dex module via stargate                                                                                                                              |
-| Reflect                                          | https://github.com/neutron-org/neutron-contracts/tree/main/contracts/reflect                    | This contract is used for tests in the main neutron repository.                                                                                                                                                                                                                                                                        |
+| Neutron Interchain Queries Example Contract      | <https://github.com/neutron-org/neutron-contracts/tree/main/contracts/neutron-interchain-queries> | The contract shows how to properly work with [Interchain Queries Module](https://github.com/neutron-org/neutron/tree/master/x/interchainqueries) using [Interchain Queries SDK package](https://github.com/neutron-org/neutron-contracts/tree/main/packages/neutron-sdk/src/interchain_queries) via CosmWasm smart-contract.           |
+| Neutron Interchain Transactions Example Contract | <https://github.com/neutron-org/neutron-contracts/tree/main/contracts/neutron_interchain_txs>     | The contract shows how to properly work with [Neutron Interchain Transactions Module](https://github.com/neutron-org/neutron/tree/master/x/interchaintxs) using [Interchain Transactions SDK package](https://github.com/neutron-org/neutron-contracts/tree/main/packages/neutron-sdk/src/interchain_txs) via CosmWasm smart-contract. |
+| Neutron IBC Transfer Example Contract            | <https://github.com/neutron-org/neutron-contracts/tree/main/contracts/ibc_transfer>               | The contract shows how to properly work with [Neutron Sudo Package](https://github.com/neutron-org/neutron-contracts/tree/main/packages/neutron_sudo) to handle a callback from IBC transfer.                                                                                                                                          |
+| Neutron dex module + Grpc Example Contract   | <https://github.com/neutron-org/neutron-contracts/tree/main/contracts/dex_grpc>               | The contract shows a way to use [Neutron SDK's Grpc package](https://github.com/neutron-org/neutron-sdk/tree/main/packages/neutron-sdk/src/grpc) to interact with Neutron dex module via grpc                                                                                                                              |
+| Reflect                                          | <https://github.com/neutron-org/neutron-contracts/tree/main/contracts/reflect>                    | This contract is used for tests in the main neutron repository.                                                                                                                                                                                                                                                                        |
 
 ## Development
 
@@ -24,7 +24,7 @@ The following contracts are maintained here:
 - `wasm32-unknown-unknown` target
 - Docker
 
-1. Install `rustup` via https://rustup.rs/
+1. Install `rustup` via <https://rustup.rs/>
 
 2. Run the following:
 

diff --git a/contracts/balance-tracker/Cargo.toml b/contracts/balance-tracker/Cargo.toml
@@ -27,4 +27,4 @@ cosmwasm-std = "1.5"
 cw-storage-plus = "1.2"
 cosmwasm-schema = "1.5"
 thiserror = "1"
-astroport = { git = "https://github.com/astroport-fi/astroport-core", version = "4" }
+astroport = { git = "https://github.com/astroport-fi/astroport-core", version = "5" }
diff --git a/contracts/balance-tracker/src/query.rs b/contracts/balance-tracker/src/query.rs
@@ -9,34 +9,33 @@ use crate::state::{BALANCES, CONFIG, TOTAL_SUPPLY_HISTORY};
 #[cfg_attr(not(feature = "library"), entry_point)]
 pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> StdResult<Binary> {
     match msg {
-        QueryMsg::BalanceAt { address, timestamp } => {
-            to_json_binary(&balance_at(deps, env, address, timestamp)?)
-        }
-        QueryMsg::TotalSupplyAt { timestamp } => {
-            to_json_binary(&total_supply_at(deps, env, timestamp)?)
+        QueryMsg::BalanceAt { address, unit } => {
+            to_json_binary(&balance_at(deps, env, address, unit)?)
         }
+        QueryMsg::TotalSupplyAt { unit } => to_json_binary(&total_supply_at(deps, env, unit)?),
         QueryMsg::Config {} => {
             let config = CONFIG.load(deps.storage)?;
             to_json_binary(&ConfigResponse {
                 tracked_denom: config.d,
                 token_factory_module: config.m,
+                track_over_seconds: true,
             })
         }
     }
 }
 
-fn balance_at(deps: Deps, env: Env, address: String, timestamp: Option<u64>) -> StdResult<Uint128> {
+fn balance_at(deps: Deps, env: Env, address: String, unit: Option<u64>) -> StdResult<Uint128> {
     let block_time = env.block.time.seconds();
-    match timestamp.unwrap_or(block_time) {
+    match unit.unwrap_or(block_time) {
         timestamp if timestamp == block_time => BALANCES.may_load(deps.storage, &address),
         timestamp => BALANCES.may_load_at_height(deps.storage, &address, timestamp),
     }
     .map(|balance| balance.unwrap_or_default())
 }
 
-fn total_supply_at(deps: Deps, env: Env, timestamp: Option<u64>) -> StdResult<Uint128> {
+fn total_supply_at(deps: Deps, env: Env, unit: Option<u64>) -> StdResult<Uint128> {
     let block_time = env.block.time.seconds();
-    match timestamp.unwrap_or(block_time) {
+    match unit.unwrap_or(block_time) {
         timestamp if timestamp == block_time => TOTAL_SUPPLY_HISTORY.may_load(deps.storage),
         timestamp => TOTAL_SUPPLY_HISTORY.may_load_at_height(deps.storage, timestamp),
     }

diff --git a/contracts/before-send-hook/schema/instantiate_msg.json b/contracts/before-send-hook/schema/instantiate_msg.json
@@ -1,5 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "InstantiateMsg",
-  "type": "object"
+  "type": "object",
+  "additionalProperties": false
 }
diff --git a/contracts/before-send-hook/schema/migrate_msg.json b/contracts/before-send-hook/schema/migrate_msg.json
@@ -1,5 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "MigrateMsg",
-  "type": "object"
+  "type": "object",
+  "additionalProperties": false
 }
diff --git a/contracts/before-send-hook/schema/query_msg.json b/contracts/before-send-hook/schema/query_msg.json
@@ -9,7 +9,8 @@
       ],
       "properties": {
         "sudo_result_block_before": {
-          "type": "object"
+          "type": "object",
+          "additionalProperties": false
         }
       },
       "additionalProperties": false
@@ -21,7 +22,8 @@
       ],
       "properties": {
         "sudo_result_track_before": {
-          "type": "object"
+          "type": "object",
+          "additionalProperties": false
         }
       },
       "additionalProperties": false

diff --git a/contracts/client_updater/schema/execute_msg.json b/contracts/client_updater/schema/execute_msg.json
@@ -29,7 +29,8 @@
             "title": {
               "type": "string"
             }
-          }
+          },
+          "additionalProperties": false
         }
       },
       "additionalProperties": false

diff --git a/contracts/client_updater/schema/instantiate_msg.json b/contracts/client_updater/schema/instantiate_msg.json
@@ -1,5 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "InstantiateMsg",
-  "type": "object"
+  "type": "object",
+  "additionalProperties": false
 }
diff --git a/contracts/dex/schema/dex_msg.json b/contracts/dex/schema/dex_msg.json
@@ -72,7 +72,8 @@
               "description": "Denom for the opposing side of the deposit",
               "type": "string"
             }
-          }
+          },
+          "additionalProperties": false
         }
       },
       "additionalProperties": false
@@ -131,7 +132,8 @@
               "description": "Denom for the opposing side of the deposit",
               "type": "string"
             }
-          }
+          },
+          "additionalProperties": false
         }
       },
       "additionalProperties": false
@@ -212,7 +214,8 @@
               "description": "Token being “bought”",
               "type": "string"
             }
-          }
+          },
+          "additionalProperties": false
         }
       },
       "additionalProperties": false
@@ -234,7 +237,8 @@
               "description": "TrancheKey for the target limit order",
               "type": "string"
             }
-          }
+          },
+          "additionalProperties": false
         }
       },
       "additionalProperties": false
@@ -256,7 +260,8 @@
               "description": "TrancheKey for the target limit order",
               "type": "string"
             }
-          }
+          },
+          "additionalProperties": false
         }
       },
       "additionalProperties": false
@@ -309,7 +314,8 @@
                 "$ref": "#/definitions/MultiHopRoute"
               }
             }
-          }
+          },
+          "additionalProperties": false
         }
       },
       "additionalProperties": false
@@ -325,7 +331,8 @@
         "disable_swap": {
           "type": "boolean"
         }
-      }
+      },
+      "additionalProperties": false
     },
     "LimitOrderType": {
       "oneOf": [
@@ -378,7 +385,8 @@
             "type": "string"
           }
         }
-      }
+      },
+      "additionalProperties": false
     },
     "PrecDec": {
       "type": "object",
@@ -389,7 +397,8 @@
         "i": {
           "type": "string"
         }
-      }
+      },
+      "additionalProperties": false
     },
     "Uint128": {
       "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",