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

feat(CL): app wiring for concentrated liquidity module #3071

Merged
merged 4 commits into from
Oct 20, 2022
Merged

feat(CL): app wiring for concentrated liquidity module #3071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6bfdbe2
feat(CL): app wiring for concentrated liquidity module
p0mvn Oct 19, 2022
6062892
Merge branch 'concentrated-liquidity-main' into roman/concentrated-wi…
p0mvn Oct 20, 2022
a96e7e0
lint
p0mvn Oct 20, 2022
2c1aa4a
field
p0mvn Oct 20, 2022
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
4 changes: 4 additions & 0 deletions app/keepers/keepers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ import (
_ "github.com/osmosis-labs/osmosis/v12/client/docs/statik"
owasm "github.com/osmosis-labs/osmosis/v12/wasmbinding"
concentratedliquidity "github.com/osmosis-labs/osmosis/v12/x/concentrated-liquidity"
concentratedliquiditytypes "github.com/osmosis-labs/osmosis/v12/x/concentrated-liquidity/types"
epochskeeper "github.com/osmosis-labs/osmosis/v12/x/epochs/keeper"
epochstypes "github.com/osmosis-labs/osmosis/v12/x/epochs/types"
gammkeeper "github.com/osmosis-labs/osmosis/v12/x/gamm/keeper"
Expand Down Expand Up @@ -256,6 +257,9 @@ func (appKeepers *AppKeepers) InitNormalKeepers(
appKeepers.GetSubspace(twaptypes.ModuleName),
appKeepers.GAMMKeeper)

appKeepers.ConcentratedLiquidityKeeper = concentratedliquidity.NewKeeper(
appKeepers.keys[concentratedliquiditytypes.StoreKey])

appKeepers.SwapRouterKeeper = swaprouter.NewKeeper(
appKeepers.keys[swaproutertypes.StoreKey],
appKeepers.GetSubspace(swaproutertypes.ModuleName),
Expand Down
7 changes: 3 additions & 4 deletions x/concentrated-liquidity/keeper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ import (
)

type Keeper struct {
storeKey sdk.StoreKey
transientKey *sdk.TransientStoreKey
storeKey sdk.StoreKey
}

func NewKeeper(storeKey sdk.StoreKey, transientKey *sdk.TransientStoreKey) *Keeper {
return &Keeper{storeKey: storeKey, transientKey: transientKey}
func NewKeeper(storeKey sdk.StoreKey) *Keeper {
return &Keeper{storeKey: storeKey}
}
7 changes: 3 additions & 4 deletions x/concentrated-liquidity/types/keys.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ import (
)

const (
ModuleName = "twap"
ModuleName = "concentrated-liquidity"

StoreKey = ModuleName
TransientStoreKey = "transient_" + ModuleName // this is silly we have to do this
RouterKey = ModuleName
StoreKey = ModuleName
RouterKey = ModuleName

QuerierRoute = ModuleName
// Contract: Coin denoms cannot contain this character
Expand Down