[FEAT] ICS20-V2 Path Forwarding #6693

* chore: adding proto files for ics20-v2 * chore: add newline

* add CurrentVersion, EscrowVersion, update tests * update hardcoded transfer channel version from interchaintest

--------- Co-authored-by: Charly <charly@interchain.berlin>

…ods (#6126)

…shalling/conversion (#6226) * chore: adding proto files for ics20-v2 * chore: add newline * chore: modify MsgTransfer to accept coins instead of coin * chore: reverted unintentional comment changes * chore: reverted unintentional comment changes * chore: adding test for conversion fn * chore: fix e2e linter * chore: adding docs * chore: addressing PR feedback * chore: remove duplicate import * chore: addressing PR feedback * chore: moved extration logic into internal package * chore: commented out failing test * chore: adding link to issue * chore: remove duplicate import * chore: fix linting errors * FungibleTokenPacketData interface methods + tests * linter * wip: token validation * update trace identifier validation in Token + tests * rm Printf * update with pr review * add CurrentVersion, EscrowVersion, update tests * pr review * fix e2e tests * pr review * update e2e test version * linter * update hardcoded transfer channel version from interchaintest * update hardcoded transfer channel version from interchaintest * wip packet unmarshaller * wip * wip testing * update test * linter * rm unnecessary version changes * rm unnecessary artifacts * update callbacks test * update comment * pr review * rename getMultiDenomFungibleTokenPacketData to unmarshalPacketDataBytesToICS20V2 --------- Co-authored-by: chatton <github.qpeyb@simplelogin.fr> Co-authored-by: Carlos Rodriguez <carlos@interchain.io>

…allbacks (#6175) * add SupportedVersions array for different ics20 versions, add version checking on channel handshake application callbacks * add tests * update pr review * pr review * last few pr review nits * linter * add version counter proposing * fix missing app versino * update code + tests to return our proposed version if counterparty version is invalid * remove if statement * address review comments: return ics20-2 if counterparty version is not supported --------- Co-authored-by: Carlos Rodriguez <carlos@interchain.io>

…transfers (#6252) * add transfer authz code + tests * linter * address review comments --------- Co-authored-by: Carlos Rodriguez <carlos@interchain.io>

…ks (#6189) * chore: adding proto files for ics20-v2 * chore: add newline * chore: modify MsgTransfer to accept coins instead of coin * chore: reverted unintentional comment changes * chore: reverted unintentional comment changes * chore: adding test for conversion fn * chore: fix e2e linter * chore: adding docs * chore: addressing PR feedback * chore: remove duplicate import * chore: addressing PR feedback * chore: moved extration logic into internal package * chore: commented out failing test * chore: adding link to issue * chore: remove duplicate import * chore: fix linting errors * FungibleTokenPacketData interface methods + tests * linter * wip: token validation * update trace identifier validation in Token + tests * rm Printf * update with pr review * pr review * linter * rm unused function: linter * wip pr feedback * fix test * pr review * lintttttt * wip: backwards compatibility for transfer rpc * implement changes for ics20-v2 packet data for onRecvPacket, onAcknowledgePacket and onTimeoutPacket * fix callbacks tests * lint --------- Co-authored-by: chatton <github.qpeyb@simplelogin.fr> Co-authored-by: Charly <charly@interchain.berlin>

…set, use sequence in key to store forwarded packet (#6325) * use nil forwarding path as default when not set, use sequence in key to store forwarded packet * lint

Sync feature with main branch

* refactor: quick change to tokens event attribute * fix: various tests * lint * lint:fixeroni * imp: remove events variable in favour of direct event emission --------- Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>

* check length of tokens array against maximum allowed * chore: add note on arbitrary selection --------- Co-authored-by: Colin Axnér <25233464+colin-axner@users.noreply.github.com>

* api(port)!: Allow passing of context, port and channel identifier to unmarshal packet data interface as disussed. This allows us to grab the app version in transfer and unmarshal the packet based on that instead of a hacky unmarshal v2 then v1 and whatever happens. * lint: as we do * callbacks: fix signature of UnmarshalPacketData as per changes, make refactors to hopefully simplify signatures. * chore: lint and remove some todos. * review: address feedback.

* chore: specifically unmarshal v1 or v2 without brute force * chore: fix TestPacketDataUnmarshalerInterface test in transfer module * Pass dest values OnRecv, refactor GetExpectedEvents * chore: fixing TestGetCallbackData test * chore: fixed remaining tests in callbacks module * test: simplify callbacks test, revert back to previous behaviour * chore: fix test case name * chore: addressing PR feedback * chore: added docstring for unmarshalPacketDataBytesToICS20V2 --------- Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com> Co-authored-by: Colin Axnér <25233464+colin-axner@users.noreply.github.com>

Sync Feature Branch With Main

* refactor: address various self review comments * revert: unnecessary change * lint

* refactor: apply review suggestions * imp: additional updates * refactor: make ValidateIBCDenom private * Update modules/apps/transfer/types/msgs.go Co-authored-by: Cian Hatton <cian@interchain.io> * apply review suggestions --------- Co-authored-by: Cian Hatton <cian@interchain.io>

* chore: move functions from internal/denom to trace.go * lint * lint: the comeback

* imp: self review items * apply jim's suggestion * Update modules/apps/transfer/keeper/msg_server_test.go * Update modules/apps/transfer/ibc_module.go * Update modules/apps/transfer/ibc_module.go

# Conflicts: # modules/apps/transfer/keeper/msg_server.go # modules/apps/transfer/keeper/relay.go # modules/apps/transfer/keeper/relay_test.go # modules/apps/transfer/types/keys.go # modules/apps/transfer/types/msgs_test.go # modules/apps/transfer/types/v3/packet.go # modules/apps/transfer/types/v3/packet.pb.go # modules/apps/transfer/types/v3/packet_test.go # modules/apps/transfer/types/v3/token_test.go # proto/ibc/applications/transfer/v3/packet.proto

…eanup

# Conflicts: # e2e/tests/transfer/authz_test.go # e2e/tests/transfer/incentivized_test.go # e2e/tests/transfer/upgrades_test.go # e2e/tests/upgrades/upgrade_test.go # e2e/testsuite/tx.go # modules/apps/27-interchain-accounts/host/keeper/relay_test.go # modules/apps/29-fee/transfer_test.go # modules/apps/callbacks/ibc_middleware_test.go # modules/apps/callbacks/types/types_test.go # modules/apps/transfer/client/cli/tx.go # modules/apps/transfer/internal/convert/convert.go # modules/apps/transfer/internal/convert/convert_test.go # modules/apps/transfer/keeper/mbt_relay_test.go # modules/apps/transfer/keeper/msg_server.go # modules/apps/transfer/keeper/msg_server_test.go # modules/apps/transfer/keeper/relay.go # modules/apps/transfer/keeper/relay_test.go # modules/apps/transfer/transfer_test.go # modules/apps/transfer/types/keys.go # modules/apps/transfer/types/msgs.go # modules/apps/transfer/types/msgs_test.go # modules/apps/transfer/types/packet.go # modules/apps/transfer/types/packet.pb.go # modules/apps/transfer/types/packet_test.go # modules/apps/transfer/types/token_test.go # modules/apps/transfer/types/transfer_authorization_test.go # modules/apps/transfer/types/tx.pb.go # proto/ibc/applications/transfer/v1/tx.proto # proto/ibc/applications/transfer/v2/packet.proto # testing/solomachine.go

# Conflicts: # modules/apps/transfer/internal/convert/convert.go # modules/apps/transfer/keeper/mbt_relay_test.go # modules/apps/transfer/keeper/relay.go # modules/apps/transfer/keeper/relay_test.go # modules/apps/transfer/types/packet.pb.go # modules/apps/transfer/types/token_test.go

# Conflicts: # modules/apps/27-interchain-accounts/host/keeper/relay_test.go # modules/apps/transfer/internal/convert/convert.go # modules/apps/transfer/keeper/relay.go # modules/apps/transfer/keeper/relay_test.go # modules/apps/transfer/types/msgs_test.go # modules/apps/transfer/types/transfer.pb.go # modules/apps/transfer/types/transfer_authorization_test.go # modules/apps/transfer/types/tx.pb.go # proto/ibc/applications/transfer/v1/tx.proto

# Conflicts: # e2e/tests/transfer/incentivized_test.go # e2e/tests/transfer/upgrades_test.go # e2e/tests/upgrades/upgrade_test.go # e2e/testsuite/tx.go # modules/apps/transfer/keeper/msg_server_test.go

Pass nil as the next forwarding path if at final hop. Use consistent timeout for all hops.

This reverts commit e483b9a.

* nit(transfer): Mark hops as non nullable. * lint: fix additional linting issues

* feat(transfer): add forwarding info validation to token packet * Added NewForwardingInfo constructor * Removed redundant check * Clean up tests per cr comments * Back to Validate and use NewDenom

…lidate basic (#6583)

* refactor: initial simplification attempt * refactor: further organize * fix: all tests fixed * docs: improved godocs * fix: logic and testing error * style: self suggestion * docs: suggestion * docs: spellcheck * style: suggestions * style: renamed to revertForwardedPacket * style: suggestion * docs: remove docs * docs: godoc suggestion * style: suggestion * docs: colin suggestions

* chore: rename ForwardingInfo to Forwarding * chore: rename forwarding_path field to forwarding * chore: make lint-fix * chore: rename forwarding info -> forwarding * chore: renaming fixes before merge

# Conflicts: # modules/apps/29-fee/transfer_test.go # modules/apps/transfer/transfer_test.go

…6591)

* add func convert token to coin ibc * fix command: change func to ToCoin and add godoc * add unit test * Revert using ToCoin on Recv where trace manipulation occurs. Use ToCoin while forwarding. Update tests as per Carlos's review. * rename variable --------- Co-authored-by: Carlos Rodriguez <carlos@interchain.io> Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>

… memo (#6599) * transfer: Disallow a forwarding object specified with zero hops and a memo. * Apply suggestions from code review Co-authored-by: Carlos Rodriguez <carlos@interchain.io> --------- Co-authored-by: Carlos Rodriguez <carlos@interchain.io> Co-authored-by: Gjermund Garaba <bjaanes@gmail.com>

…recv callback (#6592) * refactor: initial simplification attempt * refactor: further organize * fix: all tests fixed * chore: refactor packet forward functions * chore: use receiver address directly in msg transfer * feat(transfer): move async to ibc_module for onrecv * chore: fix linter * fix: logic and testing error * style: self suggestion * docs: suggestion * docs: spellcheck * style: suggestions * style: renamed to revertForwardedPacket * style: suggestion * docs: remove docs * Added tests for transfer OnRecv * Use new names and methods from feature branch * Apply suggestions from code review Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com> * Clean up test from cr feedback * move vars to beginning of function * lint * Update modules/apps/transfer/ibc_module.go Co-authored-by: Carlos Rodriguez <carlos@interchain.io> * lint --------- Co-authored-by: srdtrk <srdtrk@hotmail.com> Co-authored-by: chatton <cian@interchain.io> Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com> Co-authored-by: Carlos Rodriguez <carlos@interchain.io> Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>

Co-authored-by: Nikolas De Giorgis <bznein@gmail.com>

Co-authored-by: Carlos Rodriguez <carlos@interchain.io>

* chore(transfer): make Forwarding non-null * chore(transfer): always validate forwarding.

#6596) * Create ontimeoutpacket test for forwarding --------- Co-authored-by: Carlos Rodriguez <carlos@interchain.io>

…fer (#6595) * feat(transfer): add should-be-forwarded convenience method to msg transfer * Clean up packet and transfer msg validation for forwarding logic --------- Co-authored-by: Carlos Rodriguez <carlos@interchain.io>

* disallow non-zero timeout height when forwarding tokens * typo * move constant * use time to create default timeout timestamp delta * Apply suggestions from code review * refactor: add GetTimeoutTimestamp helper fn to the testing pkg * lint --------- Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>

Co-authored-by: Gjermund Garaba <bjaanes@gmail.com> Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>

…warding (#6648) * Add typed errors to packet forwarding * Use forward errors in tests * Make ack construction consistent

* chore(transfer): emit forwarding information in events. * nit: rename as per Carlos's suggestion

…warding

…0-v2-path-fowarding Sync Feature Branch With Main

* feat(transfer): add unwind, refactor proto structure. gen-all * tests(transfer/types): fix test failures in types tests. * tests(transfer/keeper): fix test failures in keeper tests. * cli(transfer): fix cli usage. pending flag for unwind. * tests(callbacks): fix failing tests in callbacks. * tests(transfer/internal): fix failures in internal package. * tests(transfer): fix test failures in top level tranfer package. * tests(ica/host/keeper): fix repr of msg transfer in ica host msg execution. * lint(all): lint this bad boy * chore(transfer/types): amend validation for MsgTransfer's ShouldBeForwarded, add tests for ForwardedPacketData, minor nits. * nit(self): only pass relevant fields to create packet data; minor comment improvement. * Apply suggestions from code review Co-authored-by: Carlos Rodriguez <carlos@interchain.io> * chore(merge): fix merge issues. * chore(proto): mention optional nature of fields. * memo: do not drop it * validation: drop requirement on memo being empty on msg transfer. --------- Co-authored-by: Carlos Rodriguez <carlos@interchain.io>

…fer (#6661) * First attempt to modify proto and validation. * Fmt * Make it compile * Proto * Add basic validation * Added tests * Fix nil check and remove redundant code. * Move "forwarding" to non-pointer * Added one test case. * Moved error and changed method name. * PR Feedback. * Add nullable=false * Added test and fixed test names * Run make proto-all * Change pointer to non-pointer * Change Yet Another Pointer * More pointers * Comments and naming * Reintroduce brace removed while merging * Remove accidentally reintroduced tests

* Create ontimeoutpacket test for forwarding * Propagate ack on A * Refactoring * Minor changes * Added comments * Fix type name. * Gofumpt * Update modules/apps/transfer/keeper/relay_forwarding_test.go Co-authored-by: Carlos Rodriguez <carlos@interchain.io> * Update modules/apps/transfer/keeper/relay_forwarding_test.go Co-authored-by: Carlos Rodriguez <carlos@interchain.io> * Update modules/apps/transfer/keeper/relay_forwarding_test.go Co-authored-by: Carlos Rodriguez <carlos@interchain.io> * Update modules/apps/transfer/keeper/relay_forwarding_test.go Co-authored-by: Carlos Rodriguez <carlos@interchain.io> * Add godoc to test. * Changed trace construction * Update modules/apps/transfer/keeper/relay_forwarding_test.go Co-authored-by: Carlos Rodriguez <carlos@interchain.io> * remove error msg parameter from helper function * Add test for forwarded packet * Delete packet when not needed anymore. * Move deletion of packet in a single place. * Reintroduce newline * Do not ignore error. * PR feedback. * Construct packet for B ack check. * PR feedback * Pass packet to acknowledgeforwardedpacket * revert unwanted change * Another unwanted change * Better signature and fix source/dest * Added one more test. --------- Co-authored-by: Carlos Rodriguez <carlos@interchain.io> Co-authored-by: Gjermund Garaba <bjaanes@gmail.com>

* test(transfer): forwarding where middle chaind is source for receive and send * Fix errors after merge * Finish up the test * Update some out-of-date comments * test(transfer): multi-hop ack failure with middle chain NOT being source * Fix tests after height change * Fix tests after height change * Fix test after #6586 * Rename tests to not use scenario numbers * Rename test * address self-review comments * use boolean in NewForwarding parameter * some more review comments --------- Co-authored-by: Carlos Rodriguez <carlos@interchain.io>

* test(transfer): last chain in forwarding being ICS20 v1 * Finish TestForwarding_WithLastChainBeingICS20v1_Succeeds * Update CreateNewPath signature Co-authored-by: Nikolas De Giorgis <bznein@gmail.com> * Fix PR review comments --------- Co-authored-by: Nikolas De Giorgis <bznein@gmail.com>

* add flag for unwind in transfer cli * update long description of cli --------- Co-authored-by: Carlos Rodriguez <carlos@interchain.io>

* impl check reject transfer if len(hops) > 0 and ics20-1 * add test case hops is not empty with ics20-2 * address review comments * reorder variable declaration --------- Co-authored-by: Carlos Rodriguez <carlos@interchain.io> Co-authored-by: Gjermund Garaba <bjaanes@gmail.com>

* Create ontimeoutpacket test for forwarding * Propagate ack on A * Refactoring * Minor changes * Added comments * Fix type name. * Gofumpt * Update modules/apps/transfer/keeper/relay_forwarding_test.go Co-authored-by: Carlos Rodriguez <carlos@interchain.io> * Update modules/apps/transfer/keeper/relay_forwarding_test.go Co-authored-by: Carlos Rodriguez <carlos@interchain.io> * Update modules/apps/transfer/keeper/relay_forwarding_test.go Co-authored-by: Carlos Rodriguez <carlos@interchain.io> * Update modules/apps/transfer/keeper/relay_forwarding_test.go Co-authored-by: Carlos Rodriguez <carlos@interchain.io> * Add godoc to test. * Changed trace construction * Update modules/apps/transfer/keeper/relay_forwarding_test.go Co-authored-by: Carlos Rodriguez <carlos@interchain.io> * remove error msg parameter from helper function * Add test for forwarded packet * Construct packet for B ack check. * PR feedback * feat(transfer): add unwind, refactor proto structure. gen-all * tests(transfer/types): fix test failures in types tests. * tests(transfer/keeper): fix test failures in keeper tests. * cli(transfer): fix cli usage. pending flag for unwind. * tests(callbacks): fix failing tests in callbacks. * tests(transfer/internal): fix failures in internal package. * tests(transfer): fix test failures in top level tranfer package. * tests(ica/host/keeper): fix repr of msg transfer in ica host msg execution. * lint(all): lint this bad boy * chore(transfer/types): amend validation for MsgTransfer's ShouldBeForwarded, add tests for ForwardedPacketData, minor nits. * nit(self): only pass relevant fields to create packet data; minor comment improvement. * Apply suggestions from code review Co-authored-by: Carlos Rodriguez <carlos@interchain.io> * chore(merge): fix merge issues. * chore(proto): mention optional nature of fields. * memo: do not drop it * validation: drop requirement on memo being empty on msg transfer. * feat(transfer): add unwinding ability, wip. * Added unwind to allocation forwarding. * Add tests and move some validation * Missing import * Fixed validation and added test * PR Feedback * Return nil when returning an error. * Cleaner comment * Add test case for multiple hos --------- Co-authored-by: bznein <nikolas.degiorgis@interchain.io> Co-authored-by: Nikolas De Giorgis <bznein@gmail.com> Co-authored-by: Carlos Rodriguez <carlos@interchain.io>

This reverts commit c2a6bc6.

* Replace reflect.DeepEqual with slices.Equal * Nit formatting

Co-authored-by: Carlos Rodriguez <carlos@interchain.io>

* chore: cleanup forwarding tests * lint * fix --------- Co-authored-by: Nikolas De Giorgis <nikolas.degiorgis@interchain.io> Co-authored-by: Gjermund Garaba <bjaanes@gmail.com>

…6695) * chore: pull out hop validation and consolidate transfer+packet * Update modules/apps/transfer/types/forwarding_test.go Co-authored-by: Carlos Rodriguez <carlos@interchain.io> * cr fixes --------- Co-authored-by: Carlos Rodriguez <carlos@interchain.io>

* chore: remove unwind field in authz * chore: remove duplicate test * Update modules/apps/transfer/types/transfer_authorization.go Co-authored-by: Carlos Rodriguez <carlos@interchain.io> --------- Co-authored-by: Carlos Rodriguez <carlos@interchain.io>

* Refactor validation * Fixed verification logic, added two tests * Fix check for unwind * removed unneeded indirection * Update modules/apps/transfer/types/msgs.go Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com> * Add docstring. --------- Co-authored-by: Gjermund Garaba <bjaanes@gmail.com> Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>

… forwarded packets (#6709) * allow non-cosmos-sdk AccAddress for forwarded packets * cr fixes

Co-authored-by: Carlos Rodriguez <carlos@interchain.io>

* test: forwarding with memo * fix test * cr fixes

* chore: use module account instead of custom forward address * pull blocked addr checker into keeper method * lint * clean up IsBlockedAddr

Co-authored-by: Nikolas De Giorgis <nikolas.degiorgis@interchain.io>

# Conflicts: # e2e/testsuite/testsuite.go

Co-authored-by: Damian Nolan <damiannolan@gmail.com>

Co-authored-by: Aditya <14364734+AdityaSripal@users.noreply.github.com>

Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>

Commits on Jun 10, 2024

fix: e2e build failures.

DimitrisJim committed Jun 10, 2024

Configuration menu

View commit details

Copy full SHA for 21dbb37

Browse repository at this point

Copy the full SHA

21dbb37 View commit details

Browse the repository at this point in the history

[FEAT] ICS20-V2 Path Forwarding #6693

[FEAT] ICS20-V2 Path Forwarding #6693

Commits on Apr 8, 2024

Commits on Apr 9, 2024

Commits on Apr 15, 2024

Commits on Apr 16, 2024

Commits on Apr 22, 2024

Commits on Apr 29, 2024

Commits on May 6, 2024

Commits on May 10, 2024

Commits on May 13, 2024

Commits on May 14, 2024

Commits on May 15, 2024

Commits on May 16, 2024

Commits on May 17, 2024

Commits on May 20, 2024

Commits on May 21, 2024

Commits on May 22, 2024

Commits on May 23, 2024

Commits on May 26, 2024

Commits on May 27, 2024

Commits on May 28, 2024

Commits on May 31, 2024

Commits on Jun 7, 2024

Commits on Jun 9, 2024

Commits on Jun 10, 2024

Commits on Jun 11, 2024

Commits on Jun 12, 2024

Commits on Jun 13, 2024

Commits on Jun 14, 2024

Commits on Jun 16, 2024

Commits on Jun 17, 2024

Commits on Jun 18, 2024

Commits on Jun 19, 2024

Commits on Jun 20, 2024

Commits on Jun 21, 2024

Commits on Jun 24, 2024

Commits on Jun 25, 2024

Commits on Jun 26, 2024

Commits on Jun 27, 2024

Commits on Jun 28, 2024