diff --git a/Cargo.toml b/Cargo.toml index f72cfc19..956f2a3f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,4 +4,4 @@ members = ["contracts/*", "packages/*"] [profile.release] rpath = false lto = true -overflow-checks = true \ No newline at end of file +overflow-checks = true diff --git a/contracts/ibc_transfer/Cargo.toml b/contracts/ibc_transfer/Cargo.toml index 6fd0e365..07fb0884 100644 --- a/contracts/ibc_transfer/Cargo.toml +++ b/contracts/ibc_transfer/Cargo.toml @@ -33,14 +33,14 @@ backtraces = ["cosmwasm-std/backtraces"] library = [] [dependencies] -cosmwasm-std = { version = "1.0.0", features = ["staking", "stargate"] } -cw2 = "0.15.1" +cosmwasm-std = { version = "1.3.0", 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 = { version = "0.14.0", features = ["iterator"]} +serde = { version = "1.0.149", default-features = false, features = ["derive"] } +serde-json-wasm = { version = "0.5.1" } +cw-storage-plus = { version = "1.1.0", features = ["iterator"]} neutron-sdk = { path = "../../packages/neutron-sdk", default-features = false, version = "0.6.0"} protobuf = { version = "3.2.0", features = ["with-bytes"] } [dev-dependencies] -cosmwasm-schema = { version = "1.0.0", default-features = false } \ No newline at end of file +cosmwasm-schema = { version = "1.3.0", default-features = false } \ No newline at end of file diff --git a/contracts/ibc_transfer/src/state.rs b/contracts/ibc_transfer/src/state.rs index 05e023e9..82ee71aa 100644 --- a/contracts/ibc_transfer/src/state.rs +++ b/contracts/ibc_transfer/src/state.rs @@ -32,7 +32,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 { +pub fn read_reply_payload(store: &dyn Storage, id: u64) -> StdResult { let data = REPLY_QUEUE_ID.load(store, id)?; from_binary(&Binary(data)) } @@ -54,7 +54,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 { diff --git a/contracts/neutron_interchain_queries/Cargo.toml b/contracts/neutron_interchain_queries/Cargo.toml index 2e7a8884..3fcdc8d4 100644 --- a/contracts/neutron_interchain_queries/Cargo.toml +++ b/contracts/neutron_interchain_queries/Cargo.toml @@ -32,19 +32,19 @@ backtraces = ["cosmwasm-std/backtraces"] library = [] [dependencies] -cosmwasm-std = { version = "1.0.0", features = ["staking"] } -cw2 = "0.15.1" +cosmwasm-std = { version = "1.3.0", features = ["staking"] } +cw2 = "1.1.0" schemars = "0.8.10" -serde = { version = "1.0.103", default-features = false, features = ["derive"] } +serde = { version = "1.0.149", default-features = false, features = ["derive"] } neutron-sdk = { path = "../../packages/neutron-sdk", default-features = false, version = "0.6.0"} -base64 = "0.13.0" -cosmos-sdk-proto = { version = "0.14.0", default-features = false } -cw-storage-plus = { version = "0.14.0", features = ["iterator"]} +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.0", default-features = false } diff --git a/contracts/neutron_interchain_queries/src/testing/mock_querier.rs b/contracts/neutron_interchain_queries/src/testing/mock_querier.rs index 9c574132..e57382a3 100644 --- a/contracts/neutron_interchain_queries/src/testing/mock_querier.rs +++ b/contracts/neutron_interchain_queries/src/testing/mock_querier.rs @@ -37,8 +37,8 @@ pub fn mock_dependencies( pub struct WasmMockQuerier { base: MockQuerier, - query_reponses: HashMap, - registred_queries: HashMap, + query_responses: HashMap, + registered_queries: HashMap, } impl Querier for WasmMockQuerier { @@ -61,12 +61,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 { @@ -93,10 +93,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); } } @@ -114,8 +114,8 @@ impl WasmMockQuerier { pub fn new(base: MockQuerier) -> Self { WasmMockQuerier { base, - query_reponses: HashMap::new(), - registred_queries: HashMap::new(), + query_responses: HashMap::new(), + registered_queries: HashMap::new(), } } } diff --git a/contracts/neutron_interchain_queries/src/testing/tests.rs b/contracts/neutron_interchain_queries/src/testing/tests.rs index eac8cfad..4676271e 100644 --- a/contracts/neutron_interchain_queries/src/testing/tests.rs +++ b/contracts/neutron_interchain_queries/src/testing/tests.rs @@ -1,3 +1,4 @@ +use base64::{prelude::*, Engine}; use std::str::FromStr; use super::mock_querier::mock_dependencies as dependencies; @@ -245,7 +246,7 @@ fn test_query_balance() { let registered_query = build_registered_query_response(1, QueryParam::Keys(keys.0), QueryType::KV, 987); - deps.querier.add_registred_queries(1, registered_query); + deps.querier.add_registered_queries(1, registered_query); deps.querier.add_query_response( 1, build_interchain_query_balance_response( @@ -301,7 +302,7 @@ fn test_bank_total_supply_query() { }, }; - deps.querier.add_registred_queries(1, registered_query); + deps.querier.add_registered_queries(1, registered_query); deps.querier .add_query_response(1, to_binary(&total_supply_response).unwrap()); let bank_total_balance = QueryMsg::BankTotalSupply { query_id: 1 }; @@ -336,7 +337,7 @@ fn test_distribution_fee_pool_query() { let registered_query = build_registered_query_response(1, QueryParam::Keys(keys.0), QueryType::KV, 987); - deps.querier.add_registred_queries(1, registered_query); + deps.querier.add_registered_queries(1, registered_query); deps.querier.add_query_response( 1, build_interchain_query_distribution_fee_pool_response( @@ -390,7 +391,7 @@ fn test_gov_proposals_query() { }, }; - deps.querier.add_registred_queries(1, registered_query); + deps.querier.add_registered_queries(1, registered_query); deps.querier .add_query_response(1, to_binary(&proposals_response).unwrap()); @@ -500,7 +501,7 @@ fn test_staking_validators_query() { }, }; - deps.querier.add_registred_queries(1, registered_query); + deps.querier.add_registered_queries(1, registered_query); deps.querier .add_query_response(1, to_binary(&validators_response).unwrap()); let staking_validators = QueryMsg::StakingValidators { query_id: 1 }; @@ -584,8 +585,8 @@ fn test_query_delegator_delegations() { // value: uosmo StorageValue { storage_prefix: "params".to_string(), - key: Binary::from(base64::decode("c3Rha2luZy9Cb25kRGVub20=").unwrap()), - value: Binary::from(base64::decode("InVvc21vIg==").unwrap()), + key: Binary::from(BASE64_STANDARD.decode("c3Rha2luZy9Cb25kRGVub20=").unwrap()), + value: Binary::from(BASE64_STANDARD.decode("InVvc21vIg==").unwrap()), }, // delegation // from: osmo1yz54ncxj9csp7un3xled03q6thrrhy9cztkfzs @@ -594,7 +595,7 @@ fn test_query_delegator_delegations() { StorageValue { storage_prefix: "staking".to_string(), key: Binary::from(decode_hex("311420a959e0d22e201f727137f2d7c41a5dc63b90b8141ab940697a73dd080edafeb538ad408b5cae0264").unwrap()), - value: Binary::from(base64::decode("Citvc21vMXl6NTRuY3hqOWNzcDd1bjN4bGVkMDNxNnRocnJoeTljenRrZnpzEjJvc21vdmFsb3BlcjFyMnU1cTZ0Nncwd3Nzcms2bDY2bjN0MnEzZHcydXFueTRnajJlMxoZNTE3NzYyODAwMDAwMDAwMDAwMDAwMDAwMA==").unwrap()), + value: Binary::from(BASE64_STANDARD.decode("Citvc21vMXl6NTRuY3hqOWNzcDd1bjN4bGVkMDNxNnRocnJoeTljenRrZnpzEjJvc21vdmFsb3BlcjFyMnU1cTZ0Nncwd3Nzcms2bDY2bjN0MnEzZHcydXFueTRnajJlMxoZNTE3NzYyODAwMDAwMDAwMDAwMDAwMDAwMA==").unwrap()), }, // validator: osmovaloper1r2u5q6t6w0wssrk6l66n3t2q3dw2uqny4gj2e3 // delegator_shares: "2845862840643000000000000000000" @@ -602,7 +603,7 @@ fn test_query_delegator_delegations() { StorageValue { storage_prefix: "staking".to_string(), key: Binary::from(decode_hex("21141ab940697a73dd080edafeb538ad408b5cae0264").unwrap()), - value: Binary::from(base64::decode("CjJvc21vdmFsb3BlcjFyMnU1cTZ0Nncwd3Nzcms2bDY2bjN0MnEzZHcydXFueTRnajJlMxJDCh0vY29zbW9zLmNyeXB0by5lZDI1NTE5LlB1YktleRIiCiCaZhCbacCetQorko3LfUUJX2UEyX38qBGVri8GyH8lcCADKg0yODQ1ODYyODQwNjQzMh8yODQ1ODYyODQwNjQzMDAwMDAwMDAwMDAwMDAwMDAwOqQCChRzdHJhbmdlbG92ZS12ZW50dXJlcxIQRDBEOEI4MEYxQzVDNzBCNRocaHR0cHM6Ly9zdHJhbmdlbG92ZS52ZW50dXJlcyrbAScuLi5iZWNhdXNlIG9mIHRoZSBhdXRvbWF0ZWQgYW5kIGlycmV2b2NhYmxlIGRlY2lzaW9uLW1ha2luZyBwcm9jZXNzIHdoaWNoIHJ1bGVzIG91dCBodW1hbiBtZWRkbGluZywgdGhlIERvb21zZGF5IG1hY2hpbmUgaXMgdGVycmlmeWluZyBhbmQgc2ltcGxlIHRvIHVuZGVyc3RhbmQgYW5kIGNvbXBsZXRlbHkgY3JlZGlibGUgYW5kIGNvbnZpbmNpbmcuJyAtIERyLiBTdHJhbmdlbG92ZUoAUkwKPAoRNTAwMDAwMDAwMDAwMDAwMDASEzEwMDAwMDAwMDAwMDAwMDAwMDAaEjUwMDAwMDAwMDAwMDAwMDAwMBIMCPetyYYGEKPoosUCWgEx").unwrap()), + value: Binary::from(BASE64_STANDARD.decode("CjJvc21vdmFsb3BlcjFyMnU1cTZ0Nncwd3Nzcms2bDY2bjN0MnEzZHcydXFueTRnajJlMxJDCh0vY29zbW9zLmNyeXB0by5lZDI1NTE5LlB1YktleRIiCiCaZhCbacCetQorko3LfUUJX2UEyX38qBGVri8GyH8lcCADKg0yODQ1ODYyODQwNjQzMh8yODQ1ODYyODQwNjQzMDAwMDAwMDAwMDAwMDAwMDAwOqQCChRzdHJhbmdlbG92ZS12ZW50dXJlcxIQRDBEOEI4MEYxQzVDNzBCNRocaHR0cHM6Ly9zdHJhbmdlbG92ZS52ZW50dXJlcyrbAScuLi5iZWNhdXNlIG9mIHRoZSBhdXRvbWF0ZWQgYW5kIGlycmV2b2NhYmxlIGRlY2lzaW9uLW1ha2luZyBwcm9jZXNzIHdoaWNoIHJ1bGVzIG91dCBodW1hbiBtZWRkbGluZywgdGhlIERvb21zZGF5IG1hY2hpbmUgaXMgdGVycmlmeWluZyBhbmQgc2ltcGxlIHRvIHVuZGVyc3RhbmQgYW5kIGNvbXBsZXRlbHkgY3JlZGlibGUgYW5kIGNvbnZpbmNpbmcuJyAtIERyLiBTdHJhbmdlbG92ZUoAUkwKPAoRNTAwMDAwMDAwMDAwMDAwMDASEzEwMDAwMDAwMDAwMDAwMDAwMDAaEjUwMDAwMDAwMDAwMDAwMDAwMBIMCPetyYYGEKPoosUCWgEx").unwrap()), }, // delegation // from: osmo1yz54ncxj9csp7un3xled03q6thrrhy9cztkfzs @@ -611,7 +612,7 @@ fn test_query_delegator_delegations() { StorageValue { storage_prefix: "staking".to_string(), key: Binary::from(decode_hex("311420a959e0d22e201f727137f2d7c41a5dc63b90b814cc9598513212c12c36a1775e2233b962e4d5128e").unwrap()), - value: Binary::from(base64::decode("Citvc21vMXl6NTRuY3hqOWNzcDd1bjN4bGVkMDNxNnRocnJoeTljenRrZnpzEjJvc21vdmFsb3BlcjFlajJlczVmanp0cWpjZDRwd2Ewenl2YWV2dGpkMnk1dzM3d3I5dBoaMjk2MjAyMjEwMDAwMDAwMDAwMDAwMDAwMDA=").unwrap()), + value: Binary::from(BASE64_STANDARD.decode("Citvc21vMXl6NTRuY3hqOWNzcDd1bjN4bGVkMDNxNnRocnJoeTljenRrZnpzEjJvc21vdmFsb3BlcjFlajJlczVmanp0cWpjZDRwd2Ewenl2YWV2dGpkMnk1dzM3d3I5dBoaMjk2MjAyMjEwMDAwMDAwMDAwMDAwMDAwMDA=").unwrap()), }, // validator: osmovaloper1ej2es5fjztqjcd4pwa0zyvaevtjd2y5w37wr9t // delegator_shares: "3054477259038000000000000000000" @@ -619,7 +620,7 @@ fn test_query_delegator_delegations() { StorageValue { storage_prefix: "staking".to_string(), key: Binary::from(decode_hex("2114cc9598513212c12c36a1775e2233b962e4d5128e").unwrap()), - value: Binary::from(base64::decode("CjJvc21vdmFsb3BlcjFlajJlczVmanp0cWpjZDRwd2Ewenl2YWV2dGpkMnk1dzM3d3I5dBJDCh0vY29zbW9zLmNyeXB0by5lZDI1NTE5LlB1YktleRIiCiA27dgAuZV/uS9FdsILGWLBw8eYPy+ZEyv1Df2VsrjXDiADKg0zMDU0NDc3MjU5MDM4Mh8zMDU0NDc3MjU5MDM4MDAwMDAwMDAwMDAwMDAwMDAwOoEBChFGcmVucyAo8J+knSzwn6SdKRIQQzQ3ODQ1MjI2NjYyQUY0NxoSaHR0cHM6Ly9mcmVucy5hcm15IhtzZWN1cml0eUBraWRzb250aGVibG9jay54eXoqKVlvdXIgZnJpZW5kbHkgdmFsaWRhdG9yIGZvciBjb3Ntb3MgY2hhaW5zQP3HpQFKCwj3zq6PBhCfrO86UkoKOgoRNTAwMDAwMDAwMDAwMDAwMDASEjUwMDAwMDAwMDAwMDAwMDAwMBoRNTAwMDAwMDAwMDAwMDAwMDASDAjg1rSQBhDkudCDAVoDNTAw").unwrap()), + value: Binary::from(BASE64_STANDARD.decode("CjJvc21vdmFsb3BlcjFlajJlczVmanp0cWpjZDRwd2Ewenl2YWV2dGpkMnk1dzM3d3I5dBJDCh0vY29zbW9zLmNyeXB0by5lZDI1NTE5LlB1YktleRIiCiA27dgAuZV/uS9FdsILGWLBw8eYPy+ZEyv1Df2VsrjXDiADKg0zMDU0NDc3MjU5MDM4Mh8zMDU0NDc3MjU5MDM4MDAwMDAwMDAwMDAwMDAwMDAwOoEBChFGcmVucyAo8J+knSzwn6SdKRIQQzQ3ODQ1MjI2NjYyQUY0NxoSaHR0cHM6Ly9mcmVucy5hcm15IhtzZWN1cml0eUBraWRzb250aGVibG9jay54eXoqKVlvdXIgZnJpZW5kbHkgdmFsaWRhdG9yIGZvciBjb3Ntb3MgY2hhaW5zQP3HpQFKCwj3zq6PBhCfrO86UkoKOgoRNTAwMDAwMDAwMDAwMDAwMDASEjUwMDAwMDAwMDAwMDAwMDAwMBoRNTAwMDAwMDAwMDAwMDAwMDASDAjg1rSQBhDkudCDAVoDNTAw").unwrap()), }, // delegation // from: osmo1yz54ncxj9csp7un3xled03q6thrrhy9cztkfzs @@ -628,7 +629,7 @@ fn test_query_delegator_delegations() { StorageValue { storage_prefix: "staking".to_string(), key: Binary::from(decode_hex("311420a959e0d22e201f727137f2d7c41a5dc63b90b814f8aff987b760a6e4b2b2df48a5a3b7ed2db15006").unwrap()), - value: Binary::from(base64::decode("Citvc21vMXl6NTRuY3hqOWNzcDd1bjN4bGVkMDNxNnRocnJoeTljenRrZnpzEjJvc21vdmFsb3BlcjFsemhsbnBhaHZ6bndmdjRqbWF5MnRnYWhhNWttejVxeHdtajl3ZRoYMjE5OTIwMDAwMDAwMDAwMDAwMDAwMDAw").unwrap()), + value: Binary::from(BASE64_STANDARD.decode("Citvc21vMXl6NTRuY3hqOWNzcDd1bjN4bGVkMDNxNnRocnJoeTljenRrZnpzEjJvc21vdmFsb3BlcjFsemhsbnBhaHZ6bndmdjRqbWF5MnRnYWhhNWttejVxeHdtajl3ZRoYMjE5OTIwMDAwMDAwMDAwMDAwMDAwMDAw").unwrap()), }, // validator: osmovaloper1lzhlnpahvznwfv4jmay2tgaha5kmz5qxwmj9we // delegator_shares: "3201438898476000000000000000000" @@ -636,7 +637,7 @@ fn test_query_delegator_delegations() { StorageValue { storage_prefix: "staking".to_string(), key: Binary::from(decode_hex("2114f8aff987b760a6e4b2b2df48a5a3b7ed2db15006").unwrap()), - value: Binary::from(base64::decode("CjJvc21vdmFsb3BlcjFsemhsbnBhaHZ6bndmdjRqbWF5MnRnYWhhNWttejVxeHdtajl3ZRJDCh0vY29zbW9zLmNyeXB0by5lZDI1NTE5LlB1YktleRIiCiBPXCnkQvO+pU6oGbp4ZiJBBZ7RNoLYtXYFOEdpXGH+uSADKg0zMjAxNDM4ODk4NDc2Mh8zMjAxNDM4ODk4NDc2MDAwMDAwMDAwMDAwMDAwMDAwOp8CCgtDaXRhZGVsLm9uZRIQRUJCMDNFQjRCQjRDRkNBNxoTaHR0cHM6Ly9jaXRhZGVsLm9uZSroAUNpdGFkZWwub25lIGlzIGEgbXVsdGktYXNzZXQgbm9uLWN1c3RvZGlhbCBzdGFraW5nIHBsYXRmb3JtIHRoYXQgbGV0cyBhbnlvbmUgYmVjb21lIGEgcGFydCBvZiBkZWNlbnRyYWxpemVkIGluZnJhc3RydWN0dXJlIGFuZCBlYXJuIHBhc3NpdmUgaW5jb21lLiBTdGFrZSB3aXRoIG91ciBub2RlcyBvciBhbnkgb3RoZXIgdmFsaWRhdG9yIGFjcm9zcyBtdWx0aXBsZSBuZXR3b3JrcyBpbiBhIGZldyBjbGlja3NKAFJECjoKETUwMDAwMDAwMDAwMDAwMDAwEhIyMDAwMDAwMDAwMDAwMDAwMDAaETMwMDAwMDAwMDAwMDAwMDAwEgYIkKKzhgZaATE=").unwrap()), + value: Binary::from(BASE64_STANDARD.decode("CjJvc21vdmFsb3BlcjFsemhsbnBhaHZ6bndmdjRqbWF5MnRnYWhhNWttejVxeHdtajl3ZRJDCh0vY29zbW9zLmNyeXB0by5lZDI1NTE5LlB1YktleRIiCiBPXCnkQvO+pU6oGbp4ZiJBBZ7RNoLYtXYFOEdpXGH+uSADKg0zMjAxNDM4ODk4NDc2Mh8zMjAxNDM4ODk4NDc2MDAwMDAwMDAwMDAwMDAwMDAwOp8CCgtDaXRhZGVsLm9uZRIQRUJCMDNFQjRCQjRDRkNBNxoTaHR0cHM6Ly9jaXRhZGVsLm9uZSroAUNpdGFkZWwub25lIGlzIGEgbXVsdGktYXNzZXQgbm9uLWN1c3RvZGlhbCBzdGFraW5nIHBsYXRmb3JtIHRoYXQgbGV0cyBhbnlvbmUgYmVjb21lIGEgcGFydCBvZiBkZWNlbnRyYWxpemVkIGluZnJhc3RydWN0dXJlIGFuZCBlYXJuIHBhc3NpdmUgaW5jb21lLiBTdGFrZSB3aXRoIG91ciBub2RlcyBvciBhbnkgb3RoZXIgdmFsaWRhdG9yIGFjcm9zcyBtdWx0aXBsZSBuZXR3b3JrcyBpbiBhIGZldyBjbGlja3NKAFJECjoKETUwMDAwMDAwMDAwMDAwMDAwEhIyMDAwMDAwMDAwMDAwMDAwMDAaETMwMDAwMDAwMDAwMDAwMDAwEgYIkKKzhgZaATE=").unwrap()), } ], height: 0, @@ -649,7 +650,7 @@ fn test_query_delegator_delegations() { deps.querier .add_query_response(1, to_binary(&delegations_response).unwrap()); - deps.querier.add_registred_queries(1, registered_query); + deps.querier.add_registered_queries(1, registered_query); let query_delegations = QueryMsg::GetDelegations { query_id: 1 }; let resp: DelegatorDelegationsResponse = @@ -707,11 +708,11 @@ fn test_sudo_tx_query_result_callback() { QueryType::TX, 0, ); - deps.querier.add_registred_queries(1, registered_query); + deps.querier.add_registered_queries(1, registered_query); // simulate neutron's SudoTxQueryResult call with the following payload: // a sending from neutron10h9stc5v6ntgeygf5xf945njqq5h32r54rf7kf to watched_addr of 10000 stake - let data: Binary = Binary::from(base64::decode("CpMBCpABChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnAKLm5ldXRyb24xMGg5c3RjNXY2bnRnZXlnZjV4Zjk0NW5qcXE1aDMycjU0cmY3a2YSLm5ldXRyb24xZmo2eXFya3B3NmZtcDdmN2poajU3ZHVqZnB3YWw0bTI1ZGFmengaDgoFc3Rha2USBTEwMDAwEmcKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQJPYibh+Zef13ZkulPqI27rV5xswZ0H/vh1Tnymp1RHPhIECgIIARgAEhMKDQoFc3Rha2USBDEwMDAQwJoMGkAIiXNJXmA57KhyaWpKcLLr3602A5+hlvv/b4PgcDDm9y0qikC+biNZXin1dEMpHOvX9DwOWJ9utv6EKljiSyfT").unwrap()); + let data: Binary = Binary::from(BASE64_STANDARD.decode("CpMBCpABChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnAKLm5ldXRyb24xMGg5c3RjNXY2bnRnZXlnZjV4Zjk0NW5qcXE1aDMycjU0cmY3a2YSLm5ldXRyb24xZmo2eXFya3B3NmZtcDdmN2poajU3ZHVqZnB3YWw0bTI1ZGFmengaDgoFc3Rha2USBTEwMDAwEmcKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQJPYibh+Zef13ZkulPqI27rV5xswZ0H/vh1Tnymp1RHPhIECgIIARgAEhMKDQoFc3Rha2USBDEwMDAQwJoMGkAIiXNJXmA57KhyaWpKcLLr3602A5+hlvv/b4PgcDDm9y0qikC+biNZXin1dEMpHOvX9DwOWJ9utv6EKljiSyfT").unwrap()); sudo_tx_query_result( deps.as_mut(), env.clone(), @@ -738,7 +739,7 @@ fn test_sudo_tx_query_result_callback() { // simulate neutron's SudoTxQueryResult call with the following payload: // a sending from neutron10h9stc5v6ntgeygf5xf945njqq5h32r54rf7kf to another addr of 10000 stake - let data: Binary = Binary::from(base64::decode("CpMBCpABChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnAKLm5ldXRyb24xMGg5c3RjNXY2bnRnZXlnZjV4Zjk0NW5qcXE1aDMycjU0cmY3a2YSLm5ldXRyb24xNHV4dnUyMmxocmF6eXhhZGFxdjVkNmxzd3UwcDI3NmxsN2hya2waDgoFc3Rha2USBTEwMDAwEmcKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQJPYibh+Zef13ZkulPqI27rV5xswZ0H/vh1Tnymp1RHPhIECgIIARgAEhMKDQoFc3Rha2USBDEwMDAQwJoMGkBEv2CW/0gIrankNl4aGs9LXy2BKA6kAWyl4MUxmXnbnjRpgaNbQIyo4i7nUgVsuOpqzAdudM2M53OSU0Dmo5tF").unwrap()); + let data: Binary = Binary::from(BASE64_STANDARD.decode("CpMBCpABChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnAKLm5ldXRyb24xMGg5c3RjNXY2bnRnZXlnZjV4Zjk0NW5qcXE1aDMycjU0cmY3a2YSLm5ldXRyb24xNHV4dnUyMmxocmF6eXhhZGFxdjVkNmxzd3UwcDI3NmxsN2hya2waDgoFc3Rha2USBTEwMDAwEmcKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQJPYibh+Zef13ZkulPqI27rV5xswZ0H/vh1Tnymp1RHPhIECgIIARgAEhMKDQoFc3Rha2USBDEwMDAQwJoMGkBEv2CW/0gIrankNl4aGs9LXy2BKA6kAWyl4MUxmXnbnjRpgaNbQIyo4i7nUgVsuOpqzAdudM2M53OSU0Dmo5tF").unwrap()); let res = sudo_tx_query_result( deps.as_mut(), env.clone(), @@ -770,7 +771,7 @@ fn test_sudo_tx_query_result_callback() { // simulate neutron's SudoTxQueryResult call with the following payload: // a sending from neutron10h9stc5v6ntgeygf5xf945njqq5h32r54rf7kf to watched_addr of 10000 stake - let data: Binary = Binary::from(base64::decode("CpMBCpABChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnAKLm5ldXRyb24xMGg5c3RjNXY2bnRnZXlnZjV4Zjk0NW5qcXE1aDMycjU0cmY3a2YSLm5ldXRyb24xZmo2eXFya3B3NmZtcDdmN2poajU3ZHVqZnB3YWw0bTI1ZGFmengaDgoFc3Rha2USBTEwMDAwEmcKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQJPYibh+Zef13ZkulPqI27rV5xswZ0H/vh1Tnymp1RHPhIECgIIARgAEhMKDQoFc3Rha2USBDEwMDAQwJoMGkAIiXNJXmA57KhyaWpKcLLr3602A5+hlvv/b4PgcDDm9y0qikC+biNZXin1dEMpHOvX9DwOWJ9utv6EKljiSyfT").unwrap()); + let data: Binary = Binary::from(BASE64_STANDARD.decode("CpMBCpABChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnAKLm5ldXRyb24xMGg5c3RjNXY2bnRnZXlnZjV4Zjk0NW5qcXE1aDMycjU0cmY3a2YSLm5ldXRyb24xZmo2eXFya3B3NmZtcDdmN2poajU3ZHVqZnB3YWw0bTI1ZGFmengaDgoFc3Rha2USBTEwMDAwEmcKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQJPYibh+Zef13ZkulPqI27rV5xswZ0H/vh1Tnymp1RHPhIECgIIARgAEhMKDQoFc3Rha2USBDEwMDAQwJoMGkAIiXNJXmA57KhyaWpKcLLr3602A5+hlvv/b4PgcDDm9y0qikC+biNZXin1dEMpHOvX9DwOWJ9utv6EKljiSyfT").unwrap()); sudo_tx_query_result( deps.as_mut(), env, @@ -831,11 +832,11 @@ fn test_sudo_tx_query_result_min_height_callback() { QueryType::TX, 0, ); - deps.querier.add_registred_queries(1, registered_query); + deps.querier.add_registered_queries(1, registered_query); // simulate neutron's SudoTxQueryResult call with the following payload: // a sending from neutron10h9stc5v6ntgeygf5xf945njqq5h32r54rf7kf to watched_addr of 10000 stake - let data: Binary = Binary::from(base64::decode("CpMBCpABChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnAKLm5ldXRyb24xMGg5c3RjNXY2bnRnZXlnZjV4Zjk0NW5qcXE1aDMycjU0cmY3a2YSLm5ldXRyb24xZmo2eXFya3B3NmZtcDdmN2poajU3ZHVqZnB3YWw0bTI1ZGFmengaDgoFc3Rha2USBTEwMDAwEmcKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQJPYibh+Zef13ZkulPqI27rV5xswZ0H/vh1Tnymp1RHPhIECgIIARgAEhMKDQoFc3Rha2USBDEwMDAQwJoMGkAIiXNJXmA57KhyaWpKcLLr3602A5+hlvv/b4PgcDDm9y0qikC+biNZXin1dEMpHOvX9DwOWJ9utv6EKljiSyfT").unwrap()); + let data: Binary = Binary::from(BASE64_STANDARD.decode("CpMBCpABChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnAKLm5ldXRyb24xMGg5c3RjNXY2bnRnZXlnZjV4Zjk0NW5qcXE1aDMycjU0cmY3a2YSLm5ldXRyb24xZmo2eXFya3B3NmZtcDdmN2poajU3ZHVqZnB3YWw0bTI1ZGFmengaDgoFc3Rha2USBTEwMDAwEmcKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQJPYibh+Zef13ZkulPqI27rV5xswZ0H/vh1Tnymp1RHPhIECgIIARgAEhMKDQoFc3Rha2USBDEwMDAQwJoMGkAIiXNJXmA57KhyaWpKcLLr3602A5+hlvv/b4PgcDDm9y0qikC+biNZXin1dEMpHOvX9DwOWJ9utv6EKljiSyfT").unwrap()); sudo_tx_query_result( deps.as_mut(), env.clone(), @@ -862,7 +863,7 @@ fn test_sudo_tx_query_result_min_height_callback() { // simulate neutron's SudoTxQueryResult call with the following payload: // a sending from neutron10h9stc5v6ntgeygf5xf945njqq5h32r54rf7kf to another addr of 10000 stake - let data: Binary = Binary::from(base64::decode("CpMBCpABChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnAKLm5ldXRyb24xMGg5c3RjNXY2bnRnZXlnZjV4Zjk0NW5qcXE1aDMycjU0cmY3a2YSLm5ldXRyb24xNHV4dnUyMmxocmF6eXhhZGFxdjVkNmxzd3UwcDI3NmxsN2hya2waDgoFc3Rha2USBTEwMDAwEmcKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQJPYibh+Zef13ZkulPqI27rV5xswZ0H/vh1Tnymp1RHPhIECgIIARgAEhMKDQoFc3Rha2USBDEwMDAQwJoMGkBEv2CW/0gIrankNl4aGs9LXy2BKA6kAWyl4MUxmXnbnjRpgaNbQIyo4i7nUgVsuOpqzAdudM2M53OSU0Dmo5tF").unwrap()); + let data: Binary = Binary::from(BASE64_STANDARD.decode("CpMBCpABChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnAKLm5ldXRyb24xMGg5c3RjNXY2bnRnZXlnZjV4Zjk0NW5qcXE1aDMycjU0cmY3a2YSLm5ldXRyb24xNHV4dnUyMmxocmF6eXhhZGFxdjVkNmxzd3UwcDI3NmxsN2hya2waDgoFc3Rha2USBTEwMDAwEmcKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQJPYibh+Zef13ZkulPqI27rV5xswZ0H/vh1Tnymp1RHPhIECgIIARgAEhMKDQoFc3Rha2USBDEwMDAQwJoMGkBEv2CW/0gIrankNl4aGs9LXy2BKA6kAWyl4MUxmXnbnjRpgaNbQIyo4i7nUgVsuOpqzAdudM2M53OSU0Dmo5tF").unwrap()); let res = sudo_tx_query_result( deps.as_mut(), env.clone(), @@ -894,7 +895,7 @@ fn test_sudo_tx_query_result_min_height_callback() { // simulate neutron's SudoTxQueryResult call with the following payload: // a sending from neutron10h9stc5v6ntgeygf5xf945njqq5h32r54rf7kf to watched_addr of 10000 stake - let data: Binary = Binary::from(base64::decode("CpMBCpABChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnAKLm5ldXRyb24xMGg5c3RjNXY2bnRnZXlnZjV4Zjk0NW5qcXE1aDMycjU0cmY3a2YSLm5ldXRyb24xZmo2eXFya3B3NmZtcDdmN2poajU3ZHVqZnB3YWw0bTI1ZGFmengaDgoFc3Rha2USBTEwMDAwEmcKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQJPYibh+Zef13ZkulPqI27rV5xswZ0H/vh1Tnymp1RHPhIECgIIARgAEhMKDQoFc3Rha2USBDEwMDAQwJoMGkAIiXNJXmA57KhyaWpKcLLr3602A5+hlvv/b4PgcDDm9y0qikC+biNZXin1dEMpHOvX9DwOWJ9utv6EKljiSyfT").unwrap()); + let data: Binary = Binary::from(BASE64_STANDARD.decode("CpMBCpABChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnAKLm5ldXRyb24xMGg5c3RjNXY2bnRnZXlnZjV4Zjk0NW5qcXE1aDMycjU0cmY3a2YSLm5ldXRyb24xZmo2eXFya3B3NmZtcDdmN2poajU3ZHVqZnB3YWw0bTI1ZGFmengaDgoFc3Rha2USBTEwMDAwEmcKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQJPYibh+Zef13ZkulPqI27rV5xswZ0H/vh1Tnymp1RHPhIECgIIARgAEhMKDQoFc3Rha2USBDEwMDAQwJoMGkAIiXNJXmA57KhyaWpKcLLr3602A5+hlvv/b4PgcDDm9y0qikC+biNZXin1dEMpHOvX9DwOWJ9utv6EKljiSyfT").unwrap()); sudo_tx_query_result( deps.as_mut(), env, diff --git a/contracts/neutron_interchain_txs/Cargo.toml b/contracts/neutron_interchain_txs/Cargo.toml index e1637f3f..1b9211d1 100644 --- a/contracts/neutron_interchain_txs/Cargo.toml +++ b/contracts/neutron_interchain_txs/Cargo.toml @@ -32,15 +32,15 @@ backtraces = ["cosmwasm-std/backtraces"] library = [] [dependencies] -cosmwasm-std = { version = "1.0.0", features = ["staking"] } -cw2 = "0.15.1" +cosmwasm-std = { version = "1.3.0", features = ["staking"] } +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 = { version = "0.14.0", features = ["iterator"]} -cosmos-sdk-proto = { version = "0.14.0", default-features = false } +serde = { version = "1.0.149", default-features = false, features = ["derive"] } +serde-json-wasm = { version = "0.5.1" } +cw-storage-plus = { version = "1.1.0", features = ["iterator"]} +cosmos-sdk-proto = { version = "0.16.0", default-features = false } neutron-sdk = { path = "../../packages/neutron-sdk", default-features = false, version = "0.6.0"} -base64 = "0.13.0" +base64 = "0.21.2" protobuf = { version = "3.2.0", features = ["with-bytes"] } prost = "0.11" prost-types = "0.11" @@ -49,4 +49,4 @@ thiserror = { version = "1.0" } [dev-dependencies] -cosmwasm-schema = { version = "1.0.0", default-features = false } +cosmwasm-schema = { version = "1.3.0", default-features = false } diff --git a/contracts/neutron_interchain_txs/src/storage.rs b/contracts/neutron_interchain_txs/src/storage.rs index b5bf1c6e..27a7eeea 100644 --- a/contracts/neutron_interchain_txs/src/storage.rs +++ b/contracts/neutron_interchain_txs/src/storage.rs @@ -41,7 +41,7 @@ pub fn save_reply_payload(store: &mut dyn Storage, payload: SudoPayload) -> StdR REPLY_ID_STORAGE.save(store, &to_vec(&payload)?) } -pub fn read_reply_payload(store: &mut dyn Storage) -> StdResult { +pub fn read_reply_payload(store: &dyn Storage) -> StdResult { let data = REPLY_ID_STORAGE.load(store)?; from_binary(&Binary(data)) } @@ -64,7 +64,7 @@ pub fn read_errors_from_queue(store: &dyn Storage) -> StdResult, St } pub fn read_sudo_payload( - store: &mut dyn Storage, + store: &dyn Storage, channel_id: String, seq_id: u64, ) -> StdResult { diff --git a/packages/neutron-sdk/Cargo.toml b/packages/neutron-sdk/Cargo.toml index 4159350e..fce79872 100644 --- a/packages/neutron-sdk/Cargo.toml +++ b/packages/neutron-sdk/Cargo.toml @@ -22,21 +22,21 @@ incremental = false overflow-checks = true [dependencies] -cosmwasm-std = { version = "1.0.0", features = ["staking"] } +cosmwasm-std = { version = "1.3.0", features = ["staking"] } cosmos-sdk-proto = { version = "0.16.0", default-features = false } prost = "0.11" -serde = { version = "1.0.147", default-features = false, features = ["derive"] } +serde = { version = "1.0.149", default-features = false, features = ["derive"] } schemars = "0.8.10" -serde-json-wasm = "0.4.1" -cw-storage-plus = { version = "1.0.1", features = ["iterator"]} -base64 = "0.20.0" -bech32 = "0.9.0" +serde-json-wasm = "0.5.1" +cw-storage-plus = { version = "1.1.0", features = ["iterator"]} +base64 = "0.21.2" +bech32 = "0.9.1" thiserror = { version = "1.0" } serde_json = { version = "1.0.87" } protobuf = { version = "3.2.0", features = ["with-bytes"] } -cosmwasm-schema = "1.1.0" +cosmwasm-schema = "1.3.0" [dev-dependencies] -cosmwasm-schema = { version = "1.0.0", default-features = false } +cosmwasm-schema = { version = "1.3.0", default-features = false } prost-types = "0.11.1" hex = "0.4.3" \ No newline at end of file diff --git a/packages/neutron-sdk/src/interchain_queries/v045/testing.rs b/packages/neutron-sdk/src/interchain_queries/v045/testing.rs index 7b3701ad..c1283daf 100644 --- a/packages/neutron-sdk/src/interchain_queries/v045/testing.rs +++ b/packages/neutron-sdk/src/interchain_queries/v045/testing.rs @@ -10,6 +10,8 @@ use crate::interchain_queries::v045::types::{ TotalSupply, Validator as ContractValidator, DECIMAL_PLACES, KEY_BOND_DENOM, STAKING_STORE_KEY, }; use crate::{NeutronError, NeutronResult}; +use base64::prelude::*; +use base64::Engine; use cosmos_sdk_proto::cosmos::base::v1beta1::{Coin, DecCoin}; use cosmos_sdk_proto::cosmos::distribution::v1beta1::FeePool as CosmosFeePool; use cosmos_sdk_proto::cosmos::gov::v1beta1::{ @@ -759,7 +761,7 @@ fn test_delegations_reconstruct() { #[test] fn test_balance_reconstruct_from_hex() { let bytes = hex::decode(BALANCES_HEX_RESPONSE).unwrap(); // decode hex string to bytes - let base64_input = base64::encode(bytes); // encode bytes to base64 string + let base64_input = BASE64_STANDARD.encode(bytes); // encode bytes to base64 string let s = StorageValue { storage_prefix: String::default(), // not used in reconstruct @@ -781,7 +783,7 @@ fn test_balance_reconstruct_from_hex() { #[test] fn test_bank_total_supply_reconstruct_from_hex() { let bytes = hex::decode(TOTAL_SUPPLY_HEX_RESPONSE).unwrap(); // decode hex string to bytes - let base64_input = base64::encode(bytes); // encode bytes to base64 string + let base64_input = BASE64_STANDARD.encode(bytes); // encode bytes to base64 string let s = StorageValue { storage_prefix: String::default(), // not used in reconstruct @@ -803,7 +805,7 @@ fn test_bank_total_supply_reconstruct_from_hex() { #[test] fn test_staking_validators_reconstruct_from_hex() { let bytes = hex::decode(STAKING_VALIDATOR_HEX_RESPONSE).unwrap(); // decode hex string to bytes - let base64_input = base64::encode(bytes); // encode bytes to base64 string + let base64_input = BASE64_STANDARD.encode(bytes); // encode bytes to base64 string let s = StorageValue { storage_prefix: String::default(), // not used in reconstruct @@ -842,7 +844,7 @@ fn test_staking_validators_reconstruct_from_hex() { #[test] fn test_government_proposals_reconstruct_from_hex() { let bytes = hex::decode(GOV_PROPOSAL_HEX_RESPONSE).unwrap(); // decode hex string to bytes - let base64_input = base64::encode(bytes); // encode bytes to base64 string + let base64_input = BASE64_STANDARD.encode(bytes); // encode bytes to base64 string let s = StorageValue { storage_prefix: String::default(), // not used in reconstruct @@ -879,7 +881,7 @@ fn test_government_proposals_reconstruct_from_hex() { #[test] fn test_fee_pool_reconstruct_from_hex() { let bytes = hex::decode(FEE_POOL_HEX_RESPONSE).unwrap(); // decode hex string to bytes - let base64_input = base64::encode(bytes); // encode bytes to base64 string + let base64_input = BASE64_STANDARD.encode(bytes); // encode bytes to base64 string let s = StorageValue { storage_prefix: String::default(), // not used in reconstruct @@ -901,11 +903,11 @@ fn test_fee_pool_reconstruct_from_hex() { #[test] fn test_delegations_reconstruct_from_hex() { let staking_denom_bytes = hex::decode(STAKING_DENOM_HEX_RESPONSE).unwrap(); // decode hex string to bytes - let staking_denom_base64_input = base64::encode(staking_denom_bytes); // encode bytes to base64 string + let staking_denom_base64_input = BASE64_STANDARD.encode(staking_denom_bytes); // encode bytes to base64 string let staking_validator_bytes = hex::decode(STAKING_VALIDATOR_HEX_RESPONSE).unwrap(); // decode hex string to bytes - let staking_validator_base64_input = base64::encode(staking_validator_bytes); // encode bytes to base64 string + let staking_validator_base64_input = BASE64_STANDARD.encode(staking_validator_bytes); // encode bytes to base64 string let delegation_bytes = hex::decode(DELEGATOR_DELEGATIONS_HEX_RESPONSE).unwrap(); // decode hex string to bytes - let delegation_base64_input = base64::encode(delegation_bytes); // encode bytes to base64 string + let delegation_base64_input = BASE64_STANDARD.encode(delegation_bytes); // encode bytes to base64 string let mut st_values: Vec = vec![StorageValue { storage_prefix: String::default(), // not used in reconstruct