Merge branch 'main' into feeburn

ChihuahuaChain · Aug 10, 2023 · 1410d1d · 1410d1d
2 parents 1184218 + d75b6e5
commit 1410d1d
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 ARG IMG_TAG=latest
 ARG PLATFORM="linux/amd64"
-ARG GO_VERSION="1.19"
+ARG GO_VERSION="1.20"
 ARG RUNNER_IMAGE="gcr.io/distroless/static"
 
 FROM --platform=${PLATFORM} golang:${GO_VERSION}-alpine as builder
@@ -13,10 +13,10 @@ COPY . .
 # For more details see https://github.com/CosmWasm/wasmvm#builds-of-libwasmvm
 ARG ARCH=x86_64
 # See https://github.com/CosmWasm/wasmvm/releases
-ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.2.1/libwasmvm_muslc.aarch64.a /lib/libwasmvm_muslc.aarch64.a
-ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.2.1/libwasmvm_muslc.x86_64.a /lib/libwasmvm_muslc.x86_64.a
-RUN sha256sum /lib/libwasmvm_muslc.aarch64.a | grep 86bc5fdc0f01201481c36e17cd3dfed6e9650d22e1c5c8983a5b78c231789ee0
-RUN sha256sum /lib/libwasmvm_muslc.x86_64.a | grep a00700aa19f5bfe0f46290ddf69bf51eb03a6dfcd88b905e1081af2e42dbbafc
+ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.3.0/libwasmvm_muslc.aarch64.a /lib/libwasmvm_muslc.aarch64.a
+ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.3.0/libwasmvm_muslc.x86_64.a /lib/libwasmvm_muslc.x86_64.a
+RUN sha256sum /lib/libwasmvm_muslc.aarch64.a | grep b1610f9c8ad8bdebf5b8f819f71d238466f83521c74a2deb799078932e862722
+RUN sha256sum /lib/libwasmvm_muslc.x86_64.a | grep b4aad4480f9b4c46635b4943beedbb72c929eab1d1b9467fe3b43e6dbf617e32
 RUN cp /lib/libwasmvm_muslc.${ARCH}.a /lib/libwasmvm_muslc.a
 
 ENV PACKAGES curl make git libc-dev bash gcc linux-headers eudev-dev python3

diff --git a/Makefile b/Makefile
@@ -99,15 +99,15 @@ build: check-go-version
 
 BUILD_TARGETS := build install
 
-build-reproducible-all: check-go-version build-reproducible-amd64 build-reproducible-arm64
+build-reproducible-all: build-reproducible-amd64 build-reproducible-arm64
 
-build-reproducible-amd64: check-go-version
+build-reproducible-amd64:
 	ARCH=x86_64 PLATFORM=linux/amd64 $(MAKE) build-reproducible-generic
 
-build-reproducible-arm64: check-go-version
+build-reproducible-arm64:
 	ARCH=aarch64 PLATFORM=linux/arm64 $(MAKE) build-reproducible-generic
 
-build-reproducible-generic: check-go-version go.sum
+build-reproducible-generic: go.sum
 	$(DOCKER) rm $(subst /,-,latest-build-$(PLATFORM)) || true
 	DOCKER_BUILDKIT=1 $(DOCKER) build -t latest-build-$(PLATFORM) \
 		--build-arg ARCH=$(ARCH) \

diff --git a/README.md b/README.md
@@ -91,7 +91,7 @@ sed -i.bak 's/minimum-gas-prices =.*/minimum-gas-prices = "1uhuahua"/' $HOME/.ch
 
 Install cosmovisor 
 ```bash
-go install github.com/cosmos/cosmos-sdk/cosmovisor/cmd/cosmovisor@v1.0.0
+go install github.com/cosmos/cosmos-sdk/cosmovisor/cmd/cosmovisor@latest
 
 which cosmovisor
 
@@ -136,7 +136,7 @@ After=network-online.target
 
 [Service]
 User=<your-user>
-ExecStart=/home/<your-user>/go/bin/cosmovisor start
+ExecStart=/home/<your-user>/go/bin/cosmovisor run start
 Restart=always
 RestartSec=3
 LimitNOFILE=4096
@@ -217,6 +217,8 @@ _Make sure to join our [Discord](https://discord.gg/chihuahua) and contact a mod
 
 # Chain Upgrades
 
+- **v500** _(v5.0.0)_ - Block 8711111 - (2023-08-10 15:28:23)
+  - [Upgrade Instruction](https://github.com/ChihuahuaChain/chihuahua/blob/main/mainnet/UPGRADES/v500)
 - **v421** _(v4.2.1)_ - Block 6376376 - (2022-03-04 12:20:37)
   - [Upgrade Instruction](https://github.com/ChihuahuaChain/chihuahua/blob/main/mainnet/UPGRADES/v421)
 - **v420** _(v4.2.0)_ - Block 6039999 - (2022-02-09 13:41:07)

diff --git a/mainnet/UPGRADES/v500/README.md b/mainnet/UPGRADES/v500/README.md
@@ -0,0 +1,38 @@
+# Chihuahua v5.0.0 Upgrade
+
+The Upgrade is scheduled for block `8711111`. A countdown clock is [here](https://www.mintscan.io/chihuahua/blocks/8711111)
+
+This guide assumes that you use cosmovisor to manage upgrades
+
+## Ensure you are using at least go1.20 before compiling (you will get an error anyways so, upgrade your go!) 
+
+```bash
+# get the new version
+cd chihuahua
+git fetch --all
+git checkout v5.0.0
+make install
+```
+
+# check the version
+
+```bash
+# should be v5.0.0
+chihuahuad version
+# Should be commit 1184218fd760897018f870eee78c14cef1ee0379
+chihuahuad version --long
+```
+
+# Make new directory and copy binary
+
+```bash
+mkdir -p $HOME/.chihuahuad/cosmovisor/upgrades/v500/bin
+cp $HOME/go/bin/chihuahuad $HOME/.chihuahuad/cosmovisor/upgrades/v500/bin
+```
+
+# check the version again
+
+```bash
+# should be v5.0.0
+$HOME/.chihuahuad/cosmovisor/upgrades/v500/bin/chihuahuad version
+```