Skip to content

Commit 056f938

Browse files
pbukvapbukva
authored
Revert "Removed Gaia liquid staking module (#426)" (#429)
This reverts commit eb39fe4.
1 parent eb39fe4 commit 056f938

4 files changed

Lines changed: 68 additions & 11 deletions

File tree

‎app/app.go‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
"github.com/cosmos/cosmos-sdk/x/group"
2929
groupmodule "github.com/cosmos/cosmos-sdk/x/group/module"
3030
"github.com/cosmos/cosmos-sdk/x/protocolpool"
31+
"github.com/cosmos/gaia/v25/x/liquid"
3132
"github.com/cosmos/gogoproto/proto"
3233
icacontroller "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/controller"
3334
ibccallbacks "github.com/cosmos/ibc-go/v10/modules/apps/callbacks"
@@ -121,6 +122,8 @@ import (
121122
"github.com/cosmos/cosmos-sdk/x/staking"
122123
stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
123124
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
125+
liquidkeeper "github.com/cosmos/gaia/v25/x/liquid/keeper"
126+
liquidtypes "github.com/cosmos/gaia/v25/x/liquid/types"
124127
ica "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts"
125128
icacontrollerkeeper "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/controller/keeper"
126129
icacontrollertypes "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/controller/types"
@@ -254,6 +257,7 @@ type App struct {
254257
SlashingKeeper slashingkeeper.Keeper
255258
MintKeeper mintkeeper.Keeper
256259
DistrKeeper distrkeeper.Keeper
260+
LiquidKeeper *liquidkeeper.Keeper
257261
GovKeeper govkeeper.Keeper
258262
UpgradeKeeper *upgradekeeper.Keeper
259263
EvidenceKeeper evidencekeeper.Keeper
@@ -283,7 +287,7 @@ type App struct {
283287
sm *module.SimulationManager
284288
}
285289

286-
// New returns a reference to an initialized App.
290+
// New returns a reference to an initialized Gaia.
287291
// NewSimApp returns a reference to an initialized SimApp.
288292
func New(
289293
logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest bool,
@@ -345,6 +349,7 @@ func New(
345349
icacontrollertypes.StoreKey,
346350
paramstypes.StoreKey,
347351
CapabilityStoreKey,
352+
liquidtypes.StoreKey,
348353
)
349354
tkeys := storetypes.NewTransientStoreKeys(paramstypes.TStoreKey)
350355
memkeys := storetypes.NewMemoryStoreKeys(CapabilityMemStoreKey)
@@ -476,6 +481,16 @@ func New(
476481
authtypes.NewModuleAddress(govtypes.ModuleName).String(),
477482
)
478483

484+
app.LiquidKeeper = liquidkeeper.NewKeeper(
485+
appCodec,
486+
runtime.NewKVStoreService(keys[liquidtypes.StoreKey]),
487+
app.AccountKeeper,
488+
app.BankKeeper,
489+
app.StakingKeeper,
490+
app.DistrKeeper,
491+
authtypes.NewModuleAddress(govtypes.ModuleName).String(),
492+
)
493+
479494
app.FeeGrantKeeper = feegrantkeeper.NewKeeper(
480495
appCodec,
481496
runtime.NewKVStoreService(keys[feegrant.StoreKey]),
@@ -488,6 +503,7 @@ func New(
488503
stakingtypes.NewMultiStakingHooks(
489504
app.DistrKeeper.Hooks(),
490505
app.SlashingKeeper.Hooks(),
506+
app.LiquidKeeper.Hooks(),
491507
),
492508
)
493509

@@ -567,7 +583,7 @@ func New(
567583

568584
app.GovKeeper = *govKeeper.SetHooks(
569585
govtypes.NewMultiGovHooks(
570-
// register the governance hooks
586+
// register the governance hooks
571587
),
572588
)
573589

@@ -597,7 +613,7 @@ func New(
597613

598614
app.EpochsKeeper.SetHooks(
599615
epochstypes.NewMultiEpochHooks(
600-
// insert epoch hooks receivers here
616+
// insert epoch hooks receivers here
601617
),
602618
)
603619

@@ -747,6 +763,7 @@ func New(
747763
transfer.NewAppModule(app.TransferKeeper),
748764
ica.NewAppModule(&app.ICAControllerKeeper, &app.ICAHostKeeper),
749765
ibctm.NewAppModule(tmLightClientModule),
766+
liquid.NewAppModule(appCodec, app.LiquidKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),
750767
)
751768

752769
// BasicModuleManager defines the module BasicManager is in charge of setting up basic,
@@ -787,6 +804,7 @@ func New(
787804
ibctransfertypes.ModuleName,
788805
ibcexported.ModuleName,
789806
icatypes.ModuleName,
807+
liquidtypes.ModuleName,
790808
wasmtypes.ModuleName,
791809
)
792810

@@ -839,6 +857,7 @@ func New(
839857
icatypes.ModuleName,
840858
// wasm after ibc transfer
841859
wasmtypes.ModuleName,
860+
liquidtypes.ModuleName,
842861
}
843862

844863
exportModuleOrder := []string{
@@ -867,6 +886,7 @@ func New(
867886
icatypes.ModuleName,
868887
// wasm after ibc transfer
869888
wasmtypes.ModuleName,
889+
liquidtypes.ModuleName,
870890
}
871891

872892
app.mm.SetOrderInitGenesis(genesisModuleOrder...)
@@ -1046,15 +1066,15 @@ func (app *App) LegacyAmino() *codec.LegacyAmino {
10461066
return app.legacyAmino
10471067
}
10481068

1049-
// AppCodec returns app codec.
1069+
// AppCodec returns Gaia's app codec.
10501070
//
10511071
// NOTE: This is solely to be used for testing purposes as it may be desirable
10521072
// for modules to register their own custom testing types.
10531073
func (app *App) AppCodec() codec.Codec {
10541074
return app.appCodec
10551075
}
10561076

1057-
// InterfaceRegistry returns InterfaceRegistry
1077+
// InterfaceRegistry returns Gaia's InterfaceRegistry
10581078
func (app *App) InterfaceRegistry() types.InterfaceRegistry {
10591079
return app.interfaceRegistry
10601080
}

‎app/upgrades.go‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"strings"
99
"time"
1010

11+
"cosmossdk.io/math"
1112
storetypes "cosmossdk.io/store/types"
1213
circuittypes "cosmossdk.io/x/circuit/types"
1314
"cosmossdk.io/x/nft"
@@ -24,6 +25,8 @@ import (
2425
//minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
2526
paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
2627
protocolpooltypes "github.com/cosmos/cosmos-sdk/x/protocolpool/types"
28+
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
29+
liquidtypes "github.com/cosmos/gaia/v25/x/liquid/types"
2730
icacontrollertypes "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/controller/types"
2831
icatypes "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/types"
2932
ibctransfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types"
@@ -45,6 +48,7 @@ var v053StoreUpgrades = storetypes.StoreUpgrades{
4548
group.StoreKey,
4649
icacontrollertypes.StoreKey,
4750
nft.StoreKey,
51+
liquidtypes.StoreKey,
4852
},
4953
Renamed: []storetypes.StoreRename{
5054
// {OldKey: "oldkey", NewKey: "newkey"},
@@ -100,11 +104,39 @@ func (app *App) RegisterUpgradeHandlers(cfg module.Configurator) {
100104
return nil, err
101105
}
102106

107+
/*
108+
// Pre-seed legacy x/params for mint
109+
if ss, ok := app.ParamsKeeper.GetSubspace(minttypes.ModuleName); ok {
110+
if !ss.Has(sdkCtx, minttypes.KeyInflationRateChange) {
111+
p := minttypes.DefaultParams()
112+
p.MintDenom = "afet"
113+
// TODO: if your chain had custom values, set them here:
114+
ss.SetParamSet(sdkCtx, &p)
115+
}
116+
}
117+
*/
118+
103119
err = migrateConsensusParamsFromParamsStore(app, sdkCtx)
104120
if err != nil {
105121
return nil, err
106122
}
107123

124+
// Bootstrap liquid staking
125+
err = app.StakingKeeper.IterateValidators(ctx, func(_ int64, v stakingtypes.ValidatorI) (stop bool) {
126+
lv := liquidtypes.LiquidValidator{
127+
OperatorAddress: v.GetOperator(),
128+
LiquidShares: math.LegacyZeroDec(),
129+
}
130+
err := app.LiquidKeeper.SetLiquidValidator(ctx, lv)
131+
if err != nil {
132+
return false
133+
}
134+
return false
135+
})
136+
if err != nil {
137+
return nil, err
138+
}
139+
108140
// If you must pin any module "from" versions, adjust fromVM here.
109141
return app.mm.RunMigrations(ctx, cfg, fromVM)
110142
},

‎go.mod‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ require (
88
github.com/CosmWasm/wasmd v0.61.2
99
github.com/CosmWasm/wasmvm/v3 v3.0.0 // indirect
1010
github.com/cosmos/cosmos-proto v1.0.0-beta.5 // indirect
11+
github.com/cosmos/gaia/v25 v25.1.1
1112
github.com/cosmos/gogogateway v1.2.0 // indirect
1213
github.com/cosmos/gogoproto v1.7.0
1314
github.com/cosmos/iavl v1.2.6 // indirect

‎go.sum‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -820,8 +820,8 @@ github.com/cometbft/cometbft v0.38.19 h1:vNdtCkvhuwUlrcLPAyigV7lQpmmo+tAq8CsB8gZ
820820
github.com/cometbft/cometbft v0.38.19/go.mod h1:UCu8dlHqvkAsmAFmWDRWNZJPlu6ya2fTWZlDrWsivwo=
821821
github.com/cometbft/cometbft-db v1.0.4 h1:cezb8yx/ZWcF124wqUtAFjAuDksS1y1yXedvtprUFxs=
822822
github.com/cometbft/cometbft-db v1.0.4/go.mod h1:M+BtHAGU2XLrpUxo3Nn1nOCcnVCiLM9yx5OuT0u5SCA=
823-
github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg=
824-
github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM=
823+
github.com/containerd/continuity v0.4.5 h1:ZRoN1sXq9u7V6QoHMcVWGhOwDFqZ4B9i5H6un1Wh0x4=
824+
github.com/containerd/continuity v0.4.5/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE=
825825
github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
826826
github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
827827
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
@@ -832,6 +832,8 @@ github.com/cosmos/cosmos-db v1.1.3 h1:7QNT77+vkefostcKkhrzDK9uoIEryzFrU9eoMeaQOP
832832
github.com/cosmos/cosmos-db v1.1.3/go.mod h1:kN+wGsnwUJZYn8Sy5Q2O0vCYA99MJllkKASbs6Unb9U=
833833
github.com/cosmos/cosmos-proto v1.0.0-beta.5 h1:eNcayDLpip+zVLRLYafhzLvQlSmyab+RC5W7ZfmxJLA=
834834
github.com/cosmos/cosmos-proto v1.0.0-beta.5/go.mod h1:hQGLpiIUloJBMdQMMWb/4wRApmI9hjHH05nefC0Ojec=
835+
github.com/cosmos/gaia/v25 v25.1.1 h1:PVfU1tY/ImLv387SxS7aLUejWhKpCXxy92FYwxHFGsc=
836+
github.com/cosmos/gaia/v25 v25.1.1/go.mod h1:nk61Mb7EUU9hnfblUyYEwO/W5IajYOQQrArz8r0iQAY=
835837
github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
836838
github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
837839
github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE=
@@ -1337,6 +1339,8 @@ github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS4
13371339
github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
13381340
github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
13391341
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
1342+
github.com/moby/sys/user v0.3.0 h1:9ni5DlcW5an3SvRSx4MouotOygvzaXbaSrc/wGDFWPo=
1343+
github.com/moby/sys/user v0.3.0/go.mod h1:bG+tYYYJgaMtRKgEmuueC0hJEAZWwtIbZTB+85uoHjs=
13401344
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
13411345
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
13421346
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
@@ -1382,10 +1386,10 @@ github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeD
13821386
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
13831387
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
13841388
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
1385-
github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/cbdlwvlWt0pnFI=
1386-
github.com/opencontainers/image-spec v1.1.0-rc5/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=
1387-
github.com/opencontainers/runc v1.1.12 h1:BOIssBaW1La0/qbNZHXOOa71dZfZEQOzW7dqQf3phss=
1388-
github.com/opencontainers/runc v1.1.12/go.mod h1:S+lQwSfncpBha7XTy/5lBwWgm5+y5Ma/O44Ekby9FK8=
1389+
github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
1390+
github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
1391+
github.com/opencontainers/runc v1.2.3 h1:fxE7amCzfZflJO2lHXf4y/y8M1BoAqp+FVmG19oYB80=
1392+
github.com/opencontainers/runc v1.2.3/go.mod h1:nSxcWUydXrsBZVYNSkTjoQ/N6rcyTtn+1SD5D4+kRIM=
13891393
github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
13901394
github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
13911395
github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=

0 commit comments

Comments
 (0)