From 11223728fdd89c7d4a5bdf8788119b4a95cd5951 Mon Sep 17 00:00:00 2001 From: jhernandezb Date: Wed, 10 Jan 2024 08:01:24 -0600 Subject: [PATCH 1/2] bump wasmvm to v1.3.1 --- .drone.yml | 4 ++-- Dockerfile | 4 ++-- cmd/starsd/cmd/start.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index eb7c2f782..059afad19 100644 --- a/.drone.yml +++ b/.drone.yml @@ -48,8 +48,8 @@ steps: path: /go commands: - apk add --no-cache ca-certificates build-base git - - wget https://github.com/CosmWasm/wasmvm/releases/download/v1.3.0/libwasmvm_muslc.x86_64.a -O /lib/libwasmvm_muslc.a - - echo "b4aad4480f9b4c46635b4943beedbb72c929eab1d1b9467fe3b43e6dbf617e32 /lib/libwasmvm_muslc.a" | sha256sum -c + - wget https://github.com/CosmWasm/wasmvm/releases/download/v1.3.1/libwasmvm_muslc.x86_64.a -O /lib/libwasmvm_muslc.a + - echo "a547e994eb9b7a6548929a74085d167056b1e7c1fdf613845f175dad4c609b86 /lib/libwasmvm_muslc.a" | sha256sum -c - LEDGER_ENABLED=false BUILD_TAGS=muslc LINK_STATICALLY=true make build - echo "Ensuring binary is statically linked ..." && (file $PWD/bin/starsd | grep "statically linked") environment: diff --git a/Dockerfile b/Dockerfile index 941741436..235788e84 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,8 +12,8 @@ WORKDIR /code COPY . /code/ # See https://github.com/CosmWasm/wasmvm/releases -ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.3.0/libwasmvm_muslc.x86_64.a /lib/libwasmvm_muslc.a -RUN echo "b4aad4480f9b4c46635b4943beedbb72c929eab1d1b9467fe3b43e6dbf617e32 /lib/libwasmvm_muslc.a" | sha256sum -c +ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.3.1/libwasmvm_muslc.x86_64.a /lib/libwasmvm_muslc.a +RUN echo "a547e994eb9b7a6548929a74085d167056b1e7c1fdf613845f175dad4c609b86 /lib/libwasmvm_muslc.a" | sha256sum -c # force it to use static lib (from above) not standard libgo_cosmwasm.so file RUN LEDGER_ENABLED=false BUILD_TAGS=muslc LINK_STATICALLY=true make build diff --git a/cmd/starsd/cmd/start.go b/cmd/starsd/cmd/start.go index a44417c31..c3d86580b 100644 --- a/cmd/starsd/cmd/start.go +++ b/cmd/starsd/cmd/start.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" ) -var LibwasmVersion = "1.3.0" +var LibwasmVersion = "1.3.1" func CheckLibwasmVersion(_ *cobra.Command, _ []string) error { version, err := wasmvmapi.LibwasmvmVersion() diff --git a/go.mod b/go.mod index 11a0d8ea5..65bcd7721 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/CosmWasm/wasmd v0.33.0 - github.com/CosmWasm/wasmvm v1.3.0 + github.com/CosmWasm/wasmvm v1.3.1 github.com/armon/go-metrics v0.4.1 github.com/cometbft/cometbft v0.37.1 github.com/cosmos/cosmos-proto v1.0.0-beta.2 diff --git a/go.sum b/go.sum index 9fd3edc2b..ae7c8f0e6 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.33.0 h1:bNh596FfZj26m02kjpA0pkRj/f1JueMokT3zJfHT6Ww= github.com/CosmWasm/wasmd v0.33.0/go.mod h1:BuszgLUQffVXxjfFCRjc2RuulJOpLyNZpG9+GdC0t/c= -github.com/CosmWasm/wasmvm v1.3.0 h1:x12X4bKlUPS7TT9QQP45+fJo2sp30GEbiSSgb9jsec8= -github.com/CosmWasm/wasmvm v1.3.0/go.mod h1:vW/E3h8j9xBQs9bCoijDuawKo9kCtxOaS8N8J7KFtkc= +github.com/CosmWasm/wasmvm v1.3.1 h1:EdDItqJalI+n2HQUA6XGFOSSaYsCoqJtiRzlja54jVI= +github.com/CosmWasm/wasmvm v1.3.1/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 561f8beaadb1b36a7a16af80163c2ce5ada20d11 Mon Sep 17 00:00:00 2001 From: jhernandezb Date: Wed, 10 Jan 2024 08:07:29 -0600 Subject: [PATCH 2/2] fix checksum --- .drone.yml | 4 ++-- Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 059afad19..8279cfc19 100644 --- a/.drone.yml +++ b/.drone.yml @@ -49,7 +49,7 @@ steps: commands: - apk add --no-cache ca-certificates build-base git - wget https://github.com/CosmWasm/wasmvm/releases/download/v1.3.1/libwasmvm_muslc.x86_64.a -O /lib/libwasmvm_muslc.a - - echo "a547e994eb9b7a6548929a74085d167056b1e7c1fdf613845f175dad4c609b86 /lib/libwasmvm_muslc.a" | sha256sum -c + - echo "129da0e50eaa3da093eb84c3a8f48da20b9573f3afdf83159b3984208c8ec5c3 /lib/libwasmvm_muslc.a" | sha256sum -c - LEDGER_ENABLED=false BUILD_TAGS=muslc LINK_STATICALLY=true make build - echo "Ensuring binary is statically linked ..." && (file $PWD/bin/starsd | grep "statically linked") environment: @@ -404,6 +404,6 @@ volumes: --- kind: signature -hmac: a41a2d807eb0a057b55afc2f3a5addc67d3df8923eca45ce85d548a495b01a25 +hmac: 3e192b1ba0b96faae31cbb5976ef24b15f86d17c04b3e7c848d1e0991800acf1 ... diff --git a/Dockerfile b/Dockerfile index 235788e84..e35c3e272 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ COPY . /code/ # See https://github.com/CosmWasm/wasmvm/releases ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.3.1/libwasmvm_muslc.x86_64.a /lib/libwasmvm_muslc.a -RUN echo "a547e994eb9b7a6548929a74085d167056b1e7c1fdf613845f175dad4c609b86 /lib/libwasmvm_muslc.a" | sha256sum -c +RUN echo "129da0e50eaa3da093eb84c3a8f48da20b9573f3afdf83159b3984208c8ec5c3 /lib/libwasmvm_muslc.a" | sha256sum -c # force it to use static lib (from above) not standard libgo_cosmwasm.so file RUN LEDGER_ENABLED=false BUILD_TAGS=muslc LINK_STATICALLY=true make build