Skip to content

Commit 345091c

Browse files
authored
Merge pull request #3 from dudong2/dudong2/feat/[email protected]
feat: bump up cosmos/ibc-go v3.3.1
2 parents c366ca9 + 0c18b52 commit 345091c

File tree

181 files changed

+5119
-1116
lines changed

Some content is hidden

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

181 files changed

+5119
-1116
lines changed

.github/workflows/codeql-analysis.yml

+81
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL"
13+
14+
on:
15+
push:
16+
branches: [ main ]
17+
pull_request:
18+
# The branches below must be a subset of the branches above
19+
branches: [ main ]
20+
schedule:
21+
- cron: '37 21 * * 4'
22+
23+
jobs:
24+
analyze:
25+
name: Analyze
26+
runs-on: ubuntu-latest
27+
permissions:
28+
actions: read
29+
contents: read
30+
security-events: write
31+
32+
strategy:
33+
fail-fast: false
34+
matrix:
35+
language: [ 'go' ]
36+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
37+
# Learn more:
38+
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
39+
40+
steps:
41+
- name: Checkout repository
42+
uses: actions/checkout@v3
43+
- uses: technote-space/[email protected]
44+
with:
45+
PATTERNS: |
46+
**/**.go
47+
go.mod
48+
go.sum
49+
50+
# Initializes the CodeQL tools for scanning.
51+
- name: Initialize CodeQL
52+
uses: github/codeql-action/init@v2
53+
with:
54+
languages: ${{ matrix.language }}
55+
# If you wish to specify custom queries, you can do so here or in a config file.
56+
# By default, queries listed here will override any specified in a config file.
57+
# Prefix the list here with "+" to use these queries and those in the config file.
58+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
59+
queries: crypto-com/cosmos-sdk-codeql@main,security-and-quality
60+
if: env.GIT_DIFF
61+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
62+
# If this step fails, then you should remove it and run the build manually (see below)
63+
64+
- name: Autobuild
65+
uses: github/codeql-action/autobuild@v2
66+
if: env.GIT_DIFF
67+
68+
# ℹ️ Command-line programs to run using the OS shell.
69+
# 📚 https://git.io/JvXDl
70+
71+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
72+
# and modify them (or add more) to build your code if your project
73+
# uses a compiled language
74+
75+
#- run: |
76+
# make bootstrap
77+
# make release
78+
79+
- name: Perform CodeQL Analysis
80+
uses: github/codeql-action/analyze@v2
81+
if: env.GIT_DIFF

.github/workflows/release.yml

+27-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@ name: Release
33
on:
44
push:
55
tags:
6-
- 'v[0-9]+.[0-9]+.[0-9]+-?[a-z0-9]*' # Push events to matching v*, i.e. v1.0.0, v20.15.10, v3.0.0-alpha1
6+
- 'v[0-9]+.[0-9]+.[0-9]+' # Push events to matching v*, i.e. v1.0.0, v20.15.10
7+
- 'v[0-9]+.[0-9]+.[0-9]+-?[a-z0-9]+' # Push events to matching v*-[alpha/beta/rc], i.e. v3.0.0-alpha1, v3.0.0-beta1, v3.0.0-rc0
8+
9+
env:
10+
REGISTRY: ghcr.io
11+
IMAGE_NAME: ibc-go-simd
712

813
jobs:
914
goreleaser:
@@ -26,3 +31,24 @@ jobs:
2631
args: release --rm-dist
2732
env:
2833
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
34+
35+
- name: Log in to the Container registry
36+
uses: docker/login-action@49ed152c8eca782a232dede0303416e8f356c37b
37+
with:
38+
registry: ${{ env.REGISTRY }}
39+
username: ${{ github.actor }}
40+
password: ${{ secrets.GITHUB_TOKEN }}
41+
42+
- name: Extract metadata (tags, labels) for Docker
43+
id: meta
44+
uses: docker/metadata-action@69f6fc9d46f2f8bf0d5491e4aabe0bb8c6a4678a
45+
with:
46+
images: ${{ env.REGISTRY }}/line/${{ env.IMAGE_NAME }}
47+
48+
- name: Build and push Docker image
49+
uses: docker/build-push-action@1cb9d22b932e4832bb29793b7777ec860fc1cde0
50+
with:
51+
context: .
52+
push: false
53+
tags: ${{ steps.meta.outputs.tags }}
54+
labels: ${{ steps.meta.outputs.labels }}

.github/workflows/test.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
run: go version
2626
- name: install tparse
2727
run: |
28-
export GO111MODULE="on" && go install github.com/mfridman/[email protected]
29-
- uses: actions/cache@v2.1.7
28+
go install github.com/mfridman/[email protected]
29+
- uses: actions/cache@v3
3030
with:
3131
path: ~/go/bin
3232
key: ${{ runner.os }}-go-tparse-binary
@@ -98,7 +98,7 @@ jobs:
9898
- uses: actions/[email protected]
9999
with:
100100
go-version: 1.18
101-
- uses: technote-space/get-diff-action@v6.0.1
101+
- uses: technote-space/get-diff-action@v6.1.0
102102
with:
103103
PATTERNS: |
104104
**/**.go

