diff --git a/Cargo.lock b/Cargo.lock index 1298614..5fd70d1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -26,6 +26,12 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +[[package]] +name = "base64" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" + [[package]] name = "base64ct" version = "1.5.2" @@ -67,6 +73,9 @@ name = "bytes" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" +dependencies = [ + "serde", +] [[package]] name = "cfg-if" @@ -82,20 +91,20 @@ checksum = "722e23542a15cea1f65d4a1419c4cfd7a26706c70871a13a04238ca3f40f1661" [[package]] name = "cosmos-sdk-proto" -version = "0.14.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20b42021d8488665b1a0d9748f1f81df7235362d194f44481e2e61bf376b77b4" +checksum = "c4776e787b24d9568dd61d3237eeb4eb321d622fb881b858c7b82806420e87d4" dependencies = [ - "prost 0.11.0", - "prost-types 0.11.1", + "prost", + "prost-types", "tendermint-proto", ] [[package]] name = "cosmwasm-crypto" -version = "1.1.4" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce1c26e5595c6a960cd3d6dc1d8629e16a2b0cb22ecd653b28bbf292d7c53a3c" +checksum = "227315dc11f0bb22a273d0c43d3ba8ef52041c42cf959f09045388a89c57e661" dependencies = [ "digest 0.10.5", "ed25519-zebra", @@ -106,9 +115,9 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.1.4" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a24050753f242554c558dfe7a6b3a456850f2bc6fcf8b518988720e40a5fa21" +checksum = "6fca30d51f7e5fbfa6440d8b10d7df0231bdf77e97fd3fe5d0cb79cc4822e50c" dependencies = [ "syn", ] @@ -139,11 +148,11 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.1.4" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78e50ba8bfea2e449be2e7fa96fd8b196d09fb5ef34e27a18f28835ed835b199" +checksum = "b13d5a84d15cf7be17dc249a21588cdb0f7ef308907c50ce2723316a7d79c3dc" dependencies = [ - "base64", + "base64 0.13.0", "cosmwasm-crypto", "cosmwasm-derive", "derivative", @@ -208,31 +217,9 @@ dependencies = [ [[package]] name = "cw-storage-plus" -version = "0.14.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c8b264257c4f44c49b7ce09377af63aa040768ecd3fd7bdd2d48a09323a1e90" -dependencies = [ - "cosmwasm-std", - "schemars", - "serde", -] - -[[package]] -name = "cw-storage-plus" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc6cf70ef7686e2da9ad7b067c5942cd3e88dd9453f7af42f54557f8af300fb0" -dependencies = [ - "cosmwasm-std", - "schemars", - "serde", -] - -[[package]] -name = "cw-storage-plus" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b6f91c0b94481a3e9ef1ceb183c37d00764f8751e39b45fc09f4d9b970d469" +checksum = "053a5083c258acd68386734f428a5a171b29f7d733151ae83090c6fcc9417ffa" dependencies = [ "cosmwasm-std", "schemars", @@ -241,13 +228,13 @@ dependencies = [ [[package]] name = "cw2" -version = "0.15.1" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5abb8ecea72e09afff830252963cb60faf945ce6cef2c20a43814516082653da" +checksum = "8fb70cee2cf0b4a8ff7253e6bc6647107905e8eb37208f87d54f67810faa62f8" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus 0.15.1", + "cw-storage-plus", "schemars", "serde", ] @@ -441,7 +428,7 @@ version = "0.1.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus 0.14.0", + "cw-storage-plus", "cw2", "neutron-sdk", "protobuf", @@ -486,14 +473,16 @@ checksum = "c0f80d65747a3e43d1596c7c5492d95d5edddaabd45a7fcdb02b95f644164966" [[package]] name = "neutron-sdk" version = "0.1.0" -source = "git+https://github.com/neutron-org/neutron-contracts.git?branch=neutron_audit_oak_19_09_2022_fixes#17f469b4a3c21b1281d6d6f2c3fb092ceed00a28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48b0fe1882e00f244da9a05937a6f0d7f9f82bb2539d35ea2a06507f78418af" dependencies = [ - "base64", + "base64 0.20.0", "bech32", "cosmos-sdk-proto", + "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus 0.16.0", - "prost 0.11.0", + "cw-storage-plus", + "prost", "protobuf", "schemars", "serde", @@ -506,14 +495,14 @@ dependencies = [ name = "neutron_interchain_queries" version = "0.1.0" dependencies = [ - "base64", + "base64 0.20.0", "cosmos-sdk-proto", "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus 0.14.0", + "cw-storage-plus", "cw2", "neutron-sdk", - "prost 0.11.0", + "prost", "schemars", "serde", "serde-json-wasm", @@ -523,16 +512,16 @@ dependencies = [ name = "neutron_interchain_txs" version = "0.1.0" dependencies = [ - "base64", + "base64 0.20.0", "bech32", "cosmos-sdk-proto", "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus 0.14.0", + "cw-storage-plus", "cw2", "neutron-sdk", - "prost 0.11.0", - "prost-types 0.11.1", + "prost", + "prost-types", "protobuf", "schemars", "serde", @@ -544,16 +533,16 @@ dependencies = [ name = "neutron_validators_test" version = "0.1.0" dependencies = [ - "base64", + "base64 0.20.0", "bech32", "cosmos-sdk-proto", "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus 0.14.0", + "cw-storage-plus", "cw2", "neutron-sdk", - "prost 0.11.0", - "prost-types 0.10.1", + "prost", + "prost-types", "protobuf", "schemars", "serde", @@ -629,42 +618,19 @@ dependencies = [ [[package]] name = "prost" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e" -dependencies = [ - "bytes", - "prost-derive 0.10.1", -] - -[[package]] -name = "prost" -version = "0.11.0" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "399c3c31cdec40583bb68f0b18403400d01ec4289c383aa047560439952c4dd7" +checksum = "c01db6702aa05baa3f57dec92b8eeeeb4cb19e894e73996b32a4093289e54592" dependencies = [ "bytes", - "prost-derive 0.11.0", -] - -[[package]] -name = "prost-derive" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn", + "prost-derive", ] [[package]] name = "prost-derive" -version = "0.11.0" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7345d5f0e08c0536d7ac7229952590239e77abf0a0100a1b1d890add6ea96364" +checksum = "c8842bad1a5419bca14eac663ba798f6bc19c413c2fdceb5f3ba3b0932d96720" dependencies = [ "anyhow", "itertools", @@ -675,22 +641,12 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68" -dependencies = [ - "bytes", - "prost 0.10.4", -] - -[[package]] -name = "prost-types" -version = "0.11.1" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dfaa718ad76a44b3415e6c4d53b17c8f99160dcb3a99b10470fce8ad43f6e3e" +checksum = "017f79637768cde62820bc2d4fe0e45daaa027755c323ad077767c6c5f173091" dependencies = [ "bytes", - "prost 0.11.0", + "prost", ] [[package]] @@ -946,16 +902,16 @@ dependencies = [ [[package]] name = "tendermint-proto" -version = "0.23.9" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ce80bf536476db81ecc9ebab834dc329c9c1509a694f211a73858814bfe023" +checksum = "d5895470f28c530f8ae8c4071bf8190304ce00bd131d25e81730453124a3375c" dependencies = [ "bytes", "flex-error", "num-derive", "num-traits", - "prost 0.11.0", - "prost-types 0.11.1", + "prost", + "prost-types", "serde", "serde_bytes", "subtle-encoding", diff --git a/artifacts/checksums.txt b/artifacts/checksums.txt index 16a0ea4..e65ea49 100644 --- a/artifacts/checksums.txt +++ b/artifacts/checksums.txt @@ -1,5 +1,5 @@ -5a752bebfa54f3eaf2e93ab30fcb3df3f011ae4bee0a98576db3d527ab5c2161 ibc_transfer.wasm -a94019b4c7a0f40fd643b5092fcc1d1f6fdc4d45ec6354b7faf9e0036cabb0f0 neutron_interchain_queries.wasm -411e97a618b1b36c87909c7630d9d898876524b368825ed5b2d59c8bf4a094f1 neutron_interchain_txs.wasm -6c36f6953f5dff64381c7a8cfe93ef93f0b30b2715970023f84662c0279b3683 neutron_validators_test.wasm -105a855247f10cf087e1cade5f12a65a5e5bd2550f3d145e7fde17929134dcad reflect.wasm +1c464063a6755ac10ee89452855bf4626f30a214feabae6ee527b4df6ce55170 ibc_transfer.wasm +b7ca3f944c6671f66ed05ca08a72f376471d0732747212cec0e9cceef87387a7 neutron_interchain_queries.wasm +0cbf5a6537c87379f79ce0c18b53ba9567ba8241fe45f875ff3485ca593467b5 neutron_interchain_txs.wasm +6ccbcad30bb8cef52ff5740d66882a7cb59c366dbd90b5c8f9c0bab0bdd9e0fe neutron_validators_test.wasm +070e30620d189da7a0fb21e4dc748c8d2d15f35ba0f6445a16eb9bc817c75d3a reflect.wasm diff --git a/artifacts/checksums_intermediate.txt b/artifacts/checksums_intermediate.txt index 8f80948..4b3d562 100644 --- a/artifacts/checksums_intermediate.txt +++ b/artifacts/checksums_intermediate.txt @@ -1,5 +1,5 @@ -2cc7b156be2601fbe03630325bed16c1b9230c72e85bfb8ef0e16fabccd1da5a target/wasm32-unknown-unknown/release/ibc_transfer.wasm -baddf282847837960320c189b70da0006ce1b4c56d58ae187fa62d82c44b1865 target/wasm32-unknown-unknown/release/neutron_interchain_queries.wasm -33b694f034e685e338009b34c367501fa1a9f238d7f0c62c2562d2d39effefb5 target/wasm32-unknown-unknown/release/neutron_interchain_txs.wasm -4ec8a0804f485bf7b2bf750228a1bf84f36e4d44ea15426a51d4587d88d96bbe target/wasm32-unknown-unknown/release/neutron_validators_test.wasm -fc1db59525b8463b62f252632931da5a4af7a7f2ced7d58ca964641e3ad1c449 target/wasm32-unknown-unknown/release/reflect.wasm +fb7325cf35d53aef1fd833cf5f43b4ef28bcc88b9c4e3de88e05e20b8625e846 target/wasm32-unknown-unknown/release/ibc_transfer.wasm +4a8d5ebde439bfecc3f24dac4b66eb5c6550285e15db83c505d14af696187bea target/wasm32-unknown-unknown/release/neutron_interchain_queries.wasm +6c57719e44d77487537d0b1f73dc54f1f7f8a2e8edaf28828ec66b7d5e8f7267 target/wasm32-unknown-unknown/release/neutron_interchain_txs.wasm +9e6864d11a044bb8a397b2d0183cd1d622ba0201573578f6841e64f722c9ba6e target/wasm32-unknown-unknown/release/neutron_validators_test.wasm +59ca165fcddee953b0479a484dfeb577fc2744305119b09e817cc33d06d7fb91 target/wasm32-unknown-unknown/release/reflect.wasm diff --git a/artifacts/ibc_transfer.wasm b/artifacts/ibc_transfer.wasm index a88a8a8..62a7ca2 100644 Binary files a/artifacts/ibc_transfer.wasm and b/artifacts/ibc_transfer.wasm differ diff --git a/artifacts/neutron_interchain_queries.wasm b/artifacts/neutron_interchain_queries.wasm index 1703251..4c2e7c5 100644 Binary files a/artifacts/neutron_interchain_queries.wasm and b/artifacts/neutron_interchain_queries.wasm differ diff --git a/artifacts/neutron_interchain_txs.wasm b/artifacts/neutron_interchain_txs.wasm index 4cb579b..04844ca 100644 Binary files a/artifacts/neutron_interchain_txs.wasm and b/artifacts/neutron_interchain_txs.wasm differ diff --git a/artifacts/neutron_validators_test.wasm b/artifacts/neutron_validators_test.wasm index 92762d9..7fe2d52 100644 Binary files a/artifacts/neutron_validators_test.wasm and b/artifacts/neutron_validators_test.wasm differ diff --git a/artifacts/reflect.wasm b/artifacts/reflect.wasm index 2472a09..ffc2ae4 100644 Binary files a/artifacts/reflect.wasm and b/artifacts/reflect.wasm differ diff --git a/contracts/ibc_transfer/Cargo.toml b/contracts/ibc_transfer/Cargo.toml index d1c4ff0..e9ac408 100644 --- a/contracts/ibc_transfer/Cargo.toml +++ b/contracts/ibc_transfer/Cargo.toml @@ -34,12 +34,12 @@ library = [] [dependencies] cosmwasm-std = { version = "1.0.0", features = ["staking", "stargate"] } -cw2 = "0.15.1" +cw2 = "1.0.1" 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"]} -neutron-sdk = { git = "https://github.com/neutron-org/neutron-contracts.git", branch = "neutron_audit_oak_19_09_2022_fixes", default-features = false, version = "0.1.0"} +cw-storage-plus = { version = "1.0.1", features = ["iterator"]} +neutron-sdk = "0.1.0" protobuf = { version = "3.2.0", features = ["with-bytes"] } [dev-dependencies] diff --git a/contracts/neutron_interchain_queries/Cargo.toml b/contracts/neutron_interchain_queries/Cargo.toml index dfd6db0..9fe4a98 100644 --- a/contracts/neutron_interchain_queries/Cargo.toml +++ b/contracts/neutron_interchain_queries/Cargo.toml @@ -33,13 +33,13 @@ library = [] [dependencies] cosmwasm-std = { version = "1.0.0", features = ["staking"] } -cw2 = "0.15.1" +cw2 = "1.0.1" schemars = "0.8.10" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -neutron-sdk = { git = "https://github.com/neutron-org/neutron-contracts.git", branch = "neutron_audit_oak_19_09_2022_fixes", default-features = false, version = "0.1.0"} -base64 = "0.13.0" -cosmos-sdk-proto = { version = "0.14.0", default-features = false } -cw-storage-plus = { version = "0.14.0", features = ["iterator"]} +neutron-sdk = "0.1.0" +base64 = "0.20.0" +cosmos-sdk-proto = { version = "0.16.0", default-features = false } +cw-storage-plus = { version = "1.0.1", features = ["iterator"]} prost = "0.11" serde-json-wasm = "0.4.1" diff --git a/contracts/neutron_interchain_queries/schema/execute_msg.json b/contracts/neutron_interchain_queries/schema/execute_msg.json index 4a7999f..0eee951 100644 --- a/contracts/neutron_interchain_queries/schema/execute_msg.json +++ b/contracts/neutron_interchain_queries/schema/execute_msg.json @@ -417,7 +417,7 @@ ] }, "path": { - "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-sdk module: 'staking', 'bank', etc.)", + "description": "*path** is a path to the storage (storage prefix) where you want to read value by key (usually name of cosmos-packages module: 'staking', 'bank', etc.)", "type": "string" } } diff --git a/contracts/neutron_interchain_txs/Cargo.toml b/contracts/neutron_interchain_txs/Cargo.toml index ff9f1de..f6e28f1 100644 --- a/contracts/neutron_interchain_txs/Cargo.toml +++ b/contracts/neutron_interchain_txs/Cargo.toml @@ -33,14 +33,14 @@ library = [] [dependencies] cosmwasm-std = { version = "1.0.0", features = ["staking"] } -cw2 = "0.15.1" +cw2 = "1.0.1" 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 } -neutron-sdk = { git = "https://github.com/neutron-org/neutron-contracts.git", branch = "neutron_audit_oak_19_09_2022_fixes", default-features = false, version = "0.1.0"} -base64 = "0.13.0" +cw-storage-plus = { version = "1.0.1", features = ["iterator"]} +cosmos-sdk-proto = { version = "0.16.0", default-features = false } +neutron-sdk = "0.1.0" +base64 = "0.20.0" protobuf = { version = "3.2.0", features = ["with-bytes"] } prost = "0.11" prost-types = "0.11" diff --git a/contracts/neutron_validator_test/Cargo.toml b/contracts/neutron_validator_test/Cargo.toml index d74b815..40f1ba8 100644 --- a/contracts/neutron_validator_test/Cargo.toml +++ b/contracts/neutron_validator_test/Cargo.toml @@ -33,17 +33,17 @@ library = [] [dependencies] cosmwasm-std = { version = "1.0.0", features = ["staking"] } -cw2 = "0.15.1" +cw2 = "1.0.1" 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 } -neutron-sdk = { git = "https://github.com/neutron-org/neutron-contracts.git", branch = "neutron_audit_oak_19_09_2022_fixes", default-features = false, version = "0.1.0"} -base64 = "0.13.0" +cw-storage-plus = { version = "1.0.1", features = ["iterator"]} +cosmos-sdk-proto = { version = "0.16.0", default-features = false } +neutron-sdk = "0.1.0" +base64 = "0.20.0" protobuf = { version = "3", features = ["with-bytes"] } prost = "0.11" -prost-types = "0.10" +prost-types = "0.11.5" bech32 = "0.9.0" thiserror = { version = "1.0" } diff --git a/contracts/reflect/Cargo.toml b/contracts/reflect/Cargo.toml index 5860c89..bf0ada3 100644 --- a/contracts/reflect/Cargo.toml +++ b/contracts/reflect/Cargo.toml @@ -34,10 +34,10 @@ library = [] [dependencies] cosmwasm-std = { version = "1.0.0", features = ["staking"] } -cw2 = "0.15.1" +cw2 = "1.0.1" schemars = "0.8.10" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -neutron-sdk = { git = "https://github.com/neutron-org/neutron-contracts.git", branch = "neutron_audit_oak_19_09_2022_fixes", default-features = false, version = "0.1.0"} +neutron-sdk = "0.1.0" [dev-dependencies] cosmwasm-schema = { version = "1.0.0", default-features = false } \ No newline at end of file