Merge pull request #3 from neutron-org/chore/bump-deps

bump deps #ntrn-66
neutron-org · Aug 3, 2023 · 870d081 · 870d081
2 parents f432dcd + 04d03e0
commit 870d081
Show file tree

Hide file tree

Showing 36 changed files with 545 additions and 655 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/artifacts/checksums.txt b/artifacts/checksums.txt
@@ -0,0 +1,11 @@
+c0190cf28da64b4058da71a9083c187d45f84ee7b9db11a0830025ecb0a687dc  client_updater.wasm
+4ee0b1e8a1c39e7a440f236778e76935f29506f354b6a59712d267181da77678  echo.wasm
+fec7d4b6280569bd4ca428d1f5b52702a3378533f50362e1c3f1c848c4e91303  ibc_transfer.wasm
+af52c56fb25355afa04d86c7d9e867f9db9295a455fb8a89f9cfdbd6374dd1ff  msg_receiver.wasm
+05e49fb2d0295c9a9e27a0077da856126f8285c2e949cb1f927f08fa8a867c8e  neutron_interchain_queries.wasm
+19d3ea0f4f0a24d202edbd2a7989dcffa61ba3d6754ff382cbd89d4ecd034a67  neutron_interchain_txs.wasm
+344ec19c522cc5e6135a77a181345f02a0f65ef19ad919d5236dc16f53d33e76  neutron_price_feed_mock.wasm
+4678704ef3ffd9f1240b719991dc629623929fa75499fd6ed9f76eda4c8a556a  neutron_validators_test.wasm
+c24970beb5a08bfc73dc422e63207342343802a329f28d527b4accaaf66209f8  reflect.wasm
+e3ab89e1d88381142c6a970daafceda3cb3fde6f8222e450834045d1f7c9f971  stargate_querier.wasm
+a9ee139212dca756adbde1e86723154b1fd79dc96cbc7e4885a851d8c978e946  tokenfactory.wasm
diff --git a/artifacts/checksums_intermediate.txt b/artifacts/checksums_intermediate.txt
@@ -0,0 +1,11 @@
+a67c60c5853497b890d67dd2bfed1caf0984a03af01ec67c877e63688970814e  target/wasm32-unknown-unknown/release/echo.wasm
+bebad52462ca1ddc557ae7ea3fc09aab0a11dd86497027a473f885bbe0c91d6c  target/wasm32-unknown-unknown/release/ibc_transfer.wasm
+b09e4f513e19e78b5ea08e10d26dc4d61056a4c6f534e783039f32494c39021b  target/wasm32-unknown-unknown/release/neutron_interchain_queries.wasm
+43c926644f096ba26d356c34f0f409b94b793d8398b1845e5fe03ffee7400e0c  target/wasm32-unknown-unknown/release/neutron_interchain_txs.wasm
+e947d71ddeb4f6e61d756b48981bedae6973e0b25a9d873c3bba5e9878079d8b  target/wasm32-unknown-unknown/release/neutron_price_feed_mock.wasm
+8893279611c69a5ca55628f0476e943ca60b8900cb0ae17fefc2f38c4e472215  target/wasm32-unknown-unknown/release/neutron_validators_test.wasm
+b260fdda36208b9017f0f142821fa3bb47f3d3dea86901d687cf3d3da00946e0  target/wasm32-unknown-unknown/release/reflect.wasm
+fc80abbf059bafa21b25162af22ddb963a1ea1c6ab4dd671855adb3e1f8a8a84  target/wasm32-unknown-unknown/release/tokenfactory.wasm
+d89ba235e130977d1f79ac4d7f9252f6f6bed3002dfc1d08227ba138acec70b1  target/wasm32-unknown-unknown/release/client_updater.wasm
+f1ec0aa2f9c84a8b0d63d877fb6dcaf2d25c30023740f3ef53072496124c7dce  target/wasm32-unknown-unknown/release/msg_receiver.wasm
+0cd5cb6ac3532b558fffa62d501936ccbe748cddf465746ad639ac3a166066ce  target/wasm32-unknown-unknown/release/stargate_querier.wasm
diff --git a/artifacts/ibc_transfer.wasm b/artifacts/ibc_transfer.wasm
diff --git a/artifacts/neutron_interchain_txs.wasm b/artifacts/neutron_interchain_txs.wasm
diff --git a/build_release.sh b/build_release.sh
@@ -1,4 +1,4 @@
 docker run --rm -v "$(pwd)":/code \
     --mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
     --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-    cosmwasm/workspace-optimizer:0.12.13
