From 06ced3b4319af8adb44063ebc7d79c377356242c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Stuczy=C5=84ski?= Date: Fri, 5 Jan 2024 11:48:57 +0000 Subject: [PATCH 1/2] building canonical cw3-flex-multisig and cw4-group contracts --- .gitmodules | 3 +++ Makefile | 16 ++++++++++++++++ cw-plus | 1 + 3 files changed, 20 insertions(+) create mode 100644 .gitmodules create mode 160000 cw-plus diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000000..e19d842633d --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "cw-plus"] + path = cw-plus + url = git@github.com:CosmWasm/cw-plus.git diff --git a/Makefile b/Makefile index d50cdbdb9f2..d85856ec8d4 100644 --- a/Makefile +++ b/Makefile @@ -138,6 +138,22 @@ CONTRACTS_OUT_DIR=contracts/target/wasm32-unknown-unknown/release contracts: build-release-contracts wasm-opt-contracts +multisig: prepare-cw-plus build-cw3 build-cw4 opt-cw3 opt-cw4 +prepare-cw-plus: + git -C cw-plus fetch + # make sure to use correct version + git -C cw-plus reset --hard v1.0.0 + +build-cw3: + RUSTFLAGS='-C link-arg=-s' cargo build --manifest-path cw-plus/contracts/cw3-flex-multisig/Cargo.toml --release --lib --target wasm32-unknown-unknown +build-cw4: + RUSTFLAGS='-C link-arg=-s' cargo build --manifest-path cw-plus/contracts/cw4-group/Cargo.toml --release --lib --target wasm32-unknown-unknown + +opt-cw3: + wasm-opt --signext-lowering -Os cw-plus/target/wasm32-unknown-unknown/release/cw3_flex_multisig.wasm -o cw-plus/target/wasm32-unknown-unknown/release/cw3_flex_multisig.wasm +opt-cw4: + wasm-opt --signext-lowering -Os cw-plus/target/wasm32-unknown-unknown/release/cw4_group.wasm -o cw-plus/target/wasm32-unknown-unknown/release/cw4_group.wasm + wasm-opt-contracts: for contract in $(CONTRACTS_WASM); do \ wasm-opt --signext-lowering -Os $(CONTRACTS_OUT_DIR)/$$contract -o $(CONTRACTS_OUT_DIR)/$$contract; \ diff --git a/cw-plus b/cw-plus new file mode 160000 index 00000000000..1a598fd99f7 --- /dev/null +++ b/cw-plus @@ -0,0 +1 @@ +Subproject commit 1a598fd99f788e1f0a2d735ff7d19571ca70205c From 86d804809cf5ffd80cfb9e9dbf68483411014bf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Stuczy=C5=84ski?= Date: Fri, 5 Jan 2024 11:51:19 +0000 Subject: [PATCH 2/2] renamed the build target --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d85856ec8d4..6b16206c7be 100644 --- a/Makefile +++ b/Makefile @@ -136,9 +136,9 @@ CONTRACTS=vesting_contract mixnet_contract nym_service_provider_directory nym_na CONTRACTS_WASM=$(addsuffix .wasm, $(CONTRACTS)) CONTRACTS_OUT_DIR=contracts/target/wasm32-unknown-unknown/release -contracts: build-release-contracts wasm-opt-contracts +contracts: build-release-contracts wasm-opt-contracts canonical-multisig -multisig: prepare-cw-plus build-cw3 build-cw4 opt-cw3 opt-cw4 +canonical-multisig: prepare-cw-plus build-cw3 build-cw4 opt-cw3 opt-cw4 prepare-cw-plus: git -C cw-plus fetch # make sure to use correct version