Merge branch 'main' into carlos/886-remove-portchannel-capability-aut…

…hentication-from-ics-026-routed-handlers
cosmos · Aug 9, 2024 · ca3214f · ca3214f
2 parents c238bb5 + 2003a86
commit ca3214f
Show file tree

Hide file tree

Showing 29 changed files with 3,884 additions and 231 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,14 +1,14 @@
 # Default owners for repository
 # 2/n quorum required for merge
 
-*       @mpoke @adityasripal @cwgoes @colin-axner @angbrav
+*       @adityasripal @cwgoes @angbrav @colin-axner @damiannolan @sangier
 
 # CODEOWNERS for the CODEOWNER file
 
-/.github/CODEOWNERS @mpoke @adityasripal @cwgoes @colin-axner @angbrav @damiannolan
+/.github/CODEOWNERS @adityasripal @cwgoes @angbrav 
 
 # CODEOWNERS for the specs
 
-/spec/app @adityasripal @cwgoes @colin-axner @angbrav
+/spec/app @adityasripal @cwgoes @colin-axner @damiannolan @sangier
 
 /spec/app/ics-028-cross-chain-validation @mpoke @adityasripal @cwgoes @angbrav @insumity
diff --git a/.github/workflows/link-check.yml b/.github/workflows/link-check.yml
@@ -4,6 +4,6 @@ jobs:
   markdown-link-check:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - uses: gaurav-nelson/github-action-markdown-link-check@v1
 
diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ All standards at or past the "Draft" stage are listed here in order of their ICS
 | --------------------------------------------------------------- | -------------------------- | ----- | --------------- | ------------- |
 | [6](spec/client/ics-006-solo-machine-client/README.md)          | Solo Machine Client        | Candidate | [ibc-go](https://github.com/cosmos/ibc-go/tree/main/modules/light-clients/06-solomachine) | Protocol team |
 | [7](spec/client/ics-007-tendermint-client/README.md)            | Tendermint Client          | Candidate | [ibc-go](https://github.com/cosmos/ibc-go/tree/main/modules/light-clients/07-tendermint), [ibc-rs](https://github.com/cosmos/ibc-rs/tree/main/ibc-clients/ics07-tendermint) | Protocol team |
-| [8](spec/client/ics-008-wasm-client/README.md)                  | Wasm Client                | Draft | | Protocol team / [Composable Finance](https://www.composable.finance) |
+| [8](spec/client/ics-008-wasm-client/README.md)                  | Wasm Client                | Candidate | [ibc-go](https://github.com/cosmos/ibc-go/tree/main/modules/light-clients/08-wasm), [ibc-rs](https://github.com/cosmos/ibc-rs/tree/main/ibc-clients/ics08-wasm) | Protocol team / [Composable Finance](https://www.composable.finance) |
 | [9](spec/client/ics-009-loopback-cilent/README.md)       | Loopback Client            | Draft | [ibc-go](https://github.com/cosmos/ibc-go/tree/main/modules/light-clients/09-localhost) | Protocol team |
 | [10](spec/client/ics-010-grandpa-client/README.md)              | GRANDPA Client             | Draft | | [Octopus Network](https://oct.network) |
 
@@ -57,17 +57,18 @@ All standards at or past the "Draft" stage are listed here in order of their ICS
 
 ### App
 
-| Interchain Standard Number                               | Standard Title          | Stage | Implementations | Maintainer    |
-| -------------------------------------------------------- | ----------------------- | ----- | --------------- | ------------- |
-| [20](spec/app/ics-020-fungible-token-transfer/README.md) | Fungible Token Transfer | Candidate | [ibc-go](https://github.com/cosmos/ibc-go/tree/main/modules/apps/transfer), [ibc-rs](https://github.com/cosmos/ibc-rs/tree/main/ibc-apps/ics20-transfer) | Protocol team |
-| [27](spec/app/ics-027-interchain-accounts/README.md)     | Interchain Accounts     | Candidate | [ibc-go](https://github.com/cosmos/ibc-go/tree/main/modules/apps/27-interchain-accounts) | Protocol team | 
-| [28](spec/app/ics-028-cross-chain-validation/README.md)  | Cross-Chain Validation  | Candidate | [interchain-security](https://github.com/cosmos/interchain-security/tree/main) | Cosmos Hub team |
-| [29](spec/app/ics-029-fee-payment) | General Relayer Incentivization Mechanism | Candidate | [ibc-go](https://github.com/cosmos/ibc-go/tree/main/modules/apps/29-fee) | Protocol team |
-| [30](spec/app/ics-030-middleware) | IBC Application Middleware | N/A | N/A | Protocol team |
-| [31](spec/app/ics-031-crosschain-queries) | Cross-Chain Queries | Draft | N/A | Protocol team |
-| [32](https://github.com/strangelove-ventures/async-icq) | Interchain Queries | Candidate | [async-icq](https://github.com/strangelove-ventures/async-icq) | [Strangelove Ventures](https://strange.love) |
-| [100](spec/app/ics-100-atomic-swap) | Interchain Atomic Swap | Candidate | [ibcswap](https://github.com/ibcswap/ibcswap) | [Side Labs](https://side.one) |
-| [721](spec/app/ics-721-nft-transfer) | Non-Fungible Token Transfer | Candidate | [nft-transfer](https://github.com/bianjieai/nft-transfer) | [IRIS Network](https://www.irisnet.org) |
+| Interchain Standard Number                               | Version | Standard Title          | Stage     | Implementations                                                                                                           | Maintainer         |
+| -------------------------------------------------------- | ------- | ----------------------- | --------- | ------------------------------------------------------------------------------------------------------------------------- | ------------------ |
+| [20](spec/app/ics-020-fungible-token-transfer/README.md) | v2      | Fungible Token Transfer | Candidate | [ibc-go](https://github.com/cosmos/ibc-go/tree/ics20-v2-beta.0/modules/apps/transfer)                                     | Protocol team      |
+| [20](spec/app/ics-020-fungible-token-transfer/v1/README.md) | v1      | Fungible Token Transfer | Candidate | [ibc-go](https://github.com/cosmos/ibc-go/tree/main/modules/apps/transfer), [ibc-rs](https://github.com/cosmos/ibc-rs/tree/main/ibc-apps/ics20-transfer) | Protocol team      |
+| [27](spec/app/ics-027-interchain-accounts/README.md)     | v1      | Interchain Accounts     | Candidate | [ibc-go](https://github.com/cosmos/ibc-go/tree/main/modules/apps/27-interchain-accounts)                                  | Protocol team      | 
+| [28](spec/app/ics-028-cross-chain-validation/README.md)  | v1      | Cross-Chain Validation  | Candidate | [interchain-security](https://github.com/cosmos/interchain-security/tree/main)                                            | Cosmos Hub team    |
+| [29](spec/app/ics-029-fee-payment)                       | v1      | General Relayer Incentivization Mechanism | Candidate | [ibc-go](https://github.com/cosmos/ibc-go/tree/main/modules/apps/29-fee)                                                  | Protocol team      |
+| [30](spec/app/ics-030-middleware)                        | v1      | IBC Application Middleware | N/A      | N/A                                                                                                                       | Protocol team      |
+| [31](spec/app/ics-031-crosschain-queries)                | v1      | Cross-Chain Queries     | Draft     | N/A                                                                                                                       | Protocol team      |
+| [32](https://github.com/strangelove-ventures/async-icq)  | v1      | Interchain Queries      | Candidate | [async-icq](https://github.com/strangelove-ventures/async-icq)                                                            | [Strangelove Ventures](https://strange.love) |
+| [100](spec/app/ics-100-atomic-swap)                      | v1      | Interchain Atomic Swap  | Candidate | [ibcswap](https://github.com/ibcswap/ibcswap)                                                                             | [Side Labs](https://side.one) |
+| [721](spec/app/ics-721-nft-transfer)                     | v1      | Non-Fungible Token Transfer | Candidate | [nft-transfer](https://github.com/bianjieai/nft-transfer)                                                                 | [IRIS Network](https://www.irisnet.org) |
 
 ## Translations
 

diff --git a/archive/papers/2020-05/src/metadata.yaml b/archive/papers/2020-05/src/metadata.yaml
@@ -14,7 +14,7 @@ lang: en
 babel-lang: english
 abstract: |
   The interblockchain communication protocol (IBC) is an end-to-end, connection-oriented, stateful protocol for reliable, ordered, and authenticated communication between modules on separate distributed ledgers.
-  IBC is designed for interoperation between heterogenous ledgers arranged in an unknown, dynamic topology, operating with varied consensus algorithms and state machines. The protocol realises this by specifying
+  IBC is designed for interoperation between heterogeneous ledgers arranged in an unknown, dynamic topology, operating with varied consensus algorithms and state machines. The protocol realises this by specifying
   the sufficient set of data structures, abstractions, and semantics of a communication protocol which once implemented by participating ledgers will allow them to safely communicate. IBC is payload-agnostic
   and provides a cross-ledger asynchronous communication primitive which can be used as a constituent building block by a wide variety of applications.
 

diff --git a/meta/CONTRIBUTING.md b/meta/CONTRIBUTING.md
@@ -39,7 +39,7 @@ When reviewing PRs please use the following review explanations:
 - `Approval` through the GH UI means that you understand all the changes proposed in the PR. In addition:
   - You must also think through anything which ought to be included but is not.
   - You must think through any potential security issues or incentive-compatibility flaws introduced by the changes.
-  - The changes must be consistent with the other IBC standards, especially the [core IBC standards](../README.md#core). 
+  - The changes must be consistent with the other IBC standards, especially the [core IBC standards](../README.md#core-transport). 
   - The modified standard must be consistent with the description from [ICS 1](../spec/ics-001-ics-standard/README.md).
 - If you are only making "surface level" reviews, submit any notes as `Comments` without adding a review.
 

diff --git a/meta/STANDARDS_COMMITTEE.md b/meta/STANDARDS_COMMITTEE.md
@@ -4,7 +4,6 @@ Currently, the core standardisation committee consists of:
 
 - Aditya Sripal (@adityasripal)
 - Christopher Goes (@cwgoes)
-- Marius Poke (@mpoke)
 - Manuel Bravo (@angbrav)
 - Stefano Angieri (@sangier)