fix: Use wasmvm v1.5.4

.mergify.yml

@@ -1,26 +1,32 @@
+defaults:
+ actions:
+ backport:
+ assignees:
+ - "{{ author }}"
+
 queue_rules:
  - name: default
  conditions:
- - "#approved-reviews-by>2"
+ - "#approved-reviews-by>1"
+ commit_message_template: |
+ {{ title }} (#{{ number }})
+ {{ body }}
 
 pull_request_rules:
- - name: automerge to main with label automerge and branch protection passing
+ - name: Automatic merge on approval to the main branch
  conditions:
- - "#approved-reviews-by>2"
+ - "#approved-reviews-by>=1"
  - base=main
  - label=A:automerge
  actions:
  queue:
  name: default
  method: squash
- commit_message_template: |
- {{ title }} (#{{ number }})
- {{ body }}
- - name: backport patches to v2.1.x branch
+ - name: Backport patches to release/v3.1.x branch
  conditions:
  - base=main
- - label=backport/v2.1.x
+ - label=backport/v3.1.x
  actions:
  backport:
  branches:
- - release/v2.1.x
+ - release/v3.1.x

Makefile

@@ -336,21 +336,21 @@ localnet-start: localnet-stop build-linux
  -v /etc/shadow:/etc/shadow:ro \
  classic-terra/terrad-env testnet --chain-id ${TESTNET_CHAINID} --v ${TESTNET_NVAL} -o . --starting-ip-address 192.168.10.2 --keyring-backend=test; \
  fi
- docker-compose up -d
+ docker compose up -d
 
 localnet-start-upgrade: localnet-upgrade-stop build-linux
  $(MAKE) -C contrib/updates build-cosmovisor-linux BUILDDIR=$(BUILDDIR)
  $(if $(shell $(DOCKER) inspect -f '{{ .Id }}' classic-terra/terrad-upgrade-env 2>/dev/null),$(info found image classic-terra/terrad-upgrade-env),$(MAKE) -C contrib/localnet terrad-upgrade-env)
  bash contrib/updates/prepare_cosmovisor.sh $(BUILDDIR) ${TESTNET_NVAL} ${TESTNET_CHAINID}
- docker-compose -f ./contrib/updates/docker-compose.yml up -d
+ docker compose -f ./contrib/updates/docker-compose.yml up -d
 
 localnet-upgrade-stop:
- docker-compose -f ./contrib/updates/docker-compose.yml down
+ docker compose -f ./contrib/updates/docker-compose.yml down
  rm -rf build/node*
  rm -rf build/gentxs
 
 localnet-stop:
- docker-compose down
+ docker compose down
  rm -rf build/node*
  rm -rf build/gentxs
 

contrib/updates/prepare_cosmovisor.sh

@@ -5,7 +5,9 @@
 
 # These fields should be fetched automatically in the future
 # Need to do more upgrade to see upgrade patterns
+
 OLD_VERSION=v3.1.3
+
 # this command will retrieve the folder with the largest number in format v<number>
 SOFTWARE_UPGRADE_NAME=$(ls -d -- ./app/upgrades/v* | sort -Vr | head -n 1 | xargs basename)
 BUILDDIR=$1

go.mod

@@ -7,7 +7,7 @@ require (
  cosmossdk.io/math v1.3.0
  cosmossdk.io/simapp v0.0.0-20230602123434-616841b9704d
  github.com/CosmWasm/wasmd v0.45.0
- github.com/CosmWasm/wasmvm v1.5.2
+ github.com/CosmWasm/wasmvm v1.5.4
  github.com/cometbft/cometbft v0.37.4
  github.com/cometbft/cometbft-db v0.8.0
  github.com/cosmos/cosmos-sdk v0.47.10
@@ -225,7 +225,7 @@ replace (
 )
 
 replace (
- github.com/CosmWasm/wasmd => github.com/classic-terra/wasmd v0.45.0-terra.5
+ github.com/CosmWasm/wasmd => github.com/classic-terra/wasmd v0.45.0-terra.7
  // use cometbft
  github.com/cometbft/cometbft => github.com/classic-terra/cometbft v0.37.4-terra1
  github.com/cometbft/cometbft-db => github.com/cometbft/cometbft-db v0.8.0

go.sum

@@ -222,8 +222,8 @@ github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg6
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/ChainSafe/go-schnorrkel v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRrLeDnvGIM=
 github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4=
-github.com/CosmWasm/wasmvm v1.5.2 h1:+pKB1Mz9GZVt1vadxB+EDdD1FOz3dMNjIKq/58/lrag=
-github.com/CosmWasm/wasmvm v1.5.2/go.mod h1:Q0bSEtlktzh7W2hhEaifrFp1Erx11ckQZmjq8FLCyys=
+github.com/CosmWasm/wasmvm v1.5.4 h1:Opqy65ubJ8bMsT08dn85VjRdsLJVPIAgIXif92qOMGc=
+github.com/CosmWasm/wasmvm v1.5.4/go.mod h1:Q0bSEtlktzh7W2hhEaifrFp1Erx11ckQZmjq8FLCyys=
 github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
@@ -356,8 +356,8 @@ github.com/classic-terra/goleveldb v0.0.0-20230914223247-2b28f6655121 h1:fjpWDB0
 github.com/classic-terra/goleveldb v0.0.0-20230914223247-2b28f6655121/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
 github.com/classic-terra/ibc-go/v7 v7.4.0-terra h1:hawaq62XKlxyc8xLyIcc6IujDDEbqDBU+2U15SF+hj8=
 github.com/classic-terra/ibc-go/v7 v7.4.0-terra/go.mod h1:s0lxNkjVIqsb8AVltL0qhzxeLgOKvWZrknPuvgjlEQ8=
-github.com/classic-terra/wasmd v0.45.0-terra.5 h1:0fuc4lS1Z0Egci6hwK4DZqOwF2l9fGsZuPTZ1akObFY=
-github.com/classic-terra/wasmd v0.45.0-terra.5/go.mod h1:r/AxjzSLyrQbrANEsV/d+qf/vmCDFiAoVwWenGs23ZY=
+github.com/classic-terra/wasmd v0.45.0-terra.7 h1:s2Wx2kWmsajiYP0cHADsbD2dYg0JAZSwd2JeeEEpTZM=
+github.com/classic-terra/wasmd v0.45.0-terra.7/go.mod h1:dF31qSPGrHgGPreCCIbAtw/YnJT0Gi997sAA5ZllPSI=
 github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cloudflare/cloudflare-go v0.14.0/go.mod h1:EnwdgGMaFOruiPZRFSgn+TsQ3hQ7C/YWzIGLeu5c304=