chore: include router-9600-1 light client substitution

Author: johnletey

upgrade/upgrade.go

@@ -32,19 +32,11 @@ import (
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 	clientkeeper "github.com/cosmos/ibc-go/v8/modules/core/02-client/keeper"
 	authoritykeeper "github.com/noble-assets/authority/keeper"
-	orbiter "github.com/noble-assets/orbiter"
+	"github.com/noble-assets/orbiter"
 	orbitertypes "github.com/noble-assets/orbiter/types"
 	orbitercore "github.com/noble-assets/orbiter/types/core"
 )
 
-// orbiterCustomGen overriede the default module genesis to pause the Hyperlane forwarding.
-func orbiterCustomGen(cdc codec.Codec) json.RawMessage {
-	gen := orbitertypes.DefaultGenesisState()
-	gen.ForwarderGenesis.PausedProtocolIds = append(gen.ForwarderGenesis.PausedProtocolIds, orbitercore.PROTOCOL_HYPERLANE)
-
-	return cdc.MustMarshalJSON(gen)
-}
-
 func CreateUpgradeHandler(
 	mm *module.Manager,
 	cfg module.Configurator,
@@ -69,21 +61,26 @@ func CreateUpgradeHandler(
 			return vm, err
 		}
 
-		err = ClaimDistributionFunds(ctx, logger, addressCodec, authorityKeeper, bankKeeper)
+		err = claimDistributionFunds(ctx, logger, addressCodec, authorityKeeper, bankKeeper)
 		if err != nil {
 			return vm, err
 		}
 
-		err = UpdateVaultsState(ctx, addressCodec, authorityKeeper, dollarKeeper)
+		err = updateVaultsState(ctx, addressCodec, authorityKeeper, dollarKeeper)
 		if err != nil {
 			return vm, err
 		}
 
-		// The IBC light client for the shido_9008-1 chain has expired on
-		// Noble's mainnet. In IBC-Go v8.7.0, the MsgRecoverClient message does
-		// not support the LegacyAminoJSON signing mode, preventing recovery
-		// via the Noble Maintenance Multisig. As a result, the client must be
-		// manually recovered as part of this software upgrade.
+		// The IBC light clients for both the router_9600-1 and shido_9008-1
+		// chains have expired on Noble's mainnet. In IBC-Go v8.7.0, the
+		// MsgRecoverClient message does not support the LegacyAminoJSON
+		// signing mode, preventing recovery via the Noble Maintenance
+		// Multisig. As a result, the client must be manually recovered as part
+		// of this software upgrade.
+		err = clientKeeper.RecoverClient(sdkCtx, "07-tendermint-136", "07-tendermint-192")
+		if err != nil {
+			logger.Error("unabled to recover router_9600-1 light client", "err", err)
+		}
 		err = clientKeeper.RecoverClient(sdkCtx, "07-tendermint-106", "07-tendermint-186")
 		if err != nil {
 			logger.Error("unable to recover shido_9008-1 light client", "err", err)
@@ -95,11 +92,19 @@ func CreateUpgradeHandler(
 	}
 }
 
-// ClaimDistributionFunds transfers all transaction fees accrued by Noble prior
+// orbiterCustomGen overrides the default module genesis to pause the Hyperlane forwarding.
+func orbiterCustomGen(cdc codec.Codec) json.RawMessage {
+	gen := orbitertypes.DefaultGenesisState()
+	gen.ForwarderGenesis.PausedProtocolIds = append(gen.ForwarderGenesis.PausedProtocolIds, orbitercore.PROTOCOL_HYPERLANE)
+
+	return cdc.MustMarshalJSON(gen)
+}
+
+// claimDistributionFunds transfers all transaction fees accrued by Noble prior
 // to the v8 Helium upgrade (November 2024) to the x/authority owner. The funds
 // are currently stuck as the x/distribution module was removed and replaced by
 // the x/authority module without a proper migration of funds.
-func ClaimDistributionFunds(ctx context.Context, logger log.Logger, addressCodec address.Codec, authorityKeeper *authoritykeeper.Keeper, bankKeeper bankkeeper.Keeper) error {
+func claimDistributionFunds(ctx context.Context, logger log.Logger, addressCodec address.Codec, authorityKeeper *authoritykeeper.Keeper, bankKeeper bankkeeper.Keeper) error {
 	// NOTE: We hardcode the x/distribution module name to avoid an import.
 	address := authtypes.NewModuleAddress("distribution")
 	balance := bankKeeper.GetAllBalances(ctx, address)
@@ -127,10 +132,10 @@ func ClaimDistributionFunds(ctx context.Context, logger log.Logger, addressCodec
 	return nil
 }
 
-// UpdateVaultsState sets state variables around Vaults Season One and Season
+// updateVaultsState sets state variables around Vaults Season One and Season
 // Two. We do this so that we can remove these values from the app.yaml file,
 // allowing us to ship one binary for both mainnet and testnet.
-func UpdateVaultsState(ctx context.Context, addressCodec address.Codec, authorityKeeper *authoritykeeper.Keeper, dollarKeeper *dollarkeeper.Keeper) error {
+func updateVaultsState(ctx context.Context, addressCodec address.Codec, authorityKeeper *authoritykeeper.Keeper, dollarKeeper *dollarkeeper.Keeper) error {
 	switch sdk.UnwrapSDKContext(ctx).ChainID() {
 	case TestnetChainID:
 		err := dollarKeeper.VaultsSeasonOneEnded.Set(ctx, true)