Remove 29-fee (#8000)

* rm 29-fee * rm docs * lint * add back test * doc link fix
cosmos · Feb 24, 2025 · 972afc2 · 972afc2
1 parent 9f677ba
commit 972afc2
Show file tree

Hide file tree

Showing 124 changed files with 99 additions and 24,259 deletions.
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/docs/dev/project-structure.md b/docs/dev/project-structure.md
@@ -21,8 +21,7 @@ This folder contains implementations for the IBC TAO (`core`), IBC applications
 
 - `transfer`: This is the Cosmos SDK implementation of the [ICS 20](https://github.com/cosmos/ibc/tree/main/spec/app/ics-020-fungible-token-transfer) protocol, which enables cross-chain fungible token transfers. For more information, read the [module's docs](../docs/02-apps/01-transfer/01-overview.md)
 - `27-interchain-accounts`: This is the Cosmos SDK implementation of the [ICS 27](https://github.com/cosmos/ibc/tree/main/spec/app/ics-027-interchain-accounts) protocol, which enables cross-chain account management built upon IBC. For more information, read the [module's documentation](../docs/02-apps/02-interchain-accounts/01-overview.md).
-- `29-fee`: This is the Cosmos SDK implementation of the [ICS 29](https://github.com/cosmos/ibc/tree/main/spec/app/ics-029-fee-payment) middleware, which handles packet incentivisation and fee distribution on top of any ICS application protocol, enabling fee payment to relayer operators. For more information, read the [module's documentation](../docs/04-middleware/01-ics29-fee/01-overview.md).
-- `callbacks`: This is an implementation of [ADR 008](../architecture/adr-008-app-caller-cbs.md) that allows for secondary applications (e.g. smart contracts, modules) to call into IBC apps as part of their state machine logic and then do some actions on packet lifecycle events. For more information, read the [module's documentation](../docs/04-middleware/02-callbacks/01-overview.md).
+- `callbacks`: This is an implementation of [ADR 008](../architecture/adr-008-app-caller-cbs.md) that allows for secondary applications (e.g. smart contracts, modules) to call into IBC apps as part of their state machine logic and then do some actions on packet lifecycle events. For more information, read the [module's documentation](../docs/04-middleware/01-callbacks/01-overview.md).
 
 ### `light-clients`
 

diff --git a/docs/docs/01-ibc/08-relayer.md b/docs/docs/01-ibc/08-relayer.md
@@ -50,4 +50,4 @@ piece of information needed to relay a packet.
 ## Example Implementations
 
 - [Golang Relayer](https://github.com/cosmos/relayer)
-- [Hermes](https://github.com/informalsystems/ibc-rs/tree/master/crates/relayer)
+- [Hermes](https://github.com/informalsystems/hermes)
diff --git a/docs/docs/02-apps/01-transfer/04-messages.md b/docs/docs/02-apps/01-transfer/04-messages.md
@@ -69,7 +69,7 @@ If the `Amount` is set to the maximum value for a 256-bit unsigned integer (i.e.
 
 The memo field was added to allow applications and users to attach metadata to transfer packets. The field is optional and may be left empty. When it is used to attach metadata for a particular middleware, the memo field should be represented as a json object where different middlewares use different json keys.
 
-For example, the following memo field is used by the [callbacks middleware](../../04-middleware/02-callbacks/01-overview.md) to attach a source callback to a transfer packet:
+For example, the following memo field is used by the [callbacks middleware](../../04-middleware/01-callbacks/01-overview.md) to attach a source callback to a transfer packet:
 
 ```jsonc
 {

diff --git a/docs/docs/02-apps/01-transfer/10-ICS20-v1/04-messages.md b/docs/docs/02-apps/01-transfer/10-ICS20-v1/04-messages.md
@@ -50,7 +50,7 @@ If the `Amount` is set to the maximum value for a 256-bit unsigned integer (i.e.
 
 The memo field was added to allow applications and users to attach metadata to transfer packets. The field is optional and may be left empty. When it is used to attach metadata for a particular middleware, the memo field should be represented as a json object where different middlewares use different json keys.
 
-For example, the following memo field is used by the [callbacks middleware](../../../04-middleware/02-callbacks/01-overview.md) to attach a source callback to a transfer packet:
+For example, the following memo field is used by the [callbacks middleware](../../../04-middleware/01-callbacks/01-overview.md) to attach a source callback to a transfer packet:
 
 ```jsonc
 {

diff --git a/docs/docs/03-light-clients/04-wasm/03-integration.md b/docs/docs/03-light-clients/04-wasm/03-integration.md
@@ -203,7 +203,7 @@ app.WasmKeeper = wasmkeeper.NewKeeper(
   app.BankKeeper,
   app.StakingKeeper,
   distrkeeper.NewQuerier(app.DistrKeeper),
-  app.IBCFeeKeeper, // ISC4 Wrapper: fee IBC middleware
+  app.IBCKeeper.ChannelKeeper,
   app.IBCKeeper.ChannelKeeper,
   &app.IBCKeeper.PortKeeper,
   scopedWasmKeeper,

diff --git a/...04-middleware/02-callbacks/01-overview.md → ...04-middleware/01-callbacks/01-overview.md b/...04-middleware/02-callbacks/01-overview.md → ...04-middleware/01-callbacks/01-overview.md
diff --git a/...middleware/02-callbacks/02-integration.md → ...middleware/01-callbacks/02-integration.md b/...middleware/02-callbacks/02-integration.md → ...middleware/01-callbacks/02-integration.md
diff --git a/...-middleware/02-callbacks/03-interfaces.md → ...-middleware/01-callbacks/03-interfaces.md b/...-middleware/02-callbacks/03-interfaces.md → ...-middleware/01-callbacks/03-interfaces.md
diff --git a/...s/04-middleware/02-callbacks/04-events.md → ...s/04-middleware/01-callbacks/04-events.md b/...s/04-middleware/02-callbacks/04-events.md → ...s/04-middleware/01-callbacks/04-events.md
diff --git a/...4-middleware/02-callbacks/05-end-users.md → ...4-middleware/01-callbacks/05-end-users.md b/...4-middleware/02-callbacks/05-end-users.md → ...4-middleware/01-callbacks/05-end-users.md
diff --git a/...docs/04-middleware/02-callbacks/06-gas.md → ...docs/04-middleware/01-callbacks/06-gas.md b/...docs/04-middleware/02-callbacks/06-gas.md → ...docs/04-middleware/01-callbacks/06-gas.md
diff --git a/...4-middleware/02-callbacks/_category_.json → ...4-middleware/01-callbacks/_category_.json b/...4-middleware/02-callbacks/_category_.json → ...4-middleware/01-callbacks/_category_.json
diff --git a/...ware/02-callbacks/images/callbackflow.svg → ...ware/01-callbacks/images/callbackflow.svg b/...ware/02-callbacks/images/callbackflow.svg → ...ware/01-callbacks/images/callbackflow.svg
diff --git a/...02-callbacks/images/ics4-callbackflow.svg → ...01-callbacks/images/ics4-callbackflow.svg b/...02-callbacks/images/ics4-callbackflow.svg → ...01-callbacks/images/ics4-callbackflow.svg
diff --git a/docs/docs/04-middleware/01-ics29-fee/01-overview.md b/docs/docs/04-middleware/01-ics29-fee/01-overview.md
diff --git a/docs/docs/04-middleware/01-ics29-fee/02-integration.md b/docs/docs/04-middleware/01-ics29-fee/02-integration.md