Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Channel upgradability #3228

Merged
merged 142 commits into from
May 31, 2024
Merged
Show file tree
Hide file tree
Changes from 127 commits
Commits
Show all changes
142 commits
Select commit Hold shift + click to select a range
0657501
Add new channel states
seanchen1991 Mar 31, 2023
b3b0ebc
Change channel state enum discriminants
seanchen1991 Mar 31, 2023
b8b0c2f
Update channel state doc comment
seanchen1991 Mar 31, 2023
98dd3fc
Stub out channel upgrade CLI commands
seanchen1991 Apr 4, 2023
ca83021
Use tx_chan_cmd macro for TxChanOpenInit command
seanchen1991 Apr 5, 2023
ed2cab2
Stub out build_channel_upgrade_init function
seanchen1991 Apr 5, 2023
df882ff
Add MsgChannelUpgradeInit type
seanchen1991 Apr 5, 2023
9915965
Add more tests for MsgChannelUpgradeInit message type
seanchen1991 Apr 6, 2023
d6e0e16
Add chan_upgrade_try file for MsgChannelUpgradeTry message type
seanchen1991 Apr 6, 2023
0e15393
Add build_chan_upgrade_init_and_send method
seanchen1991 Apr 7, 2023
4107486
Add UpgradeInit and UpgradeTry ChannelEvents
seanchen1991 Apr 7, 2023
6baee8f
Fix compilation errors with UpgradeInit and UpgradeTry impls
seanchen1991 Apr 7, 2023
e742f7c
Merge branch 'master' into sean/channel-upgradability
seanchen1991 Apr 7, 2023
5d61c0d
Merge branch 'master' of https://github.com/informalsystems/hermes in…
seanchen1991 Apr 12, 2023
3f80bfc
Stub out MsgChannelUpgradeTry
seanchen1991 Apr 12, 2023
99560ff
Add missing fields to MsgChannelUpgradeInit
seanchen1991 Apr 12, 2023
00691d8
Use ibc-proto branch with channel upgrade messages
romac Apr 13, 2023
c571933
Fill in todos
romac Apr 13, 2023
feb4f7f
Comment out code in tx chan-upgrade-init and add todos
romac Apr 13, 2023
410cb5e
Add `UpgradeTimeout` enum
romac Apr 13, 2023
111b3c5
Fleshing out MsgChannelUpgradeTry
seanchen1991 Apr 13, 2023
78ef69a
Resolve merge conflicts
seanchen1991 Apr 13, 2023
ca22ecd
Clean up MsgChannelUpgradeTry
seanchen1991 Apr 13, 2023
168be50
Clean up MsgChannelUpgradeTry
seanchen1991 Apr 13, 2023
cc8b9b2
Fix error conversion
seanchen1991 Apr 14, 2023
3cfb4da
Formatting and clippy
romac Apr 17, 2023
27c2361
Disable tests and fix more clippy warnings
romac Apr 17, 2023
b131e27
Re-enable tests
romac Apr 17, 2023
a2b9c99
Wrap up channel upgrade init CLI
seanchen1991 Apr 17, 2023
8b5590f
Merge branch 'master' into sean/channel-upgradability
seanchen1991 Apr 17, 2023
90c049e
Cargo fmt
seanchen1991 Apr 17, 2023
41fd57a
Merge branch 'sean/channel-upgradability' of https://github.com/infor…
seanchen1991 Apr 17, 2023
c895ae5
Remove unnecessary CLI parameter
seanchen1991 Apr 17, 2023
67893a8
Pass an `UpgradeTimeout` to `.build_chan_upgrade_init_and_send`
romac Apr 18, 2023
e48553d
Fix bug when converting integer to channel state
romac Apr 18, 2023
1a00b39
Proper implementation of `State::less_or_equal_progress`
romac Apr 18, 2023
47c1d0c
Fix broken test
seanchen1991 Apr 18, 2023
59734bd
Ignore channel upgrade try tests for now
seanchen1991 Apr 18, 2023
056b819
Fix channel upgrade try tests
seanchen1991 Apr 18, 2023
cdb3e18
Stub out build_channel_upgrade_try
seanchen1991 Apr 18, 2023
cf1afa5
Stub out build_channel_upgrade_try
seanchen1991 Apr 18, 2023
73296b7
Fix return type of build_chan_upgrade_try
seanchen1991 Apr 18, 2023
ba248af
Cargo fmt
seanchen1991 Apr 18, 2023
eba95e7
Remove stub function
seanchen1991 Apr 18, 2023
f6c1bd3
Add missing clone
seanchen1991 Apr 18, 2023
f411420
Merge branch 'master' into sean/channel-upgradability
seanchen1991 Apr 18, 2023
d3a5f50
Remove redundant clone
seanchen1991 Apr 18, 2023
9e77f73
Merge branch 'sean/channel-upgradability' of https://github.com/infor…
seanchen1991 Apr 18, 2023
3253b2b
Add integration tests for channel upgradability (#3247)
ljoss17 Apr 19, 2023
b46d3d0
Fix check for new channel ordering
romac Apr 19, 2023
c67fc74
Merge branch 'master' into sean/channel-upgradability
romac Apr 19, 2023
fa87302
Fix broken doc comment link
seanchen1991 Apr 19, 2023
feea74b
Progress on build_chan_upgrade_try
seanchen1991 Apr 19, 2023
6fe71cc
Progress on build_chan_upgrade_try
seanchen1991 Apr 19, 2023
9243470
Update ChanUpgradeInit step to use new design improvements
ljoss17 Apr 20, 2023
b07c03d
Nicely report connection id parsing failures
romac Apr 20, 2023
486d2d1
Address merge conflicts
seanchen1991 Apr 20, 2023
0b30345
Document some fields of MsgChannelUpgradeTry
seanchen1991 Apr 20, 2023
01216d0
Add build_chan_upgrade_try_and_send fn
seanchen1991 Apr 20, 2023
e977d1d
Cargo fmt
seanchen1991 Apr 20, 2023
65d265f
Update UpgradeInit to mirror event attributers from 'channel_upgrade_…
ljoss17 Apr 21, 2023
d50b89a
Treat timestamp 0 as no timestamp
romac Apr 21, 2023
3a7acdd
Fix parsing UpgradeAttributes and improve ChanUpgradeInit test
ljoss17 Apr 21, 2023
678149a
Merge branch 'sean/channel-upgradability' of github.com:informalsyste…
ljoss17 Apr 21, 2023
8e6813d
Add Hermes data requirements document (#3262)
romac Apr 21, 2023
fc911af
Update nix flake to use simd v7.0.0 (#3264)
ljoss17 Apr 21, 2023
fb2e556
Merge branch 'sean/channel-upgradability' of https://github.com/infor…
seanchen1991 Apr 21, 2023
e02acdf
Address compiler errors for now
seanchen1991 Apr 21, 2023
ace5a21
Cargo fmt
seanchen1991 Apr 21, 2023
68cd401
Add channel-upgrade job to the CI
romac Apr 22, 2023
e28ddcc
Format flake.nix
romac Apr 22, 2023
5d42c8f
Update flake.lock
romac Apr 22, 2023
92f1d74
Fix test
romac Apr 22, 2023
b262fc2
Update guide templates
romac Apr 22, 2023
b8ce0a7
Expose `tx chan-upgrade-try` command
romac Apr 22, 2023
1635987
Merge branch 'master' into sean/channel-upgradability + fixes
ljoss17 Jun 21, 2023
8a271b4
Update TRY ste implementation for channel upgrade
ljoss17 Jun 21, 2023
9d36d2e
Fix channel upgrade TRY step
ljoss17 Jun 23, 2023
546842b
Merge branch 'master' into sean/channel-upgradability
ljoss17 Jun 23, 2023
b153c0e
Update nix flake
ljoss17 Jun 23, 2023
7b89a95
Merge branch 'master' into sean/channel-upgradability
ljoss17 Jul 3, 2023
246cf7c
Add integration test for `ChanUpgradeTry` step (#3259)
ljoss17 Jul 4, 2023
464b51a
Merge branch 'master' into sean/channel-upgradability
ljoss17 Jul 19, 2023
128e48e
Add Channel Upgrade ACK and CONFIRM steps (#3462)
ljoss17 Jul 24, 2023
ce6c01f
Merge branch 'master' into sean/channel-upgradability
ljoss17 Jul 24, 2023
8aad9da
Merge branch 'master' into sean/channel-upgradability
ljoss17 Aug 8, 2023
749d7db
Add missing CLIs for channel upgrade (#3495)
ljoss17 Aug 14, 2023
8e70414
Merge branch 'master' into sean/channel-upgradability
ljoss17 Aug 23, 2023
7925add
Update channel upgrade after spec rework
ljoss17 Aug 24, 2023
7a0531d
Update nix flake
ljoss17 Aug 24, 2023
9dd685d
Update nix flake
ljoss17 Aug 24, 2023
eb29842
Add test bootstrap compatibility for pre and post SDK v0.47.0
ljoss17 Aug 24, 2023
f01e40e
Merge branch 'master' into sean/channel-upgradability
ljoss17 Aug 28, 2023
fc58444
Merge branch 'master' into sean/channel-upgradability
ljoss17 Oct 10, 2023
08525ec
Merge branch 'master' into sean/channel-upgradability
ljoss17 Oct 12, 2023
f368a14
Channel upgrade worker handshake (#3569)
ljoss17 Oct 13, 2023
c4a8ecc
Merge branch 'master' into sean/channel-upgradability
ljoss17 Oct 19, 2023
e65dfba
Merge branch 'master' into sean/channel-upgradability
ljoss17 Oct 20, 2023
babc732
Merge branch 'master' into sean/channel-upgradability
ljoss17 Oct 23, 2023
a4dc932
Merge branch 'master' into sean/channel-upgradability
ljoss17 Dec 1, 2023
775cb9a
Merge branch 'master' into sean/channel-upgradability
ljoss17 Dec 5, 2023
3f9d346
Update nix flake and remove log file
ljoss17 Dec 6, 2023
63f2da2
Merge branch 'master' into sean/channel-upgradability
ljoss17 Dec 8, 2023
de88932
Merge branch 'master' into sean/channel-upgradability
ljoss17 Dec 20, 2023
1749a71
Merge branch 'master' into sean/channel-upgradability
ljoss17 Dec 20, 2023
a9175e2
Merge branch 'master' into sean/channel-upgradability
ljoss17 Jan 5, 2024
b07076e
Merge branch 'master' into sean/channel-upgradability
ljoss17 Jan 29, 2024
09181fe
Merge branch 'master' into sean/channel-upgradability
ljoss17 Feb 7, 2024
c3deea4
Merge branch 'master' into sean/channel-upgradability
ljoss17 Mar 6, 2024
b4e1d29
Use governance proposal to initialise channel upgrade tests (#3680)
ljoss17 Mar 8, 2024
9aedc1d
Merge branch 'master' into sean/channel-upgradability
ljoss17 Mar 8, 2024
d2e9452
Remove unnecessary fields from IBC channel upgrade events
ljoss17 Apr 2, 2024
0c241e0
Merge branch 'master' into sean/channel-upgradability
ljoss17 Apr 3, 2024
c6bddb7
Merge branch 'master' into sean/channel-upgradability
ljoss17 Apr 3, 2024
2101474
cargo fmt
ljoss17 Apr 3, 2024
ff43a8d
Fix async ICQ test
ljoss17 Apr 3, 2024
678f3da
Fix cargo doc
ljoss17 Apr 3, 2024
d76b7c4
Remove redundant import
ljoss17 Apr 3, 2024
3481a54
Remove redundant import
ljoss17 Apr 3, 2024
e1039e5
Correctly handle channel upgrade error
ljoss17 Apr 5, 2024
364adf4
Remove validate basic from channel open try
ljoss17 Apr 8, 2024
19d3875
Merge branch 'master' into sean/channel-upgradability
ljoss17 Apr 18, 2024
e258615
Improve detection of channel upgrade cancel when one end is in Flushc…
ljoss17 Apr 19, 2024
bbc7903
Merge branch 'master' into sean/channel-upgradability
ljoss17 Apr 19, 2024
24b9d93
Add changelog entry
romac Apr 23, 2024
a52f66d
Merge branch 'master' into sean/channel-upgradability
romac May 14, 2024
bea6867
Fix post-merge compilation issues
romac May 14, 2024
a185fa1
Rename `State::Flushcomplete` to `State::FlushComplete`
romac May 14, 2024
08d708f
Small cleanup
romac May 14, 2024
fb18998
Sort imports
romac May 15, 2024
29e3e09
Whitespace
romac May 22, 2024
08400d0
Remove patch override
romac May 22, 2024
8ff6cb3
Apply suggestions from code review
ljoss17 May 27, 2024
918cf47
cargo fmt
ljoss17 May 27, 2024
63ad028
Merge branch 'master' into sean/channel-upgradability
ljoss17 May 27, 2024
a97766f
Fix codespell errors
ljoss17 May 27, 2024
e2d02b8
Merge branch 'master' into sean/channel-upgradability
ljoss17 May 29, 2024
f26c275
Use IncludeProof for query_upgrade and query_upgrade_error
ljoss17 May 29, 2024
f4e8310
Add a method to build and send channel upgrade open or cancel
ljoss17 May 29, 2024
9a23149
Merge branch 'master' into sean/channel-upgradability
ljoss17 May 29, 2024
7c56bc2
Remove unnecessary assertions
ljoss17 May 29, 2024
c74f9e5
Add handling of channel upgrade timeout event in channel worker
ljoss17 May 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Add support for upgrading channels, as per the [ICS 004 specification](https://github.com/cosmos/ibc/blob/main/spec/core/ics-004-channel-and-packet-semantics/UPGRADES.md) ([#3228](https://github.com/informalsystems/hermes/issues/2547))
This feature allows chains to upgrade an existing channel to take advantage of new features without having to create a new channel, thus preserving all existing packet state processed on the channel. For example, a channel could now be upgraded to enable the [ICS 029 fee middleware](https://ibc.cosmos.network/main/middleware/ics29-fee/overview), allowing relayer operators on that channel to receive fees each time they relay an incentivized packet.
2 changes: 1 addition & 1 deletion .github/workflows/integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
command: simd
account_prefix: cosmos
native_token: stake
features: ica,ics29-fee
features: ica,ics29-fee,channel-upgrade
- package: wasmd
command: wasmd
account_prefix: wasm
Expand Down
18 changes: 18 additions & 0 deletions crates/relayer-cli/src/commands/tx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,24 @@ pub enum TxCmd {
/// Confirm the closing of a channel (ChannelCloseConfirm)
ChanCloseConfirm(channel::TxChanCloseConfirmCmd),

/// Relay the channel upgrade attempt (ChannelUpgradeTry)
ChanUpgradeTry(channel::TxChanUpgradeTryCmd),

/// Relay the channel upgrade attempt (ChannelUpgradeAck)
ChanUpgradeAck(channel::TxChanUpgradeAckCmd),

/// Relay the channel upgrade attempt (ChannelUpgradeConfirm)
ChanUpgradeConfirm(channel::TxChanUpgradeConfirmCmd),

/// Relay the channel upgrade attempt (ChannelUpgradeOpen)
ChanUpgradeOpen(channel::TxChanUpgradeOpenCmd),

/// Relay the channel upgrade cancellation (ChannelUpgradeCancel)
ChanUpgradeCancel(channel::TxChanUpgradeCancelCmd),

/// Relay the channel upgrade timeout (ChannelUpgradeTimeout)
ChanUpgradeTimeout(channel::TxChanUpgradeTimeoutCmd),

/// Send a fungible token transfer test transaction (ICS20 MsgTransfer)
FtTransfer(transfer::TxIcs20MsgTransferCmd),

Expand Down
Loading
Loading