chore: restore latest osmosis

Author: nemo83

caribic/src/setup.rs

@@ -82,7 +82,7 @@ pub async fn download_mithril(mithril_path: &Path) -> Result<(), Box<dyn std::er
 }
 
 pub async fn download_osmosis(osmosis_path: &Path) -> Result<(), Box<dyn std::error::Error>> {
-    let url = "https://github.com/osmosis-labs/osmosis/archive/refs/tags/v25.2.0.zip";
+    let url = "https://github.com/osmosis-labs/osmosis/archive/refs/tags/v30.0.1.zip";
     download_repository(url, osmosis_path, "osmosis").await
 }
 

chains/osmosis/configuration/Dockerfile

@@ -1,14 +1,16 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION="1.21"
+# Please, when adding/editing this Dockerfile also take care of Dockerfile.cosmovisor as well
+
+ARG GO_VERSION="1.23"
 ARG RUNNER_IMAGE="gcr.io/distroless/static-debian11"
 ARG BUILD_TAGS="netgo,ledger,muslc"
 
 # --------------------------------------------------------
 # Builder
 # --------------------------------------------------------
 
-FROM golang:${GO_VERSION}-alpine3.18 as builder
+FROM golang:${GO_VERSION}-alpine3.20 as builder
 
 ARG GIT_VERSION
 ARG GIT_COMMIT
@@ -17,7 +19,8 @@ ARG BUILD_TAGS
 RUN apk add --no-cache \
     ca-certificates \
     build-base \
-    linux-headers
+    linux-headers \
+    binutils-gold
 
 # Download go dependencies
 WORKDIR /osmosis
@@ -27,12 +30,12 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
     go mod download
 
 # Cosmwasm - Download correct libwasmvm version
-RUN ARCH=$(uname -m) && WASMVM_VERSION=$(go list -m github.com/CosmWasm/wasmvm | sed 's/.* //') && \
+RUN ARCH=$(uname -m) && WASMVM_VERSION=$(go list -m github.com/CosmWasm/wasmvm/v2 | sed 's/.* //') && \
     wget https://github.com/CosmWasm/wasmvm/releases/download/$WASMVM_VERSION/libwasmvm_muslc.$ARCH.a \
-    -O /lib/libwasmvm_muslc.a && \
+    -O /lib/libwasmvm_muslc.$ARCH.a && \
     # verify checksum
     wget https://github.com/CosmWasm/wasmvm/releases/download/$WASMVM_VERSION/checksums.txt -O /tmp/checksums.txt && \
-    sha256sum /lib/libwasmvm_muslc.a | grep $(cat /tmp/checksums.txt | grep libwasmvm_muslc.$ARCH | cut -d ' ' -f 1)
+    sha256sum /lib/libwasmvm_muslc.$ARCH.a | grep $(cat /tmp/checksums.txt | grep libwasmvm_muslc.$ARCH | cut -d ' ' -f 1) 
 
 # Copy the remaining files
 COPY . .
@@ -42,7 +45,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/root/go/pkg/mod \
     GOWORK=off go build \
     -mod=readonly \
-    -tags ${BUILD_TAGS} \
+    -tags "netgo,ledger,muslc" \
     -ldflags \
     "-X github.com/cosmos/cosmos-sdk/version.Name="osmosis" \
     -X github.com/cosmos/cosmos-sdk/version.AppName="osmosisd" \
@@ -62,7 +65,7 @@ FROM ${RUNNER_IMAGE}
 
 COPY --from=builder /osmosis/build/osmosisd /bin/osmosisd
 
-ENV HOME /osmosis
+ENV HOME=/osmosis
 WORKDIR $HOME
 
 EXPOSE 26656

chains/osmosis/configuration/docker-compose.yml

@@ -5,8 +5,8 @@ services:
       context: ../../
       dockerfile: Dockerfile
       args:
-        RUNNER_IMAGE: golang:1.21.7-alpine3.19
-        GO_VERSION: "1.21"
+        RUNNER_IMAGE: alpine:3.19
+        GO_VERSION: "1.23"
     volumes:
       - ./scripts/uosmoUionBalancerPool.json:/osmosis/uosmoUionBalancerPool.json
       - ./scripts/uosmoUusdcBalancerPool.json:/osmosis/uosmoUusdcBalancerPool.json
@@ -36,4 +36,4 @@ services:
       - 6379:6379
       - 8001:8001
     volumes:
-      - ./redis-data:/data
+      - ./redis-data:/data