feat: prepare v10.0.0-rc.3 (#559)

Author: johnletey

ante_permissioned_hyperlane.go

@@ -20,10 +20,11 @@ import (
 	"fmt"
 	"strings"
 
+	ismtypes "github.com/bcp-innovations/hyperlane-cosmos/x/core/01_interchain_security/types"
+	hyperlanetypes "github.com/bcp-innovations/hyperlane-cosmos/x/core/types"
+	warptypes "github.com/bcp-innovations/hyperlane-cosmos/x/warp/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/authz"
-
-	"github.com/noble-assets/noble/v10/upgrade"
 )
 
 var _ sdk.AnteDecorator = &PermissionedHyperlaneDecorator{}
@@ -36,23 +37,25 @@ func NewPermissionedHyperlaneDecorator() PermissionedHyperlaneDecorator {
 }
 
 func (d PermissionedHyperlaneDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (newCtx sdk.Context, err error) {
-	// NOTE: We choose to only permission Hyperlane on mainnet in order to
-	// allow quicker iteration on testnet. TODO(@john): Once the exact user
-	// messages are determined on testnet, enable them here for mainnet!
-	if ctx.ChainID() == upgrade.MainnetChainID {
-		for _, msg := range tx.GetMsgs() {
-			err := d.CheckMessage(msg)
-			if err != nil {
-				return ctx, err
-			}
+	for _, msg := range tx.GetMsgs() {
+		err := d.CheckMessage(msg)
+		if err != nil {
+			return ctx, err
 		}
 	}
 
 	return next(ctx, tx, simulate)
 }
 
 func (d PermissionedHyperlaneDecorator) CheckMessage(msg sdk.Msg) error {
-	if m, ok := msg.(*authz.MsgExec); ok {
+	switch m := msg.(type) {
+	case *ismtypes.MsgAnnounceValidator:
+		return nil
+	case *hyperlanetypes.MsgProcessMessage:
+		return nil
+	case *warptypes.MsgRemoteTransfer:
+		return nil
+	case *authz.MsgExec:
 		execMsgs, err := m.GetMessages()
 		if err != nil {
 			return err
@@ -64,11 +67,15 @@ func (d PermissionedHyperlaneDecorator) CheckMessage(msg sdk.Msg) error {
 				return err
 			}
 		}
-	}
+	default:
+		typeUrl := sdk.MsgTypeURL(msg)
+		if strings.HasPrefix(typeUrl, "/hyperlane") {
+			if strings.HasPrefix(typeUrl, "/hyperlane.core.post_dispatch") {
+				return nil
+			}
 
-	typeUrl := sdk.MsgTypeURL(msg)
-	if strings.HasPrefix(typeUrl, "/hyperlane") {
-		return fmt.Errorf("%s is currently a permissioned action", typeUrl)
+			return fmt.Errorf("%s is currently a permissioned action", typeUrl)
+		}
 	}
 
 	return nil

app.go

@@ -122,7 +122,6 @@ import (
 
 	// Noble Modules
 	dollarkeeper "dollar.noble.xyz/v2/keeper"
-	dollartypes "dollar.noble.xyz/v2/types"
 	authoritykeeper "github.com/noble-assets/authority/keeper"
 	forwardingkeeper "github.com/noble-assets/forwarding/v2/keeper"
 	globalfeekeeper "github.com/noble-assets/globalfee/keeper"
@@ -307,7 +306,6 @@ func NewApp(
 	proposalHandler := NewProposalHandler(
 		app.BaseApp, app.Mempool(), app.PreBlocker, app.txConfig,
 		jesterClient, app.DollarKeeper, app.WormholeKeeper,
-		app.appCodec, runtime.NewKVStoreService(app.GetKey(dollartypes.ModuleName)),
 	)
 
 	app.SetPrepareProposal(proposalHandler.PrepareProposal())

e2e/upgrade_test.go

@@ -27,12 +27,12 @@ func TestChainUpgrade(t *testing.T) {
 		t.Skip("skipping test in short mode.")
 	}
 
-	genesisVersion := "v10.0.0-beta.1"
+	genesisVersion := "v10.0.0-rc.2"
 
 	upgrades := []e2e.ChainUpgrade{
 		{
 			Image:       e2e.LocalImages[0],
-			UpgradeName: "v10.0.0-rc.0",
+			UpgradeName: "v10.0.0-rc.3",
 		},
 	}
 

go.mod

@@ -5,7 +5,6 @@ go 1.24
 require (
 	connectrpc.com/connect v1.18.1
 	cosmossdk.io/client/v2 v2.0.0-beta.8
-	cosmossdk.io/collections v0.4.0
 	cosmossdk.io/core v0.11.1
 	cosmossdk.io/depinject v1.1.0
 	cosmossdk.io/errors v1.0.1
@@ -22,9 +21,7 @@ require (
 	github.com/circlefin/noble-fiattokenfactory v0.0.0-20250123235012-5f9bd9dd2c5b
 	github.com/cometbft/cometbft v0.38.17
 	github.com/cosmos/cosmos-db v1.1.1
-	github.com/cosmos/cosmos-proto v1.0.0-beta.5
 	github.com/cosmos/cosmos-sdk v0.50.13
-	github.com/cosmos/gogoproto v1.7.0
 	github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.2.0
 	github.com/cosmos/ibc-apps/modules/rate-limiting/v8 v8.0.0
 	github.com/cosmos/ibc-go/modules/capability v1.0.1
@@ -58,6 +55,7 @@ require (
 	cloud.google.com/go/iam v1.2.0 // indirect
 	cloud.google.com/go/storage v1.43.0 // indirect
 	cosmossdk.io/api v0.7.6 // indirect
+	cosmossdk.io/collections v0.4.0 // indirect
 	cosmossdk.io/x/tx v0.13.8 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/4meepo/tagalign v1.3.4 // indirect
@@ -112,8 +110,10 @@ require (
 	github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
 	github.com/cometbft/cometbft-db v0.14.1 // indirect
 	github.com/cosmos/btcutil v1.0.5 // indirect
+	github.com/cosmos/cosmos-proto v1.0.0-beta.5 // indirect
 	github.com/cosmos/go-bip39 v1.0.0 // indirect
 	github.com/cosmos/gogogateway v1.2.0 // indirect
+	github.com/cosmos/gogoproto v1.7.0 // indirect
 	github.com/cosmos/iavl v1.2.2 // indirect
 	github.com/cosmos/ics23/go v0.11.0 // indirect
 	github.com/cosmos/ledger-cosmos-go v0.14.0 // indirect

proposal.go

@@ -22,14 +22,10 @@ import (
 	"slices"
 	"time"
 
-	"cosmossdk.io/collections"
-	"cosmossdk.io/core/store"
 	"cosmossdk.io/errors"
-	"cosmossdk.io/math"
 	abci "github.com/cometbft/cometbft/abci/types"
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/mempool"
 
@@ -42,9 +38,6 @@ import (
 
 	dollarkeeper "dollar.noble.xyz/v2/keeper"
 	dollarportaltypes "dollar.noble.xyz/v2/types/portal"
-	dollartypes "dollar.noble.xyz/v2/types/v2"
-
-	"github.com/noble-assets/noble/v10/upgrade"
 )
 
 // jesterIndex is the index of the injected Jester response in a block.
@@ -59,10 +52,6 @@ type ProposalHandler struct {
 
 	defaultPrepareProposalHandler sdk.PrepareProposalHandler
 	defaultPreBlocker             sdk.PreBlocker
-
-	// Requirements for the Noble Dollar v2.0.0-rc.1 -> v2.0.0-rc.2 migration.
-	cdc         codec.BinaryCodec
-	dollarStore store.KVStoreService
 }
 
 func NewProposalHandler(
@@ -73,8 +62,6 @@ func NewProposalHandler(
 	jesterClient jester.QueryServiceClient,
 	dollarKeeper *dollarkeeper.Keeper,
 	wormholeKeeper *wormholekeeper.Keeper,
-	cdc codec.BinaryCodec,
-	dollarStore store.KVStoreService,
 ) *ProposalHandler {
 	defaultHandler := baseapp.NewDefaultProposalHandler(mempool, app)
 
@@ -87,9 +74,6 @@ func NewProposalHandler(
 
 		defaultPrepareProposalHandler: defaultHandler.PrepareProposalHandler(),
 		defaultPreBlocker:             preBlocker,
-
-		cdc:         cdc,
-		dollarStore: dollarStore,
 	}
 }
 
@@ -167,31 +151,6 @@ func (h *ProposalHandler) PrepareProposal() sdk.PrepareProposalHandler {
 // PreBlocker processes all injected $USDN transfers from Jester.
 func (h *ProposalHandler) PreBlocker() sdk.PreBlocker {
 	return func(ctx sdk.Context, req *abci.RequestFinalizeBlock) (*sdk.ResponsePreBlock, error) {
-		// This is a temporary migration for Noble's testnet (grand-1) to be performed at
-		// Block 30,446,659 that migrates the state of the Noble Dollar module from
-		// v2.0.0-rc.1 to v2.0.0-rc.2
-		if ctx.ChainID() == upgrade.TestnetChainID && ctx.BlockHeight() == 30446659 {
-			err := h.dollarKeeper.Stats.Set(ctx, dollartypes.Stats{
-				TotalHolders:      37,
-				TotalPrincipal:    math.NewInt(94834253580),
-				TotalYieldAccrued: math.NewInt(922359307),
-			})
-			if err != nil {
-				return nil, errors.Wrap(err, "failed to set stats for dollar")
-			}
-
-			err = h.dollarKeeper.TotalExternalYield.Set(
-				ctx,
-				collections.Join(int32(dollartypes.Provider_IBC), "channel-43"),
-				math.NewInt(7639046),
-			)
-			if err != nil {
-				return nil, errors.Wrap(err, "failed to set total external yield for dollar")
-			}
-
-			ctx.Logger().Info("migrated dollar from v2.0.0-rc.1 to v2.0.0-rc.2")
-		}
-
 		res, err := h.defaultPreBlocker(ctx, req)
 		if err != nil {
 			return nil, errors.Wrap(err, "default PreBlocker failed")

upgrade/constants.go

@@ -17,7 +17,7 @@
 package upgrade
 
 // UpgradeName is the name of this specific software upgrade used on-chain.
-const UpgradeName = "v10.0.0-rc.0"
+const UpgradeName = "v10.0.0-rc.3"
 
 // TestnetChainID is the Chain ID of the Noble testnet.
 const TestnetChainID = "grand-1"

upgrade/store.go

@@ -20,20 +20,10 @@ import (
 	storetypes "cosmossdk.io/store/types"
 	upgradetypes "cosmossdk.io/x/upgrade/types"
 	"github.com/cosmos/cosmos-sdk/baseapp"
-	ratelimittypes "github.com/cosmos/ibc-apps/modules/rate-limiting/v8/types"
 )
 
 func CreateStoreLoader(upgradeHeight int64) baseapp.StoreLoader {
-	storeUpgrades := storetypes.StoreUpgrades{
-		Added: []string{
-			// IBC Modules
-			ratelimittypes.ModuleName,
-		},
-		Deleted: []string{
-			// Noble Modules
-			"autocctp",
-		},
-	}
+	storeUpgrades := storetypes.StoreUpgrades{}
 
 	return upgradetypes.UpgradeStoreLoader(upgradeHeight, &storeUpgrades)
 }