Skip to content

Commit

Permalink
fix: Only apply v8 fork logic on osmosis-1 (#1610)
Browse files Browse the repository at this point in the history
(cherry picked from commit e9062fc)

# Conflicts:
#	app/upgrades/v8/forks.go
  • Loading branch information
joeabbey authored and mergify[bot] committed May 27, 2022
1 parent ef21a94 commit 77cf9cf
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions app/upgrades/v8/forks.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,17 @@ import (

// RunForkLogic executes height-gated on-chain fork logic for the Osmosis v8
// upgrade.
<<<<<<< HEAD
func RunForkLogic(ctx sdk.Context, superfluid *superfluidkeeper.Keeper, poolincentives *poolincentiveskeeper.Keeper, gamm *gammkeeper.Keeper) {
=======
func RunForkLogic(ctx sdk.Context, appKeepers *keepers.AppKeepers) {
// Only proceed with v8 for mainnet, testnets need not adjust their pool incentives or unbonding.
// https://github.com/osmosis-labs/osmosis/issues/1609
if ctx.ChainID() != "osmosis-1" {
return
}

>>>>>>> e9062fc (fix: Only apply v8 fork logic on osmosis-1 (#1610))
for i := 0; i < 100; i++ {
ctx.Logger().Info("I am upgrading to v8")
}
Expand Down

0 comments on commit 77cf9cf

Please sign in to comment.