+    cosmwasm/workspace-optimizer:0.14.0
diff --git a/contracts/client_updater/Cargo.toml b/contracts/client_updater/Cargo.toml
@@ -33,11 +33,11 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cosmwasm-std = { version = "1.0.0", features = ["staking"] }
-cw2 = "0.15.1"
-cw-storage-plus = { version = "0.14.0", features = ["iterator"]}
+cosmwasm-std = { version = "1.3.1", features = ["staking"] }
+cw2 = "1.1.0"
+cw-storage-plus = { version = "1.1.0", features = ["iterator"]}
 schemars = "0.8.10"
-serde = { version = "1.0.103", default-features = false, features = ["derive"] }
-neutron-sdk = { package = "neutron-sdk", git = "https://github.com/neutron-org/neutron-sdk.git", default-features = false, rev="f8ca35a900f4cbf2a7cdbcc40498fd79d741e2f2"}
+serde = { version = "1.0.180", default-features = false, features = ["derive"] }
+neutron-sdk = { package = "neutron-sdk", version = "0.6.1" }
 [dev-dependencies]
 cosmwasm-schema = { version = "1.0.0", default-features = false }
diff --git a/contracts/echo/Cargo.toml b/contracts/echo/Cargo.toml
@@ -33,10 +33,10 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cosmwasm-std = "1.2.5"
-cw2 = "1.0.1"
+cosmwasm-std = "1.3.1"
+cw2 = "1.1.0"
 schemars = "0.8.10"
-serde = { version = "1.0.103", default-features = false, features = ["derive"] }
+serde = { version = "1.0.180", default-features = false, features = ["derive"] }
 
 [dev-dependencies]
-cosmwasm-schema = { version = "1.0.0", default-features = false }
+cosmwasm-schema = { version = "1.3.1", default-features = false }
diff --git a/contracts/ibc_transfer/Cargo.toml b/contracts/ibc_transfer/Cargo.toml
@@ -33,14 +33,14 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cosmwasm-std = "1.2.5"
-cw2 = "1.0.1"
+cosmwasm-std = { version = "1.3.1", features = ["staking", "stargate"] }
+cw2 = "1.1.0"
 schemars = "0.8.10"
-serde = { version = "1.0.103", default-features = false, features = ["derive"] }
-serde-json-wasm = { version = "0.4.1" }
-cw-storage-plus = "1.0.1"
-neutron-sdk = "0.5.0"
+serde = { version = "1.0.180", default-features = false, features = ["derive"] }
+serde-json-wasm = { version = "0.5.1" }
+cw-storage-plus = { version = "1.1.0", features = ["iterator"]}
+neutron-sdk = { package = "neutron-sdk", version = "0.6.1" }
 protobuf = { version = "3.2.0", features = ["with-bytes"] }
 
 [dev-dependencies]
-cosmwasm-schema = { version = "1.0.0", default-features = false }
+cosmwasm-schema = { version = "1.3.1", default-features = false }
diff --git a/contracts/ibc_transfer/src/state.rs b/contracts/ibc_transfer/src/state.rs
@@ -37,7 +37,7 @@ pub fn save_reply_payload(store: &mut dyn Storage, payload: SudoPayload) -> StdR
     Ok(id)
 }
 
