Skip to content

Commit e650be9

Browse files
authored
deps: update to cosmos-sdk v0.47 (cosmos#2672)
1 parent b8e05d3 commit e650be9

File tree

123 files changed

+1328
-1854
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+1328
-1854
lines changed

.github/workflows/e2e-compatibility-workflow-call.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@ on:
66
required: true
77
type: string
88
test-suite:
9-
description: 'Test suite to run'
9+
description: "Test suite to run"
1010
required: true
1111
type: string
1212

13-
1413
jobs:
1514
load-test-matrix:
1615
outputs:
@@ -43,7 +42,7 @@ jobs:
4342
repository: cosmos/ibc-go
4443
- uses: actions/setup-go@v3
4544
with:
46-
go-version: 1.18
45+
go-version: 1.19
4746
- name: Run e2e Test
4847
run: |
4948
cd e2e

.github/workflows/e2e-fork.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- uses: actions/checkout@v3
2121
- uses: actions/setup-go@v3
2222
with:
23-
go-version: 1.18
23+
go-version: 1.19
2424
- id: set-matrix
2525
run: echo "matrix=$(go run cmd/build_test_matrix/main.go)" >> $GITHUB_OUTPUT
2626
env:
@@ -44,7 +44,7 @@ jobs:
4444
- name: Setup Go
4545
uses: actions/setup-go@v3
4646
with:
47-
go-version: 1.18
47+
go-version: 1.19
4848
- name: Run e2e Test
4949
run: |
5050
cd e2e

.github/workflows/e2e-test-workflow-call.yml

+10-11
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,38 @@ on:
22
workflow_call:
33
inputs:
44
test-entry-point:
5-
description: 'Test entry point'
5+
description: "Test entry point"
66
required: false
77
type: string
88
default: "" # empty string means run all tests
99
test-exclusions:
10-
description: 'Comma separated list of tests to skip'
10+
description: "Comma separated list of tests to skip"
1111
required: false
1212
type: string
1313
default: "" # empty string means don't skip any test.
1414
chain-image:
15-
description: 'The image to use for chains'
15+
description: "The image to use for chains"
1616
required: true
1717
type: string
1818
default: "ghcr.io/cosmos/ibc-go-simd"
1919
chain-a-tag:
20-
description: 'The tag to use for chain A'
20+
description: "The tag to use for chain A"
2121
required: true
2222
type: string
2323
default: main
2424
chain-b-tag:
2525
default: v4.0.0
26-
description: 'The tag to use for chain B'
26+
description: "The tag to use for chain B"
2727
required: true
2828
type: string
2929
chain-binary:
3030
default: "simd"
31-
description: 'The chain binary'
31+
description: "The chain binary"
3232
required: false
3333
type: string
3434
relayer-tag:
35-
description: 'The tag to use for the relayer'
36-
required: false
35+
description: "The tag to use for the relayer"
36+
required: false
3737
default: "v2.1.2"
3838
type: string
3939
build-and-push-docker-image:
@@ -42,7 +42,6 @@ on:
4242
type: boolean
4343
default: false
4444

45-
4645
env:
4746
REGISTRY: ghcr.io
4847
IMAGE_NAME: ibc-go-simd
@@ -100,7 +99,7 @@ jobs:
10099
- uses: actions/checkout@v3
101100
- uses: actions/setup-go@v3
102101
with:
103-
go-version: 1.18
102+
go-version: 1.19
104103
- id: set-matrix
105104
run: echo "matrix=$(go run cmd/build_test_matrix/main.go)" >> $GITHUB_OUTPUT
106105
env:
@@ -125,7 +124,7 @@ jobs:
125124
- uses: actions/checkout@v3
126125
- uses: actions/setup-go@v3
127126
with:
128-
go-version: 1.18
127+
go-version: 1.19
129128
- name: Run e2e Test
130129
run: |
131130
cd e2e

.github/workflows/e2e-upgrade.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- uses: actions/checkout@v3
3030
- uses: actions/setup-go@v3
3131
with:
32-
go-version: 1.18
32+
go-version: 1.19
3333
- name: Run e2e upgrade test
3434
run: |
3535
cd e2e

.github/workflows/golangci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
steps:
1818
- uses: actions/setup-go@v3
1919
with:
20-
go-version: 1.18
20+
go-version: 1.19
2121
- uses: actions/checkout@v3
2222
- name: golangci-lint
2323
uses: golangci/[email protected]
2424
with:
2525
version: latest
26-
args: --timeout 5m
26+
args: --timeout 5m

.github/workflows/test.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
steps:
2222
- uses: actions/setup-go@v3
2323
with:
24-
go-version: 1.18
24+
go-version: 1.19
2525
- name: Display go version
2626
run: go version
2727
- name: install tparse
@@ -41,7 +41,7 @@ jobs:
4141
- uses: actions/checkout@v3
4242
- uses: actions/setup-go@v3
4343
with:
44-
go-version: 1.18
44+
go-version: 1.19
4545
- uses: technote-space/[email protected]
4646
id: git_diff
4747
with:
@@ -97,7 +97,7 @@ jobs:
9797
- uses: actions/checkout@v3
9898
- uses: actions/setup-go@v3
9999
with:
100-
go-version: 1.18
100+
go-version: 1.19
101101
- uses: technote-space/[email protected]
102102
with:
103103
PATTERNS: |

CHANGELOG.md

+23-23
Large diffs are not rendered by default.

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.18 as builder
1+
FROM golang:1.19 as builder
22

33
ENV GOPATH=""
44
ENV GOMODULE="on"

Makefile

+13-20
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ SIMAPP = ./testing/simapp
1313
MOCKS_DIR = $(CURDIR)/tests/mocks
1414
HTTPS_GIT := https://github.com/cosmos/ibc-go.git
1515
DOCKER := $(shell which docker)
16-
DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf:1.9.0
1716
PROJECT_NAME = $(shell git remote get-url origin | xargs basename -s .git)
1817

1918
export GO111MODULE = on
@@ -307,37 +306,31 @@ format:
307306
### Protobuf ###
308307
###############################################################################
309308

310-
protoVer=v0.7
311-
protoImageName=tendermintdev/sdk-proto-gen:$(protoVer)
312-
containerProtoGen=$(PROJECT_NAME)-proto-gen-$(protoVer)
313-
containerProtoGenSwagger=$(PROJECT_NAME)-proto-gen-swagger-$(protoVer)
314-
containerProtoFmt=$(PROJECT_NAME)-proto-fmt-$(protoVer)
309+
protoVer=0.11.2
310+
protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
311+
protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)
315312

