chore(union-ibc): update cosmwasm-std to 2.1.4 (#3381)

- Update cosmwasm-std from 1.5 to 2.1 for workspace - Kept ucs00 and ucs02 on cosmwasm-std 1.5 - Updates cw-storage-plus to 2.0.0 to support cosmwasm-std 2.0+
unionlabs · Dec 18, 2024 · eb0ee95 · eb0ee95
2 parents 8288811 + 1a9d740
commit eb0ee95
Show file tree

Hide file tree

Showing 24 changed files with 73 additions and 121 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -275,10 +275,10 @@ bytes                    = { version = "1.2.1", default-features = false }
 chrono                   = { version = "0.4.26", default-features = false }
 clap                     = { version = "4.3.0", default-features = false, features = ["std"] }       # clap has a fake std feature that is required to be enabled by default
 color-eyre               = { version = "0.6.2", default-features = false }
-cosmwasm-schema          = { version = "1.5", default-features = false }
-cosmwasm-std             = { version = "1.5.4", default-features = false }
+cosmwasm-schema          = { version = "2.1.4", default-features = false }
+cosmwasm-std             = { version = "2.1.4", default-features = false }
 crossbeam-queue          = { version = "0.3.8", default-features = false }
-cw-storage-plus          = { version = "1.2", default-features = false }
+cw-storage-plus          = { version = "2.0.0", default-features = false }
 dashmap                  = { version = "5.5.3", default-features = false }
 derive_more              = { version = "0.99.17", default-features = false }
 either                   = { version = "1.9.0", default-features = false }

diff --git a/cosmwasm/multicall/src/contract.rs b/cosmwasm/multicall/src/contract.rs
@@ -43,7 +43,7 @@ pub fn execute(
                 },
             )?;
             for (denom, amount) in expected_funds.into_iter() {
-                if !has_coins(&info.funds, &Coin::new(amount.into(), denom)) {
+                if !has_coins(&info.funds, &Coin::new(amount, denom)) {
                     return Err(ContractError::FundsMismatch);
                 }
             }

diff --git a/cosmwasm/token-factory-api/Cargo.toml b/cosmwasm/token-factory-api/Cargo.toml
@@ -7,5 +7,5 @@ version = "0.1.0"
 workspace = true
 
 [dependencies]
-cosmwasm-schema = { version = "2.0.0" }
-cosmwasm-std    = { version = "2.0.0" }
+cosmwasm-schema = { workspace = true }
+cosmwasm-std    = { workspace = true }
diff --git a/cosmwasm/ucs00-pingpong/Cargo.toml b/cosmwasm/ucs00-pingpong/Cargo.toml
@@ -16,9 +16,9 @@ crate-type = ["cdylib", "rlib"]
 library = []
 
 [dependencies]
-cosmwasm-schema = { workspace = true }
-cosmwasm-std    = { workspace = true, features = ["stargate"] }
-cw-storage-plus = { workspace = true }
+cosmwasm-schema = { version = "1.5" }
+cosmwasm-std    = { version = "1.5.4", features = ["stargate"] }
+cw-storage-plus = { version = "1.2" }
 ethabi          = { workspace = true }
 serde           = { workspace = true, features = ["derive"] }
 thiserror       = { workspace = true }

diff --git a/cosmwasm/ucs01-relay-api/Cargo.toml b/cosmwasm/ucs01-relay-api/Cargo.toml
@@ -7,8 +7,8 @@ version = "0.1.0"
 workspace = true
 
 [dependencies]
-cosmwasm-schema   = { version = "2.0.0" }
-cosmwasm-std      = { version = "2.0.0", features = ["stargate"] }
+cosmwasm-schema   = { workspace = true }
+cosmwasm-std      = { workspace = true, features = ["stargate", "std"] }
 ethabi            = { workspace = true }
 go-parse-duration = { workspace = true }
 prost             = { workspace = true }

diff --git a/cosmwasm/ucs01-relay/Cargo.toml b/cosmwasm/ucs01-relay/Cargo.toml
@@ -18,10 +18,10 @@ library = []
 
 [dependencies]
 base58             = { version = "0.2" }
-cosmwasm-schema    = { version = "2.1.0" }
-cosmwasm-std       = { version = "2.1.0", features = ["stargate", "cosmwasm_2_1", "abort"] }
+cosmwasm-schema    = { workspace = true }
+cosmwasm-std       = { workspace = true, features = ["stargate", "cosmwasm_2_1", "abort"] }
 cw-controllers     = { version = "2.0.0" }
-cw-storage-plus    = { version = "2.0.0" }
+cw-storage-plus    = { workspace = true }
 cw2                = { version = "2.0.0" }
 ethabi             = { workspace = true }
 go-parse-duration  = { workspace = true }

diff --git a/cosmwasm/ucs02-nft/Cargo.toml b/cosmwasm/ucs02-nft/Cargo.toml
@@ -16,9 +16,9 @@ crate-type = ["cdylib", "rlib"]
 library = []
 
 [dependencies]
-cosmwasm-schema = { workspace = true }
-cosmwasm-std    = { workspace = true, features = ["stargate"] }
-cw-storage-plus = { workspace = true }
+cosmwasm-schema = { version = "1.5" }
+cosmwasm-std    = { version = "1.5.4", features = ["stargate"] }
+cw-storage-plus = { version = "1.2" }
 ethabi          = { workspace = true }
 ics721          = { git = "https://github.com/hussein-aitlahcen/cw-ics721", rev = "dd5b7add6fdc81e633084031f8512e5e909dd42a" }
 ics721-base     = { git = "https://github.com/hussein-aitlahcen/cw-ics721", rev = "dd5b7add6fdc81e633084031f8512e5e909dd42a", features = ["library"] }

diff --git a/cosmwasm/union-ibc/core/light-client-interface/Cargo.toml b/cosmwasm/union-ibc/core/light-client-interface/Cargo.toml
@@ -6,9 +6,9 @@ repository.workspace   = true
 version                = "0.1.0"
 
 [dependencies]
-cosmwasm-schema                    = { version = "2.1.4", package = "cosmwasm-schema" }
-cosmwasm-std                       = { version = "2.1.4", package = "cosmwasm-std" }
-cw-storage-plus                    = { version = "2.0.0", package = "cw-storage-plus" }
+cosmwasm-schema                    = { workspace = true, package = "cosmwasm-schema" }
+cosmwasm-std                       = { workspace = true, package = "cosmwasm-std" }
+cw-storage-plus                    = { workspace = true, package = "cw-storage-plus" }
 frame-support-procedural.workspace = true
 macros.workspace                   = true
 schemars                           = { workspace = true }

diff --git a/cosmwasm/union-ibc/light-clients/arbitrum/Cargo.toml b/cosmwasm/union-ibc/light-clients/arbitrum/Cargo.toml
@@ -15,7 +15,7 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 arbitrum-light-client-types = { workspace = true, features = ["serde", "ethabi"] }
 arbitrum-verifier           = { workspace = true }
-cosmwasm-std                = { version = "2.1.4", features = ["abort", "cosmwasm_2_1"] }
+cosmwasm-std                = { workspace = true, features = ["abort", "cosmwasm_2_1"] }
 ethereum-light-client       = { workspace = true, features = ["library"] }
 ethereum-light-client-types = { workspace = true }
 evm-storage-verifier        = { workspace = true }

diff --git a/cosmwasm/union-ibc/light-clients/berachain/Cargo.toml b/cosmwasm/union-ibc/light-clients/berachain/Cargo.toml
@@ -18,7 +18,7 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 beacon-api-types      = { workspace = true, features = ["ssz"] }
 bytes                 = { workspace = true }
-cosmwasm-std          = { version = "2.1.4", features = ["abort", "cosmwasm_2_1"] }
+cosmwasm-std          = { workspace = true, features = ["abort", "cosmwasm_2_1"] }
 ethereum-light-client = { workspace = true, features = ["library"] }
 hex                   = { workspace = true }
 schemars              = { workspace = true }

diff --git a/cosmwasm/union-ibc/light-clients/cometbls/Cargo.toml b/cosmwasm/union-ibc/light-clients/cometbls/Cargo.toml
@@ -19,7 +19,7 @@ crate-type = ["cdylib", "rlib"]
 bytes                       = { workspace = true }
 cometbls-groth16-verifier   = { workspace = true }
 cometbls-light-client-types = { workspace = true, features = ["serde", "ethabi"] }
-cosmwasm-std                = { version = "2.1.4", features = ["abort", "iterator", "cosmwasm_2_1"] }
+cosmwasm-std                = { workspace = true, features = ["abort", "iterator", "cosmwasm_2_1"] }
 hex                         = { workspace = true }
 ics23                       = { workspace = true }
 schemars                    = { workspace = true }

diff --git a/cosmwasm/union-ibc/light-clients/ethereum/Cargo.toml b/cosmwasm/union-ibc/light-clients/ethereum/Cargo.toml
@@ -18,8 +18,8 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 alloy                       = { workspace = true, features = ["sol-types"] }
 beacon-api-types            = { workspace = true }
-cosmwasm-schema             = { version = "2.1.4" }
-cosmwasm-std                = { version = "2.1.4", features = ["abort", "cosmwasm_2_1"] }
+cosmwasm-schema             = { workspace = true }
+cosmwasm-std                = { workspace = true, features = ["abort", "cosmwasm_2_1"] }
 ethereum-light-client-types = { workspace = true, features = ["serde", "ethabi"] }
 ethereum-sync-protocol      = { workspace = true }
 evm-storage-verifier        = { workspace = true }

diff --git a/cosmwasm/union-ibc/light-clients/movement/Cargo.toml b/cosmwasm/union-ibc/light-clients/movement/Cargo.toml
@@ -8,9 +8,9 @@ version      = "0.1.0"
 [dependencies]
 aptos-verifier              = { workspace = true }
 bcs                         = { workspace = true }
-cosmwasm-schema             = { version = "2.1.4" }
-cosmwasm-std                = { version = "2.1.4", features = ["abort"] }
-cw-storage-plus             = { version = "2.0.0" }
+cosmwasm-schema             = { workspace = true }
+cosmwasm-std                = { workspace = true, features = ["abort"] }
+cw-storage-plus             = { workspace = true }
 ethereum-light-client-types = { workspace = true }
 evm-storage-verifier        = { workspace = true }
 hex                         = { workspace = true, features = ["alloc"] }

diff --git a/cosmwasm/union-ibc/light-clients/scroll/Cargo.toml b/cosmwasm/union-ibc/light-clients/scroll/Cargo.toml
@@ -13,8 +13,8 @@ workspace = true
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-cosmwasm-std                = { version = "2.1.4", features = ["abort"] }
-cw-storage-plus             = { version = "2.0.0" }
+cosmwasm-std                = { workspace = true, features = ["abort"] }
+cw-storage-plus             = { workspace = true }
 ethereum-light-client       = { workspace = true, features = ["library"] }
 ethereum-light-client-types = { workspace = true }
 evm-storage-verifier        = { workspace = true }

diff --git a/cosmwasm/union-ibc/light-clients/tendermint/Cargo.toml b/cosmwasm/union-ibc/light-clients/tendermint/Cargo.toml
@@ -17,7 +17,7 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 bytes           = { workspace = true }
-cosmwasm-std    = { version = "2.1.4", features = ["abort", "cosmwasm_2_1"] }
+cosmwasm-std    = { workspace = true, features = ["abort", "cosmwasm_2_1", "iterator"] }
 hex             = { workspace = true }
 prost           = { workspace = true }
 protos          = { workspace = true, features = ["proto_full", "std"] }

diff --git a/cosmwasm/union-ibc/light-clients/tendermint/src/storage.rs b/cosmwasm/union-ibc/light-clients/tendermint/src/storage.rs
@@ -1,4 +1,4 @@
-use cosmwasm_std::{CustomQuery, Deps, DepsMut};
+use cosmwasm_std::{CustomQuery, Deps, DepsMut, Storage};
 use unionlabs::{google::protobuf::timestamp::Timestamp, ibc::core::client::height::Height};
 
 pub const CONSENSUS_STATE_ITER_KEY_PREFIX: &str = "iter_cons";

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -69,18 +69,6 @@
     };
     nix-filter.url = "github:numtide/nix-filter?rev=3449dc925982ad46246cfc36469baf66e1b64f17";
     get-flake.url = "github:ursi/get-flake";
