Skip to content

Commit

Permalink
chore: bump rust optimizer (#8682)
Browse files Browse the repository at this point in the history
* bump rust optimizer across osmosis

* Update CHANGELOG.md
  • Loading branch information
faddat authored Sep 10, 2024
1 parent 56b9e96 commit 0a76887
Show file tree
Hide file tree
Showing 12 changed files with 58 additions and 46 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* [#8649](https://github.com/osmosis-labs/osmosis/pull/8649) chore: update to tagged submodules
* [#8663](https://github.com/osmosis-labs/osmosis/pull/8663) fix: protorev throws a nil pointer
* [#8676](https://github.com/osmosis-labs/osmosis/pull/8676) fix: update enforce sub-authenticator to be greater than 1 error message
* [#8682](https://github.com/osmosis-labs/osmosis/pull/8682) chore: bump cosmwasm-optimizer

### Config

Expand Down
15 changes: 9 additions & 6 deletions cosmwasm/contracts/crosschain-registry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
[package]
name = "crosschain-registry"
version = "0.1.0"
authors = ["Adam Tucker <adam@osmosis.team>", "Nicolas Lara <nicolaslara@gmail.com>"]
authors = [
"Adam Tucker <adam@osmosis.team>",
"Nicolas Lara <nicolaslara@gmail.com>",
]
edition = "2021"

exclude = [
Expand All @@ -31,27 +34,27 @@ imported = []
optimize = """docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.11
cosmwasm/rust-optimizer:0.16.0
"""
optimize-m1 = """docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer-arm64:0.12.11
cosmwasm/rust-optimizer-arm64:0.16.0
"""

[[bin]]
name = "build-schema"
path = "build-schema/schema.rs"

[dependencies]
cosmwasm-schema = { workspace = true }
cosmwasm-std = { workspace = true }
cosmwasm-schema = { workspace = true }
cosmwasm-std = { workspace = true }
cw-storage-plus = { workspace = true }
cw2 = { workspace = true }
serde = { workspace = true }
thiserror = { workspace = true }
cw-utils = { workspace = true }
registry = { path = "../../packages/registry"}
registry = { path = "../../packages/registry" }

[dev-dependencies]
cw-multi-test = "0.16.2"
24 changes: 14 additions & 10 deletions cosmwasm/contracts/crosschain-swaps/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ name = "crosschain-swaps"
version = "0.1.0"
authors = ["Nicolas Lara <nicolaslara@gmail.com>"]
edition = "2021"
rust-version = "1.65.0"
rust-version = "1.65.0"

exclude = [
# Those files are rust-optimizer artifacts. You might want to commit them for convenience but they should not be part of the crates publication.
Expand All @@ -32,21 +32,21 @@ imported = []
optimize = """docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.11
cosmwasm/rust-optimizer:0.16.0
"""
optimize-m1 = """docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer-arm64:0.12.11
cosmwasm/rust-optimizer-arm64:0.16.0
"""

[[bin]]
name = "build-schema"
path = "build-schema/schema.rs"

[dependencies]
cosmwasm-schema = { workspace = true }
cosmwasm-std = { workspace = true }
cosmwasm-schema = { workspace = true }
cosmwasm-std = { workspace = true }
cw-storage-plus = { workspace = true }
cw2 = { workspace = true }
schemars = { workspace = true }
Expand All @@ -57,14 +57,18 @@ serde-json-wasm = { workspace = true }
serde-cw-value = { workspace = true }
bech32 = { workspace = true }
cw-utils = { workspace = true }
itertools = {workspace = true}
itertools = { workspace = true }

swaprouter = { path = "../swaprouter", features = ["imported"]}
registry = { path = "../../packages/registry"}
prost = {version = "0.11.2", default-features = false, features = ["prost-derive"]}
swaprouter = { path = "../swaprouter", features = ["imported"] }
registry = { path = "../../packages/registry" }
prost = { version = "0.11.2", default-features = false, features = [
"prost-derive",
] }
enum-repr = "0.2.6"

[dev-dependencies]
cw-multi-test = { workspace = true }
osmosis-test-tube = { workspace = true }
crosschain-registry = { path = "../crosschain-registry", features = ["imported"]}
crosschain-registry = { path = "../crosschain-registry", features = [
"imported",
] }
16 changes: 8 additions & 8 deletions cosmwasm/contracts/outpost/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "outpost"
version = "0.1.0"
authors = ["Nicolas Lara <nicolaslara@gmail.com>"]
edition = "2021"
rust-version = "1.65.0"
rust-version = "1.65.0"

exclude = [
# Those files are rust-optimizer artifacts. You might want to commit them for convenience but they should not be part of the source code publication.
Expand All @@ -29,21 +29,21 @@ callbacks = []
optimize = """docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.11
cosmwasm/rust-optimizer:0.16.0
"""
optimize-m1 = """docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer-arm64:0.12.11
cosmwasm/rust-optimizer-arm64:0.16.0
"""

[[bin]]
name = "build-schema"
path = "build-schema/schema.rs"

[dependencies]
cosmwasm-schema = { workspace = true }
cosmwasm-std = { workspace = true }
cosmwasm-schema = { workspace = true }
cosmwasm-std = { workspace = true }
cw-storage-plus = { workspace = true }
cw2 = { workspace = true }
thiserror = { workspace = true }
Expand All @@ -52,9 +52,9 @@ bech32 = { workspace = true }
cw-utils = { workspace = true }
osmosis-std = { workspace = true }

swaprouter = { path = "../swaprouter", features = ["imported"]}
crosschain-swaps = { path = "../crosschain-swaps", features = ["imported"]}
registry = { path = "../../packages/registry"}
swaprouter = { path = "../swaprouter", features = ["imported"] }
crosschain-swaps = { path = "../crosschain-swaps", features = ["imported"] }
registry = { path = "../../packages/registry" }

[dev-dependencies]
cw-multi-test = { workspace = true }
10 changes: 5 additions & 5 deletions cosmwasm/contracts/swaprouter/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ authors = ["Sunny Aggarwal <sunnya97@protonmail.ch>"]
edition = "2021"
name = "swaprouter"
version = "0.1.0"
rust-version = "1.65.0"
rust-version = "1.65.0"

exclude = [
# Those files are rust-optimizer artifacts. You might want to commit them for convenience but they should not be part of the source code publication.
Expand All @@ -32,21 +32,21 @@ imported = []
optimize = """docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.11
cosmwasm/rust-optimizer:0.16.0
"""
optimize-m1 = """docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer-arm64:0.12.11
cosmwasm/rust-optimizer-arm64:0.16.0
"""

[[bin]]
name = "build-schema"
path = "build-schema/schema.rs"

[dependencies]
cosmwasm-schema = { workspace = true }
cosmwasm-std = { workspace = true }
cosmwasm-schema = { workspace = true }
cosmwasm-std = { workspace = true }
cw-storage-plus = { workspace = true }
cw2 = { workspace = true }
schemars = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion tests/ibc-hooks/testutils/contracts/counter/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ library = []
optimize = """docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.6
cosmwasm/rust-optimizer:0.16.0
"""

[dependencies]
Expand Down
8 changes: 5 additions & 3 deletions tests/ibc-hooks/testutils/contracts/echo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,20 @@ library = []
optimize = """docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.6
cosmwasm/rust-optimizer:0.16.0
"""

[dependencies]
base64 = "0.21.0"
cosmwasm-schema = "1.1.3"
cosmwasm-std = {version = "1.2", features = ["stargate"]}
cosmwasm-std = { version = "1.2", features = ["stargate"] }
cosmwasm-storage = "1.1.3"
cw-storage-plus = "1.0.1"
osmosis-std = "0.15.2"
osmosis-std-derive = "0.15.2"
prost = {version = "0.11.2", default-features = false, features = ["prost-derive"]}
prost = { version = "0.11.2", default-features = false, features = [
"prost-derive",
] }
schemars = "0.8.10"
serde = { version = "1.0.145", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.31" }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
authors = ["Osmosis Team"]
name = "counter"
version = "0.1.0"
authors = Osmosis Team
edition = "2021"

exclude = [
Expand Down Expand Up @@ -36,7 +36,7 @@ library = []
optimize = """docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.6
cosmwasm/rust-optimizer:0.16.0
"""

[dependencies]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ library = []
optimize = """docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.6
cosmwasm/rust-optimizer:0.16.0
"""

[dependencies]
Expand Down
12 changes: 7 additions & 5 deletions x/ibc-rate-limit/contracts/rate-limiter/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,27 @@ verbose_responses = []
optimize = """docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.6
cosmwasm/rust-optimizer:0.16.0
"""

[dependencies]
cosmwasm-std = { version = "1.1.5", features = ["stargate", "cosmwasm_1_1"]}
cosmwasm-std = { version = "1.1.5", features = ["stargate", "cosmwasm_1_1"] }
cosmwasm-schema = "1.1.5"
cosmwasm-storage = "1.1.5"
cw-storage-plus = "0.16.0"
cw2 = "0.13.2"
schemars = "0.8.8"
serde = { version = "1.0.137", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.31" }
prost = {version = "0.11.2", default-features = false, features = ["prost-derive"]}
osmosis-std-derive = {version = "0.12.0"}
prost = { version = "0.11.2", default-features = false, features = [
"prost-derive",
] }
osmosis-std-derive = { version = "0.12.0" }
osmosis-std = "0.12.0"
sha2 = "0.10.6"
hex = "0.4.3"

[dev-dependencies]
cw-multi-test = "0.13.2"
serde-json-wasm = "0.5.2"
itertools = "0.13"
itertools = "0.13"
8 changes: 4 additions & 4 deletions x/smart-account/testutils/contracts/echo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@ library = []
optimize = """docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.6
cosmwasm/rust-optimizer:0.16.0
"""

[dependencies]
cosmwasm-schema = "1.1.3"
cosmwasm-std = {version = "1.5", features = ["stargate"]}
cosmwasm-std = { version = "1.5", features = ["stargate"] }
cosmwasm-storage = "1.1.3"
cw-storage-plus = "1.0.1"
schemars = "0.8.10"
serde = {version = "1.0.145", default-features = false, features = ["derive"]}
serde = { version = "1.0.145", default-features = false, features = ["derive"] }
#serde-cw-value = "0.7.0"
osmosis-std = "0.20.1"
thiserror = {version = "1.0.31"}
thiserror = { version = "1.0.31" }
#base64-simd = "0.8.0"
osmosis-authenticators = "0.22.0-alpha.19"
sha2 = "0.10.8"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ library = []
optimize = """docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.12.6
cosmwasm/rust-optimizer:0.16.0
"""

[dependencies]
Expand Down

0 comments on commit 0a76887

Please sign in to comment.