add Validate

x/ecocredit/basket/msg_create.go

@@ -57,8 +57,17 @@ func (m MsgCreate) ValidateBasic() error {
 }
 
 // Validate additional validation with access to the state data.
+// minFee must be sorted.
 func (m MsgCreate) Validate(minFee sdk.Coins) error {
-	// TODO: update function to do stateful validation
+	// Note if user is adding too much denoms then we fails as well.
+	if len(minFee) != len(m.Fee) {
+		return errBadReq.Wrap("Wrong denom set, expected %v", m.Fee)
+	}
+	for i, c := range m.Fee.Sort() {
+		if minFee[i].Denom != c.Denom || minFee[i].Amount > c.Amount {
+			return errBadReq.Wrap("Wrong denom set, expected %v", m.Fee)
+		}
+	}
 	return nil
 }
 

x/ecocredit/server/basket/create.go

@@ -11,8 +11,8 @@ import (
 
 func (k Keeper) Create(ctx context.Context, msg *basket.MsgCreate) (*basket.MsgCreateResponse, error) {
 	sdkCtx := sdk.UnwrapSDKContext(ctx)
-	// TODO: use param
-	if err := msg.Validate(nil); err != nil {
+	fee := k.ecocreditKeeper.GetCreateBasketFee(ctx)
+	if err := msg.Validate(fee); err != nil {
 		return nil, err
 	}
 	// TODO: need to decide about the denom creation
@@ -21,8 +21,7 @@ func (k Keeper) Create(ctx context.Context, msg *basket.MsgCreate) (*basket.MsgC
 	if err != nil {
 		return nil, err
 	}
-	fee := k.ecocreditKeeper.GetCreateBasketFee(ctx)
-	k.bankKeeper.SendCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins)
+	k.bankKeeper.SendCoinsFromAccountToModule(sdkCtx, sender, feeModuleAccName, fee)
 
 	err = sdkCtx.EventManager().EmitTypedEvent(&basket.EventCreate{
 		BasketDenom: denom,

x/ecocredit/server/basket/keys.go

@@ -6,8 +6,9 @@ import (
 	"github.com/regen-network/regen-ledger/x/ecocredit"
 )
 
-var feeBasketAcc []byte
+// var feeBasketAcc []byte
+var feeModuleAccName = ecocredit.ModuleName + "basket-fees"
 
 func init() {
-	feeBasketAcc = authtypes.NewModuleAddress(ecocredit.ModuleName + "basket-fees")
+	// feeBasketAcc = authtypes.NewModuleAddress(ecocredit.ModuleName + "basket-fees")
 }