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.

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

feat! Break out LSM module from SDK #3455

Open
wants to merge 39 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
3257c7e
Port proto files
Eric-Warehime Dec 17, 2024
af1bb94
Add types keys
Eric-Warehime Dec 17, 2024
8c9573c
WIP migrate LSM to its own module
Eric-Warehime Dec 18, 2024
66dfe2d
Add more functions
Eric-Warehime Dec 19, 2024
74266a3
Validate genesis
Eric-Warehime Dec 19, 2024
7ad4806
Wire up keeper
Eric-Warehime Dec 19, 2024
a2653d6
Update expected keepers
Eric-Warehime Jan 3, 2025
9612d78
Add simulation, fix lints
Eric-Warehime Jan 3, 2025
06e3aa2
Remove subspace, mod acc check
Eric-Warehime Jan 7, 2025
d262622
Ignore overflow lint
Eric-Warehime Jan 7, 2025
798773d
Not porting invariants
Eric-Warehime Jan 7, 2025
17c5b12
Add mocks, liquid val type storage
Eric-Warehime Jan 10, 2025
88ace9d
Add tests, liquid validator types
Eric-Warehime Jan 10, 2025
4d8d4ce
tokenize share record test
Eric-Warehime Jan 10, 2025
624bbd7
Remove sims
Eric-Warehime Jan 13, 2025
ce4244a
Update proto
Eric-Warehime Jan 13, 2025
8116c8c
Add autocli
Eric-Warehime Jan 13, 2025
155f93a
Add cli
Eric-Warehime Jan 13, 2025
5861f45
Fix format
Eric-Warehime Jan 13, 2025
b948fea
Merge remote-tracking branch 'origin' into eric/lsm-split
Eric-Warehime Jan 13, 2025
06b0abf
Fix lint
Eric-Warehime Jan 13, 2025
31feb7e
Remove lsm fork
Eric-Warehime Jan 13, 2025
60340f4
Fix errors
Eric-Warehime Jan 13, 2025
4648833
Update e2e tests
Eric-Warehime Jan 13, 2025
7bfb79d
Add tests, hooks
Eric-Warehime Jan 16, 2025
432baa2
Add distr functions to service
Eric-Warehime Jan 16, 2025
b1fd9fb
Fix
Eric-Warehime Jan 16, 2025
36ffe51
Merge remote-tracking branch 'origin' into eric/lsm-split
Eric-Warehime Jan 21, 2025
cd95cea
Merge remote-tracking branch 'origin' into eric/lsm-split
Eric-Warehime Jan 22, 2025
8eaf861
Fix v22, v23 for lsm module deps
Eric-Warehime Jan 22, 2025
ce2ec2c
Fix upgrade
Eric-Warehime Jan 23, 2025
27dbeb3
Merge remote-tracking branch 'origin' into eric/lsm-split
Eric-Warehime Jan 27, 2025
843e15a
Fix bech32 warning
Eric-Warehime Jan 27, 2025
7810327
Rename to x/liquid
Eric-Warehime Jan 30, 2025
9b566fa
Add begin blocker, update hooks comment
Eric-Warehime Jan 30, 2025
016c2a6
Remove validator bond
Eric-Warehime Jan 31, 2025
3fe152a
Fix tests
Eric-Warehime Jan 31, 2025
93b6a02
Update gov prop in tests
Eric-Warehime Jan 31, 2025
8cf8f07
Merge remote-tracking branch 'origin' into eric/lsm-split
Eric-Warehime Jan 31, 2025
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
Prev Previous commit
Next Next commit
Wire up keeper
Eric-Warehime committed Dec 19, 2024

Verified

This commit was signed with the committer’s verified signature.
Eric-Warehime Eric Warehime
commit 7ad480689e49057d38ffab12e98413268e9e8b8d
14 changes: 14 additions & 0 deletions app/keepers/keepers.go
Original file line number Diff line number Diff line change
@@ -82,6 +82,9 @@ import (
"github.com/CosmWasm/wasmd/x/wasm"
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"

lsmkeeper "github.com/cosmos/gaia/v22/x/lsm/keeper"
lsmtypes "github.com/cosmos/gaia/v22/x/lsm/types"
)

type AppKeepers struct {
@@ -98,6 +101,7 @@ type AppKeepers struct {
SlashingKeeper slashingkeeper.Keeper
MintKeeper mintkeeper.Keeper
DistrKeeper distrkeeper.Keeper
LsmKeeper *lsmkeeper.Keeper
GovKeeper *govkeeper.Keeper
CrisisKeeper *crisiskeeper.Keeper
UpgradeKeeper *upgradekeeper.Keeper
@@ -282,6 +286,16 @@ func NewAppKeeper(
),
)

appKeepers.LsmKeeper = lsmkeeper.NewKeeper(
appCodec,
runtime.NewKVStoreService(appKeepers.keys[lsmtypes.StoreKey]),
appKeepers.AccountKeeper,
appKeepers.BankKeeper,
appKeepers.StakingKeeper,
appKeepers.DistrKeeper,
authtypes.NewModuleAddress(govtypes.ModuleName).String(),
)

appKeepers.FeeMarketKeeper = feemarketkeeper.NewKeeper(
appCodec,
appKeepers.keys[feemarkettypes.StoreKey],
2 changes: 2 additions & 0 deletions app/keepers/keys.go
Original file line number Diff line number Diff line change
@@ -29,6 +29,7 @@ import (
paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
lsmtypes "github.com/cosmos/gaia/v22/x/lsm/types"

wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
)
@@ -62,6 +63,7 @@ func (appKeepers *AppKeepers) GenerateKeys() {
consensusparamtypes.StoreKey,
feemarkettypes.StoreKey,
wasmtypes.StoreKey,
lsmtypes.StoreKey,
)

// Define transient store keys