Merge branch 'main' into ica-oracle

Stride-Labs · Aug 8, 2023 · f1c024b · f1c024b
2 parents c277b78 + d3eb434
commit f1c024b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -15,9 +15,9 @@
 	path = deps/juno
 	url = https://github.com/CosmosContracts/juno.git
 [submodule "deps/osmosis"]
-	# Commit: 08669da8509059980dc964976ee1ca60c84f5c8a
+	# Commit: v16.1.1-no-fees
 	path = deps/osmosis
-	url = https://github.com/osmosis-labs/osmosis.git
+	url = https://github.com/Stride-Labs/osmosis.git
 [submodule "deps/stargaze"]
 	# Commit: v9.0.1
 	path = deps/stargaze

diff --git a/deps/osmosis b/deps/osmosis
diff --git a/dockernet/dockerfiles/Dockerfile.osmo b/dockernet/dockerfiles/Dockerfile.osmo
@@ -1,27 +1,28 @@
-FROM golang:1.19-alpine3.15 AS builder
+FROM golang:1.20-alpine3.16 AS builder
 
 WORKDIR /opt/
 
 RUN set -eux; apk add --no-cache ca-certificates build-base; apk add git linux-headers
 
-ENV COMMIT_HASH=08669da8509059980dc964976ee1ca60c84f5c8a
+ENV COMMIT_HASH=v16.1.1-no-fees
 
-RUN git clone https://github.com/osmosis-labs/osmosis.git \
+RUN git clone https://github.com/Stride-Labs/osmosis.git \
     && cd osmosis \
     && git checkout ${COMMIT_HASH} 
 
 WORKDIR /opt/osmosis
 
 # Cosmwasm - download correct libwasmvm version and verify checksum
-RUN WASMVM_VERSION=v1.0.0 \
+# Note: checksum not available for v1.2.3, otherwise command should be
+#  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 $(uname -m) | cut -d ' ' -f 1)
+RUN WASMVM_VERSION=v1.2.3 \
     && wget https://github.com/CosmWasm/wasmvm/releases/download/$WASMVM_VERSION/libwasmvm_muslc.$(uname -m).a \
-    -O /lib/libwasmvm_muslc.a \
-    && 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 $(uname -m) | cut -d ' ' -f 1)
+    -O /lib/libwasmvm_muslc.a 
 
 RUN BUILD_TAGS=muslc LINK_STATICALLY=true make build
 
-FROM alpine:3.15
+FROM alpine:3.16
 COPY --from=builder /opt/osmosis/build/osmosisd /usr/local/bin/
 RUN apk add bash vim \
     && addgroup -g 1000 osmosis \

diff --git a/dockernet/dockerfiles/Dockerfile.stars b/dockernet/dockerfiles/Dockerfile.stars
@@ -1,4 +1,4 @@
-FROM golang:1.19-alpine3.15 AS builder
+FROM golang:1.20-alpine3.16 AS builder
 
 WORKDIR /opt
 
@@ -12,15 +12,15 @@ RUN git clone https://github.com/public-awesome/stargaze \
 
 WORKDIR /opt/stargaze
 
-ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.0.0/libwasmvm_muslc.aarch64.a /lib/libwasmvm_muslc.aarch64.a
-ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.0.0/libwasmvm_muslc.x86_64.a /lib/libwasmvm_muslc.x86_64.a
-RUN sha256sum /lib/libwasmvm_muslc.aarch64.a | grep 7d2239e9f25e96d0d4daba982ce92367aacf0cbd95d2facb8442268f2b1cc1fc
-RUN sha256sum /lib/libwasmvm_muslc.x86_64.a | grep f6282df732a13dec836cda1f399dd874b1e3163504dbd9607c6af915b2740479
+ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.1.1/libwasmvm_muslc.aarch64.a /lib/libwasmvm_muslc.aarch64.a
+ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.1.1/libwasmvm_muslc.x86_64.a /lib/libwasmvm_muslc.x86_64.a
+RUN sha256sum /lib/libwasmvm_muslc.aarch64.a | grep 9ecb037336bd56076573dc18c26631a9d2099a7f2b40dc04b6cae31ffb4c8f9a
+RUN sha256sum /lib/libwasmvm_muslc.x86_64.a | grep 6e4de7ba9bad4ae9679c7f9ecf7e283dd0160e71567c6a7be6ae47c81ebe7f32
 RUN cp /lib/libwasmvm_muslc.$(uname -m).a /lib/libwasmvm_muslc.a
 
 RUN LEDGER_ENABLED=false BUILD_TAGS=muslc LINK_STATICALLY=true make build
 
-FROM alpine:3.15
+FROM alpine:3.16
 COPY --from=builder /opt/stargaze/bin/starsd /usr/local/bin/
 RUN apk add --update bash vim ca-certificates \
     && addgroup -g 1000 stars \