-    wasmvm = {
-      url = "github:CosmWasm/wasmvm/v1.5.4";
-      flake = false;
-    };
-    wasmvm-2_1_2 = {
-      url = "github:CosmWasm/wasmvm/v2.1.2";
-      flake = false;
-    };
-    wasmvm-2_1_3 = {
-      url = "github:CosmWasm/wasmvm/v2.1.3";
-      flake = false;
-    };
     stargaze = {
       url = "git+https://github.com/public-awesome/stargaze?ref=main&submodules=1";
       flake = false;

diff --git a/lib/chain-utils/src/cosmos_sdk.rs b/lib/chain-utils/src/cosmos_sdk.rs
@@ -1,5 +1,6 @@
 use std::sync::Arc;
 
+use bip32::secp256k1::ecdsa::signature::SignatureEncoding;
 use prost::{Message, Name};
 use serde::{Deserialize, Serialize};
 use sha2::Digest;

diff --git a/lib/unionlabs/Cargo.toml b/lib/unionlabs/Cargo.toml
@@ -16,7 +16,7 @@ bip32                    = { workspace = true, features = ["secp256k1"] }
 bitvec                   = { workspace = true }
 chrono                   = { workspace = true, features = ["alloc"] }
 clap                     = { workspace = true, features = ["derive"] }
-cosmwasm-std             = { workspace = true, optional = true }
+cosmwasm-std             = { workspace = true, optional = true, features = ["std"] }
 derive_more              = { workspace = true, features = ["display"] }
 either                   = { workspace = true }
 enumorph                 = { workspace = true }

diff --git a/networks/osmosis.nix b/networks/osmosis.nix
@@ -28,18 +28,18 @@
           }
           // (
             let
