From a290c1b1b2001dff1f4300d2acf9c82c47d82ea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Stuczy=C5=84ski?= Date: Mon, 30 Oct 2023 11:29:14 +0000 Subject: [PATCH 1/2] replaced '--disable-sign-ext' with '--signext-lowering' when running wasm-opt + updated wasm-opt --- .github/workflows/ci-contracts-upload-binaries.yml | 2 +- .github/workflows/publish-nym-contracts.yml | 4 ++-- Makefile | 6 +----- contracts/mixnet/Makefile | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci-contracts-upload-binaries.yml b/.github/workflows/ci-contracts-upload-binaries.yml index c5466d75060..48237e80ac1 100644 --- a/.github/workflows/ci-contracts-upload-binaries.yml +++ b/.github/workflows/ci-contracts-upload-binaries.yml @@ -35,7 +35,7 @@ jobs: - name: Install Rust stable uses: actions-rs/toolchain@v1 with: - toolchain: 1.69.0 + toolchain: stable target: wasm32-unknown-unknown override: true diff --git a/.github/workflows/publish-nym-contracts.yml b/.github/workflows/publish-nym-contracts.yml index f1cd855e020..03c4eddb635 100644 --- a/.github/workflows/publish-nym-contracts.yml +++ b/.github/workflows/publish-nym-contracts.yml @@ -14,13 +14,13 @@ jobs: - name: Install Rust stable uses: actions-rs/toolchain@v1 with: - toolchain: 1.69.0 + toolchain: stable target: wasm32-unknown-unknown override: true components: rustfmt, clippy - name: Install wasm-opt - run: cargo install --version 0.112.0 wasm-opt + run: cargo install --version 0.114.0 wasm-opt - name: Build release contracts run: make contracts diff --git a/Makefile b/Makefile index b567e3db31e..31127bc4138 100644 --- a/Makefile +++ b/Makefile @@ -93,10 +93,6 @@ $(eval $(call add_cargo_workspace,contracts,contracts,--lib --target wasm32-unkn $(eval $(call add_cargo_workspace,wallet,nym-wallet)) $(eval $(call add_cargo_workspace,connect,nym-connect/desktop)) -# OVERRIDE: wasm-opt fails if the binary has been built with the latest rustc. -# Pin to the last working version. -contracts_BUILD_RELEASE_TOOLCHAIN := +1.69.0 - # ----------------------------------------------------------------------------- # SDK # ----------------------------------------------------------------------------- @@ -144,7 +140,7 @@ contracts: build-release-contracts wasm-opt-contracts wasm-opt-contracts: for contract in $(CONTRACTS_WASM); do \ - wasm-opt --disable-sign-ext -Os $(CONTRACTS_OUT_DIR)/$$contract -o $(CONTRACTS_OUT_DIR)/$$contract; \ + wasm-opt --signext-lowering -Os $(CONTRACTS_OUT_DIR)/$$contract -o $(CONTRACTS_OUT_DIR)/$$contract; \ done # Consider adding 's' to make plural consistent (beware: used in github workflow) diff --git a/contracts/mixnet/Makefile b/contracts/mixnet/Makefile index 01452be7010..4583495c9a9 100644 --- a/contracts/mixnet/Makefile +++ b/contracts/mixnet/Makefile @@ -1,5 +1,5 @@ opt: wasm - wasm-opt --disable-sign-ext -Os ../target/wasm32-unknown-unknown/release/mixnet_contract.wasm -o ../target/wasm32-unknown-unknown/release/mixnet_contract.wasm + wasm-opt --signext-lowering -Os ../target/wasm32-unknown-unknown/release/mixnet_contract.wasm -o ../target/wasm32-unknown-unknown/release/mixnet_contract.wasm wasm: RUSTFLAGS='-C link-arg=-s' cargo build --release --target wasm32-unknown-unknown From 86ccf076ec19b8e778cea394d4cfd1146f9ccf41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Stuczy=C5=84ski?= Date: Tue, 31 Oct 2023 10:45:56 +0000 Subject: [PATCH 2/2] updated wasm-opt used in CI --- .github/workflows/ci-contracts-upload-binaries.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-contracts-upload-binaries.yml b/.github/workflows/ci-contracts-upload-binaries.yml index 48237e80ac1..620012763e3 100644 --- a/.github/workflows/ci-contracts-upload-binaries.yml +++ b/.github/workflows/ci-contracts-upload-binaries.yml @@ -42,7 +42,7 @@ jobs: - name: Install wasm-opt uses: ./.github/actions/install-wasm-opt with: - version: '112' + version: '114' - name: Build release contracts run: make contracts