add check if duplicate host zone

osmosis-labs · Oct 31, 2023 · 83e6408 · 83e6408
1 parent 8beefb9
commit 83e6408
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/x/feeabs/keeper/config.go b/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)

diff --git a/x/feeabs/keeper/proposal.go b/x/feeabs/keeper/proposal.go
@@ -4,12 +4,17 @@ 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)