From 479e3a74f544077cb63fbb58e7985b41468ff97b Mon Sep 17 00:00:00 2001 From: Benjamin DENEUX Date: Fri, 31 May 2024 10:10:49 +0200 Subject: [PATCH 1/2] build: bump axoned docker image from v7.1.0 to v8.0.0 --- Makefile.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.toml b/Makefile.toml index 5421e103..6cf79752 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -651,7 +651,7 @@ CHAIN_MONIKER = "local-node" DIR_DEPLOY = "${DIR_TARGET}/deploy" DIR_TARGET = "./target" DIR_WASM = "${DIR_TARGET}/wasm32-unknown-unknown/release" -DOCKER_IMAGE_AXONED = "axone/axoned:7.1.0" +DOCKER_IMAGE_AXONED = "axoneprotocol/axoned:8.0.0" KEYRING_BACKEND = "test" MNEMONIC_ALICE = "code ceiling reduce repeat unfold intact cloud marriage nut remove illegal eternal pool frame mask rate buzz vintage pulp suggest loan faint snake spoon" MNEMONIC_BOB = "add pig champion lounge initial tunnel oak panic drama float foot elegant coast manage diesel essence glory bicycle sniff upon horse crash damage bounce" From 518a232149620f0ee77b5ea0fc13acd52bc1dbe2 Mon Sep 17 00:00:00 2001 From: Benjamin DENEUX Date: Fri, 31 May 2024 14:28:46 +0200 Subject: [PATCH 2/2] build: use new wait-tx query to replace the sleep command --- Makefile.toml | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/Makefile.toml b/Makefile.toml index 6cf79752..cf815d52 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -433,9 +433,11 @@ docker run --rm \ --gas auto \ --gas-adjustment 1.5 \ --chain-id ${CHAIN} \ - --broadcast-mode sync \ - --yes - sleep 5 # 🤮 temporary fix since '--brodcast-mode block' is no longer available, new cli command is comming but not available now on axoned@v5.0.0. Needs cosmos-sdk@v0.47.5 : https://github.com/cosmos/cosmos-sdk/releases/tag/v0.47.5. + --yes | docker run --rm -i \ + --network host \ + -v `pwd`:/app:ro \ + -w /app \ + ${DOCKER_IMAGE_AXONED} query wait-tx ''' [tasks.chain-deploy-contracts] @@ -519,11 +521,13 @@ docker run --rm \ --gas auto \ --gas-adjustment 1.5 \ --chain-id ${CHAIN} \ - --broadcast-mode sync \ --yes \ --label $label \ - --no-admin - sleep 5 # 🤮 temporary fix since '--brodcast-mode block' is no longer available, new cli command is comming but not available now on axoned@v5.0.0. Needs cosmos-sdk@v0.47.5 : https://github.com/cosmos/cosmos-sdk/releases/tag/v0.47.5. + --no-admin | docker run --rm -i \ + --network host \ + -v `pwd`:/app:ro \ + -w /app \ + ${DOCKER_IMAGE_AXONED} query wait-tx ''' [tasks.chain-query-contract] @@ -587,11 +591,13 @@ docker run --rm \ --gas auto \ --gas-adjustment 1.5 \ --chain-id ${CHAIN} \ - --broadcast-mode sync \ - --yes \ - --output json \ - | jq -r '.' - sleep 5 # 🤮 temporary fix since '--brodcast-mode block' is no longer available, new cli command is comming but not available now on axoned@v5.0.0. Needs cosmos-sdk@v0.47.5 : https://github.com/cosmos/cosmos-sdk/releases/tag/v0.47.5. + --yes | docker run --rm -i \ + --network host \ + -v `pwd`:/app:ro \ + -w /app \ + ${DOCKER_IMAGE_AXONED} query wait-tx \ + --output json \ + | jq -r '.' ''' [tasks.install-llvm-tools-preview]