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.

Sign up for GitHub

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

Jump to bottom

XCS + Registries integration: IBC forward generation using registries #4694

Merged
merged 21 commits into from
Mar 24, 2023
Merged

XCS + Registries integration: IBC forward generation using registries #4694

merged 21 commits into from
Mar 24, 2023

Conversation

nicolaslara
Copy link
Contributor

What is the purpose of the change

This PR is contains #4683. While that one only replaced the prefix registry, this one replaces the whole IBC message creation to support forwarding.

This is still a draft at the moment. Some things missing:

  • Pre-swap unwrapping
  • How to deal with validation and user specified memos
  • Tests specific to multiple hops
  • More/better tests
    • All chains have the osmo prefix, which makes it hard to test all potential validation paths. Changing this has proven harder than expected, so how we test may depend on our ability to change those prefixes in the testing app.
  • Add a registry to check if a chain allows forwarding.
  • Cleanup

Brief Changelog

  • Contracts now use the registries to build the forward package
  • Lots of refactoring

Testing and Verifying

Tests have been adapted to the new changes.

Documentation and Release Note

  • Does this pull request introduce a new feature or user-facing behavior changes? (yes / no)
  • Is a relevant changelog entry added to the Unreleased section in CHANGELOG.md? (yes / no)
  • How is the feature or change documented? (not applicable / specification (x/<module>/spec/) / Osmosis docs repo / not documented)

@nicolaslara nicolaslara mentioned this pull request Mar 22, 2023
Closed
@nicolaslara nicolaslara added the V:state/compatible/no_backport State machine compatible PR, depends on prior breaks label Mar 22, 2023
@github-actions github-actions bot added the T:CI label Mar 22, 2023
czarcas7ic
czarcas7ic approved these changes Mar 23, 2023
View reviewed changes
Copy link
Member

@czarcas7ic czarcas7ic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All questions have been addressed, LGTM! Should be good to merge once merge conflicts are fixed

@nicolaslara
Copy link
Contributor Author

I still have the items in the TODO that need to be addressed:

  • Pre-swap unwrapping
  • How to deal with validation and user specified memos
  • Tests specific to multiple hops
  • More/better tests
  • All chains have the osmo prefix, which makes it hard to test all potential validation paths. Changing this has proven harder than expected, so how we test may depend on our ability to change those prefixes in the testing app.
  • Add a registry to check if a chain allows forwarding.

But maybe we should merge this and add the rest as individual issues

