From bf4f8ef58f02340a139faeb6e25e9b160758ba76 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Wed, 10 Jan 2024 14:39:28 +0100 Subject: [PATCH 1/2] Upgrade wasmvm to 1.2.5 --- .circleci/config.yml | 2 +- Dockerfile | 8 ++++---- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 785d2a8..fc08537 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ jobs: name: Check libwasmvm version command: | LIBWASMVM_VERSION=$(./build/noisd query wasm libwasmvm-version) - if [[ "$LIBWASMVM_VERSION" != "1.2.3" ]] ; then + if [[ "$LIBWASMVM_VERSION" != "1.2.5" ]] ; then echo "Got unexpected libwasmvm version: $LIBWASMVM_VERSION" exit 1 fi diff --git a/Dockerfile b/Dockerfile index 1e21013..1c95c83 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,11 +23,11 @@ RUN APK_ARCH="$(apk --print-arch)"; \ echo "Detected architecture: $APK_ARCH"; \ case "$APK_ARCH" in \ aarch64) \ - wget -O /lib/libwasmvm_muslc.a https://github.com/CosmWasm/wasmvm/releases/download/v1.2.3/libwasmvm_muslc.aarch64.a \ - && sha256sum /lib/libwasmvm_muslc.a | grep d6904bc0082d6510f1e032fc1fd55ffadc9378d963e199afe0f93dd2667c0160 ;; \ + wget -O /lib/libwasmvm_muslc.a https://github.com/CosmWasm/wasmvm/releases/download/v1.2.5/libwasmvm_muslc.aarch64.a \ + && sha256sum /lib/libwasmvm_muslc.a | grep 741c5862c237c17edd32dcebdd1d43d40d1684afe049b0f0aba9da8f556a6285 ;; \ x86_64) \ - wget -O /lib/libwasmvm_muslc.a https://github.com/CosmWasm/wasmvm/releases/download/v1.2.3/libwasmvm_muslc.x86_64.a \ - && sha256sum /lib/libwasmvm_muslc.a | grep bb8ffda690b15765c396266721e45516cb3021146fd4de46f7daeda5b0d82c86 ;; \ + wget -O /lib/libwasmvm_muslc.a https://github.com/CosmWasm/wasmvm/releases/download/v1.2.5/libwasmvm_muslc.x86_64.a \ + && sha256sum /lib/libwasmvm_muslc.a | grep cfbf72e719a33328fbb196d88795f1f2a0a9b2288d4c882b5467fba39f8de86d ;; \ esac; WORKDIR /code diff --git a/go.mod b/go.mod index 556e628..b193b2e 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,7 @@ go 1.19 require ( github.com/CosmWasm/wasmd v0.31.0 + github.com/CosmWasm/wasmvm v1.2.5 // indirect; Fix CWA-2023-004 github.com/cosmos/cosmos-sdk v0.45.15 github.com/cosmos/go-bip39 v1.0.0 github.com/cosmos/ibc-go/v4 v4.3.1 @@ -30,7 +31,6 @@ require ( github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect github.com/99designs/keyring v1.2.1 // indirect github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect - github.com/CosmWasm/wasmvm v1.2.3 // indirect github.com/DataDog/zstd v1.5.0 // indirect github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect github.com/Workiva/go-datastructures v1.0.53 // indirect diff --git a/go.sum b/go.sum index 2a0143c..144f8e7 100644 --- a/go.sum +++ b/go.sum @@ -66,8 +66,8 @@ github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible/go.mo github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo= github.com/CosmWasm/wasmd v0.31.0 h1:xACf6A/SkCeGWQWrKGsR4X9PQb5G4XYuNfnrl+HQ1mE= github.com/CosmWasm/wasmd v0.31.0/go.mod h1:VcyDGk/ISVlMUeW+1GGL0zdHWBS2FPwLEV2qZ86l7l8= -github.com/CosmWasm/wasmvm v1.2.3 h1:OKYlobwmVGbl0eSn0mXoAAjE5hIuXnQCLPjbNd91sVY= -github.com/CosmWasm/wasmvm v1.2.3/go.mod h1:vW/E3h8j9xBQs9bCoijDuawKo9kCtxOaS8N8J7KFtkc= +github.com/CosmWasm/wasmvm v1.2.5 h1:D+ZRNvrcPveuX7sSb12VPNKm/hcU7XebPK07PMJkai8= +github.com/CosmWasm/wasmvm v1.2.5/go.mod h1:vW/E3h8j9xBQs9bCoijDuawKo9kCtxOaS8N8J7KFtkc= 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.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= From 50e40319292bed7bda783af73628eb830a1bcf8e Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Wed, 10 Jan 2024 15:35:33 +0100 Subject: [PATCH 2/2] Bimp to 1.2.6 --- .circleci/config.yml | 2 +- Dockerfile | 8 ++++---- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fc08537..f80c264 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ jobs: name: Check libwasmvm version command: | LIBWASMVM_VERSION=$(./build/noisd query wasm libwasmvm-version) - if [[ "$LIBWASMVM_VERSION" != "1.2.5" ]] ; then + if [[ "$LIBWASMVM_VERSION" != "1.2.6" ]] ; then echo "Got unexpected libwasmvm version: $LIBWASMVM_VERSION" exit 1 fi diff --git a/Dockerfile b/Dockerfile index 1c95c83..f37a413 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,11 +23,11 @@ RUN APK_ARCH="$(apk --print-arch)"; \ echo "Detected architecture: $APK_ARCH"; \ case "$APK_ARCH" in \ aarch64) \ - wget -O /lib/libwasmvm_muslc.a https://github.com/CosmWasm/wasmvm/releases/download/v1.2.5/libwasmvm_muslc.aarch64.a \ - && sha256sum /lib/libwasmvm_muslc.a | grep 741c5862c237c17edd32dcebdd1d43d40d1684afe049b0f0aba9da8f556a6285 ;; \ + wget -O /lib/libwasmvm_muslc.a https://github.com/CosmWasm/wasmvm/releases/download/v1.2.6/libwasmvm_muslc.aarch64.a \ + && sha256sum /lib/libwasmvm_muslc.a | grep 1014ebcce48bd7b019f66798ec8dbb42b383f324038296c64de35bdbf5f28243 ;; \ x86_64) \ - wget -O /lib/libwasmvm_muslc.a https://github.com/CosmWasm/wasmvm/releases/download/v1.2.5/libwasmvm_muslc.x86_64.a \ - && sha256sum /lib/libwasmvm_muslc.a | grep cfbf72e719a33328fbb196d88795f1f2a0a9b2288d4c882b5467fba39f8de86d ;; \ + wget -O /lib/libwasmvm_muslc.a https://github.com/CosmWasm/wasmvm/releases/download/v1.2.6/libwasmvm_muslc.x86_64.a \ + && sha256sum /lib/libwasmvm_muslc.a | grep d93b02f34d2da0aa7f20786add8abdca8224334db541f954d28fad64641b9136 ;; \ esac; WORKDIR /code diff --git a/go.mod b/go.mod index b193b2e..f683974 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/CosmWasm/wasmd v0.31.0 - github.com/CosmWasm/wasmvm v1.2.5 // indirect; Fix CWA-2023-004 + github.com/CosmWasm/wasmvm v1.2.6 // indirect; Fix CWA-2023-004 github.com/cosmos/cosmos-sdk v0.45.15 github.com/cosmos/go-bip39 v1.0.0 github.com/cosmos/ibc-go/v4 v4.3.1 diff --git a/go.sum b/go.sum index 144f8e7..b8f3db2 100644 --- a/go.sum +++ b/go.sum @@ -66,8 +66,8 @@ github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible/go.mo github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo= github.com/CosmWasm/wasmd v0.31.0 h1:xACf6A/SkCeGWQWrKGsR4X9PQb5G4XYuNfnrl+HQ1mE= github.com/CosmWasm/wasmd v0.31.0/go.mod h1:VcyDGk/ISVlMUeW+1GGL0zdHWBS2FPwLEV2qZ86l7l8= -github.com/CosmWasm/wasmvm v1.2.5 h1:D+ZRNvrcPveuX7sSb12VPNKm/hcU7XebPK07PMJkai8= -github.com/CosmWasm/wasmvm v1.2.5/go.mod h1:vW/E3h8j9xBQs9bCoijDuawKo9kCtxOaS8N8J7KFtkc= +github.com/CosmWasm/wasmvm v1.2.6 h1:QmOaiJUyeh8+pPCjJBTgWrbi/hCzCuWewduDO85Pcpc= +github.com/CosmWasm/wasmvm v1.2.6/go.mod h1:KO0zfQgCsQ6urWL1MYLlGqRgr7R4an6jo+LWRZjfD4c= 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.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=