@@ -28,7 +28,6 @@ import (
2828 "cosmossdk.io/log"
2929 "cosmossdk.io/math"
3030 storetypes "cosmossdk.io/store/types"
31- abci "github.com/cometbft/cometbft/abci/types"
3231 "github.com/cometbft/cometbft/crypto"
3332 "github.com/cometbft/cometbft/libs/bytes"
3433 cmtos "github.com/cometbft/cometbft/libs/os"
@@ -46,8 +45,6 @@ import (
4645 sdk "github.com/cosmos/cosmos-sdk/types"
4746 "github.com/cosmos/cosmos-sdk/types/module"
4847 "github.com/cosmos/cosmos-sdk/x/auth/ante"
49- authoritytypes "github.com/noble-assets/authority/types"
50- forwardingtypes "github.com/noble-assets/forwarding/v2/types"
5148 "github.com/noble-assets/noble/v11/api"
5249 "github.com/noble-assets/noble/v11/jester"
5350 "github.com/noble-assets/noble/v11/upgrade"
@@ -320,25 +317,7 @@ func NewApp(
320317 )
321318
322319 app .SetPrepareProposal (proposalHandler .PrepareProposal ())
323- app .SetPreBlocker (func (ctx sdk.Context , req * abci.RequestFinalizeBlock ) (* sdk.ResponsePreBlock , error ) {
324- // On Noble mainnet, the v10.1.2 upgrade is applied at block #36,887,000.
325- // This upgrade removes support for the wildcard in the x/forwarding
326- // module allowed denoms configuration, which we set explicitly to USDC.
327- if ctx .ChainID () == upgrade .MainnetChainID && req .Height == 36887000 {
328- _ , err := app .ForwardingKeeper .SetAllowedDenoms (ctx , & forwardingtypes.MsgSetAllowedDenoms {
329- Signer : authoritytypes .ModuleAddress .String (),
330- Denoms : []string {
331- app .FTFKeeper .GetMintingDenom (ctx ).Denom , // USDC
332- app .DollarKeeper .GetDenom (), // USDN
333- },
334- })
335- if err != nil {
336- return nil , err
337- }
338- }
339-
340- return proposalHandler .PreBlocker ()(ctx , req )
341- })
320+ app .SetPreBlocker (proposalHandler .PreBlocker ())
342321
343322 if err := app .RegisterUpgradeHandler (); err != nil {
344323 return nil , err
0 commit comments