-              inherit (self'.packages) libwasmvm;
+              inherit (self'.packages) libwasmvm-1_5_2;
             in
             if pkgs.stdenv.isLinux then
               {
                 # Statically link if we're on linux
                 nativeBuildInputs = [
                   pkgs.musl
-                  libwasmvm
+                  libwasmvm-1_5_2
                 ];
                 ldflags = [
                   "-linkmode external"
-                  "-extldflags '-Wl,-z,muldefs -z noexecstack -static -L${pkgs.musl}/lib -L${libwasmvm}/lib'"
+                  "-extldflags '-Wl,-z,muldefs -z noexecstack -static -L${pkgs.musl}/lib -L${libwasmvm-1_5_2}/lib'"
                 ];
               }
             # else if pkgs.stdenv.isDarwin then {

diff --git a/networks/stargaze.nix b/networks/stargaze.nix
@@ -27,18 +27,18 @@
           }
           // (
             let
-              inherit (self'.packages) libwasmvm;
+              inherit (self'.packages) libwasmvm-1_5_2;
             in
             if pkgs.stdenv.isLinux then
               {
                 # Statically link if we're on linux
                 nativeBuildInputs = [
                   pkgs.musl
-                  libwasmvm
+                  libwasmvm-1_5_2
                 ];
                 ldflags = [
                   "-linkmode external"
-                  "-extldflags '-Wl,-z,muldefs -z noexecstack -static -L${pkgs.musl}/lib -L${libwasmvm}/lib'"
+                  "-extldflags '-Wl,-z,muldefs -z noexecstack -static -L${pkgs.musl}/lib -L${libwasmvm-1_5_2}/lib'"
                 ];
               }
             # else if pkgs.stdenv.isDarwin then {