-
Notifications
You must be signed in to change notification settings - Fork 608
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
fix: add indirect incentivized pools to incentivized pools query #5589
Merged
Merged
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
5431164
add indirect incentivized pools to inc pool query
czarcas7ic ceccc51
add changelog entry
czarcas7ic 81ce026
type conversion
czarcas7ic ea3788a
fix behavior
czarcas7ic 28f7ee9
fix behavior
czarcas7ic bba673d
use map to prevent unnecessary second iteration
czarcas7ic 42a2e17
nil pointer error
czarcas7ic e70ac41
implement shared proto file
czarcas7ic 18ee857
use longest duration as holder value
czarcas7ic 1ebe6dc
use longest lockable duration
czarcas7ic b7e3225
add duration into incentivizedPoolIDs map
czarcas7ic File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| syntax = "proto3"; | ||
| package osmosis.gamm.v1beta1; | ||
|
|
||
| import "gogoproto/gogo.proto"; | ||
| import "google/protobuf/any.proto"; | ||
| import "cosmos_proto/cosmos.proto"; | ||
| import "cosmos/base/v1beta1/coin.proto"; | ||
|
|
||
| option go_package = "github.com/osmosis-labs/osmosis/v16/x/gamm/types"; | ||
|
|
||
| // MigrationRecords contains all the links between balancer and concentrated | ||
| // pools | ||
| message MigrationRecords { | ||
| repeated BalancerToConcentratedPoolLink balancer_to_concentrated_pool_links = | ||
| 1 [ (gogoproto.nullable) = false ]; | ||
| } | ||
|
|
||
| // BalancerToConcentratedPoolLink defines a single link between a single | ||
| // balancer pool and a single concentrated liquidity pool. This link is used to | ||
| // allow a balancer pool to migrate to a single canonical full range | ||
| // concentrated liquidity pool position | ||
| // A balancer pool can be linked to a maximum of one cl pool, and a cl pool can | ||
| // be linked to a maximum of one balancer pool. | ||
| message BalancerToConcentratedPoolLink { | ||
| option (gogoproto.equal) = true; | ||
| uint64 balancer_pool_id = 1; | ||
| uint64 cl_pool_id = 2; | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| syntax = "proto3"; | ||
| package osmosis.poolincentives.v1beta1; | ||
|
|
||
| import "gogoproto/gogo.proto"; | ||
| import "google/protobuf/duration.proto"; | ||
| import "osmosis/pool-incentives/v1beta1/incentives.proto"; | ||
|
|
||
| option go_package = "github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"; | ||
|
|
||
| // MigrationRecords contains all the links between balancer and concentrated | ||
| // pools. | ||
| // | ||
| // This is copied over from the gamm proto file in order to circumnavigate | ||
| // the circular dependency between the two modules. | ||
| message MigrationRecords { | ||
| repeated BalancerToConcentratedPoolLink balancer_to_concentrated_pool_links = | ||
| 1 [ (gogoproto.nullable) = false ]; | ||
| } | ||
|
|
||
| // BalancerToConcentratedPoolLink defines a single link between a single | ||
| // balancer pool and a single concentrated liquidity pool. This link is used to | ||
| // allow a balancer pool to migrate to a single canonical full range | ||
| // concentrated liquidity pool position | ||
| // A balancer pool can be linked to a maximum of one cl pool, and a cl pool can | ||
| // be linked to a maximum of one balancer pool. | ||
| // | ||
| // This is copied over from the gamm proto file in order to circumnavigate | ||
| // the circular dependency between the two modules. | ||
| message BalancerToConcentratedPoolLink { | ||
| option (gogoproto.equal) = true; | ||
| uint64 balancer_pool_id = 1; | ||
| uint64 cl_pool_id = 2; | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we make an issue to track unifying this?
I know we discussed this, and I'm not intending to block on this but it really feels like less overall overhead if we just unified it in this PR. This should be faster to do than writing up a good issue
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Discussed offline after leaving this comment and made a PR which ended up being quick: #5596
Happy to deal with #5596 separately