From 6d1eea2a357ed8a98c16e0a2cc2abd15e8e30905 Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Fri, 14 Jun 2024 12:51:32 +0200 Subject: [PATCH 1/2] Upgrade optimizer --- .circleci/config.yml | 2 +- README.md | 6 +++--- scripts/optimizer.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 534f7ef77..d2a1884b9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -506,7 +506,7 @@ jobs: - run: name: Build development contracts command: | - docker run --volumes-from with_code cosmwasm/workspace-optimizer:0.13.0 + docker run --volumes-from with_code cosmwasm/optimizer:0.16.0 docker cp with_code:/code/artifacts ./artifacts - run: name: Show data diff --git a/README.md b/README.md index 0e9cc5092..9b9a069ff 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,6 @@ | cw4 | [![cw4 on crates.io](https://img.shields.io/crates/v/cw4.svg)](https://crates.io/crates/cw4) | [![Docs](https://docs.rs/cw4/badge.svg)](https://docs.rs/cw4) | [![codecov](https://codecov.io/gh/CosmWasm/cw-plus/branch/main/graph/badge.svg?token=IYY72ZVS3X)](https://codecov.io/gh/CosmWasm/cw-plus) | | cw20 | [![cw20 on crates.io](https://img.shields.io/crates/v/cw20.svg)](https://crates.io/crates/cw20) | [![Docs](https://docs.rs/cw20/badge.svg)](https://docs.rs/cw20) | [![codecov](https://codecov.io/gh/CosmWasm/cw-plus/branch/main/graph/badge.svg?token=IYY72ZVS3X)](https://codecov.io/gh/CosmWasm/cw-plus) | - | Contracts | Download | Docs | Coverage | | ------------------ | -------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | | cw1-subkeys | [Release v0.13.4](https://github.com/CosmWasm/cw-plus/releases/download/v0.13.4/cw1_subkeys.wasm) | [![Docs](https://docs.rs/cw1-subkeys/badge.svg)](https://docs.rs/cw1-subkeys) | [![codecov](https://codecov.io/gh/CosmWasm/cw-plus/branch/main/graph/badge.svg?token=IYY72ZVS3X)](https://codecov.io/gh/CosmWasm/cw-plus) | @@ -21,7 +20,8 @@ | cw20-base | [Release v0.13.4](https://github.com/CosmWasm/cw-plus/releases/download/v0.13.4/cw20_base.wasm) | [![Docs](https://docs.rs/cw20-base/badge.svg)](https://docs.rs/cw20-base) | [![codecov](https://codecov.io/gh/CosmWasm/cw-plus/branch/main/graph/badge.svg?token=IYY72ZVS3X)](https://codecov.io/gh/CosmWasm/cw-plus) | | cw20-ics20 | [Release v0.13.4](https://github.com/CosmWasm/cw-plus/releases/download/v0.13.4/cw20_ics20.wasm) | [![Docs](https://docs.rs/cw20-ics20/badge.svg)](https://docs.rs/cw20-ics20) | [![codecov](https://codecov.io/gh/CosmWasm/cw-plus/branch/main/graph/badge.svg?token=IYY72ZVS3X)](https://codecov.io/gh/CosmWasm/cw-plus) | -Note: `cw2` and `controllers` have been moved to the [`cw-minus` repo](https://github.com/CosmWasm/cw-minus) and can be followed there. +Note: `cw2` and `controllers` have been moved to the [`cw-minus` repo](https://github.com/CosmWasm/cw-minus) and can be +followed there. Note: `cw721` and `cw721-base` have moved to the new [`cw-nfts` repo](https://github.com/CosmWasm/cw-nfts) and can be followed there. @@ -102,7 +102,7 @@ To compile all the contracts, run the following in the repo root: docker run --rm -v "$(pwd)":/code \ --mount type=volume,source="$(basename "$(pwd)")_cache",target=/target \ --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \ - cosmwasm/workspace-optimizer:0.13.0 + cosmwasm/optimizer:0.16.0 ``` This will compile all packages in the `contracts` directory and output the stripped and optimized wasm code under the diff --git a/scripts/optimizer.sh b/scripts/optimizer.sh index 966349ee4..2f5fa7483 100755 --- a/scripts/optimizer.sh +++ b/scripts/optimizer.sh @@ -1,7 +1,7 @@ : U="cosmwasm" -V="0.13.0" +V="0.16.0" M=$(uname -m) #M="x86_64" # Force Intel arch @@ -13,4 +13,4 @@ S=${S:+-$S} docker run --platform $A --rm -v "$(pwd)":/code \ --mount type=volume,source="$(basename "$(pwd)")_cache",target=/target \ --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \ - $U/workspace-optimizer$S:$V + $U/optimizer$S:$V From b8812b7c4d1fa325d12ee95366ebb63094b46e0c Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Fri, 14 Jun 2024 12:51:53 +0200 Subject: [PATCH 2/2] Rename cargo configs --- contracts/cw1-subkeys/.cargo/{config => config.toml} | 0 contracts/cw1-whitelist/.cargo/{config => config.toml} | 0 contracts/cw20-base/.cargo/{config => config.toml} | 0 contracts/cw20-ics20/.cargo/{config => config.toml} | 0 contracts/cw3-fixed-multisig/.cargo/{config => config.toml} | 0 contracts/cw3-flex-multisig/.cargo/{config => config.toml} | 0 contracts/cw4-group/.cargo/{config => config.toml} | 0 contracts/cw4-stake/.cargo/{config => config.toml} | 0 packages/cw1/.cargo/{config => config.toml} | 0 packages/cw20/.cargo/{config => config.toml} | 0 packages/cw3/.cargo/{config => config.toml} | 0 packages/cw4/.cargo/{config => config.toml} | 0 12 files changed, 0 insertions(+), 0 deletions(-) rename contracts/cw1-subkeys/.cargo/{config => config.toml} (100%) rename contracts/cw1-whitelist/.cargo/{config => config.toml} (100%) rename contracts/cw20-base/.cargo/{config => config.toml} (100%) rename contracts/cw20-ics20/.cargo/{config => config.toml} (100%) rename contracts/cw3-fixed-multisig/.cargo/{config => config.toml} (100%) rename contracts/cw3-flex-multisig/.cargo/{config => config.toml} (100%) rename contracts/cw4-group/.cargo/{config => config.toml} (100%) rename contracts/cw4-stake/.cargo/{config => config.toml} (100%) rename packages/cw1/.cargo/{config => config.toml} (100%) rename packages/cw20/.cargo/{config => config.toml} (100%) rename packages/cw3/.cargo/{config => config.toml} (100%) rename packages/cw4/.cargo/{config => config.toml} (100%) diff --git a/contracts/cw1-subkeys/.cargo/config b/contracts/cw1-subkeys/.cargo/config.toml similarity index 100% rename from contracts/cw1-subkeys/.cargo/config rename to contracts/cw1-subkeys/.cargo/config.toml diff --git a/contracts/cw1-whitelist/.cargo/config b/contracts/cw1-whitelist/.cargo/config.toml similarity index 100% rename from contracts/cw1-whitelist/.cargo/config rename to contracts/cw1-whitelist/.cargo/config.toml diff --git a/contracts/cw20-base/.cargo/config b/contracts/cw20-base/.cargo/config.toml similarity index 100% rename from contracts/cw20-base/.cargo/config rename to contracts/cw20-base/.cargo/config.toml diff --git a/contracts/cw20-ics20/.cargo/config b/contracts/cw20-ics20/.cargo/config.toml similarity index 100% rename from contracts/cw20-ics20/.cargo/config rename to contracts/cw20-ics20/.cargo/config.toml diff --git a/contracts/cw3-fixed-multisig/.cargo/config b/contracts/cw3-fixed-multisig/.cargo/config.toml similarity index 100% rename from contracts/cw3-fixed-multisig/.cargo/config rename to contracts/cw3-fixed-multisig/.cargo/config.toml diff --git a/contracts/cw3-flex-multisig/.cargo/config b/contracts/cw3-flex-multisig/.cargo/config.toml similarity index 100% rename from contracts/cw3-flex-multisig/.cargo/config rename to contracts/cw3-flex-multisig/.cargo/config.toml diff --git a/contracts/cw4-group/.cargo/config b/contracts/cw4-group/.cargo/config.toml similarity index 100% rename from contracts/cw4-group/.cargo/config rename to contracts/cw4-group/.cargo/config.toml diff --git a/contracts/cw4-stake/.cargo/config b/contracts/cw4-stake/.cargo/config.toml similarity index 100% rename from contracts/cw4-stake/.cargo/config rename to contracts/cw4-stake/.cargo/config.toml diff --git a/packages/cw1/.cargo/config b/packages/cw1/.cargo/config.toml similarity index 100% rename from packages/cw1/.cargo/config rename to packages/cw1/.cargo/config.toml diff --git a/packages/cw20/.cargo/config b/packages/cw20/.cargo/config.toml similarity index 100% rename from packages/cw20/.cargo/config rename to packages/cw20/.cargo/config.toml diff --git a/packages/cw3/.cargo/config b/packages/cw3/.cargo/config.toml similarity index 100% rename from packages/cw3/.cargo/config rename to packages/cw3/.cargo/config.toml diff --git a/packages/cw4/.cargo/config b/packages/cw4/.cargo/config.toml similarity index 100% rename from packages/cw4/.cargo/config rename to packages/cw4/.cargo/config.toml