[R4R] optional bep3 config params (#546)

* add minAmount, maxAmount

* update kava-3 params for compile

* fix migration script

* update to mainnet params

* remove height span validation for incoming swaps

* update to sdk.Int, set lock to 220

* update lock range to [220, 270]

* update bep3 module docs

* update MsgClaim's ValidateBasic

* update test comments

contrib/current/wip_genesis.json

@@ -49,14 +49,16 @@
         "params": {
           "bnb_deputy_address": "kava1tfvn5t8qwngqd2q427za2mel48pcus3z9u73fl",
           "bnb_deputy_fixed_fee": "1000",
-          "max_block_lock": "600",
+          "min_amount": "0",
-          "min_block_lock": "80",
+          "max_amount": "1000000000000",
+          "min_block_lock": "220",
+          "max_block_lock": "270",
           "supported_assets": [
             {
               "active": true,
               "coin_id": "714",
               "denom": "bnb",
-              "limit": "10000000000000"
+              "limit": "350000000000000"
             }
           ]
         }

contrib/kava-3/params.go

@@ -111,7 +111,9 @@ func addBep3State(cdc *codec.Codec, appState genutil.AppMap) {
 	appState[bep3.ModuleName] = cdc.MustMarshalJSON(bep3.NewGenesisState(
 		bep3.NewParams(
 			mustAccAddressFromBech32(deputyAddressBech32),
-			1000,
+			bep3.DefaultBnbDeputyFixedFee,
+			bep3.DefaultMinAmount,
+			bep3.DefaultMaxAmount,
 			bep3.DefaultMinBlockLock,
 			bep3.DefaultMaxBlockLock,
 			bep3.AssetParams{{

migrate/v0_8/testdata/all-new.json

@@ -306,13 +306,15 @@
       "params": {
         "bnb_deputy_address": "kava1xy7hrjy9r0algz9w3gzm8u6mrpq97kwta747gj",
         "bnb_deputy_fixed_fee": "1000",
-        "min_block_lock": "80",
+        "min_amount": "0",
-        "max_block_lock": "600",
+        "max_amount": "1000000000000",
+        "min_block_lock": "220",
+        "max_block_lock": "270",
         "supported_assets": [
           {
             "denom": "bnb",
             "coin_id": "714",
-            "limit": "100000000000",
+            "limit": "350000000000000",
             "active": true
           }
         ]

x/bep3/abci_test.go

@@ -52,8 +52,8 @@ func (suite *ABCITestSuite) ResetKeeper() {
 	var randomNumbers []tmbytes.HexBytes
 	for i := 0; i < 10; i++ {
 		// Set up atomic swap variables
-		expireHeight := uint64(360)
+		expireHeight := bep3.DefaultMinBlockLock
-		amount := cs(c("bnb", int64(100)))
+		amount := cs(c("bnb", int64(10000)))
 		timestamp := ts(i)
 		randomNumber, _ := bep3.GenerateSecureRandomNumber()
 		randomNumberHash := bep3.CalculateRandomHash(randomNumber[:], timestamp)

x/bep3/alias.go

@@ -73,6 +73,7 @@ var (
 	ErrInvalidClaimSecret      = types.ErrInvalidClaimSecret
 	ErrInvalidCurrentSupply    = types.ErrInvalidCurrentSupply
 	ErrInvalidHeightSpan       = types.ErrInvalidHeightSpan
+	ErrInvalidAmount           = types.ErrInvalidAmount
 	ErrInvalidIncomingSupply   = types.ErrInvalidIncomingSupply
 	ErrInvalidOutgoingSupply   = types.ErrInvalidOutgoingSupply
 	ErrInvalidTimestamp        = types.ErrInvalidTimestamp
@@ -96,17 +97,21 @@ var (
 	RegisterCodec              = types.RegisterCodec
 
 	// variable aliases
-	AbsoluteMaximumBlockLock        = types.AbsoluteMaximumBlockLock
-	AbsoluteMinimumBlockLock        = types.AbsoluteMinimumBlockLock
 	AssetSupplyKeyPrefix            = types.AssetSupplyKeyPrefix
 	AtomicSwapByBlockPrefix         = types.AtomicSwapByBlockPrefix
 	AtomicSwapCoinsAccAddr          = types.AtomicSwapCoinsAccAddr
 	AtomicSwapKeyPrefix             = types.AtomicSwapKeyPrefix
 	AtomicSwapLongtermStoragePrefix = types.AtomicSwapLongtermStoragePrefix
+	DefaultBnbDeputyFixedFee        = types.DefaultBnbDeputyFixedFee
+	DefaultMinAmount                = types.DefaultMinAmount
+	DefaultMaxAmount                = types.DefaultMaxAmount
 	DefaultMaxBlockLock             = types.DefaultMaxBlockLock
 	DefaultMinBlockLock             = types.DefaultMinBlockLock
 	DefaultSupportedAssets          = types.DefaultSupportedAssets
 	KeyBnbDeputyAddress             = types.KeyBnbDeputyAddress
+	KeyBnbDeputyFixedFee            = types.KeyBnbDeputyFixedFee
+	KeyMinAmount                    = types.KeyMinAmount
+	KeyMaxAmount                    = types.KeyMaxAmount
 	KeyMaxBlockLock                 = types.KeyMaxBlockLock
 	KeyMinBlockLock                 = types.KeyMinBlockLock
 	KeySupportedAssets              = types.KeySupportedAssets

x/bep3/genesis_test.go

@@ -71,7 +71,7 @@ func (suite *GenesisTestSuite) TestGenesisState() {
 			name: "0 deputy fees",
 			genState: func() app.GenesisState {
 				gs := baseGenState(suite.addrs[0])
-				gs.Params.BnbDeputyFixedFee = 0
+				gs.Params.BnbDeputyFixedFee = sdk.ZeroInt()
 				return app.GenesisState{"bep3": bep3.ModuleCdc.MustMarshalJSON(gs)}
 			},
 			expectPass: true,
@@ -119,7 +119,7 @@ func (suite *GenesisTestSuite) TestGenesisState() {
 				randomNumber, _ := bep3.GenerateSecureRandomNumber()
 				randomNumberHash := bep3.CalculateRandomHash(randomNumber[:], timestamp)
 				swap := bep3.NewAtomicSwap(cs(c("bnb", overLimitAmount.Int64())), randomNumberHash,
-					uint64(360), timestamp, suite.addrs[0], addrs[1], TestSenderOtherChain,
+					bep3.DefaultMinBlockLock, timestamp, suite.addrs[0], addrs[1], TestSenderOtherChain,
 					TestRecipientOtherChain, 0, bep3.Open, true, bep3.Incoming)
 				gs.AtomicSwaps = bep3.AtomicSwaps{swap}
 
@@ -222,37 +222,11 @@ func (suite *GenesisTestSuite) TestGenesisState() {
 			expectPass: false,
 		},
 		{
-			name: "minimum block lock below limit",
+			name: "minimum block lock cannot be > maximum block lock",
 			genState: func() app.GenesisState {
 				gs := baseGenState(suite.addrs[0])
-				gs.Params.MinBlockLock = 1
+				gs.Params.MinBlockLock = 201
-				return app.GenesisState{"bep3": bep3.ModuleCdc.MustMarshalJSON(gs)}
+				gs.Params.MaxBlockLock = 200
-			},
-			expectPass: false,
-		},
-		{
-			name: "minimum block lock above limit",
-			genState: func() app.GenesisState {
-				gs := baseGenState(suite.addrs[0])
-				gs.Params.MinBlockLock = 500000
-				return app.GenesisState{"bep3": bep3.ModuleCdc.MustMarshalJSON(gs)}
-			},
-			expectPass: false,
-		},
-		{
-			name: "maximum block lock below limit",
-			genState: func() app.GenesisState {
-				gs := baseGenState(suite.addrs[0])
-				gs.Params.MaxBlockLock = 1
-				return app.GenesisState{"bep3": bep3.ModuleCdc.MustMarshalJSON(gs)}
-			},
-			expectPass: false,
-		},
-		{
-			name: "maximum block lock above limit",
-			genState: func() app.GenesisState {
-				gs := baseGenState(suite.addrs[0])
-				gs.Params.MaxBlockLock = 100000000
 				return app.GenesisState{"bep3": bep3.ModuleCdc.MustMarshalJSON(gs)}
 			},
 			expectPass: false,

x/bep3/handler_test.go

@@ -47,7 +47,7 @@ func (suite *HandlerTestSuite) SetupTest() {
 }
 
 func (suite *HandlerTestSuite) AddAtomicSwap() (tmbytes.HexBytes, tmbytes.HexBytes) {
-	expireHeight := uint64(360)
+	expireHeight := bep3.DefaultMinBlockLock
 	amount := cs(c("bnb", int64(50000)))
 	timestamp := ts(0)
 	randomNumber, _ := bep3.GenerateSecureRandomNumber()
@@ -72,7 +72,7 @@ func (suite *HandlerTestSuite) TestMsgCreateAtomicSwap() {
 	msg := bep3.NewMsgCreateAtomicSwap(
 		suite.addrs[0], suite.addrs[2], TestRecipientOtherChain,
 		TestSenderOtherChain, randomNumberHash, timestamp, amount,
-		uint64(300))
+		bep3.DefaultMinBlockLock)
 
 	res, err := suite.handler(suite.ctx, msg)
 	suite.Require().NoError(err)

x/bep3/integration_test.go

@@ -38,8 +38,11 @@ func baseGenState(deputy sdk.AccAddress) bep3.GenesisState {
 	bep3Genesis := bep3.GenesisState{
 		Params: bep3.Params{
 			BnbDeputyAddress:  deputy,
-			MinBlockLock:     bep3.DefaultMinBlockLock, // 80
+			BnbDeputyFixedFee: bep3.DefaultBnbDeputyFixedFee, // 1,000
-			MaxBlockLock:     bep3.DefaultMaxBlockLock, // 360
+			MinAmount:         bep3.DefaultMinAmount,         // 0
+			MaxAmount:         bep3.DefaultMaxAmount,         // 10,000
+			MinBlockLock:      bep3.DefaultMinBlockLock,      // 220
+			MaxBlockLock:      bep3.DefaultMaxBlockLock,      // 270
 			SupportedAssets: bep3.AssetParams{
 				bep3.AssetParam{
 					Denom:  "btc",
@@ -73,7 +76,7 @@ func baseGenState(deputy sdk.AccAddress) bep3.GenesisState {
 
 func loadSwapAndSupply(addr sdk.AccAddress, index int) (bep3.AtomicSwap, bep3.AssetSupply) {
 	coin := c(DenomMap[index], 50000)
-	expireOffset := uint64((index * 15) + 360) // Default expire height + offet to match timestamp
+	expireOffset := bep3.DefaultMinBlockLock // Default expire height + offet to match timestamp
 	timestamp := ts(index)                   // One minute apart
 	randomNumber, _ := bep3.GenerateSecureRandomNumber()
 	randomNumberHash := bep3.CalculateRandomHash(randomNumber[:], timestamp)

x/bep3/keeper/integration_test.go

@@ -20,7 +20,7 @@ const (
 )
 
 var (
-	StandardSupplyLimit = i(100000000000)
+	StandardSupplyLimit = i(350000000000000)
 	DenomMap            = map[int]string{0: "btc", 1: "eth", 2: "bnb", 3: "xrp", 4: "dai"}
 	TestUser1           = sdk.AccAddress(crypto.AddressHash([]byte("KavaTestUser1")))
 	TestUser2           = sdk.AccAddress(crypto.AddressHash([]byte("KavaTestUser2")))
@@ -36,8 +36,10 @@ func NewBep3GenStateMulti(deputyAddress sdk.AccAddress) app.GenesisState {
 		Params: bep3.Params{
 			BnbDeputyAddress:  deputyAddress,
 			BnbDeputyFixedFee: types.DefaultBnbDeputyFixedFee, // 1000
-			MinBlockLock:      types.DefaultMinBlockLock,      // 80
+			MinAmount:         types.DefaultMinAmount,         // 0
-			MaxBlockLock:      types.DefaultMaxBlockLock,      // 360
+			MaxAmount:         types.DefaultMaxAmount,         // 10,000
+			MinBlockLock:      types.DefaultMinBlockLock,      // 220
+			MaxBlockLock:      types.DefaultMaxBlockLock,      // 270
 			SupportedAssets: types.AssetParams{
 				types.AssetParam{
 					Denom:  "bnb",
@@ -67,7 +69,7 @@ func atomicSwaps(ctx sdk.Context, count int) types.AtomicSwaps {
 }
 
 func atomicSwap(ctx sdk.Context, index int) types.AtomicSwap {
-	expireOffset := uint64((index * 15) + 360) // Default expire height + offet to match timestamp
+	expireOffset := uint64(200) // Default expire height + offet to match timestamp
 	timestamp := ts(index)      // One minute apart
 	randomNumber, _ := types.GenerateSecureRandomNumber()
 	randomNumberHash := types.CalculateRandomHash(randomNumber[:], timestamp)

x/bep3/keeper/params.go

@@ -25,15 +25,21 @@ func (k Keeper) GetBnbDeputyAddress(ctx sdk.Context) sdk.AccAddress {
 }
 
 // GetBnbDeputyFixedFee returns the deputy's fixed fee
-func (k Keeper) GetBnbDeputyFixedFee(ctx sdk.Context) uint64 {
+func (k Keeper) GetBnbDeputyFixedFee(ctx sdk.Context) sdk.Int {
 	params := k.GetParams(ctx)
 	return params.BnbDeputyFixedFee
 }
 
-// GetMaxBlockLock returns the maximum block lock
+// GetMinAmount returns the minimum amount
-func (k Keeper) GetMaxBlockLock(ctx sdk.Context) uint64 {
+func (k Keeper) GetMinAmount(ctx sdk.Context) sdk.Int {
 	params := k.GetParams(ctx)
-	return params.MaxBlockLock
+	return params.MinAmount
+}
+
+// GetMaxAmount returns the maximum amount
+func (k Keeper) GetMaxAmount(ctx sdk.Context) sdk.Int {
+	params := k.GetParams(ctx)
+	return params.MaxAmount
 }
 
 // GetMinBlockLock returns the minimum block lock
@@ -42,6 +48,12 @@ func (k Keeper) GetMinBlockLock(ctx sdk.Context) uint64 {
 	return params.MinBlockLock
 }
 
+// GetMaxBlockLock returns the maximum block lock
+func (k Keeper) GetMaxBlockLock(ctx sdk.Context) uint64 {
+	params := k.GetParams(ctx)
+	return params.MaxBlockLock
+}
+
 // GetAssets returns a list containing all supported assets
 func (k Keeper) GetAssets(ctx sdk.Context) (types.AssetParams, bool) {
 	params := k.GetParams(ctx)

x/bep3/keeper/params_test.go

@@ -54,12 +54,20 @@ func (suite *ParamsTestSuite) TestGetBnbDeputyFixedFee() {
 	suite.Equal(bnbDeputyFixedFee, res)
 }
 
-func (suite *ParamsTestSuite) TestGetMaxBlockLock() {
+func (suite *ParamsTestSuite) TestGetMinAmount() {
 	params := suite.keeper.GetParams(suite.ctx)
-	maxBlockLock := params.MaxBlockLock
+	minAmount := params.MinAmount
 
-	res := suite.keeper.GetMaxBlockLock(suite.ctx)
+	res := suite.keeper.GetMinAmount(suite.ctx)
-	suite.Equal(maxBlockLock, res)
+	suite.Equal(minAmount, res)
+}
+
+func (suite *ParamsTestSuite) TestGetMaxAmount() {
+	params := suite.keeper.GetParams(suite.ctx)
+	maxAmount := params.MaxAmount
+
+	res := suite.keeper.GetMaxAmount(suite.ctx)
+	suite.Equal(maxAmount, res)
 }
 
 func (suite *ParamsTestSuite) TestGetMinBlockLock() {
@@ -70,6 +78,14 @@ func (suite *ParamsTestSuite) TestGetMinBlockLock() {
 	suite.Equal(minBlockLock, res)
 }
 
+func (suite *ParamsTestSuite) TestGetMaxBlockLock() {
+	params := suite.keeper.GetParams(suite.ctx)
+	maxBlockLock := params.MaxBlockLock
+
+	res := suite.keeper.GetMaxBlockLock(suite.ctx)
+	suite.Equal(maxBlockLock, res)
+}
+
 func (suite *ParamsTestSuite) TestGetAssets() {
 	params := suite.keeper.GetParams(suite.ctx)
 	assets := params.SupportedAssets

x/bep3/keeper/querier_test.go

@@ -62,7 +62,7 @@ func (suite *QuerierTestSuite) SetupTest() {
 	isSwapID := make(map[string]bool)
 	for i := 0; i < 10; i++ {
 		// Set up atomic swap variables
-		expireHeight := uint64(360)
+		expireHeight := types.DefaultMinBlockLock
 		amount := cs(c("bnb", 100))
 		timestamp := ts(0)
 		randomNumber, _ := types.GenerateSecureRandomNumber()

x/bep3/keeper/swap.go

@@ -28,19 +28,6 @@ func (k Keeper) CreateAtomicSwap(ctx sdk.Context, randomNumberHash []byte, times
 		return sdkerrors.Wrapf(sdkerrors.ErrUnauthorized, "%s is a module account", recipient)
 	}
 
-	// The heightSpan period should be more than 10 minutes and less than one week
-	// Assume average block time interval is 10 second. 10 mins = 60 blocks, 1 week = 60480 blocks
-	if heightSpan < k.GetMinBlockLock(ctx) || heightSpan > k.GetMaxBlockLock(ctx) {
-		return sdkerrors.Wrapf(types.ErrInvalidHeightSpan, "height span %d, range %d - %d", heightSpan, k.GetMinBlockLock(ctx), k.GetMaxBlockLock(ctx))
-	}
-
-	// Unix timestamp must be in range [-15 mins, 30 mins] of the current time
-	pastTimestampLimit := ctx.BlockTime().Add(time.Duration(-15) * time.Minute).Unix()
-	futureTimestampLimit := ctx.BlockTime().Add(time.Duration(30) * time.Minute).Unix()
-	if timestamp < pastTimestampLimit || timestamp >= futureTimestampLimit {
-		return sdkerrors.Wrap(types.ErrInvalidTimestamp, time.Unix(timestamp, 0).UTC().String())
-	}
-
 	if len(amount) != 1 {
 		return fmt.Errorf("amount must contain exactly one coin")
 	}
@@ -50,6 +37,18 @@ func (k Keeper) CreateAtomicSwap(ctx sdk.Context, randomNumberHash []byte, times
 		return err
 	}
 
+	// Swap amount must be within the specified swap amount limits
+	if amount[0].Amount.LT(k.GetMinAmount(ctx)) || amount[0].Amount.GT(k.GetMaxAmount(ctx)) {
+		return sdkerrors.Wrapf(types.ErrInvalidAmount, "amount %d outside range [%d, %d]", amount[0].Amount, k.GetMinAmount(ctx), k.GetMaxAmount(ctx))
+	}
+
+	// Unix timestamp must be in range [-15 mins, 30 mins] of the current time
+	pastTimestampLimit := ctx.BlockTime().Add(time.Duration(-15) * time.Minute).Unix()
+	futureTimestampLimit := ctx.BlockTime().Add(time.Duration(30) * time.Minute).Unix()
+	if timestamp < pastTimestampLimit || timestamp >= futureTimestampLimit {
+		return sdkerrors.Wrap(types.ErrInvalidTimestamp, time.Unix(timestamp, 0).UTC().String())
+	}
+
 	var direction types.SwapDirection
 	deputy := k.GetBnbDeputyAddress(ctx)
 	if sender.Equals(deputy) {
@@ -70,8 +69,12 @@ func (k Keeper) CreateAtomicSwap(ctx sdk.Context, randomNumberHash []byte, times
 		// Incoming swaps have already had their fees collected by the deputy during the relay process.
 		err = k.IncrementIncomingAssetSupply(ctx, amount[0])
 	case types.Outgoing:
-		// Amount in outgoing swaps must be greater than the deputy's fixed fee.
+		// Outoing swaps must have a height span within the accepted range
-		if amount[0].Amount.Uint64() <= k.GetBnbDeputyFixedFee(ctx) {
+		if heightSpan < k.GetMinBlockLock(ctx) || heightSpan > k.GetMaxBlockLock(ctx) {
+			return sdkerrors.Wrapf(types.ErrInvalidHeightSpan, "height span %d outside range [%d, %d]", heightSpan, k.GetMinBlockLock(ctx), k.GetMaxBlockLock(ctx))
+		}
+		// Amount in outgoing swaps must be able to pay the deputy's fixed fee.
+		if amount[0].Amount.LTE(k.GetBnbDeputyFixedFee(ctx).Add(k.GetMinAmount(ctx))) {
 			return sdkerrors.Wrap(types.ErrInsufficientAmount, amount[0].String())
 		}
 		err = k.IncrementOutgoingAssetSupply(ctx, amount[0])

x/bep3/keeper/swap_test.go

@@ -34,7 +34,7 @@ type AtomicSwapTestSuite struct {
 }
 
 const (
-	STARING_BNB_BALANCE = int64(1000000000)
+	STARING_BNB_BALANCE = int64(3000000000000)
 	BNB_DENOM           = "bnb"
 )
 
@@ -84,7 +84,7 @@ func (suite *AtomicSwapTestSuite) GenerateSwapDetails() {
 	var timestamps []int64
 	var randomNumberHashes []tmbytes.HexBytes
 	var randomNumbers []tmbytes.HexBytes
-	for i := 0; i < 10; i++ {
+	for i := 0; i < 15; i++ {
 		// Set up atomic swap details
 		timestamp := ts(i)
 		randomNumber, _ := types.GenerateSecureRandomNumber()
@@ -126,7 +126,7 @@ func (suite *AtomicSwapTestSuite) TestCreateAtomicSwap() {
 			args{
 				randomNumberHash:    suite.randomNumberHashes[0],
 				timestamp:           suite.timestamps[0],
-				heightSpan:          uint64(360),
+				heightSpan:          types.DefaultMinBlockLock,
 				sender:              suite.deputy,
 				recipient:           suite.addrs[1],
 				senderOtherChain:    TestSenderOtherChain,
@@ -144,7 +144,7 @@ func (suite *AtomicSwapTestSuite) TestCreateAtomicSwap() {
 			args{
 				randomNumberHash:    suite.randomNumberHashes[0],
 				timestamp:           suite.timestamps[0],
-				heightSpan:          uint64(360),
+				heightSpan:          types.DefaultMinBlockLock,
 				sender:              suite.addrs[1],
 				recipient:           suite.addrs[2],
 				senderOtherChain:    TestSenderOtherChain,
@@ -163,12 +163,12 @@ func (suite *AtomicSwapTestSuite) TestCreateAtomicSwap() {
 			args{
 				randomNumberHash:    suite.randomNumberHashes[1],
 				timestamp:           suite.timestamps[1],
-				heightSpan:          uint64(360),
+				heightSpan:          types.DefaultMinBlockLock,
 				sender:              suite.addrs[1],
 				recipient:           suite.addrs[2],
 				senderOtherChain:    TestSenderOtherChain,
 				recipientOtherChain: TestRecipientOtherChain,
-				coins:               cs(c(BNB_DENOM, int64(suite.keeper.GetBnbDeputyFixedFee(suite.ctx)))),
+				coins:               cs(c(BNB_DENOM, suite.keeper.GetBnbDeputyFixedFee(suite.ctx).Int64())),
 				crossChain:          true,
 				direction:           types.Outgoing,
 			},
@@ -181,7 +181,7 @@ func (suite *AtomicSwapTestSuite) TestCreateAtomicSwap() {
 			args{
 				randomNumberHash:    suite.randomNumberHashes[2],
 				timestamp:           suite.timestamps[2],
-				heightSpan:          uint64(360),
+				heightSpan:          types.DefaultMinBlockLock,
 				sender:              suite.deputy,
 				recipient:           suite.addrs[2],
 				senderOtherChain:    TestSenderOtherChain,
@@ -199,7 +199,7 @@ func (suite *AtomicSwapTestSuite) TestCreateAtomicSwap() {
 			args{
 				randomNumberHash:    suite.randomNumberHashes[3],
 				timestamp:           suite.timestamps[3] - 2000,
-				heightSpan:          uint64(360),
+				heightSpan:          types.DefaultMinBlockLock,
 				sender:              suite.deputy,
 				recipient:           suite.addrs[3],
 				senderOtherChain:    TestSenderOtherChain,
@@ -217,7 +217,7 @@ func (suite *AtomicSwapTestSuite) TestCreateAtomicSwap() {
 			args{
 				randomNumberHash:    suite.randomNumberHashes[4],
 				timestamp:           suite.timestamps[4] + 5000,
-				heightSpan:          uint64(360),
+				heightSpan:          types.DefaultMinBlockLock,
 				sender:              suite.deputy,
 				recipient:           suite.addrs[4],
 				senderOtherChain:    TestSenderOtherChain,
@@ -230,37 +230,37 @@ func (suite *AtomicSwapTestSuite) TestCreateAtomicSwap() {
 			false,
 		},
 		{
-			"small height span",
+			"small height span on outgoing swap",
 			currentTmTime,
 			args{
 				randomNumberHash:    suite.randomNumberHashes[5],
 				timestamp:           suite.timestamps[5],
-				heightSpan:          uint64(5),
+				heightSpan:          uint64(100),
-				sender:              suite.deputy,
+				sender:              suite.addrs[5],
-				recipient:           suite.addrs[5],
+				recipient:           suite.deputy,
 				senderOtherChain:    TestSenderOtherChain,
 				recipientOtherChain: TestRecipientOtherChain,
 				coins:               cs(c(BNB_DENOM, 50000)),
 				crossChain:          true,
-				direction:           types.Incoming,
+				direction:           types.Outgoing,
 			},
 			false,
 			false,
 		},
 		{
-			"big height span",
+			"big height span on outgoing swap",
 			currentTmTime,
 			args{
 				randomNumberHash:    suite.randomNumberHashes[6],
 				timestamp:           suite.timestamps[6],
-				heightSpan:          uint64(1000000),
+				heightSpan:          uint64(300),
-				sender:              suite.deputy,
+				sender:              suite.addrs[6],
-				recipient:           suite.addrs[6],
+				recipient:           suite.deputy,
 				senderOtherChain:    TestSenderOtherChain,
 				recipientOtherChain: TestRecipientOtherChain,
 				coins:               cs(c(BNB_DENOM, 50000)),
 				crossChain:          true,
-				direction:           types.Incoming,
+				direction:           types.Outgoing,
 			},
 			false,
 			false,
@@ -271,7 +271,7 @@ func (suite *AtomicSwapTestSuite) TestCreateAtomicSwap() {
 			args{
 				randomNumberHash:    suite.randomNumberHashes[7],
 				timestamp:           suite.timestamps[7],
-				heightSpan:          uint64(360),
+				heightSpan:          types.DefaultMinBlockLock,
 				sender:              suite.deputy,
 				recipient:           suite.addrs[7],
 				senderOtherChain:    TestSenderOtherChain,
@@ -289,7 +289,7 @@ func (suite *AtomicSwapTestSuite) TestCreateAtomicSwap() {
 			args{
 				randomNumberHash:    suite.randomNumberHashes[0],
 				timestamp:           suite.timestamps[0],
-				heightSpan:          uint64(360),
+				heightSpan:          types.DefaultMinBlockLock,
 				sender:              suite.deputy,
 				recipient:           suite.addrs[1],
 				senderOtherChain:    TestSenderOtherChain,
@@ -307,7 +307,7 @@ func (suite *AtomicSwapTestSuite) TestCreateAtomicSwap() {
 			args{
 				randomNumberHash:    suite.randomNumberHashes[8],
 				timestamp:           suite.timestamps[8],
-				heightSpan:          uint64(360),
+				heightSpan:          types.DefaultMinBlockLock,
 				sender:              suite.deputy,
 				recipient:           suite.randMacc,
 				senderOtherChain:    TestSenderOtherChain,
@@ -319,6 +319,42 @@ func (suite *AtomicSwapTestSuite) TestCreateAtomicSwap() {
 			false,
 			false,
 		},
+		{
+			"exactly at maximum amount",
+			currentTmTime,
+			args{
+				randomNumberHash:    suite.randomNumberHashes[10],
+				timestamp:           suite.timestamps[10],
+				heightSpan:          types.DefaultMinBlockLock,
+				sender:              suite.deputy,
+				recipient:           suite.addrs[4],
+				senderOtherChain:    TestSenderOtherChain,
+				recipientOtherChain: TestRecipientOtherChain,
+				coins:               cs(c(BNB_DENOM, 1000000000000)), // 10,000 BNB
+				crossChain:          true,
+				direction:           types.Incoming,
+			},
+			true,
+			true,
+		},
+		{
+			"above maximum amount",
+			currentTmTime,
+			args{
+				randomNumberHash:    suite.randomNumberHashes[11],
+				timestamp:           suite.timestamps[11],
+				heightSpan:          types.DefaultMinBlockLock,
+				sender:              suite.deputy,
+				recipient:           suite.addrs[5],
+				senderOtherChain:    TestSenderOtherChain,
+				recipientOtherChain: TestRecipientOtherChain,
+				coins:               cs(c(BNB_DENOM, 1000000000001)), // 10,001 BNB
+				crossChain:          true,
+				direction:           types.Incoming,
+			},
+			false,
+			false,
+		},
 	}
 
 	for _, tc := range testCases {
@@ -503,7 +539,7 @@ func (suite *AtomicSwapTestSuite) TestClaimAtomicSwap() {
 
 			// Create atomic swap
 			err := suite.keeper.CreateAtomicSwap(suite.ctx, suite.randomNumberHashes[i], suite.timestamps[i],
-				uint64(360), sender, expectedRecipient, TestSenderOtherChain, TestRecipientOtherChain,
+				types.DefaultMinBlockLock, sender, expectedRecipient, TestSenderOtherChain, TestRecipientOtherChain,
 				expectedClaimAmount, true)
 			suite.NoError(err)
 
@@ -657,7 +693,7 @@ func (suite *AtomicSwapTestSuite) TestRefundAtomicSwap() {
 			}
 
 			err := suite.keeper.CreateAtomicSwap(suite.ctx, suite.randomNumberHashes[i], suite.timestamps[i],
-				uint64(360), sender, suite.addrs[9], TestSenderOtherChain, TestRecipientOtherChain,
+				types.DefaultMinBlockLock, sender, suite.addrs[9], TestSenderOtherChain, TestRecipientOtherChain,
 				expectedRefundAmount, true)
 			suite.NoError(err)
 

x/bep3/simulation/genesis.go

@@ -19,6 +19,9 @@ import (
 // Simulation parameter constants
 const (
 	BnbDeputyAddress  = "bnb_deputy_address"
+	BnbDeputyFixedFee = "bnb_deputy_fixed_fee"
+	MinAmount         = "min_amount"
+	MaxAmount         = "max_amount"
 	MinBlockLock      = "min_block_lock"
 	MaxBlockLock      = "max_block_lock"
 	SupportedAssets   = "supported_assets"
@@ -37,23 +40,37 @@ func GenRandBnbDeputy(r *rand.Rand) simulation.Account {
 }
 
 // GenRandBnbDeputyFixedFee randomized BnbDeputyFixedFee in range [2, 10000]
-func GenRandBnbDeputyFixedFee(r *rand.Rand) uint64 {
+func GenRandBnbDeputyFixedFee(r *rand.Rand) sdk.Int {
 	min := int(2)
-	max := int(10000)
+	max := types.DefaultBnbDeputyFixedFee.Int64()
-	return uint64(r.Intn(max-min) + min)
+	return sdk.NewInt(int64(r.Intn(int(max)-min) + min))
+}
+
+// GenMinAmount randomized MinAmount in range [0, 1000000000000]
+func GenMinAmount(r *rand.Rand) sdk.Int {
+	min := types.DefaultMinAmount.Int64()
+	max := types.DefaultMaxAmount.Int64()
+	return sdk.NewInt((int64(r.Intn(int(max-min))) + min))
+}
+
+// GenMaxAmount randomized MaxAmount
+func GenMaxAmount(r *rand.Rand, minAmount sdk.Int) sdk.Int {
+	min := minAmount.Int64()
+	max := types.DefaultMaxAmount.Int64()
+	return sdk.NewInt((int64(r.Intn(int(max-min))) + min))
 }
 
 // GenMinBlockLock randomized MinBlockLock
 func GenMinBlockLock(r *rand.Rand) uint64 {
-	min := int(types.AbsoluteMinimumBlockLock)
+	min := 20
-	max := int(types.AbsoluteMaximumBlockLock)
+	max := int(types.DefaultMaxBlockLock)
 	return uint64(r.Intn(max-min) + min)
 }
 
 // GenMaxBlockLock randomized MaxBlockLock
 func GenMaxBlockLock(r *rand.Rand, minBlockLock uint64) uint64 {
 	min := int(minBlockLock)
-	max := int(types.AbsoluteMaximumBlockLock)
+	max := int(types.DefaultMaxBlockLock)
 	return uint64(r.Intn(max-min) + min)
 }
 
@@ -108,9 +125,11 @@ func RandomizedGenState(simState *module.SimulationState) {
 func loadRandomBep3GenState(simState *module.SimulationState) types.GenesisState {
 	bnbDeputy := GenRandBnbDeputy(simState.Rand)
 	bnbDeputyFixedFee := GenRandBnbDeputyFixedFee(simState.Rand)
+	minAmount := types.DefaultMinAmount
+	maxAmount := GenMaxAmount(simState.Rand, minAmount)
 
 	// min/max block lock are hardcoded to 50/100 for expected -NumBlocks=100
-	minBlockLock := types.AbsoluteMinimumBlockLock
+	minBlockLock := uint64(50)
 	maxBlockLock := minBlockLock * 2
 
 	var supportedAssets types.AssetParams
@@ -123,6 +142,8 @@ func loadRandomBep3GenState(simState *module.SimulationState) types.GenesisState
 		Params: types.Params{
 			BnbDeputyAddress:  bnbDeputy.Address,
 			BnbDeputyFixedFee: bnbDeputyFixedFee,
+			MinAmount:         minAmount,
+			MaxAmount:         maxAmount,
 			MinBlockLock:      minBlockLock,
 			MaxBlockLock:      maxBlockLock,
 			SupportedAssets:   supportedAssets,

x/bep3/simulation/operations.go

@@ -65,11 +65,11 @@ func SimulateMsgCreateAtomicSwap(ak types.AccountKeeper, k keeper.Keeper) simula
 		})
 
 		// Search for an account that holds coins received by an atomic swap
-		bnbDeputyFixedFee := k.GetBnbDeputyFixedFee(ctx)
+		minAmountPlusFee := k.GetMinAmount(ctx).Add(k.GetBnbDeputyFixedFee(ctx))
 		senderOut, asset, found := findValidAccountAssetSupplyPair(accs, supplies, func(acc simulation.Account, asset types.AssetSupply) bool {
 			if asset.CurrentSupply.Amount.IsPositive() {
 				authAcc := ak.GetAccount(ctx, acc.Address)
-				if authAcc.SpendableCoins(ctx.BlockTime()).AmountOf(asset.Denom).GT(sdk.NewIntFromUint64(bnbDeputyFixedFee)) {
+				if authAcc.SpendableCoins(ctx.BlockTime()).AmountOf(asset.Denom).GT(minAmountPlusFee) {
 					return true
 				}
 			}
@@ -128,9 +128,14 @@ func SimulateMsgCreateAtomicSwap(ak types.AccountKeeper, k keeper.Keeper) simula
 			}
 		}
 
+		// The maximum amount for all swaps is limited by the total max limit
+		if maximumAmount.GT(k.GetMaxAmount(ctx)) {
+			maximumAmount = k.GetMaxAmount(ctx)
+		}
+
 		// Get an amount of coins between 0.1 and 2% of total coins
 		amount := maximumAmount.Quo(sdk.NewInt(int64(simulation.RandIntBetween(r, 50, 1000))))
-		if amount.LT(sdk.NewIntFromUint64(bnbDeputyFixedFee)) {
+		if amount.LT(minAmountPlusFee) {
 			return simulation.NewOperationMsgBasic(types.ModuleName, fmt.Sprintf("no-operation (all funds exhausted for asset %s)", denom), "", false, nil), nil, nil
 		}
 		coins := sdk.NewCoins(sdk.NewCoin(denom, amount))

x/bep3/simulation/params.go

@@ -12,6 +12,8 @@ import (
 const (
 	keyBnbDeputyAddress  = "BnbDeputyAddress"
 	keyBnbDeputyFixedFee = "BnbDeputyFixedFee"
+	keyMinAmount         = "MinAmount"
+	keyMaxAmount         = "MaxAmount"
 	keyMinBlockLock      = "MinBlockLock"
 	keyMaxBlockLock      = "MaxBlockLock"
 	keySupportedAssets   = "SupportedAssets"
@@ -21,6 +23,7 @@ const (
 func ParamChanges(r *rand.Rand) []simulation.ParamChange {
 	// We generate MinBlockLock first because the result is required by GenMaxBlockLock()
 	minBlockLockVal := GenMinBlockLock(r)
+	minAmount := GenMinAmount(r)
 
 	return []simulation.ParamChange{
 		simulation.NewSimParamChange(types.ModuleName, keyBnbDeputyAddress,
@@ -30,7 +33,17 @@ func ParamChanges(r *rand.Rand) []simulation.ParamChange {
 		),
 		simulation.NewSimParamChange(types.ModuleName, keyBnbDeputyFixedFee,
 			func(r *rand.Rand) string {
-				return fmt.Sprintf("\"%d\"", GenRandBnbDeputyFixedFee(r))
+				return fmt.Sprintf("\"%s\"", GenRandBnbDeputyFixedFee(r).String())
+			},
+		),
+		simulation.NewSimParamChange(types.ModuleName, keyMinAmount,
+			func(r *rand.Rand) string {
+				return fmt.Sprintf("\"%s\"", minAmount.String())
+			},
+		),
+		simulation.NewSimParamChange(types.ModuleName, keyMaxAmount,
+			func(r *rand.Rand) string {
+				return fmt.Sprintf("\"%s\"", GenMaxAmount(r, minAmount).String())
 			},
 		),
 		simulation.NewSimParamChange(types.ModuleName, keyMinBlockLock,

x/bep3/spec/02_state.md

@@ -11,11 +11,13 @@ order: 2
 ```go
 // Params governance parameters for bep3 module
 type Params struct {
-	BnbDeputyAddress  sdk.AccAddress `json:"bnb_deputy_address" yaml:"bnb_deputy_address"`     // deputy's address on Kava
+	BnbDeputyAddress  sdk.AccAddress `json:"bnb_deputy_address" yaml:"bnb_deputy_address"`     // Bnbchain deputy address
-	BnbDeputyFixedFee uint64         `json:"bnb_deputy_fixed_fee" yaml:"bnb_deputy_fixed_fee"` // deputy's fixed fee
+	BnbDeputyFixedFee sdk.Int        `json:"bnb_deputy_fixed_fee" yaml:"bnb_deputy_fixed_fee"` // Deputy fixed fee in BNB
-	MinBlockLock      uint64         `json:"min_block_lock" yaml:"min_block_lock"`             // minimum swap expire height
+	MinAmount         sdk.Int        `json:"min_amount" yaml:"min_amount"`                     // Minimum swap amount
-	MaxBlockLock      uint64         `json:"max_block_lock" yaml:"max_block_lock"`             // maximum swap expire height
+	MaxAmount         sdk.Int        `json:"max_amount" yaml:"max_amount"`                     // Maximum swap amount
-	SupportedAssets   AssetParams    `json:"supported_assets" yaml:"supported_assets"`         // array of supported asset
+	MinBlockLock      uint64         `json:"min_block_lock" yaml:"min_block_lock"`             // Minimum swap block lock
+	MaxBlockLock      uint64         `json:"max_block_lock" yaml:"max_block_lock"`             // Maximum swap block lock
+	SupportedAssets   AssetParams    `json:"supported_assets" yaml:"supported_assets"`         // Supported assets
 }
 
 // AssetParam governance parameters for each asset within a supported chain

x/bep3/spec/05_params.md

@@ -9,9 +9,11 @@ The bep3 module contains the following parameters:
 | Key               | Type                    | Example                                       | Description                   |
 |-------------------|-------------------------|-----------------------------------------------|-------------------------------|
 | BnbDeputyAddress  | string (sdk.AccAddress) | "kava1xy7hrjy9r0algz9w3gzm8u6mrpq97kwta747gj" | deputy's Kava address         |
-| BnbDeputyFixedFee | uint64                  | 1000                                          | deputy's fixed bnb fee        |
+| BnbDeputyFixedFee | sdk.Int                 | sdk.NewInt(1000)                              | deputy's fixed bnb fee        |
-| MinBlockLock      | uint64                  | 80                                            | minimum swap expire height    |
+| MinAmount         | sdk.Int                 | sdk.NewInt(0)                                 | minimum swap amount           |
-| MaxBlockLock      | uint64                  | 600                                           | maximum swap expire height    |
+| MaxAmount         | sdk.Int                 | sdk.NewInt(1000000000000)                     | maximum swap amount           |
+| MinBlockLock      | uint64                  | 220                                           | minimum swap expire height    |
+| MaxBlockLock      | uint64                  | 270                                           | maximum swap expire height    |
 | SupportedAssets   | AssetParams             | []AssetParam                                  | array of supported assets     |
 |-------------------|-------------------------|-----------------------------------------------|-------------------------------|
 | AssetParam        | AssetParam              | AssetParam{"bnb", 714, sdk.NewInt(100), true} | a supported asset             |

x/bep3/types/errors.go

@@ -11,8 +11,8 @@ var (
 	ErrInvalidTimestamp = sdkerrors.Register(ModuleName, 2, "timestamp can neither be 15 minutes ahead of the current time, nor 30 minutes later")
 	// ErrInvalidHeightSpan error for when a proposed height span is outside of lock time range
 	ErrInvalidHeightSpan = sdkerrors.Register(ModuleName, 3, "height span is outside acceptable range")
-	// ErrInsufficientAmount error for when a swap's amount is less than the deputy fixed fee
+	// ErrInsufficientAmount error for when a swap's amount cannot cover the deputy's fixed fee
-	ErrInsufficientAmount = sdkerrors.Register(ModuleName, 4, "amount must be greater than the deputy fixed fee")
+	ErrInsufficientAmount = sdkerrors.Register(ModuleName, 4, "amount cannot cover the deputy fixed fee")
 	// ErrAssetNotSupported error for when an asset is not supported
 	ErrAssetNotSupported = sdkerrors.Register(ModuleName, 5, "asset not on the list of supported assets")
 	// ErrAssetNotActive error for when an asset is currently inactive
@@ -39,4 +39,6 @@ var (
 	ErrSwapNotRefundable = sdkerrors.Register(ModuleName, 16, "atomic swap is still active and cannot be refunded")
 	// ErrSwapNotClaimable error for when an atomic swap is not open and cannot be claimed
 	ErrSwapNotClaimable = sdkerrors.Register(ModuleName, 17, "atomic swap is not claimable")
+	// ErrInvalidAmount error for when a swap's amount is outside acceptable range
+	ErrInvalidAmount = sdkerrors.Register(ModuleName, 18, "amount is outside acceptable range")
 )

x/bep3/types/msg.go

@@ -183,8 +183,8 @@ func (msg MsgClaimAtomicSwap) ValidateBasic() error {
 	if len(msg.SwapID) != SwapIDLength {
 		return fmt.Errorf("the length of swapID should be %d", SwapIDLength)
 	}
-	if len(msg.RandomNumber) == 0 {
+	if len(msg.RandomNumber) != RandomNumberLength {
-		return errors.New("the length of random number cannot be 0")
+		return fmt.Errorf("the length of random number should be %d", RandomNumberLength)
 	}
 	return nil
 }

x/bep3/types/params.go

@@ -17,20 +17,22 @@ const (
 var (
 	KeyBnbDeputyAddress  = []byte("BnbDeputyAddress")
 	KeyBnbDeputyFixedFee = []byte("BnbDeputyFixedFee")
+	KeyMinAmount         = []byte("MinAmount")
+	KeyMaxAmount         = []byte("MaxAmount")
 	KeyMinBlockLock      = []byte("MinBlockLock")
 	KeyMaxBlockLock      = []byte("MaxBlockLock")
 	KeySupportedAssets   = []byte("SupportedAssets")
 
-	DefaultBnbDeputyFixedFee uint64 = 1000
+	DefaultBnbDeputyFixedFee sdk.Int = sdk.NewInt(1000) // 0.00001 BNB
-	AbsoluteMaximumBlockLock uint64 = 10000
+	DefaultMinAmount         sdk.Int = sdk.ZeroInt()
-	AbsoluteMinimumBlockLock uint64 = 50
+	DefaultMaxAmount         sdk.Int = sdk.NewInt(1000000000000) // 10,000 BNB
-	DefaultMinBlockLock      uint64 = 80
+	DefaultMinBlockLock      uint64  = 220
-	DefaultMaxBlockLock      uint64 = 600
+	DefaultMaxBlockLock      uint64  = 270
 	DefaultSupportedAssets           = AssetParams{
 		AssetParam{
 			Denom:  "bnb",
 			CoinID: 714,
-			Limit:  sdk.NewInt(100000000000),
+			Limit:  sdk.NewInt(350000000000000), // 3,500,000 BNB
 			Active: true,
 		},
 	}
@@ -39,9 +41,11 @@ var (
 // Params governance parameters for bep3 module
 type Params struct {
 	BnbDeputyAddress  sdk.AccAddress `json:"bnb_deputy_address" yaml:"bnb_deputy_address"`     // Bnbchain deputy address
-	BnbDeputyFixedFee uint64         `json:"bnb_deputy_fixed_fee" yaml:"bnb_deputy_fixed_fee"` // Deputy fixed fee in BNB
+	BnbDeputyFixedFee sdk.Int        `json:"bnb_deputy_fixed_fee" yaml:"bnb_deputy_fixed_fee"` // Deputy fixed fee in BNB
-	MinBlockLock      uint64         `json:"min_block_lock" yaml:"min_block_lock"`             // AtomicSwap minimum block lock
+	MinAmount         sdk.Int        `json:"min_amount" yaml:"min_amount"`                     // Minimum swap amount
-	MaxBlockLock      uint64         `json:"max_block_lock" yaml:"max_block_lock"`             // AtomicSwap maximum block lock
+	MaxAmount         sdk.Int        `json:"max_amount" yaml:"max_amount"`                     // Maximum swap amount
+	MinBlockLock      uint64         `json:"min_block_lock" yaml:"min_block_lock"`             // Minimum swap block lock
+	MaxBlockLock      uint64         `json:"max_block_lock" yaml:"max_block_lock"`             // Maximum swap block lock
 	SupportedAssets   AssetParams    `json:"supported_assets" yaml:"supported_assets"`         // Supported assets
 }
 
@@ -50,18 +54,24 @@ func (p Params) String() string {
 	return fmt.Sprintf(`Params:
 	Bnbchain deputy address: %s,
 	Deputy fixed fee (BNB): %d,
+	Min amount: %d,
+	Max amount: %d,
 	Min block lock: %d,
 	Max block lock: %d,
 	Supported assets: %s`,
-		p.BnbDeputyAddress.String(), p.BnbDeputyFixedFee, p.MinBlockLock, p.MaxBlockLock, p.SupportedAssets)
+		p.BnbDeputyAddress.String(), p.BnbDeputyFixedFee, p.MinAmount,
+		p.MaxAmount, p.MinBlockLock, p.MaxBlockLock, p.SupportedAssets)
 }
 
 // NewParams returns a new params object
-func NewParams(bnbDeputyAddress sdk.AccAddress, bnbDeputyFixedFee, minBlockLock, maxBlockLock uint64, supportedAssets AssetParams,
+func NewParams(bnbDeputyAddress sdk.AccAddress, bnbDeputyFixedFee, minAmount,
+	maxAmount sdk.Int, minBlockLock, maxBlockLock uint64, supportedAssets AssetParams,
 ) Params {
 	return Params{
 		BnbDeputyAddress:  bnbDeputyAddress,
 		BnbDeputyFixedFee: bnbDeputyFixedFee,
+		MinAmount:         minAmount,
+		MaxAmount:         maxAmount,
 		MinBlockLock:      minBlockLock,
 		MaxBlockLock:      maxBlockLock,
 		SupportedAssets:   supportedAssets,
@@ -75,8 +85,8 @@ func DefaultParams() Params {
 		panic(err)
 	}
 
-	return NewParams(defaultBnbDeputyAddress, DefaultBnbDeputyFixedFee,
+	return NewParams(defaultBnbDeputyAddress, DefaultBnbDeputyFixedFee, DefaultMinAmount,
-		DefaultMinBlockLock, DefaultMaxBlockLock, DefaultSupportedAssets)
+		DefaultMaxAmount, DefaultMinBlockLock, DefaultMaxBlockLock, DefaultSupportedAssets)
 }
 
 // AssetParam governance parameters for each asset within a supported chain
@@ -121,6 +131,8 @@ func (p *Params) ParamSetPairs() params.ParamSetPairs {
 	return params.ParamSetPairs{
 		params.NewParamSetPair(KeyBnbDeputyAddress, &p.BnbDeputyAddress, validateBnbDeputyAddressParam),
 		params.NewParamSetPair(KeyBnbDeputyFixedFee, &p.BnbDeputyFixedFee, validateBnbDeputyFixedFeeParam),
+		params.NewParamSetPair(KeyMinAmount, &p.MinAmount, validateMinAmountParam),
+		params.NewParamSetPair(KeyMaxAmount, &p.MaxAmount, validateMaxAmountParam),
 		params.NewParamSetPair(KeyMinBlockLock, &p.MinBlockLock, validateMinBlockLockParam),
 		params.NewParamSetPair(KeyMaxBlockLock, &p.MaxBlockLock, validateMaxBlockLockParam),
 		params.NewParamSetPair(KeySupportedAssets, &p.SupportedAssets, validateSupportedAssetsParams),
@@ -137,6 +149,18 @@ func (p Params) Validate() error {
 		return err
 	}
 
+	if err := validateMinAmountParam(p.MinAmount); err != nil {
+		return err
+	}
+
+	if err := validateMaxAmountParam(p.MaxAmount); err != nil {
+		return err
+	}
+
+	if p.MinAmount.GT(p.MaxAmount) {
+		return fmt.Errorf("minimum amount cannot be > maximum amount, got %d > %d", p.MinAmount, p.MaxAmount)
+	}
+
 	if err := validateMinBlockLockParam(p.MinBlockLock); err != nil {
 		return err
 	}
@@ -145,8 +169,8 @@ func (p Params) Validate() error {
 		return err
 	}
 
-	if p.MinBlockLock >= p.MaxBlockLock {
+	if p.MinBlockLock > p.MaxBlockLock {
-		return fmt.Errorf("minimum block lock cannot be ≥ maximum block lock, got %d ≥ %d", p.MinBlockLock, p.MaxBlockLock)
+		return fmt.Errorf("minimum block lock cannot be > maximum block lock, got %d > %d", p.MinBlockLock, p.MaxBlockLock)
 	}
 
 	return validateSupportedAssetsParams(p.SupportedAssets)
@@ -170,7 +194,25 @@ func validateBnbDeputyAddressParam(i interface{}) error {
 }
 
 func validateBnbDeputyFixedFeeParam(i interface{}) error {
-	_, ok := i.(uint64)
+	_, ok := i.(sdk.Int)
+	if !ok {
+		return fmt.Errorf("invalid parameter type: %T", i)
+	}
+
+	return nil
+}
+
+func validateMinAmountParam(i interface{}) error {
+	_, ok := i.(sdk.Int)
+	if !ok {
+		return fmt.Errorf("invalid parameter type: %T", i)
+	}
+
+	return nil
+}
+
+func validateMaxAmountParam(i interface{}) error {
+	_, ok := i.(sdk.Int)
 	if !ok {
 		return fmt.Errorf("invalid parameter type: %T", i)
 	}
@@ -179,28 +221,20 @@ func validateBnbDeputyFixedFeeParam(i interface{}) error {
 }
 
 func validateMinBlockLockParam(i interface{}) error {
-	minBlockLock, ok := i.(uint64)
+	_, ok := i.(uint64)
 	if !ok {
 		return fmt.Errorf("invalid parameter type: %T", i)
 	}
 
-	if minBlockLock < AbsoluteMinimumBlockLock {
-		return fmt.Errorf("minimum block lock cannot be less than %d, got %d", AbsoluteMinimumBlockLock, minBlockLock)
-	}
-
 	return nil
 }
 
 func validateMaxBlockLockParam(i interface{}) error {
-	maxBlockLock, ok := i.(uint64)
+	_, ok := i.(uint64)
 	if !ok {
 		return fmt.Errorf("invalid parameter type: %T", i)
 	}
 
-	if maxBlockLock > AbsoluteMaximumBlockLock {
-		return fmt.Errorf("maximum block lock cannot be greater than %d, got %d", AbsoluteMaximumBlockLock, maxBlockLock)
-	}
-
 	return nil
 }
 

x/bep3/types/params_test.go

@@ -29,7 +29,9 @@ func (suite *ParamsTestSuite) TestParamValidation() {
 
 	type args struct {
 		bnbDeputyAddress  sdk.AccAddress
-		bnbDeputyFixedFee uint64
+		bnbDeputyFixedFee sdk.Int
+		minAmount         sdk.Int
+		maxAmount         sdk.Int
 		minBlockLock      uint64
 		maxBlockLock      uint64
 		supportedAssets   types.AssetParams
@@ -46,6 +48,8 @@ func (suite *ParamsTestSuite) TestParamValidation() {
 			args: args{
 				bnbDeputyAddress:  suite.addr,
 				bnbDeputyFixedFee: types.DefaultBnbDeputyFixedFee,
+				minAmount:         types.DefaultMinAmount,
+				maxAmount:         types.DefaultMaxAmount,
 				minBlockLock:      types.DefaultMinBlockLock,
 				maxBlockLock:      types.DefaultMaxBlockLock,
 				supportedAssets:   types.DefaultSupportedAssets,
@@ -54,58 +58,54 @@ func (suite *ParamsTestSuite) TestParamValidation() {
 			expectedErr: "",
 		},
 		{
-			name: "minimum block lock below limit",
+			name: "minimum block lock == maximum block lock",
 			args: args{
 				bnbDeputyAddress:  suite.addr,
 				bnbDeputyFixedFee: types.DefaultBnbDeputyFixedFee,
-				minBlockLock:      1,
+				minAmount:         types.DefaultMinAmount,
+				maxAmount:         types.DefaultMaxAmount,
+				minBlockLock:      243,
+				maxBlockLock:      243,
+				supportedAssets:   types.DefaultSupportedAssets,
+			},
+			expectPass:  true,
+			expectedErr: "",
+		},
+		{
+			name: "minimum amount greater than maximum amount",
+			args: args{
+				bnbDeputyAddress:  suite.addr,
+				bnbDeputyFixedFee: types.DefaultBnbDeputyFixedFee,
+				minAmount:         sdk.NewInt(10000000),
+				maxAmount:         sdk.NewInt(100000),
+				minBlockLock:      types.DefaultMinBlockLock,
 				maxBlockLock:      types.DefaultMaxBlockLock,
 				supportedAssets:   types.DefaultSupportedAssets,
 			},
 			expectPass:  false,
-			expectedErr: "minimum block lock cannot be less than",
+			expectedErr: "minimum amount cannot be > maximum amount",
 		},
 		{
-			name: "minimum block lock above limit",
+			name: "minimum block lock greater than maximum block lock",
 			args: args{
 				bnbDeputyAddress:  suite.addr,
 				bnbDeputyFixedFee: types.DefaultBnbDeputyFixedFee,
-				minBlockLock:      500000,
+				minAmount:         types.DefaultMinAmount,
-				maxBlockLock:      types.DefaultMaxBlockLock,
+				maxAmount:         types.DefaultMaxAmount,
+				minBlockLock:      500,
+				maxBlockLock:      400,
 				supportedAssets:   types.DefaultSupportedAssets,
 			},
 			expectPass:  false,
-			expectedErr: "maximum block lock must be greater than minimum block lock",
+			expectedErr: "minimum block lock cannot be > maximum block lock",
-		},
-		{
-			name: "maximum block lock below limit",
-			args: args{
-				bnbDeputyAddress:  suite.addr,
-				bnbDeputyFixedFee: types.DefaultBnbDeputyFixedFee,
-				minBlockLock:      types.DefaultMinBlockLock,
-				maxBlockLock:      1,
-				supportedAssets:   types.DefaultSupportedAssets,
-			},
-			expectPass:  false,
-			expectedErr: "maximum block lock must be greater than minimum block lock",
-		},
-		{
-			name: "maximum block lock above limit",
-			args: args{
-				bnbDeputyAddress:  suite.addr,
-				bnbDeputyFixedFee: types.DefaultBnbDeputyFixedFee,
-				minBlockLock:      types.DefaultMinBlockLock,
-				maxBlockLock:      100000000,
-				supportedAssets:   types.DefaultSupportedAssets,
-			},
-			expectPass:  false,
-			expectedErr: "maximum block lock cannot be greater than",
 		},
 		{
 			name: "empty asset denom",
 			args: args{
 				bnbDeputyAddress:  suite.addr,
 				bnbDeputyFixedFee: types.DefaultBnbDeputyFixedFee,
+				minAmount:         types.DefaultMinAmount,
+				maxAmount:         types.DefaultMaxAmount,
 				minBlockLock:      types.DefaultMinBlockLock,
 				maxBlockLock:      types.DefaultMaxBlockLock,
 				supportedAssets: types.AssetParams{
@@ -125,6 +125,8 @@ func (suite *ParamsTestSuite) TestParamValidation() {
 			args: args{
 				bnbDeputyAddress:  suite.addr,
 				bnbDeputyFixedFee: types.DefaultBnbDeputyFixedFee,
+				minAmount:         types.DefaultMinAmount,
+				maxAmount:         types.DefaultMaxAmount,
 				minBlockLock:      types.DefaultMinBlockLock,
 				maxBlockLock:      types.DefaultMaxBlockLock,
 				supportedAssets: types.AssetParams{
@@ -137,13 +139,15 @@ func (suite *ParamsTestSuite) TestParamValidation() {
 				},
 			},
 			expectPass:  false,
-			expectedErr: "must be a positive integer",
+			expectedErr: "must be a non negative integer",
 		},
 		{
 			name: "negative asset limit",
 			args: args{
 				bnbDeputyAddress:  suite.addr,
 				bnbDeputyFixedFee: types.DefaultBnbDeputyFixedFee,
+				minAmount:         types.DefaultMinAmount,
+				maxAmount:         types.DefaultMaxAmount,
 				minBlockLock:      types.DefaultMinBlockLock,
 				maxBlockLock:      types.DefaultMaxBlockLock,
 				supportedAssets: types.AssetParams{
@@ -163,6 +167,8 @@ func (suite *ParamsTestSuite) TestParamValidation() {
 			args: args{
 				bnbDeputyAddress:  suite.addr,
 				bnbDeputyFixedFee: types.DefaultBnbDeputyFixedFee,
+				minAmount:         types.DefaultMinAmount,
+				maxAmount:         types.DefaultMaxAmount,
 				minBlockLock:      types.DefaultMinBlockLock,
 				maxBlockLock:      types.DefaultMaxBlockLock,
 				supportedAssets: types.AssetParams{
@@ -188,6 +194,8 @@ func (suite *ParamsTestSuite) TestParamValidation() {
 			args: args{
 				bnbDeputyAddress:  suite.addr,
 				bnbDeputyFixedFee: types.DefaultBnbDeputyFixedFee,
+				minAmount:         types.DefaultMinAmount,
+				maxAmount:         types.DefaultMaxAmount,
 				minBlockLock:      types.DefaultMinBlockLock,
 				maxBlockLock:      types.DefaultMaxBlockLock,
 				supportedAssets: types.AssetParams{
@@ -211,14 +219,15 @@ func (suite *ParamsTestSuite) TestParamValidation() {
 	}
 
 	for _, tc := range testCases {
-		params := types.NewParams(tc.args.bnbDeputyAddress, tc.args.bnbDeputyFixedFee,
+		params := types.NewParams(tc.args.bnbDeputyAddress, tc.args.bnbDeputyFixedFee, tc.args.minAmount,
-			tc.args.minBlockLock, tc.args.maxBlockLock, tc.args.supportedAssets)
+			tc.args.maxAmount, tc.args.minBlockLock, tc.args.maxBlockLock, tc.args.supportedAssets)
 
 		err := params.Validate()
 		if tc.expectPass {
 			suite.Require().NoError(err, tc.name)
 		} else {
 			suite.Require().Error(err, tc.name)
+			suite.Require().Contains(err.Error(), tc.expectedErr)
 		}
 	}
 }