Merge branch 'main' into damian/cian/ibc-consensus-host

cosmos · Apr 3, 2024 · 9b9ea03 · 9b9ea03
2 parents afb3de2 + bb739af
commit 9b9ea03
Show file tree

Hide file tree

Showing 57 changed files with 1,858 additions and 199 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -90,6 +90,14 @@ pull_request_rules:
       backport:
         branches:
           - release/v7.3.x
+  - name: backport patches to v7.4.x branch
+    conditions:
+      - base=main
+      - label=backport-to-v7.4.x
+    actions:
+      backport:
+        branches:
+          - release/v7.4.x
   - name: backport patches to v8.0.x branch
     conditions:
       - base=main

diff --git a/.github/workflows/callbacks.yml b/.github/workflows/callbacks.yml
@@ -48,11 +48,16 @@ jobs:
         run: |
           cd modules/apps/callbacks
           go test -v -mod=readonly ./...
+
+  code-analysis:
+    if: github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]'
+    runs-on: ubuntu-latest
+    steps:
       - name: sonarcloud
         if: ${{ env.GIT_DIFF && !github.event.pull_request.draft && env.SONAR_TOKEN != null }}
         uses: SonarSource/sonarcloud-github-action@v2.1.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         with:
-          projectBaseDir: modules/apps/callbacks/
+          projectBaseDir: modules/apps/callbacks/
diff --git a/.github/workflows/capability.yml b/.github/workflows/capability.yml
@@ -24,7 +24,6 @@ jobs:
           GOARCH=${{ matrix.go-arch }} go build ./...
 
   tests:
-    if: github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -35,11 +34,16 @@ jobs:
         run: |
           cd modules/capability
           go test -v -mod=readonly ./...
+
+  code-analysis:
+    if: github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]'
+    runs-on: ubuntu-latest
+    steps:
       - name: sonarcloud
         if: ${{ env.GIT_DIFF && !github.event.pull_request.draft && env.SONAR_TOKEN != null }}
         uses: SonarSource/sonarcloud-github-action@v2.1.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         with:
-          projectBaseDir: modules/capability/
+          projectBaseDir: modules/capability/
diff --git a/.github/workflows/markdown-lint.yml b/.github/workflows/markdown-lint.yml
@@ -13,7 +13,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - uses: tj-actions/changed-files@v43
+    - uses: tj-actions/changed-files@v44
       id: changed-files
       with:
         files: '**/*.md'

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -109,7 +109,7 @@ jobs:
           name: '${{ github.sha }}-${{ matrix.part }}-coverage'
           path: ./${{ matrix.part }}profile.out
 
-  repo-analysis:
+  code-analysis:
     if: github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]'
     runs-on: ubuntu-latest
     needs: [tests]

diff --git a/.github/workflows/wasm-client.yml b/.github/workflows/wasm-client.yml
@@ -45,7 +45,6 @@ jobs:
           GOARCH=${{ matrix.go-arch }} CGO_ENABLED=1 go build ./...
 
   tests:
-    if: github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -56,6 +55,11 @@ jobs:
         run: |
           cd modules/light-clients/08-wasm
           go test -v -mod=readonly ./...
+
+  code-analysis:
+    if: github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]'
+    runs-on: ubuntu-latest
+    steps:
       - name: sonarcloud
         if: ${{ env.GIT_DIFF && !github.event.pull_request.draft && env.SONAR_TOKEN != null }}
         uses: SonarSource/sonarcloud-github-action@v2.1.1

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -52,6 +52,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Features
 
