@@ -154,13 +154,12 @@ import (
154154 // kvindexer
155155 indexer "github.com/initia-labs/kvindexer"
156156 indexerconfig "github.com/initia-labs/kvindexer/config"
157- indexermodule "github.com/initia-labs/kvindexer/module"
158- indexerkeeper "github.com/initia-labs/kvindexer/module/keeper"
159- indexertypes "github.com/initia-labs/kvindexer/module/types"
160- blocksubmodule "github.com/initia-labs/kvindexer/submodule/block"
161- "github.com/initia-labs/kvindexer/submodule/nft"
162- "github.com/initia-labs/kvindexer/submodule/pair"
163- "github.com/initia-labs/kvindexer/submodule/tx"
157+ blocksubmodule "github.com/initia-labs/kvindexer/submodules/block"
158+ pair "github.com/initia-labs/kvindexer/submodules/pair"
159+ tx "github.com/initia-labs/kvindexer/submodules/tx"
160+ nft "github.com/initia-labs/kvindexer/submodules/wasm-nft"
161+ indexermodule "github.com/initia-labs/kvindexer/x/kvindexer"
162+ indexerkeeper "github.com/initia-labs/kvindexer/x/kvindexer/keeper"
164163
165164 // unnamed import of statik for swagger UI support
166165 _ "github.com/initia-labs/miniwasm/client/docs/statik"
@@ -784,7 +783,6 @@ func NewMinitiaApp(
784783 app .ModuleManager ,
785784 map [string ]module.AppModuleBasic {
786785 genutiltypes .ModuleName : genutil .NewAppModuleBasic (genutiltypes .DefaultMessageValidator ),
787- indexertypes .ModuleName : app .indexerModule ,
788786 })
789787 app .BasicModuleManager .RegisterLegacyAminoCodec (legacyAmino )
790788 app .BasicModuleManager .RegisterInterfaces (interfaceRegistry )
@@ -1277,27 +1275,33 @@ func (app *MinitiaApp) setupIndexer(appOpts servertypes.AppOptions, homePath str
12771275 }
12781276 app .indexerKeeper = indexerkeeper .NewKeeper (
12791277 appCodec ,
1280- app .AccountKeeper ,
1281- app .BankKeeper ,
1282- nil , // placeholder for distribution keeper
1283- nil , // placeholder for staking keeper
1284- nil , // placeholder for reward keeper,
1285- nil , // placeholder for community pool keeper
1286- indexerkeeper.VMKeeper {Keeper : * app .WasmKeeper },
1287- app .IBCKeeper ,
1288- app .TransferKeeper ,
1289- nil ,
1290- app .OPChildKeeper ,
1291- authtypes .FeeCollectorName ,
1278+ "wasm" ,
12921279 homePath ,
12931280 indexerConfig ,
12941281 ac ,
12951282 vc ,
12961283 )
1297- err = app .indexerKeeper .RegisterSubmodules (nft .Submodule , pair .Submodule , tx .Submodule , blocksubmodule .Submodule )
1284+ smBlock , err := blocksubmodule .NewBlockSubmodule (appCodec , app .indexerKeeper , app .OPChildKeeper )
1285+ if err != nil {
1286+ panic (err )
1287+ }
1288+ smTx , err := tx .NewTxSubmodule (appCodec , app .indexerKeeper )
1289+ if err != nil {
1290+ panic (err )
1291+ }
1292+ smPair , err := pair .NewPairSubmodule (appCodec , app .indexerKeeper , app .IBCKeeper .ChannelKeeper , app .TransferKeeper )
1293+ if err != nil {
1294+ panic (err )
1295+ }
1296+ smNft , err := nft .NewWasmNFTSubmodule (ac , appCodec , app .indexerKeeper , app .WasmKeeper , smPair )
12981297 if err != nil {
12991298 panic (err )
13001299 }
1300+ err = app .indexerKeeper .RegisterSubmodules (smBlock , smTx , smPair , smNft )
1301+ if err != nil {
1302+ panic (err )
1303+ }
1304+
13011305 app .indexerModule = indexermodule .NewAppModuleBasic (app .indexerKeeper )
13021306 // Add your implementation here
13031307
0 commit comments