Skip to content

Commit

Permalink
feat: (tokenfactory): Wire module (#158)
Browse files Browse the repository at this point in the history 
Co-authored-by: Faulty Tolly <@faulttolerance.net>
Co-authored-by: Sergi Rene <[email protected]>
  • Loading branch information
@faultytolly @srene
faultytolly and srene authored Dec 2, 2024
1 parent b9ad42b commit 92712f7
Show file tree
Hide file tree
Showing 61 changed files with 11,401 additions and 38 deletions.
100 changes: 62 additions & 38 deletions app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,11 @@ import (
timeupgradekeeper "github.com/dymensionxyz/dymension-rdk/x/timeupgrade/keeper"
timeupgradetypes "github.com/dymensionxyz/dymension-rdk/x/timeupgrade/types"

"github.com/dymensionxyz/rollapp-wasm/x/tokenfactory"
"github.com/dymensionxyz/rollapp-wasm/x/tokenfactory/bindings"
tokenfactorykeeper "github.com/dymensionxyz/rollapp-wasm/x/tokenfactory/keeper"
tokenfactorytypes "github.com/dymensionxyz/rollapp-wasm/x/tokenfactory/types"

ibctransfer "github.com/cosmos/ibc-go/v6/modules/apps/transfer"
ibctransferkeeper "github.com/cosmos/ibc-go/v6/modules/apps/transfer/keeper"
ibctransfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types"
Expand Down Expand Up @@ -169,7 +174,7 @@ var (
ibchost.StoreKey, upgradetypes.StoreKey,
epochstypes.StoreKey, hubgentypes.StoreKey,
ibctransfertypes.StoreKey, capabilitytypes.StoreKey,
wasmtypes.StoreKey, gaslesstypes.StoreKey,
wasmtypes.StoreKey, tokenfactorytypes.StoreKey, gaslesstypes.StoreKey,
hubtypes.StoreKey,
callbackTypes.StoreKey,
cwerrorsTypes.StoreKey,
Expand Down Expand Up @@ -219,6 +224,7 @@ var (
ibctransfer.AppModuleBasic{},
vesting.AppModuleBasic{},
hubgenesis.AppModuleBasic{},
tokenfactory.NewAppModuleBasic(),
wasm.AppModuleBasic{},
hub.AppModuleBasic{},
timeupgrade.AppModuleBasic{},
Expand All @@ -242,6 +248,7 @@ var (
gaslesstypes.ModuleName: nil,
callbackTypes.ModuleName: nil,
rollappparamstypes.ModuleName: nil,
tokenfactorytypes.ModuleName: {authtypes.Minter, authtypes.Burner},
}

// module accounts that are allowed to receive tokens
Expand Down Expand Up @@ -283,27 +290,28 @@ type App struct {
memKeys map[string]*storetypes.MemoryStoreKey

// keepers
AccountKeeper authkeeper.AccountKeeper
AuthzKeeper authzkeeper.Keeper
BankKeeper bankkeeper.Keeper
CapabilityKeeper *capabilitykeeper.Keeper
StakingKeeper stakingkeeper.Keeper
SequencersKeeper seqkeeper.Keeper
MintKeeper mintkeeper.Keeper
EpochsKeeper epochskeeper.Keeper
DistrKeeper distrkeeper.Keeper
GovKeeper govkeeper.Keeper
HubGenesisKeeper hubgenkeeper.Keeper
UpgradeKeeper upgradekeeper.Keeper
ParamsKeeper paramskeeper.Keeper
IBCKeeper *ibckeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly
TransferKeeper ibctransferkeeper.Keeper
WasmKeeper wasmkeeper.Keeper
FeeGrantKeeper feegrantkeeper.Keeper
GaslessKeeper gaslesskeeper.Keeper
CallbackKeeper callbackKeeper.Keeper
CWErrorsKeeper cwerrorsKeeper.Keeper
TimeUpgradeKeeper timeupgradekeeper.Keeper
AccountKeeper authkeeper.AccountKeeper
AuthzKeeper authzkeeper.Keeper
BankKeeper bankkeeper.BaseKeeper
CapabilityKeeper *capabilitykeeper.Keeper
StakingKeeper stakingkeeper.Keeper
SequencersKeeper seqkeeper.Keeper
MintKeeper mintkeeper.Keeper
EpochsKeeper epochskeeper.Keeper
DistrKeeper distrkeeper.Keeper
GovKeeper govkeeper.Keeper
HubGenesisKeeper hubgenkeeper.Keeper
UpgradeKeeper upgradekeeper.Keeper
ParamsKeeper paramskeeper.Keeper
IBCKeeper *ibckeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly
TransferKeeper ibctransferkeeper.Keeper
WasmKeeper wasmkeeper.Keeper
TokenFactoryKeeper tokenfactorykeeper.Keeper
FeeGrantKeeper feegrantkeeper.Keeper
GaslessKeeper gaslesskeeper.Keeper
CallbackKeeper callbackKeeper.Keeper
CWErrorsKeeper cwerrorsKeeper.Keeper
TimeUpgradeKeeper timeupgradekeeper.Keeper

// make scoped keepers public for test purposes
ScopedIBCKeeper capabilitykeeper.ScopedKeeper
Expand Down Expand Up @@ -446,6 +454,17 @@ func NewRollapp(
),
)

app.SequencersKeeper = *seqkeeper.NewKeeper(
appCodec,
keys[seqtypes.StoreKey],
app.GetSubspace(seqtypes.ModuleName),
authtypes.NewModuleAddress(seqtypes.ModuleName).String(),
app.AccountKeeper,
app.RollappParamsKeeper,
app.UpgradeKeeper,
[]seqkeeper.AccountBumpFilterFunc{},
)

app.DistrKeeper = distrkeeper.NewKeeper(
appCodec,
keys[distrtypes.StoreKey],
Expand Down Expand Up @@ -476,17 +495,6 @@ func NewRollapp(
app.GetSubspace(rollappparamstypes.ModuleName),
)

app.SequencersKeeper = *seqkeeper.NewKeeper(
appCodec,
keys[seqtypes.StoreKey],
app.GetSubspace(seqtypes.ModuleName),
authtypes.NewModuleAddress(seqtypes.ModuleName).String(),
app.AccountKeeper,
app.RollappParamsKeeper,
app.UpgradeKeeper,
[]seqkeeper.AccountBumpFilterFunc{},
)

app.IBCKeeper = ibckeeper.NewKeeper(
appCodec, keys[ibchost.StoreKey], app.GetSubspace(ibchost.ModuleName), &app.SequencersKeeper, app.UpgradeKeeper, scopedIBCKeeper,
)
Expand All @@ -503,6 +511,11 @@ func NewRollapp(
AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(app.UpgradeKeeper)).
AddRoute(ibcclienttypes.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper))

// The gov proposal types can be individually enabled
if len(enabledProposals) != 0 {
govRouter.AddRoute(wasm.RouterKey, wasm.NewWasmProposalHandler(app.WasmKeeper, enabledProposals))
}

govConfig := govtypes.DefaultConfig()
/*
Example of setting gov params:
Expand Down Expand Up @@ -533,6 +546,15 @@ func NewRollapp(
keys[hubtypes.StoreKey],
)

tokenFactoryKeeper := tokenfactorykeeper.NewKeeper(
keys[tokenfactorytypes.StoreKey],
app.GetSubspace(tokenfactorytypes.ModuleName),
app.AccountKeeper,
app.BankKeeper,
app.DistrKeeper,
)
app.TokenFactoryKeeper = tokenFactoryKeeper

var ics4Wrapper ibcporttypes.ICS4Wrapper
// The IBC tranfer submit is wrapped with the following middlewares:
// - denom metadata middleware
Expand Down Expand Up @@ -604,16 +626,13 @@ func NewRollapp(
panic(fmt.Sprintf("error while reading wasm config: %s", err))
}

// The gov proposal types can be individually enabled
if len(enabledProposals) != 0 {
govRouter.AddRoute(wasm.RouterKey, wasm.NewWasmProposalHandler(app.WasmKeeper, enabledProposals))
}

// Include the x/cwerrors query to stargate queries
wasmOpts = append(wasmOpts, wasmkeeper.WithQueryPlugins(&wasmkeeper.QueryPlugins{
Stargate: wasmkeeper.AcceptListStargateQuerier(getAcceptedStargateQueries(), app.GRPCQueryRouter(), appCodec),
}))

wasmOpts = append(bindings.RegisterCustomPlugins(&app.BankKeeper, &app.TokenFactoryKeeper), wasmOpts...)

// The last arguments can contain custom message handlers, and custom query handlers,
// if we want to allow any custom callbacks
availableCapabilities := strings.Join(AllCapabilities(), ",")
Expand Down Expand Up @@ -682,6 +701,7 @@ func NewRollapp(
ibc.NewAppModule(app.IBCKeeper),
ibctransfer.NewAppModule(app.TransferKeeper),
upgrade.NewAppModule(app.UpgradeKeeper),
tokenfactory.NewAppModule(app.TokenFactoryKeeper, app.AccountKeeper, app.BankKeeper),
hubgenesis.NewAppModule(appCodec, app.HubGenesisKeeper),
hub.NewAppModule(appCodec, app.HubKeeper),
timeupgrade.NewAppModule(app.TimeUpgradeKeeper, app.UpgradeKeeper),
Expand Down Expand Up @@ -720,6 +740,7 @@ func NewRollapp(
hubgentypes.ModuleName,
hubtypes.ModuleName,
wasm.ModuleName,
tokenfactorytypes.ModuleName,
callbackTypes.ModuleName,
cwerrorsTypes.ModuleName, // does not have begin blocker
rollappparamstypes.ModuleName,
Expand Down Expand Up @@ -752,6 +773,7 @@ func NewRollapp(
callbackTypes.ModuleName,
cwerrorsTypes.ModuleName,
rollappparamstypes.ModuleName,
tokenfactorytypes.ModuleName,
}
app.mm.SetOrderEndBlockers(endBlockersList...)

Expand Down Expand Up @@ -783,6 +805,7 @@ func NewRollapp(
gaslesstypes.ModuleName,
hubgentypes.ModuleName,
hubtypes.ModuleName,
tokenfactorytypes.ModuleName,
wasm.ModuleName,
callbackTypes.ModuleName,
cwerrorsTypes.ModuleName,
Expand Down Expand Up @@ -1147,6 +1170,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
paramsKeeper.Subspace(gaslesstypes.ModuleName)

paramsKeeper.Subspace(wasmtypes.ModuleName)
paramsKeeper.Subspace(tokenfactorytypes.ModuleName)
paramsKeeper.Subspace(callbackTypes.ModuleName)
paramsKeeper.Subspace(cwerrorsTypes.ModuleName)
paramsKeeper.Subspace(rollappparamstypes.ModuleName)
Expand Down
Loading

0 comments on commit 92712f7

Please sign in to comment.