+* (apps/27-interchain-accounts) [\#5785](https://github.com/cosmos/ibc-go/pull/5785) Introduce a new tx message that ICA host submodule can use to query the chain (only those marked with `module_query_safe`) and write the responses to the acknowledgement.
+
 ### Bug Fixes
 
 ## [v8.1.0](https://github.com/cosmos/ibc-go/releases/tag/v8.1.0) - 2024-01-31

diff --git a/Makefile b/Makefile
@@ -135,6 +135,12 @@ clean:
 
 .PHONY: distclean clean
 
+#? build-docker-wasm: Build wasm simapp with specified tag.
+build-docker-wasm:
+	./scripts/build-wasm-simapp-docker.sh $(tag)
+
+.PHONY: build-docker-wasm
+
 ###############################################################################
 ###                          Tools & Dependencies                           ###
 ###############################################################################
@@ -385,7 +391,6 @@ proto-update-deps:
 
 .PHONY: proto-all proto-gen proto-gen-any proto-swagger-gen proto-format proto-lint proto-check-breaking proto-update-deps
 
-
 #? help: Get more info on make commands
 help: Makefile
 	@echo " Choose a command run in "$(PROJECT_NAME)":"

diff --git a/.../versioned_docs/version-v7.3.x/03-light-clients/03-localhost/03-client-state.md b/.../versioned_docs/version-v7.3.x/03-light-clients/03-localhost/03-client-state.md
@@ -47,7 +47,7 @@ func BeginBlocker(ctx sdk.Context, k keeper.Keeper) {
 }
 ```
 
-The above calls into the the 09-localhost `UpdateState` method of the `ClientState` .
+The above calls into the 09-localhost `UpdateState` method of the `ClientState` .
 It retrieves the current block height from the application context and sets the `LatestHeight` of the 09-localhost client.
 
 ```go

diff --git a/docs/versioned_docs/version-v8.1.x/04-middleware/01-ics29-fee/03-msgs.md b/docs/versioned_docs/version-v8.1.x/04-middleware/01-ics29-fee/03-msgs.md
@@ -35,7 +35,7 @@ type MsgPayPacketFee struct{
 ```
 
 The `Fee` message contained in this synchronous fee payment method configures different fees which will be paid out for `MsgRecvPacket`, `MsgAcknowledgement`, and `MsgTimeout`/`MsgTimeoutOnClose`.
-The amount of fees escrowed in total is the denomwise maxiumum of `RecvFee + AckFee` and `TimeoutFee`. This is because we do not know whether the packet will be successfully received and acknowledged or whether it will timeout.
+The amount of fees escrowed in total is the denomwise maximum of `RecvFee + AckFee` and `TimeoutFee`. This is because we do not know whether the packet will be successfully received and acknowledged or whether it will timeout.
 
 ```go
 type Fee struct {

diff --git a/e2e/tests/interchain_accounts/base_test.go b/e2e/tests/interchain_accounts/base_test.go
@@ -90,7 +90,7 @@ func (s *InterchainAccountsTestSuite) testMsgSendTxSuccessfulTransfer(order chan
 		var err error
 		hostAccount, err = s.QueryInterchainAccount(ctx, chainA, controllerAddress, ibctesting.FirstConnectionID)
 		s.Require().NoError(err)
-		s.Require().NotZero(len(hostAccount))
+		s.Require().NotEmpty(hostAccount)
 
 		channels, err := relayer.GetChannels(ctx, s.GetRelayerExecReporter(), chainA.Config().ChainID)
 		s.Require().NoError(err)
@@ -189,7 +189,7 @@ func (s *InterchainAccountsTestSuite) TestMsgSendTx_FailedTransfer_InsufficientF
 		var err error
 		hostAccount, err = s.QueryInterchainAccount(ctx, chainA, controllerAddress, ibctesting.FirstConnectionID)
 		s.Require().NoError(err)
-		s.Require().NotZero(len(hostAccount))
+		s.Require().NotEmpty(hostAccount)
 
 		channels, err := relayer.GetChannels(ctx, s.GetRelayerExecReporter(), chainA.Config().ChainID)
 		s.Require().NoError(err)
@@ -287,7 +287,7 @@ func (s *InterchainAccountsTestSuite) TestMsgSendTx_SuccessfulTransfer_AfterReop
 		var err error
 		hostAccount, err = s.QueryInterchainAccount(ctx, chainA, controllerAddress, ibctesting.FirstConnectionID)
 		s.Require().NoError(err)
-		s.Require().NotZero(len(hostAccount))
+		s.Require().NotEmpty(hostAccount)
 
 		_, err = s.QueryChannel(ctx, chainA, portID, initialChannelID)
 		s.Require().NoError(err)
@@ -467,7 +467,7 @@ func (s *InterchainAccountsTestSuite) testMsgSendTxSuccessfulGovProposal(order c
 		var err error
 		hostAccount, err = s.QueryInterchainAccount(ctx, chainA, controllerAddress, ibctesting.FirstConnectionID)
 		s.Require().NoError(err)
-		s.Require().NotZero(len(hostAccount))
+		s.Require().NotEmpty(hostAccount)
 
 		channels, err := relayer.GetChannels(ctx, s.GetRelayerExecReporter(), chainA.Config().ChainID)
 		s.Require().NoError(err)

diff --git a/e2e/tests/interchain_accounts/localhost_test.go b/e2e/tests/interchain_accounts/localhost_test.go
@@ -122,7 +122,7 @@ func (s *LocalhostInterchainAccountsTestSuite) TestInterchainAccounts_Localhost(
 	t.Run("verify interchain account registration and deposit funds", func(t *testing.T) {
 		interchainAccAddress, err := s.QueryInterchainAccount(ctx, chainA, userAWallet.FormattedAddress(), exported.LocalhostConnectionID)
 		s.Require().NoError(err)
-		s.Require().NotZero(len(interchainAccAddress))
+		s.Require().NotEmpty(interchainAccAddress)
 
 		walletAmount := ibc.WalletAmount{
 			Address: interchainAccAddress,
@@ -136,7 +136,7 @@ func (s *LocalhostInterchainAccountsTestSuite) TestInterchainAccounts_Localhost(
 	t.Run("send packet localhost interchain accounts", func(t *testing.T) {
 		interchainAccAddress, err := s.QueryInterchainAccount(ctx, chainA, userAWallet.FormattedAddress(), exported.LocalhostConnectionID)
 		s.Require().NoError(err)
-		s.Require().NotZero(len(interchainAccAddress))
+		s.Require().NotEmpty(interchainAccAddress)
 
 		msgSend := &banktypes.MsgSend{
 			FromAddress: interchainAccAddress,
@@ -277,7 +277,7 @@ func (s *LocalhostInterchainAccountsTestSuite) TestInterchainAccounts_ReopenChan
 	t.Run("verify interchain account registration and deposit funds", func(t *testing.T) {
 		interchainAccAddress, err := s.QueryInterchainAccount(ctx, chainA, userAWallet.FormattedAddress(), exported.LocalhostConnectionID)
 		s.Require().NoError(err)
-		s.Require().NotZero(len(interchainAccAddress))
+		s.Require().NotEmpty(interchainAccAddress)
 
 		walletAmount := ibc.WalletAmount{
 			Address: interchainAccAddress,
@@ -291,7 +291,7 @@ func (s *LocalhostInterchainAccountsTestSuite) TestInterchainAccounts_ReopenChan
 	t.Run("send localhost interchain accounts packet with timeout", func(t *testing.T) {
 		interchainAccAddress, err := s.QueryInterchainAccount(ctx, chainA, userAWallet.FormattedAddress(), exported.LocalhostConnectionID)
 		s.Require().NoError(err)
-		s.Require().NotZero(len(interchainAccAddress))
+		s.Require().NotEmpty(interchainAccAddress)
 
 		msgSend := &banktypes.MsgSend{
 			FromAddress: interchainAccAddress,
@@ -407,7 +407,7 @@ func (s *LocalhostInterchainAccountsTestSuite) TestInterchainAccounts_ReopenChan
 	t.Run("verify interchain account and existing balance", func(t *testing.T) {
 		interchainAccAddress, err := s.QueryInterchainAccount(ctx, chainA, userAWallet.FormattedAddress(), exported.LocalhostConnectionID)
 		s.Require().NoError(err)
-		s.Require().NotZero(len(interchainAccAddress))
+		s.Require().NotEmpty(interchainAccAddress)
 
 		balance, err := s.QueryBalance(ctx, chainA, interchainAccAddress, chainADenom)
 		s.Require().NoError(err)
@@ -419,7 +419,7 @@ func (s *LocalhostInterchainAccountsTestSuite) TestInterchainAccounts_ReopenChan
 	t.Run("send packet localhost interchain accounts", func(t *testing.T) {
 		interchainAccAddress, err := s.QueryInterchainAccount(ctx, chainA, userAWallet.FormattedAddress(), exported.LocalhostConnectionID)
 		s.Require().NoError(err)
-		s.Require().NotZero(len(interchainAccAddress))
+		s.Require().NotEmpty(interchainAccAddress)
 
 		msgSend := &banktypes.MsgSend{
 			FromAddress: interchainAccAddress,
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,7 +47,7 @@ func BeginBlocker(ctx sdk.Context, k keeper.Keeper) { @@
     }
     ```
-    The above calls into the the 09-localhost `UpdateState` method of the `ClientState` .
+    The above calls into the 09-localhost `UpdateState` method of the `ClientState` .
     It retrieves the current block height from the application context and sets the `LatestHeight` of the 09-localhost client.
     ```go
@@ Expand Down @@