deps: update to cosmos-sdk v0.47 (#2672)

cosmos · Jan 13, 2023 · e650be9 · e650be9
1 parent b8e05d3
commit e650be9
Show file tree

Hide file tree

Showing 123 changed files with 1,328 additions and 1,854 deletions.
diff --git a/.github/workflows/e2e-compatibility-workflow-call.yaml b/.github/workflows/e2e-compatibility-workflow-call.yaml
@@ -6,11 +6,10 @@ on:
         required: true
         type: string
       test-suite:
-        description: 'Test suite to run'
+        description: "Test suite to run"
         required: true
         type: string
 
-
 jobs:
   load-test-matrix:
     outputs:
@@ -43,7 +42,7 @@ jobs:
           repository: cosmos/ibc-go
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.19
       - name: Run e2e Test
         run: |
           cd e2e

diff --git a/.github/workflows/e2e-fork.yml b/.github/workflows/e2e-fork.yml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.19
       - id: set-matrix
         run: echo "matrix=$(go run cmd/build_test_matrix/main.go)" >> $GITHUB_OUTPUT
         env:
@@ -44,7 +44,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.19
       - name: Run e2e Test
         run: |
           cd e2e

diff --git a/.github/workflows/e2e-test-workflow-call.yml b/.github/workflows/e2e-test-workflow-call.yml
@@ -2,38 +2,38 @@ on:
   workflow_call:
     inputs:
       test-entry-point:
-        description: 'Test entry point'
+        description: "Test entry point"
         required: false
         type: string
         default: "" # empty string means run all tests
       test-exclusions:
-        description: 'Comma separated list of tests to skip'
+        description: "Comma separated list of tests to skip"
         required: false
         type: string
         default: "" # empty string means don't skip any test.
       chain-image:
-        description: 'The image to use for chains'
+        description: "The image to use for chains"
         required: true
         type: string
         default: "ghcr.io/cosmos/ibc-go-simd"
       chain-a-tag:
-        description: 'The tag to use for chain A'
+        description: "The tag to use for chain A"
         required: true
         type: string
         default: main
       chain-b-tag:
         default: v4.0.0
-        description: 'The tag to use for chain B'
+        description: "The tag to use for chain B"
         required: true
         type: string
       chain-binary:
         default: "simd"
-        description: 'The chain binary'
+        description: "The chain binary"
         required: false
         type: string
       relayer-tag:
-        description: 'The tag to use for the relayer'
-        required: false 
+        description: "The tag to use for the relayer"
+        required: false
         default: "v2.1.2"
         type: string
       build-and-push-docker-image:
@@ -42,7 +42,6 @@ on:
         type: boolean
         default: false
 
-
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ibc-go-simd
@@ -100,7 +99,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.19
       - id: set-matrix
         run: echo "matrix=$(go run cmd/build_test_matrix/main.go)" >> $GITHUB_OUTPUT
         env:
@@ -125,7 +124,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.19
       - name: Run e2e Test
         run: |
           cd e2e

diff --git a/.github/workflows/e2e-upgrade.yaml b/.github/workflows/e2e-upgrade.yaml
@@ -29,7 +29,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.19
       - name: Run e2e upgrade test
         run: |
           cd e2e

diff --git a/.github/workflows/golangci.yml b/.github/workflows/golangci.yml
@@ -17,10 +17,10 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.19
       - uses: actions/checkout@v3
       - name: golangci-lint
         uses: golangci/[email protected]
         with:
           version: latest
-          args: --timeout 5m
+          args: --timeout 5m
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -21,7 +21,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.19
       - name: Display go version
         run: go version
       - name: install tparse
@@ -41,7 +41,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.19
       - uses: technote-space/[email protected]
         id: git_diff
         with:
@@ -97,7 +97,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.19
       - uses: technote-space/[email protected]
         with:
           PATTERNS: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.18 as builder
+FROM golang:1.19 as builder
 
 ENV GOPATH=""
 ENV GOMODULE="on"

diff --git a/Makefile b/Makefile
@@ -13,7 +13,6 @@ SIMAPP = ./testing/simapp
 MOCKS_DIR = $(CURDIR)/tests/mocks
 HTTPS_GIT := https://github.com/cosmos/ibc-go.git
 DOCKER := $(shell which docker)
-DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf:1.9.0
 PROJECT_NAME = $(shell git remote get-url origin | xargs basename -s .git)
 
 export GO111MODULE = on
@@ -307,37 +306,31 @@ format:
 ###                                Protobuf                                 ###
 ###############################################################################
 
-protoVer=v0.7
-protoImageName=tendermintdev/sdk-proto-gen:$(protoVer)
-containerProtoGen=$(PROJECT_NAME)-proto-gen-$(protoVer)
-containerProtoGenSwagger=$(PROJECT_NAME)-proto-gen-swagger-$(protoVer)
-containerProtoFmt=$(PROJECT_NAME)-proto-fmt-$(protoVer)
+protoVer=0.11.2
+protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
+protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)
 
 proto-all: proto-format proto-lint proto-gen
 