-pub fn read_reply_payload(store: &mut dyn Storage, id: u64) -> StdResult<SudoPayload> {
+pub fn read_reply_payload(store: &dyn Storage, id: u64) -> StdResult<SudoPayload> {
     let data = REPLY_QUEUE_ID.load(store, id)?;
     from_binary(&Binary(data))
 }
@@ -59,7 +59,7 @@ pub fn save_sudo_payload(
 }
 
 pub fn read_sudo_payload(
-    store: &mut dyn Storage,
+    store: &dyn Storage,
     channel_id: String,
     seq_id: u64,
 ) -> StdResult<SudoPayload> {

diff --git a/contracts/msg_receiver/Cargo.toml b/contracts/msg_receiver/Cargo.toml
@@ -33,17 +33,17 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cosmwasm-std = { version = "1.2.5", features = ["stargate"] }
-cosmos-sdk-proto = { version = "0.19.0", default-features = false }
-cw2 = "1.0.1"
+cosmwasm-std = "1.3.1"
+cw2 = "1.1.0"
 schemars = "0.8.10"
-serde = { version = "1.0.103", default-features = false, features = ["derive"] }
-serde-json-wasm = { version = "0.4.1" }
-neutron-sdk = "0.5.0"
-cw-storage-plus = "1.0.1"
+cosmos-sdk-proto = { version = "0.19.0", default-features = false }
+serde = { version = "1.0.180", default-features = false, features = ["derive"] }
+serde-json-wasm = { version = "0.5.1" }
+neutron-sdk = { package = "neutron-sdk", version = "0.6.1" }
+cw-storage-plus = "1.1.0"
 protobuf = { version = "3.2.0", features = ["with-bytes"] }
 prost = "0.11"
 prost-types = "0.11"
 
 [dev-dependencies]
-cosmwasm-schema = { version = "1.0.0", default-features = false }
+cosmwasm-schema = { version = "1.3.1", default-features = false }
diff --git a/contracts/neutron_interchain_queries.wasm b/contracts/neutron_interchain_queries.wasm
diff --git a/contracts/neutron_interchain_queries/Cargo.toml b/contracts/neutron_interchain_queries/Cargo.toml
@@ -32,16 +32,19 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cosmwasm-std = { version = "1.2.5", default-features = true, features = ["stargate"] }
-cw2 = "1.0.1"
+cosmwasm-std = { version = "1.3.1", features = ["staking"] }
+cw2 = "1.1.0"
 schemars = "0.8.10"
-serde = { version = "1.0.103", default-features = false, features = ["derive"] }
-neutron-sdk = "0.5.0"
-base64 = "0.13.0"
-cosmos-sdk-proto = { version = "0.14.0", default-features = false }
-cw-storage-plus = "1.0.1"
+serde = { version = "1.0.180", default-features = false, features = ["derive"] }
+neutron-sdk = { package = "neutron-sdk", version = "0.6.1" }
+base64 = "0.21.2"
+cosmos-sdk-proto = { version = "0.16.0", default-features = false }
+cw-storage-plus = { version = "1.1.0", features = ["iterator"]}
 prost = "0.11"
-serde-json-wasm = "0.4.1"
+serde-json-wasm = "0.5.1"
 
 [dev-dependencies]
-cosmwasm-schema = { version = "1.0.0", default-features = false }
+cosmwasm-schema = { version = "1.3.1", default-features = false }
+
+
+
diff --git a/contracts/neutron_interchain_queries/src/contract.rs b/contracts/neutron_interchain_queries/src/contract.rs
@@ -27,30 +27,26 @@ use cosmwasm_std::{
     entry_point, to_binary, Binary, Deps, DepsMut, Env, MessageInfo, Response, StdError, StdResult,
 };
 use cw2::set_contract_version;
-use neutron_sdk::{
-    bindings::{
-        msg::NeutronMsg,
-        query::{NeutronQuery, QueryRegisteredQueryResponse},
-        types::{Height, KVKey},
-    },
-    interchain_queries::{
-        new_register_balance_query_msg, new_register_bank_total_supply_query_msg,
-        new_register_delegator_delegations_query_msg, new_register_distribution_fee_pool_query_msg,
-        new_register_gov_proposal_query_msg, new_register_staking_validators_query_msg,
-        new_register_transfers_query_msg,
-        queries::{
-            get_registered_query, query_balance, query_bank_total, query_delegations,
-            query_distribution_fee_pool, query_government_proposals, query_staking_validators,
-        },
-        register_queries::new_register_interchain_query_msg,
-        types::{
-            QueryType, TransactionFilterItem, TransactionFilterOp, TransactionFilterValue,
-            COSMOS_SDK_TRANSFER_MSG_URL, RECIPIENT_FIELD,
-        },
-    },
-    sudo::msg::SudoMsg,
-    NeutronError, NeutronResult,
+use neutron_sdk::bindings::msg::NeutronMsg;
+use neutron_sdk::bindings::query::{NeutronQuery, QueryRegisteredQueryResponse};
+use neutron_sdk::bindings::types::{Height, KVKey};
+use neutron_sdk::interchain_queries::get_registered_query;
+use neutron_sdk::interchain_queries::types::{
+    QueryPayload, TransactionFilterItem, TransactionFilterOp, TransactionFilterValue,
 };
+use neutron_sdk::interchain_queries::v045::queries::{
+    query_balance, query_bank_total, query_delegations, query_distribution_fee_pool,
+    query_government_proposals, query_staking_validators,
+};
+use neutron_sdk::interchain_queries::v045::types::{COSMOS_SDK_TRANSFER_MSG_URL, RECIPIENT_FIELD};
+use neutron_sdk::interchain_queries::v045::{
+    new_register_balance_query_msg, new_register_bank_total_supply_query_msg,
+    new_register_delegator_delegations_query_msg, new_register_distribution_fee_pool_query_msg,
+    new_register_gov_proposal_query_msg, new_register_staking_validators_query_msg,
+    new_register_transfers_query_msg,
+};
+use neutron_sdk::sudo::msg::SudoMsg;
+use neutron_sdk::{NeutronError, NeutronResult};
 use prost::Message as ProstMessage;
 use serde_json_wasm;
 
@@ -218,61 +214,40 @@ pub fn register_transfers_query(
 }
 
 pub fn register_query_empty_id(
-    deps: DepsMut<NeutronQuery>,
-    env: Env,
+    _: DepsMut<NeutronQuery>,
+    _: Env,
     connection_id: String,
 ) -> NeutronResult<Response<NeutronMsg>> {
     let kv_key = KVKey {
         path: "test".to_string(),
         key: Binary(vec![]),
     };
-    let msg = new_register_interchain_query_msg(
-        deps,
-        env,
-        connection_id,
-        QueryType::KV,
-        vec![kv_key],
-        vec![],
-        10,
-    )?;
+    let msg =
+        NeutronMsg::register_interchain_query(QueryPayload::KV(vec![kv_key]), connection_id, 10)?;
+
     Ok(Response::new().add_message(msg))
 }
 
 pub fn register_query_empty_path(
-    deps: DepsMut<NeutronQuery>,
-    env: Env,
+    _: DepsMut<NeutronQuery>,
+    _: Env,
     connection_id: String,
 ) -> NeutronResult<Response<NeutronMsg>> {
     let kv_key = KVKey {
         path: "".to_string(),
         key: Binary("test".as_bytes().to_vec()),
     };
-    let msg = new_register_interchain_query_msg(
-        deps,
-        env,
-        connection_id,
-        QueryType::KV,
-        vec![kv_key],
-        vec![],
-        10,
-    )?;
+    let msg =
+        NeutronMsg::register_interchain_query(QueryPayload::KV(vec![kv_key]), connection_id, 10)?;
     Ok(Response::new().add_message(msg))
 }
 
 pub fn register_query_empty_keys(
-    deps: DepsMut<NeutronQuery>,
-    env: Env,
+    _: DepsMut<NeutronQuery>,
+    _: Env,
     connection_id: String,
 ) -> NeutronResult<Response<NeutronMsg>> {
-    let msg = new_register_interchain_query_msg(
-        deps,
-        env,
-        connection_id,
-        QueryType::KV,
-        vec![],
-        vec![],
-        10,
-    )?;
+    let msg = NeutronMsg::register_interchain_query(QueryPayload::KV(vec![]), connection_id, 10)?;
     Ok(Response::new().add_message(msg))
 }
 
@@ -404,7 +379,9 @@ pub fn sudo_tx_query_result(
         _ => {
             // For transfer queries, query data looks like `[{"field:"transfer.recipient", "op":"eq", "value":"some_address"}]`
             let query_data: Vec<TransactionFilterItem> =
-                serde_json_wasm::from_str(transactions_filter.as_str())?;
+                serde_json_wasm::from_str(transactions_filter.as_str()).map_err(|e| {
+                    StdError::generic_err(format!("failed to parse transactions_filter: {:?}", e))
+                })?;
 
             let recipient = query_data
                 .iter()

diff --git a/contracts/neutron_interchain_queries/src/integration_tests_mock_handlers.rs b/contracts/neutron_interchain_queries/src/integration_tests_mock_handlers.rs
@@ -1,9 +1,8 @@
 use crate::state::{IntegrationTestsQueryMock, INTEGRATION_TESTS_QUERY_MOCK};
 use cosmwasm_std::{DepsMut, Response};
-use neutron_sdk::{
-    bindings::{msg::NeutronMsg, query::NeutronQuery},
-    NeutronResult,
-};
+use neutron_sdk::bindings::msg::NeutronMsg;
+use neutron_sdk::bindings::query::NeutronQuery;
+use neutron_sdk::NeutronResult;
 
 pub fn set_query_mock(deps: DepsMut<NeutronQuery>) -> NeutronResult<Response<NeutronMsg>> {
     INTEGRATION_TESTS_QUERY_MOCK.save(deps.storage, &IntegrationTestsQueryMock::Enabled)?;

diff --git a/contracts/neutron_interchain_queries/src/state.rs b/contracts/neutron_interchain_queries/src/state.rs
@@ -18,7 +18,7 @@ pub struct Transfer {
 }
 
 pub const INTEGRATION_TESTS_QUERY_MOCK: Item<IntegrationTestsQueryMock> =
-    Item::new("integration_tests_kv_mock");
+    Item::new("integration_tests_query_mock");
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 pub enum IntegrationTestsQueryMock {

diff --git a/contracts/neutron_interchain_queries/src/testing/mock_querier.rs b/contracts/neutron_interchain_queries/src/testing/mock_querier.rs
@@ -20,11 +20,10 @@ use cosmwasm_std::{
     from_slice, Binary, Coin, ContractResult, CustomQuery, FullDelegation, OwnedDeps, Querier,
     QuerierResult, QueryRequest, SystemError, SystemResult, Uint128, Validator,
 };
+use neutron_sdk::bindings::query::NeutronQuery;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use neutron_sdk::bindings::query::NeutronQuery;
-
 pub const MOCK_CONTRACT_ADDR: &str = "cosmos2contract";
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
@@ -51,8 +50,8 @@ pub fn mock_dependencies(
 
 pub struct WasmMockQuerier {
     base: MockQuerier<NeutronQuery>,
-    query_reponses: HashMap<u64, Binary>,
-    registred_queries: HashMap<u64, Binary>,
+    query_responses: HashMap<u64, Binary>,
+    registered_queries: HashMap<u64, Binary>,
 }
 
 impl Querier for WasmMockQuerier {
@@ -75,12 +74,12 @@ impl WasmMockQuerier {
         match &request {
             QueryRequest::Custom(NeutronQuery::InterchainQueryResult { query_id }) => {
                 SystemResult::Ok(ContractResult::Ok(
-                    (*self.query_reponses.get(query_id).unwrap()).clone(),
+                    (*self.query_responses.get(query_id).unwrap()).clone(),
                 ))
             }
             QueryRequest::Custom(NeutronQuery::RegisteredInterchainQuery { query_id }) => {
                 SystemResult::Ok(ContractResult::Ok(
-                    (*self.registred_queries.get(query_id).unwrap()).clone(),
+                    (*self.registered_queries.get(query_id).unwrap()).clone(),
                 ))
             }
             QueryRequest::Custom(NeutronQuery::RegisteredInterchainQueries {
@@ -107,10 +106,10 @@ impl WasmMockQuerier {
     }
 
     pub fn add_query_response(&mut self, query_id: u64, response: Binary) {
-        self.query_reponses.insert(query_id, response);
+        self.query_responses.insert(query_id, response);
     }
-    pub fn add_registred_queries(&mut self, query_id: u64, response: Binary) {
-        self.registred_queries.insert(query_id, response);
+    pub fn add_registered_queries(&mut self, query_id: u64, response: Binary) {
+        self.registered_queries.insert(query_id, response);
     }
 }
 
@@ -128,8 +127,8 @@ impl WasmMockQuerier {
     pub fn new(base: MockQuerier<NeutronQuery>) -> Self {
         WasmMockQuerier {
             base,
-            query_reponses: HashMap::new(),
-            registred_queries: HashMap::new(),
+            query_responses: HashMap::new(),
+            registered_queries: HashMap::new(),
         }
     }
 }