add dynamic commission acc seq fix

app/upgrades/forks/constants.go

@@ -22,3 +22,16 @@ var VersionMapEnableFork = upgrades.Fork{
 	UpgradeHeight:  fork.VersionMapEnableHeight,
 	BeginForkLogic: runForkLogicVersionMapEnable,
 }
+
+type Acc struct {
+	Address  string
+	Sequence uint64
+}
+
+var affectedAccounts = []Acc{}
+
+var AccAddressFixFork = upgrades.Fork{
+	UpgradeName:    "v2.3.1",
+	UpgradeHeight:  fork.AccAddressFixHeight,
+	BeginForkLogic: runForkLogicCorrectAccountSequence,
+}

app/upgrades/forks/forks.go

@@ -62,3 +62,21 @@ func runForkLogicVersionMapEnable(ctx sdk.Context, keppers *keepers.AppKeepers,
 		keppers.UpgradeKeeper.SetModuleVersionMap(ctx, mm.GetVersionMap())
 	}
 }
+
+func runForkLogicCorrectAccountSequence(ctx sdk.Context, keppers *keepers.AppKeepers, mm *module.Manager) {
+	if ctx.ChainID() == core.ColumbusChainID {
+		// Correct account sequence
+		for _, acc := range affectedAccounts {
+			account := keppers.AccountKeeper.GetAccount(ctx, sdk.MustAccAddressFromBech32(acc.Address))
+			// check if local account sequence is equal to targeted account sequence
+			if account.GetSequence() == acc.Sequence {
+				ctx.Logger().Info(fmt.Sprintf("Account %s sequence is already correct", acc.Address))
+				continue
+			}
+
+			account.SetSequence(acc.Sequence)
+			keppers.AccountKeeper.SetAccount(ctx, account)
+			ctx.Logger().Info(fmt.Sprintf("Account %s sequence is corrected to %d", acc.Address, acc.Sequence))
+		}
+	}
+}

custom/auth/ante/ante.go

@@ -84,12 +84,14 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 		NewMinInitialDepositDecorator(options.GovKeeper, options.TreasuryKeeper),
 		ante.NewConsumeGasForTxSizeDecorator(options.AccountKeeper),
 		NewFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TreasuryKeeper),
+		dyncommante.NewDyncommDecorator(options.DyncommKeeper, options.StakingKeeper),
+
+		// Do not add any other decorators below this point unless explicitly explain.
 		ante.NewSetPubKeyDecorator(options.AccountKeeper), // SetPubKeyDecorator must be called before all signature verification decorators
 		ante.NewValidateSigCountDecorator(options.AccountKeeper),
 		ante.NewSigGasConsumeDecorator(options.AccountKeeper, options.SigGasConsumer),
 		ante.NewSigVerificationDecorator(options.AccountKeeper, options.SignModeHandler),
 		ante.NewIncrementSequenceDecorator(options.AccountKeeper),
 		ibcante.NewRedundantRelayDecorator(&options.IBCKeeper),
-		dyncommante.NewDyncommDecorator(options.DyncommKeeper, options.StakingKeeper),
 	), nil
 }

types/fork/fork.go

@@ -23,4 +23,5 @@ const (
 	// Revert Min Commission slip during v2.2.0 upgrade
 	FixMinCommissionHeight      = int64(14_890_000)
 	FixMinCommissionHeightRebel = int64(16_300_000)
+	AccAddressFixHeight         = int64(0)
 )