diff --git a/integration-tests/contracts/modules/authz-nft-trade/Cargo.lock b/integration-tests/contracts/modules/authz-nft-trade/Cargo.lock index 13c21cf20..3a60c2751 100644 --- a/integration-tests/contracts/modules/authz-nft-trade/Cargo.lock +++ b/integration-tests/contracts/modules/authz-nft-trade/Cargo.lock @@ -157,7 +157,7 @@ dependencies = [ "cw-storage-plus", "cw-utils", "cw2", - "prost 0.12.6", + "prost", "thiserror", ] @@ -233,17 +233,30 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +[[package]] +name = "coreum-std-derive" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fee3df604ec822e6a66c0279f2d8840da010f8e07503423ba413baac03c830f" +dependencies = [ + "itertools 0.10.5", + "proc-macro2", + "prost", + "quote", + "syn 1.0.109", +] + [[package]] name = "coreum-wasm-sdk" version = "1.1.0" -source = "git+https://github.com/CoreumFoundation/coreum-wasm-sdk.git?branch=upgrade-cosmwasm-std#0c2f105969a2ce3711c6da2a9e6b9613d6c787d6" +source = "git+https://github.com/CoreumFoundation/coreum-wasm-sdk.git#352e54d12300d263ce135579d5d697d3e46c8431" dependencies = [ "chrono", + "coreum-std-derive", "cosmwasm-schema", "cosmwasm-std", - "osmosis-std-derive", - "prost 0.12.6", - "prost-types 0.12.6", + "prost", + "prost-types", "schemars", "serde", "serde-cw-value", @@ -744,18 +757,6 @@ version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" -[[package]] -name = "osmosis-std-derive" -version = "0.20.1" -source = "git+https://github.com/CoreumFoundation/osmosis-std-derive.git?branch=cosmwasm_2_0#7b837aa9fae698f8432003d44d80e19921b615ea" -dependencies = [ - "itertools 0.10.5", - "proc-macro2", - "prost-types 0.11.9", - "quote", - "syn 1.0.109", -] - [[package]] name = "p256" version = "0.13.2" @@ -801,16 +802,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive 0.11.9", -] - [[package]] name = "prost" version = "0.12.6" @@ -818,20 +809,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive 0.12.6", -] - -[[package]] -name = "prost-derive" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", + "prost-derive", ] [[package]] @@ -847,22 +825,13 @@ dependencies = [ "syn 2.0.79", ] -[[package]] -name = "prost-types" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" -dependencies = [ - "prost 0.11.9", -] - [[package]] name = "prost-types" version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ - "prost 0.12.6", + "prost", ] [[package]] diff --git a/integration-tests/contracts/modules/authz-nft-trade/Cargo.toml b/integration-tests/contracts/modules/authz-nft-trade/Cargo.toml index 80b5dc4b6..8515376de 100644 --- a/integration-tests/contracts/modules/authz-nft-trade/Cargo.toml +++ b/integration-tests/contracts/modules/authz-nft-trade/Cargo.toml @@ -29,6 +29,6 @@ cosmwasm-std = { version = "2.1.4", features = ["cosmwasm_2_0"] } cw2 = "2.0.0" cw-storage-plus = "2.0.0" cosmwasm-schema = "2.1.4" -coreum-wasm-sdk = {git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git", branch = "upgrade-cosmwasm-std"} +coreum-wasm-sdk = { git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git" } cw-utils = "2.0.0" prost = "0.12.6" diff --git a/integration-tests/contracts/modules/authz-stargate/Cargo.lock b/integration-tests/contracts/modules/authz-stargate/Cargo.lock index 5ddf380dd..25d20e0fa 100644 --- a/integration-tests/contracts/modules/authz-stargate/Cargo.lock +++ b/integration-tests/contracts/modules/authz-stargate/Cargo.lock @@ -230,17 +230,30 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +[[package]] +name = "coreum-std-derive" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fee3df604ec822e6a66c0279f2d8840da010f8e07503423ba413baac03c830f" +dependencies = [ + "itertools 0.10.5", + "proc-macro2", + "prost", + "quote", + "syn 1.0.109", +] + [[package]] name = "coreum-wasm-sdk" version = "1.1.0" -source = "git+https://github.com/CoreumFoundation/coreum-wasm-sdk.git?branch=upgrade-cosmwasm-std#0c2f105969a2ce3711c6da2a9e6b9613d6c787d6" +source = "git+https://github.com/CoreumFoundation/coreum-wasm-sdk.git#352e54d12300d263ce135579d5d697d3e46c8431" dependencies = [ "chrono", + "coreum-std-derive", "cosmwasm-schema", "cosmwasm-std", - "osmosis-std-derive", - "prost 0.12.6", - "prost-types 0.12.6", + "prost", + "prost-types", "schemars", "serde", "serde-cw-value", @@ -728,18 +741,6 @@ version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" -[[package]] -name = "osmosis-std-derive" -version = "0.20.1" -source = "git+https://github.com/CoreumFoundation/osmosis-std-derive.git?branch=cosmwasm_2_0#7b837aa9fae698f8432003d44d80e19921b615ea" -dependencies = [ - "itertools 0.10.5", - "proc-macro2", - "prost-types 0.11.9", - "quote", - "syn 1.0.109", -] - [[package]] name = "p256" version = "0.13.2" @@ -785,16 +786,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive 0.11.9", -] - [[package]] name = "prost" version = "0.12.6" @@ -802,20 +793,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive 0.12.6", -] - -[[package]] -name = "prost-derive" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", + "prost-derive", ] [[package]] @@ -831,22 +809,13 @@ dependencies = [ "syn 2.0.79", ] -[[package]] -name = "prost-types" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" -dependencies = [ - "prost 0.11.9", -] - [[package]] name = "prost-types" version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ - "prost 0.12.6", + "prost", ] [[package]] diff --git a/integration-tests/contracts/modules/authz-stargate/Cargo.toml b/integration-tests/contracts/modules/authz-stargate/Cargo.toml index 000a29e59..d962820e9 100644 --- a/integration-tests/contracts/modules/authz-stargate/Cargo.toml +++ b/integration-tests/contracts/modules/authz-stargate/Cargo.toml @@ -28,4 +28,4 @@ thiserror = "1.0.56" cosmwasm-std = { version = "2.1.4", features = ["stargate", "cosmwasm_2_0"] } cw2 = "2.0.0" cosmwasm-schema = "2.1.4" -coreum-wasm-sdk = {git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git", branch = "upgrade-cosmwasm-std"} +coreum-wasm-sdk = { git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git" } diff --git a/integration-tests/contracts/modules/authz-transfer/Cargo.lock b/integration-tests/contracts/modules/authz-transfer/Cargo.lock index b1ac532a7..c643d3ba5 100644 --- a/integration-tests/contracts/modules/authz-transfer/Cargo.lock +++ b/integration-tests/contracts/modules/authz-transfer/Cargo.lock @@ -231,17 +231,30 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +[[package]] +name = "coreum-std-derive" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fee3df604ec822e6a66c0279f2d8840da010f8e07503423ba413baac03c830f" +dependencies = [ + "itertools 0.10.5", + "proc-macro2", + "prost", + "quote", + "syn 1.0.109", +] + [[package]] name = "coreum-wasm-sdk" version = "1.1.0" -source = "git+https://github.com/CoreumFoundation/coreum-wasm-sdk.git?branch=upgrade-cosmwasm-std#0c2f105969a2ce3711c6da2a9e6b9613d6c787d6" +source = "git+https://github.com/CoreumFoundation/coreum-wasm-sdk.git#352e54d12300d263ce135579d5d697d3e46c8431" dependencies = [ "chrono", + "coreum-std-derive", "cosmwasm-schema", "cosmwasm-std", - "osmosis-std-derive", - "prost 0.12.6", - "prost-types 0.12.6", + "prost", + "prost-types", "schemars", "serde", "serde-cw-value", @@ -729,18 +742,6 @@ version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" -[[package]] -name = "osmosis-std-derive" -version = "0.20.1" -source = "git+https://github.com/CoreumFoundation/osmosis-std-derive.git?branch=cosmwasm_2_0#7b837aa9fae698f8432003d44d80e19921b615ea" -dependencies = [ - "itertools 0.10.5", - "proc-macro2", - "prost-types 0.11.9", - "quote", - "syn 1.0.109", -] - [[package]] name = "p256" version = "0.13.2" @@ -786,16 +787,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive 0.11.9", -] - [[package]] name = "prost" version = "0.12.6" @@ -803,20 +794,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive 0.12.6", -] - -[[package]] -name = "prost-derive" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", + "prost-derive", ] [[package]] @@ -832,22 +810,13 @@ dependencies = [ "syn 2.0.79", ] -[[package]] -name = "prost-types" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" -dependencies = [ - "prost 0.11.9", -] - [[package]] name = "prost-types" version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ - "prost 0.12.6", + "prost", ] [[package]] diff --git a/integration-tests/contracts/modules/authz-transfer/Cargo.toml b/integration-tests/contracts/modules/authz-transfer/Cargo.toml index a70441dec..4b0275cb3 100644 --- a/integration-tests/contracts/modules/authz-transfer/Cargo.toml +++ b/integration-tests/contracts/modules/authz-transfer/Cargo.toml @@ -29,4 +29,4 @@ cosmwasm-std = { version = "2.1.4", features = ["cosmwasm_2_0"] } cw2 = "2.0.0" cw-storage-plus = "2.0.0" cosmwasm-schema = "2.1.4" -coreum-wasm-sdk = {git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git", branch = "upgrade-cosmwasm-std"} +coreum-wasm-sdk = { git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git" } diff --git a/integration-tests/contracts/modules/bank-send/Cargo.lock b/integration-tests/contracts/modules/bank-send/Cargo.lock index 0256652f1..fdfde3c1b 100644 --- a/integration-tests/contracts/modules/bank-send/Cargo.lock +++ b/integration-tests/contracts/modules/bank-send/Cargo.lock @@ -232,17 +232,30 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913" +[[package]] +name = "coreum-std-derive" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fee3df604ec822e6a66c0279f2d8840da010f8e07503423ba413baac03c830f" +dependencies = [ + "itertools", + "proc-macro2", + "prost", + "quote", + "syn 1.0.109", +] + [[package]] name = "coreum-wasm-sdk" version = "1.1.0" -source = "git+https://github.com/CoreumFoundation/coreum-wasm-sdk.git?branch=upgrade-cosmwasm-std#0c2f105969a2ce3711c6da2a9e6b9613d6c787d6" +source = "git+https://github.com/CoreumFoundation/coreum-wasm-sdk.git#352e54d12300d263ce135579d5d697d3e46c8431" dependencies = [ "chrono", + "coreum-std-derive", "cosmwasm-schema", "cosmwasm-std", - "osmosis-std-derive", - "prost 0.12.6", - "prost-types 0.12.6", + "prost", + "prost-types", "schemars", "serde", "serde-cw-value", @@ -766,18 +779,6 @@ dependencies = [ "portable-atomic", ] -[[package]] -name = "osmosis-std-derive" -version = "0.20.1" -source = "git+https://github.com/CoreumFoundation/osmosis-std-derive.git?branch=cosmwasm_2_0#7b837aa9fae698f8432003d44d80e19921b615ea" -dependencies = [ - "itertools", - "proc-macro2", - "prost-types 0.11.9", - "quote", - "syn 1.0.109", -] - [[package]] name = "p256" version = "0.13.2" @@ -829,16 +830,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive 0.11.9", -] - [[package]] name = "prost" version = "0.12.6" @@ -846,20 +837,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive 0.12.6", -] - -[[package]] -name = "prost-derive" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn 1.0.109", + "prost-derive", ] [[package]] @@ -875,22 +853,13 @@ dependencies = [ "syn 2.0.79", ] -[[package]] -name = "prost-types" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" -dependencies = [ - "prost 0.11.9", -] - [[package]] name = "prost-types" version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ - "prost 0.12.6", + "prost", ] [[package]] diff --git a/integration-tests/contracts/modules/bank-send/Cargo.toml b/integration-tests/contracts/modules/bank-send/Cargo.toml index f444f50b1..3fba5bf03 100644 --- a/integration-tests/contracts/modules/bank-send/Cargo.toml +++ b/integration-tests/contracts/modules/bank-send/Cargo.toml @@ -28,7 +28,7 @@ library = [] [dependencies] cosmwasm-std = { version = "2.1.4", features = ["cosmwasm_2_0"] } -coreum-wasm-sdk = {git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git", branch = "upgrade-cosmwasm-std"} +coreum-wasm-sdk = { git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git" } cw-storage-plus = "2.0.0" cw2 = "2.0.0" thiserror = "1.0.59" diff --git a/integration-tests/contracts/modules/dex/Cargo.lock b/integration-tests/contracts/modules/dex/Cargo.lock index 1229d0565..a92096770 100644 --- a/integration-tests/contracts/modules/dex/Cargo.lock +++ b/integration-tests/contracts/modules/dex/Cargo.lock @@ -222,11 +222,12 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "coreum-std-derive" version = "0.20.1" -source = "git+https://github.com/CoreumFoundation/osmosis-std-derive.git?branch=cosmwasm_2_0#8f878afd69cf68d9abaff19b82a8206a3b9e4698" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fee3df604ec822e6a66c0279f2d8840da010f8e07503423ba413baac03c830f" dependencies = [ "itertools 0.10.5", "proc-macro2", - "prost-types 0.11.9", + "prost", "quote", "syn 1.0.109", ] @@ -234,14 +235,14 @@ dependencies = [ [[package]] name = "coreum-wasm-sdk" version = "1.1.0" -source = "git+https://github.com/CoreumFoundation/coreum-wasm-sdk.git?branch=update-types#7ead4c74a15d10297e7c894e7bde34bded77e54e" +source = "git+https://github.com/CoreumFoundation/coreum-wasm-sdk.git#352e54d12300d263ce135579d5d697d3e46c8431" dependencies = [ "chrono", "coreum-std-derive", "cosmwasm-schema", "cosmwasm-std", - "prost 0.12.6", - "prost-types 0.12.6", + "prost", + "prost-types", "schemars", "serde", "serde-cw-value", @@ -835,16 +836,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive 0.11.9", -] - [[package]] name = "prost" version = "0.12.6" @@ -852,20 +843,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive 0.12.6", -] - -[[package]] -name = "prost-derive" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", + "prost-derive", ] [[package]] @@ -881,22 +859,13 @@ dependencies = [ "syn 2.0.79", ] -[[package]] -name = "prost-types" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" -dependencies = [ - "prost 0.11.9", -] - [[package]] name = "prost-types" version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ - "prost 0.12.6", + "prost", ] [[package]] diff --git a/integration-tests/contracts/modules/dex/Cargo.toml b/integration-tests/contracts/modules/dex/Cargo.toml index 40158e099..678a09b30 100644 --- a/integration-tests/contracts/modules/dex/Cargo.toml +++ b/integration-tests/contracts/modules/dex/Cargo.toml @@ -31,6 +31,6 @@ cosmwasm-std = { version = "2.1.4", features = ["cosmwasm_2_0"] } cw-storage-plus = "2.0.0" cw2 = "2.0.0" thiserror = "1.0.59" -coreum-wasm-sdk = {git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git", branch = "update-types"} +coreum-wasm-sdk = { git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git" } cosmwasm-schema = "2.1.4" cw-ownable = "2.1.0" diff --git a/integration-tests/contracts/modules/ft/Cargo.lock b/integration-tests/contracts/modules/ft/Cargo.lock index 66c4a2468..9c8da0dde 100644 --- a/integration-tests/contracts/modules/ft/Cargo.lock +++ b/integration-tests/contracts/modules/ft/Cargo.lock @@ -22,9 +22,9 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8" [[package]] name = "ark-bls12-381" @@ -194,9 +194,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" [[package]] name = "cfg-if" @@ -219,17 +219,30 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +[[package]] +name = "coreum-std-derive" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fee3df604ec822e6a66c0279f2d8840da010f8e07503423ba413baac03c830f" +dependencies = [ + "itertools 0.10.5", + "proc-macro2", + "prost", + "quote", + "syn 1.0.109", +] + [[package]] name = "coreum-wasm-sdk" version = "1.1.0" -source = "git+https://github.com/CoreumFoundation/coreum-wasm-sdk.git?branch=upgrade-cosmwasm-std#0c2f105969a2ce3711c6da2a9e6b9613d6c787d6" +source = "git+https://github.com/CoreumFoundation/coreum-wasm-sdk.git#352e54d12300d263ce135579d5d697d3e46c8431" dependencies = [ "chrono", + "coreum-std-derive", "cosmwasm-schema", "cosmwasm-std", - "osmosis-std-derive", - "prost 0.12.6", - "prost-types 0.12.6", + "prost", + "prost-types", "schemars", "serde", "serde-cw-value", @@ -272,7 +285,7 @@ checksum = "1b5658b1dc64e10b56ae7a449f678f96932a96f6cfad1769d608d1d1d656480a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -296,7 +309,7 @@ checksum = "c8ef1b5835a65fcca3ab8b9a02b4f4dacc78e233a5c2f20b270efb9db0666d12" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -402,7 +415,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -517,7 +530,7 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", "unicode-xid", ] @@ -734,9 +747,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.159" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "memchr" @@ -778,18 +791,6 @@ version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" -[[package]] -name = "osmosis-std-derive" -version = "0.20.1" -source = "git+https://github.com/CoreumFoundation/osmosis-std-derive.git?branch=cosmwasm_2_0#7b837aa9fae698f8432003d44d80e19921b615ea" -dependencies = [ - "itertools 0.10.5", - "proc-macro2", - "prost-types 0.11.9", - "quote", - "syn 1.0.109", -] - [[package]] name = "p256" version = "0.13.2" @@ -828,23 +829,13 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" dependencies = [ "unicode-ident", ] -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive 0.11.9", -] - [[package]] name = "prost" version = "0.12.6" @@ -852,20 +843,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive 0.12.6", -] - -[[package]] -name = "prost-derive" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", + "prost-derive", ] [[package]] @@ -878,16 +856,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.79", -] - -[[package]] -name = "prost-types" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" -dependencies = [ - "prost 0.11.9", + "syn 2.0.85", ] [[package]] @@ -896,7 +865,7 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ - "prost 0.12.6", + "prost", ] [[package]] @@ -1003,7 +972,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -1027,9 +996,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.213" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1" dependencies = [ "serde_derive", ] @@ -1054,13 +1023,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.213" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -1071,14 +1040,14 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "itoa", "memchr", @@ -1132,9 +1101,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.79" +version = "2.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56" dependencies = [ "proc-macro2", "quote", @@ -1143,22 +1112,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.64" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -1209,7 +1178,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] [[package]] @@ -1229,5 +1198,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.85", ] diff --git a/integration-tests/contracts/modules/ft/Cargo.toml b/integration-tests/contracts/modules/ft/Cargo.toml index cee9e74b1..2fcf2f95c 100644 --- a/integration-tests/contracts/modules/ft/Cargo.toml +++ b/integration-tests/contracts/modules/ft/Cargo.toml @@ -31,6 +31,6 @@ cosmwasm-std = { version = "2.1.4", features = ["cosmwasm_2_0"] } cw-storage-plus = "2.0.0" cw2 = "2.0.0" thiserror = "1.0.59" -coreum-wasm-sdk = {git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git", branch = "upgrade-cosmwasm-std"} +coreum-wasm-sdk = { git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git" } cosmwasm-schema = "2.1.4" cw-ownable = "2.1.0" diff --git a/integration-tests/contracts/modules/nft/Cargo.lock b/integration-tests/contracts/modules/nft/Cargo.lock index 77cf749f3..36cca124b 100644 --- a/integration-tests/contracts/modules/nft/Cargo.lock +++ b/integration-tests/contracts/modules/nft/Cargo.lock @@ -219,17 +219,30 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +[[package]] +name = "coreum-std-derive" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fee3df604ec822e6a66c0279f2d8840da010f8e07503423ba413baac03c830f" +dependencies = [ + "itertools 0.10.5", + "proc-macro2", + "prost", + "quote", + "syn 1.0.109", +] + [[package]] name = "coreum-wasm-sdk" version = "1.1.0" -source = "git+https://github.com/CoreumFoundation/coreum-wasm-sdk.git?branch=upgrade-cosmwasm-std#0c2f105969a2ce3711c6da2a9e6b9613d6c787d6" +source = "git+https://github.com/CoreumFoundation/coreum-wasm-sdk.git#352e54d12300d263ce135579d5d697d3e46c8431" dependencies = [ "chrono", + "coreum-std-derive", "cosmwasm-schema", "cosmwasm-std", - "osmosis-std-derive", - "prost 0.12.6", - "prost-types 0.12.6", + "prost", + "prost-types", "schemars", "serde", "serde-cw-value", @@ -779,18 +792,6 @@ version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" -[[package]] -name = "osmosis-std-derive" -version = "0.20.1" -source = "git+https://github.com/CoreumFoundation/osmosis-std-derive.git?branch=cosmwasm_2_0#7b837aa9fae698f8432003d44d80e19921b615ea" -dependencies = [ - "itertools 0.10.5", - "proc-macro2", - "prost-types 0.11.9", - "quote", - "syn 1.0.109", -] - [[package]] name = "p256" version = "0.13.2" @@ -836,16 +837,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive 0.11.9", -] - [[package]] name = "prost" version = "0.12.6" @@ -853,20 +844,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive 0.12.6", -] - -[[package]] -name = "prost-derive" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", + "prost-derive", ] [[package]] @@ -882,22 +860,13 @@ dependencies = [ "syn 2.0.79", ] -[[package]] -name = "prost-types" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" -dependencies = [ - "prost 0.11.9", -] - [[package]] name = "prost-types" version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ - "prost 0.12.6", + "prost", ] [[package]] diff --git a/integration-tests/contracts/modules/nft/Cargo.toml b/integration-tests/contracts/modules/nft/Cargo.toml index f8bd3ce35..75192cd37 100644 --- a/integration-tests/contracts/modules/nft/Cargo.toml +++ b/integration-tests/contracts/modules/nft/Cargo.toml @@ -32,6 +32,6 @@ cw-storage-plus = "2.0.0" cw2 = "2.0.0" thiserror = "1.0.59" schemars = "0.8.16" -coreum-wasm-sdk = {git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git", branch = "upgrade-cosmwasm-std"} +coreum-wasm-sdk = { git = "https://github.com/CoreumFoundation/coreum-wasm-sdk.git" } cosmwasm-schema = "2.1.4" cw-ownable = "2.1.0"