From 4486dd8229e113d4a8465fc4c42d0e62d88e1775 Mon Sep 17 00:00:00 2001 From: srdtrk Date: Sun, 29 Oct 2023 00:26:25 +0300 Subject: [PATCH 1/7] docs: removed duplicate code snippet --- docs/tutorials/01-fee/04-wire-feeibc-mod.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/docs/tutorials/01-fee/04-wire-feeibc-mod.md b/docs/tutorials/01-fee/04-wire-feeibc-mod.md index 15d427c62bd..0329fecd1a8 100644 --- a/docs/tutorials/01-fee/04-wire-feeibc-mod.md +++ b/docs/tutorials/01-fee/04-wire-feeibc-mod.md @@ -164,14 +164,6 @@ Next, we need to add the fee middleware to the `SetOrderBeginBlockers`, `SetOrde consensusparamtypes.ModuleName, // this line is used by starport scaffolding # stargate/app/endBlockers ) - app.mm.SetOrderEndBlockers( - // ... other modules - vestingtypes.ModuleName, - consensusparamtypes.ModuleName, - // plus-diff-line -+ ibcfeetypes.ModuleName, - // this line is used by starport scaffolding # stargate/app/endBlockers - ) // NOTE: The genutils module must occur after staking so that pools are // properly initialized with tokens from genesis accounts. From 3c259f345679db2f305e290e11ef907a80e070d7 Mon Sep 17 00:00:00 2001 From: srdtrk Date: Sun, 29 Oct 2023 00:29:47 +0300 Subject: [PATCH 2/7] docs: consistent use of yaml vs yml --- docs/tutorials/01-fee/07-test-app.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/tutorials/01-fee/07-test-app.md b/docs/tutorials/01-fee/07-test-app.md index 4738341ee00..f43ed728714 100644 --- a/docs/tutorials/01-fee/07-test-app.md +++ b/docs/tutorials/01-fee/07-test-app.md @@ -27,11 +27,11 @@ You can find the React app we created in the previous section [here](https://git Ignite supports running multiple chains locally with different configs. The source chain will be called earth and the destination chain will be called mars. Add the following config files to the root of the project: -```yaml reference title="earth.yaml" +```yaml reference title="earth.yml" https://github.com/srdtrk/cosmoverse2023-ibc-fee-demo/blob/96cb63bf2e60b4613a89841416066551dd666c0d/earth.yml ``` -```yaml reference title="mars.yaml" +```yaml reference title="mars.yml" https://github.com/srdtrk/cosmoverse2023-ibc-fee-demo/blob/96cb63bf2e60b4613a89841416066551dd666c0d/mars.yml ``` From 35718a6f0805e5bb0ff89c6299dd2ce6ed53f336 Mon Sep 17 00:00:00 2001 From: srdtrk Date: Sun, 29 Oct 2023 00:43:03 +0300 Subject: [PATCH 3/7] docs: using 'auto_register_counterparty_payee' --- docs/tutorials/01-fee/07-test-app.md | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/docs/tutorials/01-fee/07-test-app.md b/docs/tutorials/01-fee/07-test-app.md index f43ed728714..78aadfdc8cd 100644 --- a/docs/tutorials/01-fee/07-test-app.md +++ b/docs/tutorials/01-fee/07-test-app.md @@ -50,7 +50,7 @@ ignite chain serve -c mars.yml --reset-once We first need to create a relayer configuration file. Add the following file to the root of the project: ```toml reference title="hermes/config.toml" -https://github.com/srdtrk/cosmoverse2023-ibc-fee-demo/blob/960d8b7e148cbe2207c3a743bac7c0985a5b653a/hermes/config.toml +https://github.com/srdtrk/cosmoverse2023-ibc-fee-demo/blob/0186b9ee979c288efbe3fe5fd071169d9dbcf91e/hermes/config.toml ``` We can move this file to the `~/.hermes` directory to avoid having to specify the path to the config file every time we run the relayer: @@ -105,15 +105,9 @@ hermes create channel --channel-version '{"fee_version":"ics29-1","app_version": ``` This will create an incentivized IBC transfer channel between the two chains with the channel id `channel-0`, and channel version `{"fee_version":"ics29-1","app_version":"ics20-1"}`. -Next recall that the Fee Middleware only pays fees on the source chain. That's why we should register `damian` and `charlie` as each other's counterparty on both chains. - -```bash title="Terminal 4" -hermes fee register-counterparty-payee --chain mars --channel channel-0 --port transfer --counterparty-payee cosmos1vapwvcsr0m32ptal6z6g9hjctywrw4yzyf6y6v -``` -```bash title="Terminal 4" -hermes fee register-counterparty-payee --chain earth --channel channel-0 --port transfer --counterparty-payee cosmos1uu38gkyed0dte5f9xk20p8wcppulsjt90s7f8h -``` +Next recall that the Fee Middleware only pays fees on the source chain. That's why we should register `damian` and `charlie` as each other's counterparty on both chains. +Luckily, the relayer does this for us under the hood because we've enabled the `auto_register_counterparty_payee` option in the config file. Now we can run the relayer with the following command: From 254149383c45df84baea26aea1ed6d24674372ad Mon Sep 17 00:00:00 2001 From: srdtrk Date: Sun, 29 Oct 2023 00:53:21 +0300 Subject: [PATCH 4/7] docs: added Fee Middleware docs to prereqs --- docs/tutorials/01-fee/01-intro.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/tutorials/01-fee/01-intro.md b/docs/tutorials/01-fee/01-intro.md index cbf092b0013..908c1a30b96 100644 --- a/docs/tutorials/01-fee/01-intro.md +++ b/docs/tutorials/01-fee/01-intro.md @@ -16,10 +16,10 @@ This is a tutorial for wiring up the ICS-29 Fee Middleware to a Cosmos SDK block -- Basic Knowledge of [Go](https://golang.org/doc/tutorial/getting-started) -- Basic Knowledge of [JavaScript](https://developer.mozilla.org/en-US/docs/Web/JavaScript) +- Basic Knowledge of [TypeScript](https://www.typescriptlang.org/) - Basic Knowledge of Cosmos SDK - If you are new to Cosmos SDK, we recommend you to go through the first two categories of the [Developer Portal](https://tutorials.cosmos.network/academy/1-what-is-cosmos/) +- Basic Knowledge of [The Fee Middleware](/main/middleware/ics29-fee/overview) From 149891827e2fb64727034062a865c91a4a9ca327 Mon Sep 17 00:00:00 2001 From: srdtrk Date: Sun, 29 Oct 2023 01:31:06 +0300 Subject: [PATCH 5/7] docs: fixed broken link --- docs/tutorials/01-fee/01-intro.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorials/01-fee/01-intro.md b/docs/tutorials/01-fee/01-intro.md index 908c1a30b96..93b64690ad7 100644 --- a/docs/tutorials/01-fee/01-intro.md +++ b/docs/tutorials/01-fee/01-intro.md @@ -19,7 +19,7 @@ This is a tutorial for wiring up the ICS-29 Fee Middleware to a Cosmos SDK block - Basic Knowledge of [TypeScript](https://www.typescriptlang.org/) - Basic Knowledge of Cosmos SDK - If you are new to Cosmos SDK, we recommend you to go through the first two categories of the [Developer Portal](https://tutorials.cosmos.network/academy/1-what-is-cosmos/) -- Basic Knowledge of [The Fee Middleware](/main/middleware/ics29-fee/overview) +- Basic Knowledge of [The Fee Middleware](https://ibc.cosmos.network/main/middleware/ics29-fee/overview) From 6eabb0b498d8a7f4e494be4a6f33bf5551bc1939 Mon Sep 17 00:00:00 2001 From: srdtrk Date: Mon, 30 Oct 2023 11:19:59 +0300 Subject: [PATCH 6/7] docs: improved fee tutorial --- docs/tutorials/01-fee/02-setup-env.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/tutorials/01-fee/02-setup-env.md b/docs/tutorials/01-fee/02-setup-env.md index 23f9d490361..c6bd1bed75f 100644 --- a/docs/tutorials/01-fee/02-setup-env.md +++ b/docs/tutorials/01-fee/02-setup-env.md @@ -48,7 +48,13 @@ go version ## Hermes -Install Hermes relayer version `v1.6.0` via cargo following the instructions on the [Hermes website](https://hermes.informal.systems/quick-start/installation.html#install-via-cargo). Test if Hermes is installed by running. +Install Hermes relayer version `v1.6.0` via cargo following the instructions on the [Hermes website](https://hermes.informal.systems/quick-start/installation.html#install-via-cargo) or by using the command below. + +```bash +cargo install ibc-relayer-cli --version 1.6.0 --bin hermes --locked +``` + +Test if Hermes is installed by running the following command: ```bash hermes version From 256aa64b535741ed81278b951c9e6532d4a11ab3 Mon Sep 17 00:00:00 2001 From: srdtrk Date: Mon, 30 Oct 2023 13:00:40 +0300 Subject: [PATCH 7/7] imp: review item --- docs/tutorials/01-fee/01-intro.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorials/01-fee/01-intro.md b/docs/tutorials/01-fee/01-intro.md index 93b64690ad7..f3bd825f6a9 100644 --- a/docs/tutorials/01-fee/01-intro.md +++ b/docs/tutorials/01-fee/01-intro.md @@ -19,7 +19,7 @@ This is a tutorial for wiring up the ICS-29 Fee Middleware to a Cosmos SDK block - Basic Knowledge of [TypeScript](https://www.typescriptlang.org/) - Basic Knowledge of Cosmos SDK - If you are new to Cosmos SDK, we recommend you to go through the first two categories of the [Developer Portal](https://tutorials.cosmos.network/academy/1-what-is-cosmos/) -- Basic Knowledge of [The Fee Middleware](https://ibc.cosmos.network/main/middleware/ics29-fee/overview) +- Basic Knowledge of [the Fee Middleware module](https://ibc.cosmos.network/main/middleware/ics29-fee/overview)