-proto-format:
-	@echo "Formatting Protobuf files"
-	@if docker ps -a --format '{{.Names}}' | grep -Eq "^${containerProtoFmt}$$"; then docker start -a $(containerProtoFmt); else docker run --name $(containerProtoFmt) -v $(CURDIR):/workspace --workdir /workspace $(protoImageName) \
-		find ./ -name "*.proto" -exec clang-format -i {} \; ; fi
-
-proto-lint:
-	@$(DOCKER_BUF) lint --error-format=json
-
 proto-gen:
 	@echo "Generating Protobuf files"
-	@if docker ps -a --format '{{.Names}}' | grep -Eq "^${containerProtoGen}$$"; then docker start -a $(containerProtoGen); else docker run --name $(containerProtoGen) -v $(CURDIR):/workspace --workdir /workspace $(protoImageName) \
-		sh ./scripts/protocgen.sh; fi
+	@$(protoImage) sh ./scripts/protocgen.sh
 
 proto-swagger-gen:
 	@echo "Generating Protobuf Swagger"
-	@if docker ps -a --format '{{.Names}}' | grep -Eq "^${containerProtoGenSwagger}$$"; then docker start -a $(containerProtoGenSwagger); else docker run --name $(containerProtoGenSwagger) -v $(CURDIR):/workspace --workdir /workspace $(protoImageName) \
-		sh ./scripts/protoc-swagger-gen.sh; fi
+	@$(protoImage) sh ./scripts/protoc-swagger-gen.sh
+
+proto-format:
+	@$(protoImage) find ./ -name "*.proto" -exec clang-format -i {} \;
+
+proto-lint:
+	@$(protoImage) buf lint --error-format=json
 
 proto-check-breaking:
-	@$(DOCKER_BUF) breaking --against $(HTTPS_GIT)#branch=main
+	@$(protoImage) buf breaking --against $(HTTPS_GIT)#branch=main
 
 proto-update-deps:
 	@echo "Updating Protobuf dependencies"
-	@cd proto && buf mod update
+	$(DOCKER) run --rm -v $(CURDIR)/proto:/workspace --workdir /workspace $(protoImageName) buf mod update
 
 .PHONY: proto-all proto-gen proto-gen-any proto-swagger-gen proto-format proto-lint proto-check-breaking proto-update-deps
diff --git a/buf.work.yaml b/buf.work.yaml
@@ -5,4 +5,4 @@
 # previous "buf.yaml" configuration.
 version: v1
 directories:
-  - proto
+  - proto
diff --git a/docs/ibc/overview.md b/docs/ibc/overview.md
@@ -134,7 +134,7 @@ Proofs are passed from core IBC to light-clients as bytes. It is up to light cli
 
 - The paths that all IBC implementations must use for committing IBC messages is defined in
 [ICS-24 Host State Machine Requirements](https://github.com/cosmos/ics/tree/master/spec/core/ics-024-host-requirements). 
-- The proof format that all implementations must be able to produce and verify is defined in [ICS-23 Proofs](https://github.com/confio/ics23) implementation.
+- The proof format that all implementations must be able to produce and verify is defined in [ICS-23 Proofs](https://github.com/cosmos/ics23) implementation.
 
 ### [Capabilities](https://github.com/cosmos/cosmos-sdk/blob/main/docs/docs/core/10-ocap.md)