316313
proto-all: proto-format proto-lint proto-gen
317314

318-
proto-format:
319-
@echo "Formatting Protobuf files"
320-
@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) \
321-
find ./ -name "*.proto" -exec clang-format -i {} \; ; fi
322-
323-
proto-lint:
324-
@$(DOCKER_BUF) lint --error-format=json
325-
326315
proto-gen:
327316
@echo "Generating Protobuf files"
328-
@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) \
329-
sh ./scripts/protocgen.sh; fi
317+
@$(protoImage) sh ./scripts/protocgen.sh
330318

331319
proto-swagger-gen:
332320
@echo "Generating Protobuf Swagger"
333-
@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) \
334-
sh ./scripts/protoc-swagger-gen.sh; fi
321+
@$(protoImage) sh ./scripts/protoc-swagger-gen.sh
322+
323+
proto-format:
324+
@$(protoImage) find ./ -name "*.proto" -exec clang-format -i {} \;
325+
326+
proto-lint:
327+
@$(protoImage) buf lint --error-format=json
335328

336329
proto-check-breaking:
337-
@$(DOCKER_BUF) breaking --against $(HTTPS_GIT)#branch=main
330+
@$(protoImage) buf breaking --against $(HTTPS_GIT)#branch=main
338331

339332
proto-update-deps:
340333
@echo "Updating Protobuf dependencies"
341-
@cd proto && buf mod update
334+
$(DOCKER) run --rm -v $(CURDIR)/proto:/workspace --workdir /workspace $(protoImageName) buf mod update
342335

343336
.PHONY: proto-all proto-gen proto-gen-any proto-swagger-gen proto-format proto-lint proto-check-breaking proto-update-deps

buf.work.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# previous "buf.yaml" configuration.
66
version: v1
77
directories:
8-
- proto
8+
- proto

docs/ibc/overview.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ Proofs are passed from core IBC to light-clients as bytes. It is up to light cli
134134

135135
- The paths that all IBC implementations must use for committing IBC messages is defined in
136136
[ICS-24 Host State Machine Requirements](https://github.com/cosmos/ics/tree/master/spec/core/ics-024-host-requirements).
137-
- 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.
137+
- 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.
138138

139139
### [Capabilities](https://github.com/cosmos/cosmos-sdk/blob/main/docs/docs/core/10-ocap.md)
140140

0 commit comments

Comments
 (0)