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

fix: add missing move hook #3

Merged
merged 2 commits into from
Dec 13, 2023
Merged

fix: add missing move hook #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fd7958
add missing move hook
beer-1 Dec 13, 2023
5a01824
clear transfer stack
beer-1 Dec 13, 2023
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
220 changes: 114 additions & 106 deletions app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,6 @@ type MinitiaApp struct {
txConfig client.TxConfig
interfaceRegistry types.InterfaceRegistry

invCheckPeriod uint

// keys to access the substores
keys map[string]*storetypes.KVStoreKey
tkeys map[string]*storetypes.TransientStoreKey
Expand Down Expand Up @@ -422,118 +420,128 @@ func NewMinitiaApp(
)
app.IBCFeeKeeper = &ibcFeeKeeper

////////////////////////////
///////////////////////////
// Transfer configuration //
////////////////////////////
// Send : transfer -> move -> fee -> channel
// Receive: channel -> fee -> move -> transfer

moveMiddleware := &moveibcmiddleware.IBCMiddleware{}
feeMiddleware := &ibcfee.IBCMiddleware{}

// Create Transfer Keepers
transferKeeper := ibctransferkeeper.NewKeeper(
appCodec,
keys[ibctransfertypes.StoreKey],
app.GetSubspace(ibctransfertypes.ModuleName),
// ics4wrapper: transfer -> router
moveMiddleware,
app.IBCKeeper.ChannelKeeper,
&app.IBCKeeper.PortKeeper,
app.AccountKeeper,
app.BankKeeper,
scopedTransferKeeper,
)
app.TransferKeeper = &transferKeeper
transferModule := ibctransfer.NewAppModule(*app.TransferKeeper)
transferIBCModule := ibctransfer.NewIBCModule(*app.TransferKeeper)

// channel -> ibcfee -> move -> transfer
transferStack := feeMiddleware

// create move middleware for transfer
*moveMiddleware = moveibcmiddleware.NewIBCMiddleware(
// receive: move -> transfer
transferIBCModule,
// ics4wrapper: transfer -> move -> fee
feeMiddleware,
moveKeeper,
)

// create ibcfee middleware for transfer
*feeMiddleware = ibcfee.NewIBCMiddleware(
// receive: fee -> move -> transfer
moveMiddleware,
// ics4wrapper: transfer -> move -> fee -> channel
*app.IBCFeeKeeper,
)
// Send : transfer -> fee -> channel
// Receive: channel -> fee -> move -> transfer

var transferStack porttypes.IBCModule
{
// Create Transfer Keepers
transferKeeper := ibctransferkeeper.NewKeeper(
appCodec,
keys[ibctransfertypes.StoreKey],
app.GetSubspace(ibctransfertypes.ModuleName),
// ics4wrapper: transfer -> fee
app.IBCFeeKeeper,
app.IBCKeeper.ChannelKeeper,
&app.IBCKeeper.PortKeeper,
app.AccountKeeper,
app.BankKeeper,
scopedTransferKeeper,
)
app.TransferKeeper = &transferKeeper
transferIBCModule := ibctransfer.NewIBCModule(*app.TransferKeeper)

// create move middleware for transfer
moveMiddleware := moveibcmiddleware.NewIBCMiddleware(
// receive: move -> transfer
transferIBCModule,
// ics4wrapper: not used
nil,
moveKeeper,
)

// create ibcfee middleware for transfer
transferStack = ibcfee.NewIBCMiddleware(
// receive: fee -> move -> transfer
moveMiddleware,
// ics4wrapper: transfer -> fee -> channel
*app.IBCFeeKeeper,
)
}

////////////////////////////////
// Nft Transfer configuration //
////////////////////////////////

// Create Transfer Keepers
app.NftTransferKeeper = ibcnfttransferkeeper.NewKeeper(
appCodec,
keys[ibcnfttransfertypes.StoreKey],
// ics4wrapper: nft transfer -> fee -> channel
app.IBCFeeKeeper,
app.IBCKeeper.ChannelKeeper,
&app.IBCKeeper.PortKeeper,
app.AccountKeeper,
movekeeper.NewNftKeeper(moveKeeper),
scopedNftTransferKeeper,
authtypes.NewModuleAddress(opchildtypes.ModuleName).String(),
)
nftTransferModule := ibcnfttransfer.NewAppModule(*app.NftTransferKeeper)
nftTransferIBCModule := ibcnfttransfer.NewIBCModule(*app.NftTransferKeeper)
nftTransferStack := ibcfee.NewIBCMiddleware(
// receive: channel -> fee -> nft transfer
nftTransferIBCModule,
*app.IBCFeeKeeper,
)
var nftTransferStack porttypes.IBCModule
{
// Create Transfer Keepers
app.NftTransferKeeper = ibcnfttransferkeeper.NewKeeper(
appCodec,
keys[ibcnfttransfertypes.StoreKey],
// ics4wrapper: nft transfer -> fee -> channel
app.IBCFeeKeeper,
app.IBCKeeper.ChannelKeeper,
&app.IBCKeeper.PortKeeper,
app.AccountKeeper,
movekeeper.NewNftKeeper(moveKeeper),
scopedNftTransferKeeper,
authtypes.NewModuleAddress(opchildtypes.ModuleName).String(),
)
nftTransferIBCModule := ibcnfttransfer.NewIBCModule(*app.NftTransferKeeper)

// create move middleware for nft transfer
moveMiddleware := moveibcmiddleware.NewIBCMiddleware(
// receive: move -> nft transfer
nftTransferIBCModule,
// ics4wrapper: not used
nil,
moveKeeper,
)

nftTransferStack = ibcfee.NewIBCMiddleware(
// receive: channel -> fee -> move -> nft transfer
moveMiddleware,
*app.IBCFeeKeeper,
)
}

///////////////////////
// ICA configuration //
///////////////////////

icaHostKeeper := icahostkeeper.NewKeeper(
appCodec, keys[icahosttypes.StoreKey],
app.GetSubspace(icahosttypes.SubModuleName),
app.IBCFeeKeeper,
app.IBCKeeper.ChannelKeeper,
&app.IBCKeeper.PortKeeper,
app.AccountKeeper,
scopedICAHostKeeper,
app.MsgServiceRouter(),
)
app.ICAHostKeeper = &icaHostKeeper

icaControllerKeeper := icacontrollerkeeper.NewKeeper(
appCodec, keys[icacontrollertypes.StoreKey],
app.GetSubspace(icacontrollertypes.SubModuleName),
app.IBCFeeKeeper,
app.IBCKeeper.ChannelKeeper,
&app.IBCKeeper.PortKeeper,
scopedICAControllerKeeper,
app.MsgServiceRouter(),
)
app.ICAControllerKeeper = &icaControllerKeeper

icaAuthKeeper := icaauthkeeper.NewKeeper(
appCodec, keys[icaauthtypes.StoreKey],
*app.ICAControllerKeeper,
scopedICAAuthKeeper,
)
app.ICAAuthKeeper = &icaAuthKeeper

icaModule := ica.NewAppModule(app.ICAControllerKeeper, app.ICAHostKeeper)
icaAuthModule := icaauth.NewAppModule(appCodec, *app.ICAAuthKeeper)
icaAuthIBCModule := icaauth.NewIBCModule(*app.ICAAuthKeeper)
icaHostIBCModule := icahost.NewIBCModule(*app.ICAHostKeeper)
icaHostStack := ibcfee.NewIBCMiddleware(icaHostIBCModule, *app.IBCFeeKeeper)
icaControllerIBCModule := icacontroller.NewIBCMiddleware(icaAuthIBCModule, *app.ICAControllerKeeper)
icaControllerStack := ibcfee.NewIBCMiddleware(icaControllerIBCModule, *app.IBCFeeKeeper)
var icaHostStack porttypes.IBCModule
var icaControllerStack porttypes.IBCModule
{
icaHostKeeper := icahostkeeper.NewKeeper(
appCodec, keys[icahosttypes.StoreKey],
app.GetSubspace(icahosttypes.SubModuleName),
app.IBCFeeKeeper,
app.IBCKeeper.ChannelKeeper,
&app.IBCKeeper.PortKeeper,
app.AccountKeeper,
scopedICAHostKeeper,
app.MsgServiceRouter(),
)
app.ICAHostKeeper = &icaHostKeeper

icaControllerKeeper := icacontrollerkeeper.NewKeeper(
appCodec, keys[icacontrollertypes.StoreKey],
app.GetSubspace(icacontrollertypes.SubModuleName),
app.IBCFeeKeeper,
app.IBCKeeper.ChannelKeeper,
&app.IBCKeeper.PortKeeper,
scopedICAControllerKeeper,
app.MsgServiceRouter(),
)
app.ICAControllerKeeper = &icaControllerKeeper

icaAuthKeeper := icaauthkeeper.NewKeeper(
appCodec, keys[icaauthtypes.StoreKey],
*app.ICAControllerKeeper,
scopedICAAuthKeeper,
)
app.ICAAuthKeeper = &icaAuthKeeper

icaAuthIBCModule := icaauth.NewIBCModule(*app.ICAAuthKeeper)
icaHostIBCModule := icahost.NewIBCModule(*app.ICAHostKeeper)
icaHostStack = ibcfee.NewIBCMiddleware(icaHostIBCModule, *app.IBCFeeKeeper)
icaControllerIBCModule := icacontroller.NewIBCMiddleware(icaAuthIBCModule, *app.ICAControllerKeeper)
icaControllerStack = ibcfee.NewIBCMiddleware(icaControllerIBCModule, *app.IBCFeeKeeper)
}

//////////////////////////////
// IBC router Configuration //
Expand Down Expand Up @@ -614,10 +622,10 @@ func NewMinitiaApp(
consensus.NewAppModule(appCodec, *app.ConsensusParamsKeeper),
move.NewAppModule(app.AccountKeeper, *app.MoveKeeper),
auction.NewAppModule(app.appCodec, *app.AuctionKeeper),
transferModule,
nftTransferModule,
icaModule,
icaAuthModule,
ibctransfer.NewAppModule(*app.TransferKeeper),
ibcnfttransfer.NewAppModule(*app.NftTransferKeeper),
ica.NewAppModule(app.ICAControllerKeeper, app.ICAHostKeeper),
icaauth.NewAppModule(appCodec, *app.ICAAuthKeeper),
ibcfee.NewAppModule(*app.IBCFeeKeeper),
)

Expand Down
Loading