feat: add default denom resolver (#175)

Co-authored-by: Mantrachain Development Support <[email protected]>
MANTRA-Chain · Oct 6, 2024 · 8b6e6c6 · 8b6e6c6
1 parent 3dc7912
commit 8b6e6c6
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 13 deletions.
diff --git a/app/app.go b/app/app.go
@@ -43,6 +43,7 @@ import (
 	"github.com/MANTRA-Chain/mantrachain/x/tokenfactory"
 	tokenfactorykeeper "github.com/MANTRA-Chain/mantrachain/x/tokenfactory/keeper"
 	tokenfactorytypes "github.com/MANTRA-Chain/mantrachain/x/tokenfactory/types"
+	xfeemarkettypes "github.com/MANTRA-Chain/mantrachain/x/xfeemarket/types"
 	abci "github.com/cometbft/cometbft/abci/types"
 	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
 	dbm "github.com/cosmos/cosmos-db"
@@ -579,6 +580,8 @@ func New(
 		nil,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
+	app.FeeMarketKeeper.SetDenomResolver(&xfeemarkettypes.DefaultFeemarketDenomResolver{})
+
 	app.MarketMapKeeper = marketmapkeeper.NewKeeper(
 		runtime.NewKVStoreService(keys[marketmaptypes.StoreKey]),
 		appCodec,

diff --git a/x/xfeemarket/keeper/resolver.go b/x/xfeemarket/keeper/resolver.go
@@ -5,23 +5,15 @@ import (
 	feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types"
 )
 
-var _ feemarkettypes.DenomResolver = &XFeeMarketDenomResolver{}
-
-type XFeeMarketDenomResolver struct {
-	k Keeper
-}
-
-func NewXFeeMarketDenomResolver(k Keeper) *XFeeMarketDenomResolver {
-	return &XFeeMarketDenomResolver{k: k}
-}
+var _ feemarkettypes.DenomResolver = &Keeper{}
 
 // ConvertToDenom returns "coin.Amount denom" for all coins that are not the denom.
-func (r *XFeeMarketDenomResolver) ConvertToDenom(ctx sdk.Context, coin sdk.DecCoin, denom string) (sdk.DecCoin, error) {
+func (k Keeper) ConvertToDenom(ctx sdk.Context, coin sdk.DecCoin, denom string) (sdk.DecCoin, error) {
 	if coin.Denom == denom {
 		return coin, nil
 	}
 
-	multiplier, err := r.k.DenomMultipliers.Get(ctx, denom)
+	multiplier, err := k.DenomMultipliers.Get(ctx, denom)
 	if err != nil {
 		return sdk.DecCoin{}, err
 	}
@@ -30,8 +22,8 @@ func (r *XFeeMarketDenomResolver) ConvertToDenom(ctx sdk.Context, coin sdk.DecCo
 	return sdk.NewDecCoinFromDec(denom, amount), nil
 }
 
-func (r *XFeeMarketDenomResolver) ExtraDenoms(ctx sdk.Context) ([]string, error) {
-	iter, err := r.k.DenomMultipliers.Iterate(ctx, nil)
+func (k Keeper) ExtraDenoms(ctx sdk.Context) ([]string, error) {
+	iter, err := k.DenomMultipliers.Iterate(ctx, nil)
 	if err != nil {
 		return nil, err
 	}

diff --git a/x/xfeemarket/types/default_resolver.go b/x/xfeemarket/types/default_resolver.go
@@ -0,0 +1,25 @@
+package types
+
+import (
+	"fmt"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types"
+)
+
+var _ feemarkettypes.DenomResolver = &DefaultFeemarketDenomResolver{}
+
+type DefaultFeemarketDenomResolver struct{}
+
+// ConvertToDenom returns "coin.Amount denom" for all coins that are not the denom.
+func (r *DefaultFeemarketDenomResolver) ConvertToDenom(_ sdk.Context, coin sdk.DecCoin, denom string) (sdk.DecCoin, error) {
+	if coin.Denom == denom {
+		return coin, nil
+	}
+
+	return sdk.DecCoin{}, fmt.Errorf("error resolving denom")
+}
+
+func (r *DefaultFeemarketDenomResolver) ExtraDenoms(_ sdk.Context) ([]string, error) {
+	return []string{}, nil
+}