-
Notifications
You must be signed in to change notification settings - Fork 608
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: add indirect incentivized pools to incentivized pools query (#5589)
* add indirect incentivized pools to inc pool query * add changelog entry * type conversion * fix behavior * fix behavior * use map to prevent unnecessary second iteration * nil pointer error * implement shared proto file * use longest duration as holder value * use longest lockable duration * add duration into incentivizedPoolIDs map
- Loading branch information
1 parent
23ca8f7
commit 53ca015
Showing
15 changed files
with
1,389 additions
and
525 deletions.
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.