chore: update 08-wasm release branch (#8044)

* MsgTransfer For Eureka (#7957) (#8001) * initial progress * progress * initial build and existing tests pass * testing * documentation for tests * refactor * fix regression * Update modules/apps/transfer/types/packet.go Co-authored-by: Gjermund Garaba <[email protected]> * remove clientKeeperv2 necessity in code * remove clientkeeperv2 in transfer keeper --------- Co-authored-by: Gjermund Garaba <[email protected]> (cherry picked from commit 9f677ba) Co-authored-by: Aditya <[email protected]> * Remove 29-fee (#8000) (#8002) * rm 29-fee * rm docs * lint * add back test * doc link fix (cherry picked from commit 972afc2) Co-authored-by: Aditya <[email protected]> * feat: add cli commands for client v2 counterparty (#7997) (#8007) * feat: add client counterparty cli commands * chore: make wasm simapp possible to run more than once * add query to cli * lint (cherry picked from commit eeb8b8a) Co-authored-by: Gjermund Garaba <[email protected]> * chore: add deprecated functions for backwards compat (#8005) (#8009) * chore: add back some deprecated functions * Added DenomPathFromHash as deprecated function * fix docstring (cherry picked from commit 7bd0c6d) Co-authored-by: Gjermund Garaba <[email protected]> * chore: add backport mergify tasks (#7989) (#8015) * chore: add backport mergify tasks * add wasm ibc v10 to mergify backports (cherry picked from commit 11488cf) Co-authored-by: Gjermund Garaba <[email protected]> * chore: use ibc v2 name consistently (#8006) (#8017) (cherry picked from commit a71577c) Co-authored-by: Gjermund Garaba <[email protected]> * callbacks: Error on RecvPacket callback execution (#8014) (#8020) * change behavior of recvPacket * fix tests * error on malformed callback data * CHANGELOG --------- Co-authored-by: Gjermund Garaba <[email protected]> (cherry picked from commit c5a36e4) Co-authored-by: Aditya <[email protected]> * chore(deps): bump google.golang.org/protobuf from 1.36.4 to 1.36.5 (#7920) (#8021) * chore(deps): bump google.golang.org/protobuf from 1.36.4 to 1.36.5 Bumps google.golang.org/protobuf from 1.36.4 to 1.36.5. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * tidy --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Gjermund Garaba <[email protected]> (cherry picked from commit af5b171) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump golangci/golangci-lint-action from 6.2.0 to 6.4.1 (#7969) (#8022) Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 6.2.0 to 6.4.1. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](golangci/golangci-lint-action@v6.2.0...v6.4.1) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: srdtrk <[email protected]> (cherry picked from commit 1f11107) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Gjermund Garaba <[email protected]> * chore: remove remnants of ics20-2 (#8016) (#8045) * chore: remove remnants of ics20-2 * rename FungibleTokenPacketDataV2 to make it clear that its an internal type * fix broken link (cherry picked from commit 40f3240) Co-authored-by: Gjermund Garaba <[email protected]> * chore(deps): bump JamesIves/github-pages-deploy-action (#7991) (#8048) Bumps [JamesIves/github-pages-deploy-action](https://github.com/jamesives/github-pages-deploy-action) from 4.7.2 to 4.7.3. - [Release notes](https://github.com/jamesives/github-pages-deploy-action/releases) - [Commits](JamesIves/github-pages-deploy-action@v4.7.2...v4.7.3) --- updated-dependencies: - dependency-name: JamesIves/github-pages-deploy-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 205e6af) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump golangci/golangci-lint-action from 6.4.1 to 6.5.0 (#7983) (#8049) Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 6.4.1 to 6.5.0. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](golangci/golangci-lint-action@v6.4.1...v6.5.0) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Gjermund Garaba <[email protected]> (cherry picked from commit 272c09b) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * feat: remove channel upgradability (#8008) (#8053) * feat: remove channel upgradability * lint * basic migration setup * feat: remove channel upgradeability * fix docs * register v10 migration in app module * error on upgrading channels + code review fixes (cherry picked from commit f7b24e1) Co-authored-by: Gjermund Garaba <[email protected]> --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Aditya <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
cosmos · Feb 26, 2025 · 21dbbab · 21dbbab
1 parent 1f54e4f
commit 21dbbab
Show file tree

Hide file tree

Showing 302 changed files with 16,701 additions and 64,650 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -38,6 +38,14 @@ pull_request_rules:
       backport:
         branches:
           - callbacks/release/v0.2.x+ibc-go-v8.0.x
+  - name: backport patches to v0.3.x callbacks ibc-go v10.0.x branch
+    conditions:
+      - base=main
+      - label=backport-callbacks-to-v0.3.x+ibc-go-v10.0.x
+    actions:
+      backport:
+        branches:
+          - callbacks/release/v0.3.x+ibc-go-v10.0.x
   - name: backport patches to v0.3.x wasm ibc-go v7.4.x & wasmvm 1.5.x branch
     conditions:
       - base=main
@@ -70,6 +78,14 @@ pull_request_rules:
       backport:
         branches:
           - 08-wasm/release/v0.5.x+ibc-go-v8.4.x-wasmvm-v2.1.x
+  - name: backport patches to v0.6.x wasm ibc-go v10.0.x & wasmvm 2.2.x branch
+    conditions:
+      - base=main
+      - label=backport-wasm-v0.6.x+ibc-go-v10.0.x-wasmvm-v2.2.x
+    actions:
+      backport:
+        branches:
+          - 08-wasm/release/v0.6.x+ibc-go-v10.0.x-wasmvm-v2.2.x
   - name: backport patches to v7.4.x branch
     conditions:
       - base=main

diff --git a/.github/workflows/callbacks.yml b/.github/workflows/callbacks.yml
@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: golangci/golangci-lint-action@v6.2.0
+      - uses: golangci/golangci-lint-action@v6.5.0
         with:
           version: v1.62
           only-new-issues: true

diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
@@ -27,7 +27,7 @@ jobs:
         run: make build-docs
 
       - name: Deploy 🚀
-        uses: JamesIves/[email protected].2
+        uses: JamesIves/[email protected].3
         with:
           branch: gh-pages
           folder: docs/build

diff --git a/.github/workflows/e2emodule.yml b/.github/workflows/e2emodule.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: golangci/golangci-lint-action@v6.2.0
+      - uses: golangci/golangci-lint-action@v6.5.0
         with:
           version: v1.62
           only-new-issues: true

diff --git a/.github/workflows/golangci-feature.yml b/.github/workflows/golangci-feature.yml
@@ -27,7 +27,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6.2.0
+        uses: golangci/golangci-lint-action@v6.5.0
         with:
           version: v1.62
           only-new-issues: true

diff --git a/.github/workflows/golangci.yml b/.github/workflows/golangci.yml
@@ -23,7 +23,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6.2.0
+        uses: golangci/golangci-lint-action@v6.5.0
         with:
           version: v1.62
           only-new-issues: true

diff --git a/.github/workflows/wasm-client.yml b/.github/workflows/wasm-client.yml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: golangci/golangci-lint-action@v6.2.0
+      - uses: golangci/golangci-lint-action@v6.5.0
         with:
           version: v1.62
           only-new-issues: true

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -93,6 +93,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### State Machine Breaking
 
 * (light-clients/06-solomachine) [\#6313](https://github.com/cosmos/ibc-go/pull/6313) Fix: No-op to avoid panicking on `UpdateState` for invalid misbehaviour submissions.
+* (apps/callbacks) [\#8014](https://github.com/cosmos/ibc-go/pull/8014) Callbacks will now return an error acknowledgement if the recvPacket callback fails. This reverts all app callback changes whereas before we only reverted the callback changes. We also error on all callbacks if the callback data is set but malformed whereas before we ignored the error and continued processing.
 
 ### Improvements
 

diff --git a/README.md b/README.md
@@ -122,9 +122,7 @@ The following audits have been performed on the `ibc-go` source code:
 
 3. **Middleware**
 
-   3.1 [ICS 29 Fee Middleware](https://github.com/cosmos/ibc-go/tree/main/modules/apps/29-fee)
-
-    3.2 [Callbacks Middleware](https://github.com/cosmos/ibc-go/tree/main/modules/apps/callbacks)
+    3.1 [Callbacks Middleware](https://github.com/cosmos/ibc-go/tree/main/modules/apps/callbacks)
 
 4. **Light Clients**
 

diff --git a/RELEASES.md b/RELEASES.md
@@ -17,7 +17,7 @@ When bumping the dependencies of [Cosmos SDK](https://github.com/cosmos/cosmos-s
 
 [ibc-go](https://github.com/cosmos/ibc-go) and the [IBC protocol specification](https://github.com/cosmos/ibc) maintain different versions. Furthermore, ibc-go serves several different user groups (chains, IBC app developers, relayers, IBC light client developers). Each of these groups has different expectations of what *backwards compatible* means. It simply isn't possible to categorize a change as backwards or non backwards compatible for all user groups. We are primarily interested in when our API breaks and when changes are state machine breaking (thus requiring a coordinated upgrade). This is scoping the meaning of ibc-go to that of those interacting with the code (IBC app developers, relayers, IBC light client developers), not chains using IBC to communicate (that should be encapsulated by the IBC protocol specification versioning).
 
-To summarize: **All our ibc-go releases allow chains to communicate successfully with any chain running any version of our code**. That is to say, we are still using IBC protocol specification v1.0 (v10 will also include support for the IBC protocol specification v2.0 - also called IBC Eureka)
+To summarize: **All our ibc-go releases allow chains to communicate successfully with any chain running any version of our code**. That is to say, we are still using IBC protocol specification v1.0 (v10 will also include support for the IBC protocol specification v2.0)
 
 ## Release cycle
 
@@ -81,8 +81,8 @@ We reserve the right to drop support for releases if they are deemed unused (for
 
 |Release|End of Life Date|
 |-------|----------------|
-|`v0.1.x+ibc-go-v7.3.x`|March 17, 2025|
-|`v0.1.x+ibc-go-v8.0.x`|May 10, 2025|
+|`v0.2.x+ibc-go-v7.3.x`|March 17, 2025|
+|`v0.2.x+ibc-go-v8.0.x`|May 10, 2025|
 
 ### `08-wasm` light client proxy module
 
@@ -138,7 +138,7 @@ Versions of Golang, ibc-go, Cosmos SDK and CometBFT used by callbacks middleware
 
 | Go | callbacks | ibc-go | Cosmos SDK | Tendermint/CometBFT |
 |----|-----------|--------|------------|---------------------|
-| 1.19 | v0.1.0+ibc-go-v7.3 | v7.3.0 | v0.47.4 | v0.37.2 |
+| 1.19 | v0.2.0+ibc-go-v7.3 | v7.3.0 | v0.47.5 | v0.37.2 |
 | 1.21 | v0.2.0+ibc-go-v8.0 | v8.0.0 | v0.50.1 | v0.38.0 |
 
 ### `08-wasm` light client proxy module

diff --git a/docs/architecture/adr-008-app-caller-cbs.md b/docs/architecture/adr-008-app-caller-cbs.md
@@ -5,6 +5,7 @@
 - 2022-08-10: Initial Draft
 - 2023-03-22: Merged
 - 2023-09-13: Updated with decisions made in implementation
+- 2025-02-24: RecvPacket callback error now returns error acknowledgement
 
 ## Status
 
@@ -245,10 +246,12 @@ type ContractKeeper interface {
 		version string,
 	) error
 	// IBCReceivePacketCallback is called in the destination chain when a packet acknowledgement is written.
-	// The contract is expected to handle the callback within the user defined gas limit, and handle any errors,
-	// out of gas, or panics gracefully.
-	// This entry point is called with a cached context. If an error is returned, then the changes in
-	// this context will not be persisted, but the packet lifecycle will not be blocked.
+	// The contract is expected to handle the callback within the user defined gas limit.
+	// This entry point is called with a cached context. If an error is returned, then the error
+	// will be written as an error acknowledgement. This will cause the context changes made by the contract
+	// to be reverted along with any state changes made by the underlying application.
+	// The error acknowledgement will then be relayed to the sending application which can perform
+	// its error acknowledgement logic (e.g. refunding tokens back to user)
 	//
 	// The version provided is the base application version for the given packet send. This allows
 	// contracts to determine how to unmarshal the packetData.
@@ -397,6 +400,9 @@ func (im IBCMiddleware) OnRecvPacket(
 		ctx, packet.GetDestPort(), packet.GetDestChannel(), packet.GetSequence(),
 		types.CallbackTypeReceivePacket, callbackData, err,
 	)
+	if err != nil {
+		return channeltypes.NewErrorAcknowledgement(err)
+	}
 
 	return ack
 }

diff --git a/docs/client/config.json b/docs/client/config.json
@@ -30,14 +30,6 @@
         }
       }
     },
-    {
-      "url": "./tmp-swagger-gen/ibc/applications/fee/v1/query.swagger.json",
-      "operationIds": {
-        "rename": {
-          "Params": "FeeParams"
-        }
-      }
-    },
     {
       "url": "./tmp-swagger-gen/ibc/core/client/v1/query.swagger.json",
       "operationIds": {