Skip to content

Commit 19e50b2

Browse files
ethanfreyethanfrey
authored
Merge pull request #189 from osmosis-labs/sylvia-upgrade-custom-empty
Workaround to enable communication between `Empty` and `Custom` contracts in mt
2 parents c4c34f6 + c5bbcc4 commit 19e50b2

File tree

19 files changed

+305
-176
lines changed

19 files changed

+305
-176
lines changed

‎Cargo.lock

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+45-39
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,64 @@
11
[workspace]
2-
members = ["packages/*", "contracts/provider/*", "contracts/consumer/*", "contracts/osmosis-price-provider"]
2+
members = [
3+
"packages/*",
4+
"contracts/provider/*",
5+
"contracts/consumer/*",
6+
"contracts/osmosis-price-provider",
7+
]
38
resolver = "2"
49

510
[workspace.package]
6-
edition = "2021"
7-
version = "0.10.0-alpha.1"
8-
license = "MIT"
9-
repository = "https://github.com/osmosis-labs/mesh-security"
11+
edition = "2021"
12+
version = "0.10.0-alpha.1"
13+
license = "MIT"
14+
repository = "https://github.com/osmosis-labs/mesh-security"
1015

1116
[workspace.dependencies]
12-
mesh-apis = { path = "./packages/apis" }
13-
mesh-bindings = { path = "./packages/bindings" }
14-
mesh-burn = { path = "./packages/burn" }
15-
mesh-sync = { path = "./packages/sync" }
17+
mesh-apis = { path = "./packages/apis" }
18+
mesh-bindings = { path = "./packages/bindings" }
19+
mesh-burn = { path = "./packages/burn" }
20+
mesh-sync = { path = "./packages/sync" }
1621
mesh-virtual-staking-mock = { path = "./packages/virtual-staking-mock" }
1722

18-
mesh-vault = { path = "./contracts/provider/vault" }
19-
mesh-external-staking = { path = "./contracts/provider/external-staking" }
20-
mesh-native-staking = { path = "./contracts/provider/native-staking" }
21-
mesh-native-staking-proxy = { path = "./contracts/provider/native-staking-proxy" }
22-
23-
mesh-converter = { path = "./contracts/consumer/converter" }
24-
mesh-simple-price-feed = { path = "./contracts/consumer/simple-price-feed" }
25-
mesh-virtual-staking = { path = "./contracts/consumer/virtual-staking" }
26-
27-
sylvia = "0.10.1"
28-
cosmwasm-schema = "1.5.4"
29-
cosmwasm-std = { version = "1.5.4", features = ["ibc3", "cosmwasm_1_3"] }
30-
cw-storage-plus = "1.2.0"
31-
cw-utils = "1.0.3"
32-
cw2 = "1.1.2"
33-
osmosis-std = "0.20.1"
34-
schemars = "0.8.17"
35-
serde = { version = "1.0.199", default-features = false, features = ["derive"] }
36-
thiserror = "1.0.59"
23+
mesh-vault = { path = "./contracts/provider/vault" }
24+
mesh-external-staking = { path = "./contracts/provider/external-staking" }
25+
mesh-native-staking = { path = "./contracts/provider/native-staking" }
26+
mesh-native-staking-proxy = { path = "./contracts/provider/native-staking-proxy" }
27+
28+
mesh-converter = { path = "./contracts/consumer/converter" }
29+
mesh-simple-price-feed = { path = "./contracts/consumer/simple-price-feed" }
30+
mesh-virtual-staking = { path = "./contracts/consumer/virtual-staking" }
31+
32+
sylvia = "0.10.1"
33+
34+
cosmwasm-schema = "1.5.4"
35+
cosmwasm-std = { version = "1.5.4", features = ["ibc3", "cosmwasm_1_3"] }
36+
cw-storage-plus = "1.2.0"
37+
cw-utils = "1.0.3"
38+
cw2 = "1.1.2"
39+
osmosis-std = "0.20.1"
40+
schemars = "0.8.17"
41+
serde = { version = "1.0.199", default-features = false, features = ["derive"] }
42+
thiserror = "1.0.59"
3743
semver = "1.0.22"
3844
itertools = "0.12.1"
3945

4046
# dev deps
41-
anyhow = "1"
47+
anyhow = "1"
4248
cw-multi-test = "0.20"
43-
derivative = "2"
44-
test-case = "3.3.1"
49+
derivative = "2"
50+
test-case = "3.3.1"
4551

4652
[profile.release]
47-
codegen-units = 1
48-
debug = false
53+
codegen-units = 1
54+
debug = false
4955
debug-assertions = false
50-
lto = true
51-
panic = 'abort'
52-
rpath = false
53-
opt-level = 3
54-
overflow-checks = true
56+
lto = true
57+
panic = 'abort'
58+
rpath = false
59+
opt-level = 3
60+
overflow-checks = true
5561

5662
[profile.release.package.mesh-vault]
5763
codegen-units = 1
58-
incremental = false
64+
incremental = false

‎contracts/consumer/converter/Cargo.toml

+20-17
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ name = "mesh-converter"
33
description = "IBC connector on the Consumer side, converting their IBC messages into native tokens for virtual staking"
44
version = { workspace = true }
55
edition = { workspace = true }
6-
license = { workspace = true }
7-
repository = { workspace = true }
6+
license = { workspace = true }
7+
repository = { workspace = true }
88

99
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1010
[lib]
@@ -17,30 +17,33 @@ backtraces = ["cosmwasm-std/backtraces"]
1717
library = []
1818
# enables generation of mt utilities
1919
mt = ["library", "sylvia/mt"]
20+
# enable this for multi-tests where you need custom messages for compatibility with virtual staking
21+
fake-custom = [ "mesh-simple-price-feed/fake-custom" ]
2022

2123
[dependencies]
22-
mesh-apis = { workspace = true }
24+
mesh-apis = { workspace = true }
25+
mesh-bindings = { workspace = true }
2326

24-
sylvia = { workspace = true }
25-
cosmwasm-schema = { workspace = true }
26-
cosmwasm-std = { workspace = true }
27-
cw-storage-plus = { workspace = true }
28-
cw2 = { workspace = true }
29-
cw-utils = { workspace = true }
27+
sylvia = { workspace = true }
28+
cosmwasm-schema = { workspace = true }
29+
cosmwasm-std = { workspace = true }
30+
cw-storage-plus = { workspace = true }
31+
cw2 = { workspace = true }
32+
cw-utils = { workspace = true }
3033

31-
schemars = { workspace = true }
32-
serde = { workspace = true }
33-
thiserror = { workspace = true }
34+
schemars = { workspace = true }
35+
serde = { workspace = true }
36+
thiserror = { workspace = true }
3437

3538
[dev-dependencies]
36-
mesh-burn = { workspace = true }
39+
mesh-burn = { workspace = true }
3740
mesh-simple-price-feed = { workspace = true, features = ["mt"] }
3841

3942
cw-multi-test = { workspace = true }
40-
test-case = { workspace = true }
41-
derivative = { workspace = true }
42-
anyhow = { workspace = true }
43+
test-case = { workspace = true }
44+
derivative = { workspace = true }
45+
anyhow = { workspace = true }
4346

4447
[[bin]]
4548
name = "schema"
46-
doc = false
49+
doc = false

0 commit comments

Comments
 (0)