.goreleaser.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ checksum:
2424

2525
release:
2626
mode: keep-existing
27+
prerelease: auto
2728

2829
archives:
2930
- name_template: "{{ .ProjectName }}_simd_v{{ .Version }}_{{ .Os }}_{{ .Arch }}"
@@ -32,4 +33,4 @@ archives:
3233
- README.md
3334
- RELEASES.md
3435
- SECURITY.md
35-
- CHANGELOG.md
36+
- CHANGELOG.md

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
### Improvements
66
* [\#1](https://github.com/line/ibc-go/pull/1) apply all changes of `x/ibc` in lbm-sdk until [lbm-sdk@0fbc2fcae6dba90fa80b815cf3219d6fcf46fc64](https://github.com/line/lbm-sdk/tree/0fbc2fcae6dba90fa80b815cf3219d6fcf46fc64)
7+
* [\#3](https://github.com/line/ibc-go/pull/3) bump up github.com/cosmos/ibc-go from v3.0.0 to v3.3.1
78

89
### Bug Fixes
910

Dockerfile

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
FROM golang:1.18 as builder
2+
3+
ENV GOPATH=""
4+
ENV GOMODULE="on"
5+
6+
COPY go.mod .
7+
COPY go.sum .
8+
9+
RUN go mod download
10+
11+
ADD testing testing
12+
ADD modules modules
13+
ADD LICENSE LICENSE
14+
15+
COPY Makefile .
16+
17+
RUN make build
18+
19+
FROM ubuntu:20.04
20+
21+
COPY --from=builder /go/build/simd /bin/simd
22+
23+
ENTRYPOINT ["simd"]

Makefile

+2-4
Original file line numberDiff line numberDiff line change
@@ -335,10 +335,8 @@ lint-fix:
335335
golangci-lint run --fix --out-format=tab --issues-exit-code=0
336336
.PHONY: lint lint-fix
337337

338-
format:
339-
find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/docs/statik/statik.go" -not -path "./tests/mocks/*" -not -name '*.pb.go' | xargs gofmt -w -s
340-
find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/docs/statik/statik.go" -not -path "./tests/mocks/*" -not -name '*.pb.go' | xargs misspell -w
341-
find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/docs/statik/statik.go" -not -path "./tests/mocks/*" -not -name '*.pb.go' | xargs goimports -w -local github.com/line/lbm-sdk
338+
format:
339+
find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/docs/statik/statik.go" -not -path "./tests/mocks/*" -not -name '*.pb.go' -not -name '*.pb.gw.go' | xargs gofumpt -w
342340
.PHONY: format
343341

344342
###############################################################################

docs/.vuepress/config.js

+39-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ module.exports = {
2020
themeConfig: {
2121
repo: "cosmos/ibc-go",
2222
docsRepo: "cosmos/ibc-go",
23+
docsBranch: "main",
2324
docsDir: "docs",
2425
editLinks: true,
2526
label: "ibc",
@@ -42,10 +43,42 @@ module.exports = {
4243
"label": "v1.2.0",
4344
"key": "v1.2.0"
4445
},
46+
{
47+
"label": "v1.3.0",
48+
"key": "v1.3.0"
49+
},
50+
{
51+
"label": "v1.4.0",
52+
"key": "v1.4.0"
53+
},
54+
{
55+
"label": "v1.5.0",
56+
"key": "v1.5.0"
57+
},
4558
{
4659
"label": "v2.0.0",
4760
"key": "v2.0.0"
48-
}
61+
} ,
62+
{
63+
"label": "v2.1.0",
64+
"key": "v2.1.0"
65+
},
66+
{
67+
"label": "v2.2.0",
68+
"key": "v2.2.0"
69+
},
70+
{
71+
"label": "v2.3.0",
72+
"key": "v2.3.0"
73+
},
74+
{
75+
"label": "v3.0.0",
76+
"key": "v3.0.0"
77+
},
78+
{
79+
"label": "v3.1.0",
80+
"key": "v3.1.0"
81+
}
4982
],
5083
topbar: {
5184
banner: true
@@ -148,6 +181,11 @@ module.exports = {
148181
{
149182
title: "Migrations",
150183
children: [
184+
{
185+
title: "Support transfer of coins whose base denom contains slashes",
186+
directory: false,
187+
path: "/migrations/support-denoms-with-slashes.html"
188+
},
151189
{
152190
title: "SDK v0.43 to IBC-Go v1",
153191
directory: false,

docs/DOCS_README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ We are using [Algolia](https://www.algolia.com) to power full-text search. This
9696
## Consistency
9797

9898
Because the build processes are identical (as is the information contained herein), this file should be kept in sync as
99-
much as possible with its [counterpart in the Cosmos SDK repo](https://github.com/cosmos/cosmos-sdk/tree/master/docs/DOCS_README.md).
99+
much as possible with its [counterpart in the Cosmos SDK repo](https://github.com/cosmos/cosmos-sdk/blob/main/docs/README.md).
100100

101101
### Update and Build the RPC docs
102102

docs/apps/interchain-accounts/integration.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ app.ICAControllerKeeper = icacontrollerkeeper.NewKeeper(
7676
appCodec, keys[icacontrollertypes.StoreKey], app.GetSubspace(icacontrollertypes.SubModuleName),
7777
app.IBCKeeper.ChannelKeeper, // may be replaced with middleware such as ics29 fee
7878
app.IBCKeeper.ChannelKeeper, &app.IBCKeeper.PortKeeper,
79-
app.AccountKeeper, scopedICAControllerKeeper, app.MsgServiceRouter(),
79+
scopedICAControllerKeeper, app.MsgServiceRouter(),
8080
)
8181
app.ICAHostKeeper = icahostkeeper.NewKeeper(
8282
appCodec, keys[icahosttypes.StoreKey], app.GetSubspace(icahosttypes.SubModuleName),
@@ -122,6 +122,13 @@ app.mm.SetOrderInitGenesis(
122122
icatypes.ModuleName,
123123
...
124124
)
125+
126+
// initParamsKeeper init params keeper and its subspaces
127+
func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino, key, tkey sdk.StoreKey) paramskeeper.Keeper {
128+
...
129+
paramsKeeper.Subspace(icahosttypes.SubModuleName)
130+
paramsKeeper.Subspace(icacontrollertypes.SubModuleName)
131+
...
125132
```
126133
127134
### Using submodules exclusively

docs/apps/interchain-accounts/parameters.md

+8
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,12 @@ For example, a Cosmos SDK based chain that elects to provide hosted Interchain A
4747
"host_enabled": true,
4848
"allow_messages": ["/cosmos.staking.v1beta1.MsgDelegate", "/cosmos.gov.v1beta1.MsgVote"]
4949
}
50+
```
51+
There is also a special wildcard `"*"` message type which allows any type of message to be executed by the interchain account. This must be the only message in the `allow_messages` array.
52+
53+
```
54+
"params": {
55+
"host_enabled": true,
56+
"allow_messages": ["*"]
57+
}
5058
```

0 commit comments

Comments
 (0)