From 76b570c82e21ded85157322f13e48f358abf421c Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Sat, 24 Feb 2024 21:47:36 +0200 Subject: [PATCH 1/9] Neutron SDK with ICQ v047 --- Cargo.lock | 10 +-- Cargo.toml | 4 +- .../src/contract.rs | 8 +-- .../src/testing/tests.rs | 64 +++++++++---------- 4 files changed, 42 insertions(+), 44 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6478e34..8426066 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -152,7 +152,7 @@ checksum = "32560304ab4c365791fd307282f76637213d8083c1a98490c35159cd67852237" dependencies = [ "prost 0.12.3", "prost-types 0.12.3", - "tendermint-proto 0.34.0", + "tendermint-proto 0.34.1", ] [[package]] @@ -603,7 +603,7 @@ dependencies = [ [[package]] name = "neutron-sdk" version = "0.8.0" -source = "git+https://github.com/neutron-org/neutron-sdk?branch=main#68420318b07be21e3882a3eebc60574237536159" +source = "git+https://github.com/neutron-org/neutron-sdk?branch=feat/v047-icq#cc9ea0e322780f73b3410c7885b70a2fdbd1ab8e" dependencies = [ "bech32", "cosmos-sdk-proto 0.20.0", @@ -616,7 +616,7 @@ dependencies = [ "serde", "serde-json-wasm 1.0.1", "speedate", - "tendermint-proto 0.34.0", + "tendermint-proto 0.34.1", "thiserror", ] @@ -1186,9 +1186,9 @@ dependencies = [ [[package]] name = "tendermint-proto" -version = "0.34.0" +version = "0.34.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc728a4f9e891d71adf66af6ecaece146f9c7a11312288a3107b3e1d6979aaf" +checksum = "b797dd3d2beaaee91d2f065e7bdf239dc8d80bba4a183a288bc1279dd5a69a1e" dependencies = [ "bytes", "flex-error", diff --git a/Cargo.toml b/Cargo.toml index d7cc399..1bce8f4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,14 +13,14 @@ incremental = false overflow-checks = true [workspace.dependencies] -neutron-sdk = { git = "https://github.com/neutron-org/neutron-sdk", branch = "main" } +neutron-sdk = { git = "https://github.com/neutron-org/neutron-sdk", branch = "feat/v047-icq" } prost = "0.12.1" prost-types = "0.12.1" cosmos-sdk-proto = { version = "0.20.0", default-features = false } cosmwasm-std = { version = "1.4.1", features = [ "stargate", "staking", - "cosmwasm_1_1", + "cosmwasm_1_1", "cosmwasm_1_2" ] } cw2 = "1.1.1" diff --git a/contracts/neutron_interchain_queries/src/contract.rs b/contracts/neutron_interchain_queries/src/contract.rs index 37cc1fd..121ce21 100644 --- a/contracts/neutron_interchain_queries/src/contract.rs +++ b/contracts/neutron_interchain_queries/src/contract.rs @@ -35,20 +35,20 @@ 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::{ +use neutron_sdk::interchain_queries::v047::queries::{ query_balance, query_bank_total, query_delegations, query_distribution_fee_pool, query_government_proposals, query_staking_validators, query_unbonding_delegations, query_validators_signing_infos, }; -use neutron_sdk::interchain_queries::v045::register_queries::new_register_validators_signing_infos_query_msg; -use neutron_sdk::interchain_queries::v045::types::{COSMOS_SDK_TRANSFER_MSG_URL, RECIPIENT_FIELD}; -use neutron_sdk::interchain_queries::v045::{ +use neutron_sdk::interchain_queries::v047::register_queries::new_register_validators_signing_infos_query_msg; +use neutron_sdk::interchain_queries::v047::register_queries::{ new_register_balance_query_msg, new_register_bank_total_supply_query_msg, new_register_delegator_delegations_query_msg, new_register_delegator_unbonding_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::interchain_queries::v047::types::{COSMOS_SDK_TRANSFER_MSG_URL, RECIPIENT_FIELD}; use neutron_sdk::sudo::msg::SudoMsg; use neutron_sdk::{NeutronError, NeutronResult}; use prost::Message as ProstMessage; diff --git a/contracts/neutron_interchain_queries/src/testing/tests.rs b/contracts/neutron_interchain_queries/src/testing/tests.rs index 30fc1fc..0c843ff 100644 --- a/contracts/neutron_interchain_queries/src/testing/tests.rs +++ b/contracts/neutron_interchain_queries/src/testing/tests.rs @@ -41,15 +41,15 @@ use neutron_sdk::interchain_queries::helpers::decode_and_convert; use neutron_sdk::interchain_queries::types::{ QueryType, TransactionFilterItem, TransactionFilterOp, TransactionFilterValue, }; -use neutron_sdk::interchain_queries::v045::helpers::{ +use neutron_sdk::interchain_queries::v047::helpers::{ create_account_denom_balance_key, create_fee_pool_key, create_gov_proposal_key, create_total_denom_key, create_validator_key, create_validator_signing_info_key, }; -use neutron_sdk::interchain_queries::v045::queries::{ +use neutron_sdk::interchain_queries::v047::queries::{ BalanceResponse, DelegatorDelegationsResponse, FeePoolResponse, ProposalResponse, TotalSupplyResponse, ValidatorResponse, ValidatorSigningInfoResponse, }; -use neutron_sdk::interchain_queries::v045::types::{ +use neutron_sdk::interchain_queries::v047::types::{ Balances, FeePool, GovernmentProposal, Proposal, SigningInfo, StakingValidator, TallyResult, TotalSupply, Validator, ValidatorSigningInfo, DECIMAL_PLACES, RECIPIENT_FIELD, }; @@ -232,12 +232,10 @@ fn build_interchain_query_balance_response(addr: Addr, denom: String, amount: St let balance_key = create_account_denom_balance_key(converted_addr_bytes, &denom).unwrap(); - let balance_amount = CosmosCoin { denom, amount }; - let s = StorageValue { storage_prefix: "".to_string(), key: Binary(balance_key), - value: Binary(balance_amount.encode_to_vec()), + value: Binary(amount.into_bytes()), }; Binary::from( to_string(&QueryRegisteredQueryResultResponse { @@ -302,8 +300,8 @@ fn test_query_balance() { BalanceResponse { last_submitted_local_height: 987, balances: Balances { - coins: vec![Coin::new(8278104u128, "uosmo")] - } + coins: vec![Coin::new(8278104u128, "uosmo".to_string())] + }, } ) } @@ -355,9 +353,9 @@ fn test_bank_total_supply_query() { supply: TotalSupply { coins: vec![ Coin::new(8278104u128, "uosmo"), - Coin::new(8278104u128, "uatom") + Coin::new(8278104u128, "uatom"), ] - } + }, } ); } @@ -393,7 +391,7 @@ fn test_distribution_fee_pool_query() { last_submitted_local_height: 987, pool: FeePool { coins: vec![Coin::new(8278104u128, "uosmo")] - } + }, } ) } @@ -459,8 +457,8 @@ fn test_gov_proposals_query() { abstain: "0".to_string(), yes: "0".to_string(), no: "0".to_string(), - no_with_veto: "0".to_string() - }) + no_with_veto: "0".to_string(), + }), }, Proposal { proposal_id: 2, @@ -478,8 +476,8 @@ fn test_gov_proposals_query() { abstain: "0".to_string(), yes: "0".to_string(), no: "0".to_string(), - no_with_veto: "0".to_string() - }) + no_with_veto: "0".to_string(), + }), }, Proposal { proposal_id: 3, @@ -497,11 +495,11 @@ fn test_gov_proposals_query() { abstain: "0".to_string(), yes: "0".to_string(), no: "0".to_string(), - no_with_veto: "0".to_string() - }) - } + no_with_veto: "0".to_string(), + }), + }, ] - } + }, } ) } @@ -593,9 +591,9 @@ fn test_staking_validators_query() { max_rate: None, max_change_rate: None, update_time: None, - } + }, ] - } + }, } ) } @@ -661,9 +659,9 @@ fn test_validators_signing_infos_query() { jailed_until: None, tombstoned: false, missed_blocks_counter: 987675, - } + }, ] - } + }, } ) } @@ -690,12 +688,12 @@ fn test_query_delegator_delegations() { // response for `RegisterDelegatorDelegationsQuery` with necessary KV values to test reconstruction logic. // The values are taken from osmosis network kv_results: vec![ - // params value of staking module for key 'staking/BondDenom' - // value: uosmo + // params value of staking module for key 'staking/params' + // value: Params StorageValue { - storage_prefix: "params".to_string(), - key: Binary::from(BASE64_STANDARD.decode("c3Rha2luZy9Cb25kRGVub20=").unwrap()), - value: Binary::from(BASE64_STANDARD.decode("InVvc21vIg==").unwrap()), + storage_prefix: "staking".to_string(), + key: Binary::from(BASE64_STANDARD.decode("UQ==").unwrap()), + value: Binary::from(BASE64_STANDARD.decode("CgQIgN9uEGQYByCQTioFdWF0b20yATA6FC0xMDAwMDAwMDAwMDAwMDAwMDAwQhMxMDAwMDAwMDAwMDAwMDAwMDAwShMxMDAwMDAwMDAwMDAwMDAwMDAw").unwrap()), }, // delegation // from: osmo1yz54ncxj9csp7un3xled03q6thrrhy9cztkfzs @@ -747,7 +745,7 @@ fn test_query_delegator_delegations() { storage_prefix: "staking".to_string(), key: Binary::from(decode_hex("2114f8aff987b760a6e4b2b2df48a5a3b7ed2db15006").unwrap()), value: Binary::from(BASE64_STANDARD.decode("CjJvc21vdmFsb3BlcjFsemhsbnBhaHZ6bndmdjRqbWF5MnRnYWhhNWttejVxeHdtajl3ZRJDCh0vY29zbW9zLmNyeXB0by5lZDI1NTE5LlB1YktleRIiCiBPXCnkQvO+pU6oGbp4ZiJBBZ7RNoLYtXYFOEdpXGH+uSADKg0zMjAxNDM4ODk4NDc2Mh8zMjAxNDM4ODk4NDc2MDAwMDAwMDAwMDAwMDAwMDAwOp8CCgtDaXRhZGVsLm9uZRIQRUJCMDNFQjRCQjRDRkNBNxoTaHR0cHM6Ly9jaXRhZGVsLm9uZSroAUNpdGFkZWwub25lIGlzIGEgbXVsdGktYXNzZXQgbm9uLWN1c3RvZGlhbCBzdGFraW5nIHBsYXRmb3JtIHRoYXQgbGV0cyBhbnlvbmUgYmVjb21lIGEgcGFydCBvZiBkZWNlbnRyYWxpemVkIGluZnJhc3RydWN0dXJlIGFuZCBlYXJuIHBhc3NpdmUgaW5jb21lLiBTdGFrZSB3aXRoIG91ciBub2RlcyBvciBhbnkgb3RoZXIgdmFsaWRhdG9yIGFjcm9zcyBtdWx0aXBsZSBuZXR3b3JrcyBpbiBhIGZldyBjbGlja3NKAFJECjoKETUwMDAwMDAwMDAwMDAwMDAwEhIyMDAwMDAwMDAwMDAwMDAwMDAaETMwMDAwMDAwMDAwMDAwMDAwEgYIkKKzhgZaATE=").unwrap()), - } + }, ], height: 0, revision: 0, @@ -773,18 +771,18 @@ fn test_query_delegator_delegations() { Delegation { delegator: Addr::unchecked("osmo1yz54ncxj9csp7un3xled03q6thrrhy9cztkfzs"), validator: "osmovaloper1r2u5q6t6w0wssrk6l66n3t2q3dw2uqny4gj2e3".to_string(), - amount: Coin::new(5177628u128, "uosmo".to_string()) + amount: Coin::new(5177628u128, "uatom".to_string()), }, Delegation { delegator: Addr::unchecked("osmo1yz54ncxj9csp7un3xled03q6thrrhy9cztkfzs"), validator: "osmovaloper1ej2es5fjztqjcd4pwa0zyvaevtjd2y5w37wr9t".to_string(), - amount: Coin::new(29620221u128, "uosmo".to_string()) + amount: Coin::new(29620221u128, "uatom".to_string()), }, Delegation { delegator: Addr::unchecked("osmo1yz54ncxj9csp7un3xled03q6thrrhy9cztkfzs"), validator: "osmovaloper1lzhlnpahvznwfv4jmay2tgaha5kmz5qxwmj9we".to_string(), - amount: Coin::new(219920u128, "uosmo".to_string()) - } + amount: Coin::new(219920u128, "uatom".to_string()), + }, ], } ) From 3516492769327e6becd34caad54c0385d6b31ff2 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Sat, 24 Feb 2024 21:51:12 +0200 Subject: [PATCH 2/9] clippy --- contracts/neutron_interchain_queries/src/testing/tests.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/neutron_interchain_queries/src/testing/tests.rs b/contracts/neutron_interchain_queries/src/testing/tests.rs index 0c843ff..5ec57d2 100644 --- a/contracts/neutron_interchain_queries/src/testing/tests.rs +++ b/contracts/neutron_interchain_queries/src/testing/tests.rs @@ -230,7 +230,7 @@ fn build_interchain_query_gov_proposal_value(proposal_id: u64) -> StorageValue { fn build_interchain_query_balance_response(addr: Addr, denom: String, amount: String) -> Binary { let converted_addr_bytes = decode_and_convert(addr.as_str()).unwrap(); - let balance_key = create_account_denom_balance_key(converted_addr_bytes, &denom).unwrap(); + let balance_key = create_account_denom_balance_key(converted_addr_bytes, denom).unwrap(); let s = StorageValue { storage_prefix: "".to_string(), From 4e0cd82a68996b540824f164a81e20c03089c749 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Wed, 28 Feb 2024 11:40:40 -0300 Subject: [PATCH 3/9] change sdk branch --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8426066..e871335 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -603,7 +603,7 @@ dependencies = [ [[package]] name = "neutron-sdk" version = "0.8.0" -source = "git+https://github.com/neutron-org/neutron-sdk?branch=feat/v047-icq#cc9ea0e322780f73b3410c7885b70a2fdbd1ab8e" +source = "git+https://github.com/neutron-org/neutron-sdk?branch=feat/deprecated-data-field-ictx#9d7a83b14aa750d1534ba0ce51a88323913fb544" dependencies = [ "bech32", "cosmos-sdk-proto 0.20.0", diff --git a/Cargo.toml b/Cargo.toml index 1bce8f4..1b33c8d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ incremental = false overflow-checks = true [workspace.dependencies] -neutron-sdk = { git = "https://github.com/neutron-org/neutron-sdk", branch = "feat/v047-icq" } +neutron-sdk = { git = "https://github.com/neutron-org/neutron-sdk", branch = "feat/deprecated-data-field-ictx" } prost = "0.12.1" prost-types = "0.12.1" cosmos-sdk-proto = { version = "0.20.0", default-features = false } From 7e44e36bc538981a164f7bfd945399f74be685c3 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Wed, 6 Mar 2024 07:31:47 -0300 Subject: [PATCH 4/9] upd ack --- contracts/neutron_interchain_txs/src/contract.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contracts/neutron_interchain_txs/src/contract.rs b/contracts/neutron_interchain_txs/src/contract.rs index cc3f053..e84284b 100644 --- a/contracts/neutron_interchain_txs/src/contract.rs +++ b/contracts/neutron_interchain_txs/src/contract.rs @@ -626,7 +626,7 @@ fn sudo_response( let item_type = item.msg_type.as_str(); item_types.push(item_type.to_string()); match item_type { - "/cosmos.staking.v1beta1.MsgUndelegate" => { + "/cosmos.staking.v1beta1.MsgUndelegateResponse" => { let out: MsgUndelegateResponse = decode_message_response(&item.data)?; let completion_time = out.completion_time.or_else(|| { @@ -639,7 +639,7 @@ fn sudo_response( deps.api .debug(format!("Undelegation completion time: {:?}", completion_time).as_str()); } - "/cosmos.staking.v1beta1.MsgDelegate" => { + "/cosmos.staking.v1beta1.MsgDelegateResponse" => { let _out: MsgDelegateResponse = decode_message_response(&item.data)?; } _ => { From 7adbaa6c577eb53dd1d53759fab68418924b1063 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 12 Mar 2024 07:31:14 -0300 Subject: [PATCH 5/9] fmt & use v047 --- contracts/neutron_interchain_txs/src/contract.rs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/contracts/neutron_interchain_txs/src/contract.rs b/contracts/neutron_interchain_txs/src/contract.rs index e84284b..0044ac7 100644 --- a/contracts/neutron_interchain_txs/src/contract.rs +++ b/contracts/neutron_interchain_txs/src/contract.rs @@ -37,9 +37,8 @@ use crate::msg::{ use neutron_sdk::bindings::msg::{IbcFee, MsgSubmitTxResponse, NeutronMsg}; use neutron_sdk::bindings::query::{NeutronQuery, QueryInterchainAccountAddressResponse}; use neutron_sdk::bindings::types::ProtobufAny; -use neutron_sdk::interchain_txs::helpers::{ - decode_acknowledgement_response, decode_message_response, get_port_id, -}; +use neutron_sdk::interchain_txs::helpers::{decode_message_response, get_port_id}; +use neutron_sdk::interchain_txs::v047::helpers::decode_acknowledgement_response; use neutron_sdk::sudo::msg::{RequestPacket, SudoMsg}; use neutron_sdk::NeutronResult; @@ -623,11 +622,11 @@ fn sudo_response( let mut item_types = vec![]; for item in parsed_data { - let item_type = item.msg_type.as_str(); + let item_type = item.type_url.as_str(); item_types.push(item_type.to_string()); match item_type { "/cosmos.staking.v1beta1.MsgUndelegateResponse" => { - let out: MsgUndelegateResponse = decode_message_response(&item.data)?; + let out: MsgUndelegateResponse = decode_message_response(&item.value)?; let completion_time = out.completion_time.or_else(|| { let error_msg = "WASMDEBUG: sudo_response: Recoverable error. Failed to get completion time"; @@ -640,7 +639,7 @@ fn sudo_response( .debug(format!("Undelegation completion time: {:?}", completion_time).as_str()); } "/cosmos.staking.v1beta1.MsgDelegateResponse" => { - let _out: MsgDelegateResponse = decode_message_response(&item.data)?; + let _out: MsgDelegateResponse = decode_message_response(&item.value)?; } _ => { deps.api.debug( From 6af404576e888bcb2ee98dc96c337f8385e5876a Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Thu, 14 Mar 2024 13:14:45 +0200 Subject: [PATCH 6/9] fix neutron-sdk branch --- Cargo.lock | 50 +++++++++---------- Cargo.toml | 2 +- .../neutron_validator_test/src/contract.rs | 5 +- 3 files changed, 29 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e871335..d75c6c1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -15,9 +15,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "autocfg" @@ -107,9 +107,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.34" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" +checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" dependencies = [ "num-traits", ] @@ -362,9 +362,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "ecdsa" @@ -603,7 +603,7 @@ dependencies = [ [[package]] name = "neutron-sdk" version = "0.8.0" -source = "git+https://github.com/neutron-org/neutron-sdk?branch=feat/deprecated-data-field-ictx#9d7a83b14aa750d1534ba0ce51a88323913fb544" +source = "git+https://github.com/neutron-org/neutron-sdk?branch=feat/v047-icq#6809cf9b81490607512541ac466b4da2483d18a9" dependencies = [ "bech32", "cosmos-sdk-proto 0.20.0", @@ -703,9 +703,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opaque-debug" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "osmosis-std" @@ -760,9 +760,9 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -810,7 +810,7 @@ dependencies = [ "itertools 0.11.0", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.52", ] [[package]] @@ -833,9 +833,9 @@ dependencies = [ [[package]] name = "protobuf" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65f4a8ec18723a734e5dc09c173e0abf9690432da5340285d536edcb4dac190" +checksum = "58678a64de2fced2bdec6bca052a6716a0efe692d6e3f53d1bda6a1def64cfc0" dependencies = [ "once_cell", "protobuf-support", @@ -844,9 +844,9 @@ dependencies = [ [[package]] name = "protobuf-support" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6872f4d4f4b98303239a2b5838f5bbbb77b01ffc892d627957f37a22d7cfe69c" +checksum = "e1ed294a835b0f30810e13616b1cd34943c6d1e84a8f3b0dcfe466d256c3e7e7" dependencies = [ "thiserror", ] @@ -1006,7 +1006,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.52", ] [[package]] @@ -1126,7 +1126,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.50", + "syn 2.0.52", ] [[package]] @@ -1157,9 +1157,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.50" +version = "2.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f1bdc9872430ce9b75da68329d1c1746faf50ffac5f19e02b71e37ff881ffb" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" dependencies = [ "proc-macro2", "quote", @@ -1204,22 +1204,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.52", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 1b33c8d..1bce8f4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ incremental = false overflow-checks = true [workspace.dependencies] -neutron-sdk = { git = "https://github.com/neutron-org/neutron-sdk", branch = "feat/deprecated-data-field-ictx" } +neutron-sdk = { git = "https://github.com/neutron-org/neutron-sdk", branch = "feat/v047-icq" } prost = "0.12.1" prost-types = "0.12.1" cosmos-sdk-proto = { version = "0.20.0", default-features = false } diff --git a/contracts/neutron_validator_test/src/contract.rs b/contracts/neutron_validator_test/src/contract.rs index f044dfc..d31113d 100644 --- a/contracts/neutron_validator_test/src/contract.rs +++ b/contracts/neutron_validator_test/src/contract.rs @@ -46,7 +46,8 @@ use neutron_sdk::interchain_queries::v045::types::{COSMOS_SDK_TRANSFER_MSG_URL, use neutron_sdk::interchain_queries::v045::{ new_register_balance_query_msg, new_register_transfers_query_msg, }; -use neutron_sdk::interchain_txs::helpers::{decode_acknowledgement_response, get_port_id}; +use neutron_sdk::interchain_txs::helpers::get_port_id; +use neutron_sdk::interchain_txs::v047::helpers::decode_acknowledgement_response; use neutron_sdk::sudo::msg::{RequestPacket, SudoMsg}; use neutron_sdk::{NeutronError, NeutronResult}; @@ -613,7 +614,7 @@ fn sudo_response( let mut item_types = vec![]; for item in parsed_data { - let item_type = item.msg_type.as_str(); + let item_type = item.type_url.as_str(); item_types.push(item_type.to_string()); } From 61ae28001398aafb2ad53a209e11be133e1de166 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Thu, 14 Mar 2024 14:45:50 +0200 Subject: [PATCH 7/9] fix checking contracts + update rust version to 1.73 --- Makefile | 4 ++-- rust-toolchain.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c39fd3a..5458820 100644 --- a/Makefile +++ b/Makefile @@ -16,10 +16,10 @@ compile: --mount type=volume,source="$(notdir $(CURDIR))_cache",target=/target \ --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \ --platform linux/amd64 \ - cosmwasm/workspace-optimizer:0.14.0 + cosmwasm/workspace-optimizer:0.15.0 check_contracts: - @cargo install cosmwasm-check + @cargo install cosmwasm-check --locked @cosmwasm-check --available-capabilities iterator,staking,stargate,neutron,cosmwasm_1_1,cosmwasm_1_2 artifacts/*.wasm build: schema clippy test fmt compile check_contracts diff --git a/rust-toolchain.toml b/rust-toolchain.toml index aa46426..8142c30 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.71.0" +channel = "1.73.0" From 3bbc213cf4e96fd31d9117e6c36786e3996d9825 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Thu, 14 Mar 2024 15:13:13 +0200 Subject: [PATCH 8/9] update Cargo.lock --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index d75c6c1..653453b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -603,7 +603,7 @@ dependencies = [ [[package]] name = "neutron-sdk" version = "0.8.0" -source = "git+https://github.com/neutron-org/neutron-sdk?branch=feat/v047-icq#6809cf9b81490607512541ac466b4da2483d18a9" +source = "git+https://github.com/neutron-org/neutron-sdk?branch=feat/v047-icq#d5a055dc868e79d9a45d1e4cd03c313fc90700b1" dependencies = [ "bech32", "cosmos-sdk-proto 0.20.0", From 42737a4bdd2049886b501ef6955a38027e4ddf03 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Thu, 14 Mar 2024 18:24:32 +0200 Subject: [PATCH 9/9] update neutron-sdk to main branch --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 653453b..f0a8c25 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -603,7 +603,7 @@ dependencies = [ [[package]] name = "neutron-sdk" version = "0.8.0" -source = "git+https://github.com/neutron-org/neutron-sdk?branch=feat/v047-icq#d5a055dc868e79d9a45d1e4cd03c313fc90700b1" +source = "git+https://github.com/neutron-org/neutron-sdk?branch=main#ebdffb37fb63837649d22f5493355a40450cd2d9" dependencies = [ "bech32", "cosmos-sdk-proto 0.20.0", diff --git a/Cargo.toml b/Cargo.toml index 1bce8f4..67649ca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ incremental = false overflow-checks = true [workspace.dependencies] -neutron-sdk = { git = "https://github.com/neutron-org/neutron-sdk", branch = "feat/v047-icq" } +neutron-sdk = { git = "https://github.com/neutron-org/neutron-sdk", branch = "main" } prost = "0.12.1" prost-types = "0.12.1" cosmos-sdk-proto = { version = "0.20.0", default-features = false }