Skip to content

Commit

Permalink
Merge branch 'master' into marston/wasm126
Browse files Browse the repository at this point in the history
  • Loading branch information
TheMarstonConnell authored Jul 9, 2024
2 parents 222c4c7 + c733092 commit f4d127b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion app/upgrades.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func (app *JackalApp) registerTestnetUpgradeHandlers() {
func (app *JackalApp) registerMainnetUpgradeHandlers() {
app.registerUpgrade(bouncybulldog.NewUpgrade(app.mm, app.configurator, app.OracleKeeper))
app.registerUpgrade(v3.NewUpgrade(app.mm, app.configurator, app.StorageKeeper))
app.registerUpgrade(v4.NewUpgrade(app.mm, app.configurator, &app.StorageKeeper, &app.FileTreeKeeper))
app.registerUpgrade(v4.NewUpgrade(app.mm, app.configurator, &app.StorageKeeper, &app.FileTreeKeeper, app.BankKeeper))
}

// registerUpgrade registers the given upgrade to be supported by the app
Expand Down
3 changes: 2 additions & 1 deletion app/upgrades/v4/upgrades.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,13 @@ type Upgrade struct {
}

// NewUpgrade returns a new Upgrade instance
func NewUpgrade(mm *module.Manager, configurator module.Configurator, sk *storagekeeper.Keeper, fk *filetreemodulekeeper.Keeper) *Upgrade {
func NewUpgrade(mm *module.Manager, configurator module.Configurator, sk *storagekeeper.Keeper, fk *filetreemodulekeeper.Keeper, bk storagemoduletypes.BankKeeper) *Upgrade {
return &Upgrade{
mm: mm,
configurator: configurator,
sk: sk,
fk: fk,
bk: bk,
}
}

Expand Down

0 comments on commit f4d127b

Please sign in to comment.