Merge pull request #189 from osmosis-labs/sylvia-upgrade-custom-empty

Workaround to enable communication between `Empty` and `Custom` contracts in mt

Cargo.toml

@@ -1,58 +1,64 @@
 [workspace]
-members = ["packages/*", "contracts/provider/*", "contracts/consumer/*", "contracts/osmosis-price-provider"]
+members = [
+  "packages/*",
+  "contracts/provider/*",
+  "contracts/consumer/*",
+  "contracts/osmosis-price-provider",
+]
 resolver = "2"
 
 [workspace.package]
-edition       = "2021"
-version       = "0.10.0-alpha.1"
-license       = "MIT"
-repository    = "https://github.com/osmosis-labs/mesh-security"
+edition = "2021"
+version = "0.10.0-alpha.1"
+license = "MIT"
+repository = "https://github.com/osmosis-labs/mesh-security"
 
 [workspace.dependencies]
-mesh-apis        = { path = "./packages/apis" }
-mesh-bindings    = { path = "./packages/bindings" }
-mesh-burn        = { path = "./packages/burn" }
-mesh-sync        = { path = "./packages/sync" }
+mesh-apis = { path = "./packages/apis" }
+mesh-bindings = { path = "./packages/bindings" }
+mesh-burn = { path = "./packages/burn" }
+mesh-sync = { path = "./packages/sync" }
 mesh-virtual-staking-mock = { path = "./packages/virtual-staking-mock" }
 
-mesh-vault    = { path = "./contracts/provider/vault" }
-mesh-external-staking    = { path = "./contracts/provider/external-staking" }
-mesh-native-staking    = { path = "./contracts/provider/native-staking" }
-mesh-native-staking-proxy    = { path = "./contracts/provider/native-staking-proxy" }
-
-mesh-converter    = { path = "./contracts/consumer/converter" }
-mesh-simple-price-feed    = { path = "./contracts/consumer/simple-price-feed" }
-mesh-virtual-staking    = { path = "./contracts/consumer/virtual-staking" }
-
-sylvia           = "0.10.1"
-cosmwasm-schema  = "1.5.4"
-cosmwasm-std     = { version = "1.5.4", features = ["ibc3", "cosmwasm_1_3"] }
-cw-storage-plus  = "1.2.0"
-cw-utils         = "1.0.3"
-cw2              = "1.1.2"
-osmosis-std      = "0.20.1"
-schemars         = "0.8.17"
-serde            = { version = "1.0.199", default-features = false, features = ["derive"] }
-thiserror        = "1.0.59"
+mesh-vault = { path = "./contracts/provider/vault" }
+mesh-external-staking = { path = "./contracts/provider/external-staking" }
+mesh-native-staking = { path = "./contracts/provider/native-staking" }
+mesh-native-staking-proxy = { path = "./contracts/provider/native-staking-proxy" }
+
+mesh-converter = { path = "./contracts/consumer/converter" }
+mesh-simple-price-feed = { path = "./contracts/consumer/simple-price-feed" }
+mesh-virtual-staking = { path = "./contracts/consumer/virtual-staking" }
+
+sylvia = "0.10.1"
+
+cosmwasm-schema = "1.5.4"
+cosmwasm-std = { version = "1.5.4", features = ["ibc3", "cosmwasm_1_3"] }
+cw-storage-plus = "1.2.0"
+cw-utils = "1.0.3"
+cw2 = "1.1.2"
+osmosis-std = "0.20.1"
+schemars = "0.8.17"
+serde = { version = "1.0.199", default-features = false, features = ["derive"] }
+thiserror = "1.0.59"
 semver = "1.0.22"
 itertools = "0.12.1"
 
 # dev deps
-anyhow        = "1"
+anyhow = "1"
 cw-multi-test = "0.20"
-derivative    = "2"
-test-case     = "3.3.1"
+derivative = "2"
+test-case = "3.3.1"
 
 [profile.release]
-codegen-units    = 1
-debug            = false
+codegen-units = 1
+debug = false
 debug-assertions = false
-lto              = true
-panic            = 'abort'
-rpath            = false
-opt-level        = 3
-overflow-checks  = true
+lto = true
+panic = 'abort'
+rpath = false
+opt-level = 3
+overflow-checks = true
 
 [profile.release.package.mesh-vault]
 codegen-units = 1
-incremental   = false
+incremental = false

contracts/consumer/converter/Cargo.toml

@@ -3,8 +3,8 @@ name = "mesh-converter"
 description = "IBC connector on the Consumer side, converting their IBC messages into native tokens for virtual staking"
 version = { workspace = true }
 edition = { workspace = true }
-license       = { workspace = true }
-repository       = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [lib]
@@ -17,30 +17,33 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 # enables generation of mt utilities
 mt = ["library", "sylvia/mt"]
+# enable this for multi-tests where you need custom messages for compatibility with virtual staking 
+fake-custom = [ "mesh-simple-price-feed/fake-custom" ]
 
 [dependencies]
-mesh-apis        = { workspace = true }
+mesh-apis = { workspace = true }
+mesh-bindings = { workspace = true }
 
-sylvia           = { workspace = true }
-cosmwasm-schema  = { workspace = true }
-cosmwasm-std     = { workspace = true }
-cw-storage-plus  = { workspace = true }
-cw2              = { workspace = true }
-cw-utils         = { workspace = true }
+sylvia = { workspace = true }
+cosmwasm-schema = { workspace = true }
+cosmwasm-std = { workspace = true }
+cw-storage-plus = { workspace = true }
+cw2 = { workspace = true }
+cw-utils = { workspace = true }
 
-schemars         = { workspace = true }
-serde            = { workspace = true }
-thiserror        = { workspace = true }
+schemars = { workspace = true }
+serde = { workspace = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
-mesh-burn              = { workspace = true }
+mesh-burn = { workspace = true }
 mesh-simple-price-feed = { workspace = true, features = ["mt"] }
 
 cw-multi-test = { workspace = true }
-test-case     = { workspace = true }
-derivative    = { workspace = true }
-anyhow        = { workspace = true }
+test-case = { workspace = true }
+derivative = { workspace = true }
+anyhow = { workspace = true }
 
 [[bin]]
 name = "schema"
-doc  = false
+doc = false