@nicolaslara nicolaslara merged commit 1d76f4f into main Mar 24, 2023
@nicolaslara nicolaslara deleted the nicolas/xcs-with-registries-2 branch March 24, 2023 11:20
@nicolaslara nicolaslara mentioned this pull request Mar 24, 2023
Closed
This was referenced Mar 24, 2023
Closed
Closed
Open
Closed
Closed
czarcas7ic added a commit that referenced this pull request Mar 25, 2023
@AlpinYukseloglu @pysel
@MasterPi-2124 @AutoStake-com @ThanhNhann @nicolaslara @mattverse @davidterpay @czarcas7ic @p0mvn
[CL][bugfix] Refactor incentives tests and fix incentive forfeiting b…
6636dcc 
…ug (#4735)

* link (#4708)

* daily check for broken links (#4712)

* Update README.md

* Create check-broken-links.yml

* Update check-broken-links.yml

* Update check-broken-links.yml

* Update check-broken-links.yml

* Update check-broken-links.yml

* Update check-broken-links.yml

* Update check-broken-links.yml

* Update README.md

* Update AutoStake seed from .net to .com (#4711)

Co-authored-by: AutoStake <[email protected]>

* [tests/e2e]: simplify the logic for adding accounts to genesis sdk side and integrate into e2e (#4706)

* update logic add account genesis

* clean unused package

* golint

* XCS + Registries integration: IBC forward generation using registries (#4694)

* initial attempt at splitting registries. Issues with circular deps

* properly split registries

* added reverse prefix map

* channel validation done by registries

* integrating registry into xcs and fixing the tests

* Printing error context on failure

* full integration with unwrapping

* remove replace

* removed unused deps

* clippy

* x86 bytecode

* fmt after lints

* gofumpt

* fix re-export

* lint

* added test-contract addr

* added missing newline

* remove recovery states

* x86 bytecode

* new bytecode

* added single pool query (#4549)

* added single pool query

* added changelog

* remove empty tests as they are invalid

* removed sender and made reserved

* remove and reserve unused sender

* removed sender

* actually remove sender

* querygen

* move impl to correct file

* more flexible querygen

* Update proto/osmosis/poolmanager/v1beta1/query.proto

Co-authored-by: Matt, Park <[email protected]>

* Update proto/osmosis/poolmanager/v1beta1/query.proto

Co-authored-by: Matt, Park <[email protected]>

* Update proto/osmosis/poolmanager/v1beta1/query.proto

Co-authored-by: Matt, Park <[email protected]>

* Update proto/osmosis/poolmanager/v1beta1/query.proto

Co-authored-by: Matt, Park <[email protected]>

* protos

* added cli

* fixed command parsing

* single line

* lint

* fix cli

* run proto gen

* added whitelisted query

* fix test for v15

---------

Co-authored-by: Matt, Park <[email protected]>

* Revert "[tests/e2e]: simplify the logic for adding accounts to genesis sdk side and integrate into e2e (#4706)" (#4727)

This reverts commit a9725d6.

* ProtoRev: Adding Txs to CLI (#4567)

* init set hot routes cli command

* adding remaining txs

* few more tests

* comments

* Update upgrade_test.go (#4734)

* refactor tests and fix incentive forfeiting bug

* update create position tx

* feat: whitelist poolmanager Pool, CL Params and ClaimableFees queries (#4725)

* feat: whitelist poolmanager Pool, CL Params and ClaimableFees queries

* lint

* conflict

* fix e2e query parsing

* increase gas

---------

Co-authored-by: Ruslan Akhtariev <[email protected]>
Co-authored-by: Master Pi <[email protected]>
Co-authored-by: AutoStake <[email protected]>
Co-authored-by: AutoStake <[email protected]>
Co-authored-by: Nguyen Thanh Nhan <[email protected]>
Co-authored-by: Nicolas Lara <[email protected]>
Co-authored-by: Matt, Park <[email protected]>
Co-authored-by: David Terpay <[email protected]>
Co-authored-by: Adam Tucker <[email protected]>
Co-authored-by: Adam Tucker <[email protected]>
Co-authored-by: Roman <[email protected]>
czarcas7ic added a commit that referenced this pull request Mar 30, 2023
@czarcas7ic @p0mvn
@AlpinYukseloglu @pysel @MasterPi-2124 @AutoStake-com @ThanhNhann @nicolaslara @mattverse @davidterpay
refactor[CL]: remove freezeDuration as a parameter (#4724)
3e50c8f 
* utilize new position id in position key

* add position id to migration response

* regen proto

* modify withdraw pos in e2e

* cmd order

* avoid store key formatting with fmt.Sprintf

* set default NextPositionId to 1

* lint

* return positionId from CreatePos E2E

* utilize bytes.Buffer to build keys

* Revert "utilize bytes.Buffer to build keys"

This reverts commit 0c1bc13.

* utilize sprintf for key

* remove extra positions logic

* initial push

* regen proto

* Update go.mod

* lints

* fix sim

* add posid to sim collectincentive

* e2e test fix

* lint

* clean up

* remove extra fields

* regen proto

* only use pos id for fees

* update cli and e2e

* fee accum updates

* modify claim to use only positionId

* fix functional fees test

* pool to position id map

* add pool store to delete position

* fix conflicts from main merge

* test updates

* lints / cleanup

* add position Id to create position response

* regen proto

* regen proto

* switch order

* regen proto

* add error comment to collectFees

* move key format to types

* rename to positionFields

* Remove unnecessary test field

* revert refactor to functional fees test

* define custom errors

* remove duplicate events emitted

* correct validatePositionUpdate inputs

* Update x/concentrated-liquidity/position.go

Co-authored-by: Roman <[email protected]>

* update README for KV stores

* other readme updates

* feat: query position by id (added to stargate whitelist) (#4718)

* feat(CL): position by id query (stargate whitelisted)

* fix test

* Update app/upgrades/v15/upgrade_test.go

---------

Co-authored-by: Adam Tucker <[email protected]>

* initial push

* remove position age as input param

* [CL][bugfix] Refactor incentives tests and fix incentive forfeiting bug (#4735)

* link (#4708)

* daily check for broken links (#4712)

* Update README.md

* Create check-broken-links.yml

* Update check-broken-links.yml

* Update check-broken-links.yml

* Update check-broken-links.yml

* Update check-broken-links.yml

* Update check-broken-links.yml

* Update check-broken-links.yml

* Update README.md

* Update AutoStake seed from .net to .com (#4711)

Co-authored-by: AutoStake <[email protected]>

* [tests/e2e]: simplify the logic for adding accounts to genesis sdk side and integrate into e2e (#4706)

* update logic add account genesis

* clean unused package

* golint

* XCS + Registries integration: IBC forward generation using registries (#4694)

* initial attempt at splitting registries. Issues with circular deps

* properly split registries

* added reverse prefix map

* channel validation done by registries

* integrating registry into xcs and fixing the tests

* Printing error context on failure

* full integration with unwrapping

* remove replace

* removed unused deps

* clippy

* x86 bytecode

* fmt after lints

* gofumpt

* fix re-export

* lint

* added test-contract addr

* added missing newline

* remove recovery states

* x86 bytecode

* new bytecode

* added single pool query (#4549)

* added single pool query

* added changelog

* remove empty tests as they are invalid

* removed sender and made reserved

* remove and reserve unused sender

* removed sender

* actually remove sender

* querygen

* move impl to correct file

* more flexible querygen

* Update proto/osmosis/poolmanager/v1beta1/query.proto

Co-authored-by: Matt, Park <[email protected]>

* Update proto/osmosis/poolmanager/v1beta1/query.proto

Co-authored-by: Matt, Park <[email protected]>

* Update proto/osmosis/poolmanager/v1beta1/query.proto

Co-authored-by: Matt, Park <[email protected]>

* Update proto/osmosis/poolmanager/v1beta1/query.proto

Co-authored-by: Matt, Park <[email protected]>

* protos

* added cli

* fixed command parsing

* single line

* lint

* fix cli

* run proto gen

* added whitelisted query

* fix test for v15

---------

Co-authored-by: Matt, Park <[email protected]>

* Revert "[tests/e2e]: simplify the logic for adding accounts to genesis sdk side and integrate into e2e (#4706)" (#4727)

This reverts commit a9725d6.

* ProtoRev: Adding Txs to CLI (#4567)

* init set hot routes cli command

* adding remaining txs

* few more tests

* comments

* Update upgrade_test.go (#4734)

* refactor tests and fix incentive forfeiting bug

* update create position tx

* feat: whitelist poolmanager Pool, CL Params and ClaimableFees queries (#4725)

* feat: whitelist poolmanager Pool, CL Params and ClaimableFees queries

* lint

* conflict

* fix e2e query parsing

* increase gas

---------

Co-authored-by: Ruslan Akhtariev <[email protected]>
Co-authored-by: Master Pi <[email protected]>
Co-authored-by: AutoStake <[email protected]>
Co-authored-by: AutoStake <[email protected]>
Co-authored-by: Nguyen Thanh Nhan <[email protected]>
Co-authored-by: Nicolas Lara <[email protected]>
Co-authored-by: Matt, Park <[email protected]>
Co-authored-by: David Terpay <[email protected]>
Co-authored-by: Adam Tucker <[email protected]>
Co-authored-by: Adam Tucker <[email protected]>
Co-authored-by: Roman <[email protected]>

* refactor collect incentives test

* remove any final references to freezing

* merge main

* add back ParsePositionFromBz

* add comments to test

* add forfeit incentives withdraw test case

* add negative duration validation and test

* clean up

* add back multi-position test

* regen proto

---------

Co-authored-by: czarcas7ic <[email protected]>
Co-authored-by: Roman <[email protected]>
Co-authored-by: alpo <[email protected]>
Co-authored-by: Ruslan Akhtariev <[email protected]>
Co-authored-by: Master Pi <[email protected]>
Co-authored-by: AutoStake <[email protected]>
Co-authored-by: AutoStake <[email protected]>
Co-authored-by: Nguyen Thanh Nhan <[email protected]>
Co-authored-by: Nicolas Lara <[email protected]>
Co-authored-by: Matt, Park <[email protected]>
Co-authored-by: David Terpay <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@czarcas7ic czarcas7ic czarcas7ic approved these changes

Assignees
No one assigned
Labels
T:CI V:state/compatible/no_backport State machine compatible PR, depends on prior breaks
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@nicolaslara @czarcas7ic