Dang/fix unique kvstore

x/feeabs/ante/decorate.go

@@ -253,6 +253,11 @@ func (famfd FeeAbstrationMempoolFeeDecorator) AnteHandle(ctx sdk.Context, tx sdk
 			hasHostChainConfig := famfd.feeabsKeeper.HasHostZoneConfig(ctx, feeDenom)
 			if hasHostChainConfig {
 				hostChainConfig, _ := famfd.feeabsKeeper.GetHostZoneConfig(ctx, feeDenom)
+				// check if hostzone if frozen
+				if hostChainConfig.Frozen {
+					return ctx, feeabstypes.ErrHostZoneFrozen
+				}
+
 				nativeCoinsFees, err := famfd.feeabsKeeper.CalculateNativeFromIBCCoins(ctx, feeCoins, hostChainConfig)
 				if err != nil {
 					return ctx, sdkerrors.Wrapf(errorstypes.ErrInsufficientFee, "insufficient fees")

x/feeabs/keeper/config.go

@@ -27,6 +27,12 @@ func (k Keeper) GetHostZoneConfig(ctx sdk.Context, ibcDenom string) (types.HostC
 	return chainConfig, true
 }
 
+func (k Keeper) HasHostZoneConfigByOsmosisTokenDenom(ctx sdk.Context, osmosisIbcDenom string) bool {
+	store := ctx.KVStore(k.storeKey)
+	key := types.GetKeyHostZoneConfigByOsmosisIBCDenom(osmosisIbcDenom)
+	return store.Has(key)
+}
+
 func (k Keeper) GetHostZoneConfigByOsmosisTokenDenom(ctx sdk.Context, osmosisIbcDenom string) (types.HostChainFeeAbsConfig, bool) {
 	store := ctx.KVStore(k.storeKey)
 	key := types.GetKeyHostZoneConfigByOsmosisIBCDenom(osmosisIbcDenom)

x/feeabs/keeper/proposal.go

@@ -1,15 +1,20 @@
 package keeper
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/osmosis-labs/fee-abstraction/v7/x/feeabs/types"
+
+	errorsmod "cosmossdk.io/errors"
 )
 
 func (k Keeper) AddHostZoneProposal(ctx sdk.Context, p *types.AddHostZoneProposal) error {
-	_, found := k.GetHostZoneConfig(ctx, p.HostChainConfig.IbcDenom)
-	if found {
-		return types.ErrDuplicateHostZoneConfig
+	// Check if duplicate host zone
+	if k.HasHostZoneConfig(ctx, p.HostChainConfig.IbcDenom) {
+		return errorsmod.Wrapf(types.ErrDuplicateHostZoneConfig, "duplicate IBC denom")
+	}
+	if k.HasHostZoneConfigByOsmosisTokenDenom(ctx, p.HostChainConfig.OsmosisPoolTokenDenomIn) {
+		return errorsmod.Wrapf(types.ErrDuplicateHostZoneConfig, "duplicate Osmosis's IBC denom")
 	}
 
 	err := k.SetHostZoneConfig(ctx, *p.HostChainConfig)
@@ -40,7 +45,14 @@
 		return types.ErrHostZoneConfigNotFound
 	}
 
-	err := k.SetHostZoneConfig(ctx, *p.HostChainConfig)
+	// Delete all hostzone
+	err := k.DeleteHostZoneConfig(ctx, p.HostChainConfig.IbcDenom)
+	if err != nil {
+		return err
+	}
+
+	// set new hostzone
+	err = k.SetHostZoneConfig(ctx, *p.HostChainConfig)
 	if err != nil {
 		return err
 	}

x/feeabs/types/epoch.go

@@ -6,8 +6,8 @@ import (
 )
 
 const (
-	DefaultSwapPeriod           time.Duration = time.Minute * 180
-	DefaultQueryPeriod          time.Duration = time.Minute * 60
+	DefaultSwapPeriod           time.Duration = time.Minute * 5
+	DefaultQueryPeriod          time.Duration = time.Minute * 5
 	DefaultSwapEpochIdentifier  string        = "swap"
 	DefaultQueryEpochIdentifier string        = "query"
 )

x/feeabs/types/errors.go

@@ -9,5 +9,6 @@ var (
 	ErrInvalidIBCFees               = sdkerrors.Register(ModuleName, 2, "invalid ibc fees")
 	ErrHostZoneConfigNotFound       = sdkerrors.Register(ModuleName, 3, "host chain config not found")
 	ErrDuplicateHostZoneConfig      = sdkerrors.Register(ModuleName, 4, "duplicate config")
+	ErrHostZoneFrozen               = sdkerrors.Register(ModuleName, 5, "hostzone frozen")
 	ErrNotEnoughFundInModuleAddress = sdkerrors.Register(ModuleName, 6, "not have funding yet")
 )