From 7717815a27692e257f7460885f8ffce22a9bbe04 Mon Sep 17 00:00:00 2001 From: Mauro Lacy Date: Thu, 30 Nov 2023 10:15:54 +0100 Subject: [PATCH 1/3] Revert "Revert to cosmwasm 1.2.x for compat with sdk" This reverts commit 0b5173e7735f524171222cb75a5f49011dd8f693. --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index aa539573..657807fa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,8 +25,8 @@ mesh-simple-price-feed = { path = "./contracts/consumer/simple-price-feed" } mesh-virtual-staking = { path = "./contracts/consumer/virtual-staking" } sylvia = "0.8.1" -cosmwasm-schema = "1.2.7" -cosmwasm-std = { version = "1.2.7", features = ["ibc3", "cosmwasm_1_2"] } +cosmwasm-schema = "1.3.3" +cosmwasm-std = { version = "1.3.3", features = ["ibc3", "cosmwasm_1_3"] } cw-storage-plus = "1.1.0" cw-utils = "1.0.1" cw2 = "1.0.1" From 95030c17afb6736076e625ef45c83523aa72ff7a Mon Sep 17 00:00:00 2001 From: Mauro Lacy Date: Thu, 30 Nov 2023 10:21:41 +0100 Subject: [PATCH 2/3] Update to latest optimizer 0.15 --- scripts/optimizer.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/optimizer.sh b/scripts/optimizer.sh index d14dc7ac..2d196567 100755 --- a/scripts/optimizer.sh +++ b/scripts/optimizer.sh @@ -1,7 +1,7 @@ : U="cosmwasm" -V="0.14.0" +V="0.15.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 23f77adfb6d3475079d2a9559ae01629a0f60f4a Mon Sep 17 00:00:00 2001 From: Mauro Lacy Date: Thu, 30 Nov 2023 10:31:26 +0100 Subject: [PATCH 3/3] Update optimizer to latest 0.15.0 in CI --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 53c23a51..7e5c841f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,9 +33,9 @@ jobs: - name: Build Wasm images uses: addnab/docker-run-action@v3 with: - image: cosmwasm/workspace-optimizer:0.12.13 + image: cosmwasm/optimizer:0.15.0 options: -v ${{ github.workspace }}:/code - run: optimize_workspace.sh + run: optimize.sh - name: Create release uses: softprops/action-gh-release@v1