Pin to v0.45.5 fork for Cosmos SDK

cheqd · Jul 1, 2022 · d82bae1 · d82bae1
1 parent 35c9c8c
commit d82bae1
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 58 deletions.
diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml
@@ -13,7 +13,6 @@ jobs:
 
   call-build:
     name: "Build"
-    needs: call-lint
     uses: ./.github/workflows/build.yml
 
   call-test:

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -2,12 +2,11 @@
 ###        STAGE 1: Build node binary pre-requisites        ###
 ###############################################################
 
-FROM golang:1.17.8-buster as builder
+FROM golang:1.17.11-buster as builder
 
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     && apt-get -y install --no-install-recommends \
     curl \
-    git \
     libprotobuf-dev \
     && rm -rf /var/lib/apt/lists/*
 
@@ -101,41 +100,3 @@ RUN chmod +x /bin/node-start
 
 # Default entrypoint for cheqd-noded CLI usage
 ENTRYPOINT [ "node-start" ]
-
-
-###############################################################
-###        STAGE 4: Build Cosmovisor                        ###
-###############################################################
-
-FROM golang:1.17.8-buster AS cosmos_builder 
-
-RUN git clone https://github.com/cosmos/cosmos-sdk.git
-
-WORKDIR /go/cosmos-sdk/
-
-RUN git status \
-    && git checkout cosmovisor/v1.1.0 \
-    && make cosmovisor
-
-
-###############################################################
-###          STAGE 5: Cosmovisor-based node image           ###
-###############################################################
-
-FROM base AS cosmovisor
-
-COPY --from=cosmos_builder /go/cosmos-sdk/cosmovisor/cosmovisor /bin
-COPY --chown=cheqd:cheqd docker/cosmovisor.sh /bin/cosmovisor.sh
-
-ARG CHEQD_HOME_DIR="/home/cheqd"
-
-RUN chmod +x /bin/cosmovisor.sh
-
-USER cheqd
-
-ENV DAEMON_HOME=${CHEQD_HOME_DIR}/.cheqdnode
-ENV DAEMON_NAME=cheqd-noded
-ENV DAEMON_ALLOW_DOWNLOAD_BINARIES=true
-ENV DAEMON_RESTART_AFTER_UPGRADE=true
-
-ENTRYPOINT [ "cosmovisor.sh" ]
diff --git a/docker/cosmovisor.sh b/docker/cosmovisor.sh
diff --git a/go.mod b/go.mod
@@ -139,7 +139,7 @@ require (
 )
 
 replace (
-	github.com/cosmos/cosmos-sdk => github.com/cheqd/cosmos-sdk v0.45.4-cheqd-tag
+	github.com/cosmos/cosmos-sdk => github.com/cheqd/cosmos-sdk v0.45.5-cheqd-tag
 
 	// Fix upstream GHSA-h395-qcrw-5vmq vulnerability.
 	github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.7.0

diff --git a/go.sum b/go.sum
@@ -180,8 +180,8 @@ github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL
 github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
 github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M=
-github.com/cheqd/cosmos-sdk v0.45.4-cheqd-tag h1:vQZAlbsqwPkC8DdwRI3TpRJ8ofoqKzAkPvHNzcrx9L0=
-github.com/cheqd/cosmos-sdk v0.45.4-cheqd-tag/go.mod h1:WOqtDxN3eCCmnYLVla10xG7lEXkFjpTaqm2a2WasgCc=
+github.com/cheqd/cosmos-sdk v0.45.5-cheqd-tag h1:Uky4sG2mlbQmEIIaXcpJMKwUQ3BkBJVz2HVjyAWtX0o=
+github.com/cheqd/cosmos-sdk v0.45.5-cheqd-tag/go.mod h1:WOqtDxN3eCCmnYLVla10xG7lEXkFjpTaqm2a2WasgCc=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=