feat!: basket events update

proto/regen/ecocredit/v1alpha1/events.proto

@@ -42,16 +42,18 @@ message EventCreateBatch {
   string project_location = 7;
 }
 
-// EventReceive is an event emitted when credits are received either upon
-// creation of a new batch or upon transfer. Each batch_denom created or
-// transferred will result in a separate EventReceive for easy indexing.
+// EventReceive is an event emitted when credits are received either via
+// creation of a new batch, transfer of credits, or taking credits from a
+// basket. Each batch_denom created, transferred or taken from a basket will
+// result in a separate EventReceive for easy indexing.
 message EventReceive {
+
   // sender is the sender of the credits in the case that this event is the
   // result of a transfer. It will not be set when credits are received at
-  // initial issuance.
+  // initial issuance or taken from a basket.
   string sender = 1;
 
-  // recipient is the recipient of the credits
+  // recipient is the recipient of the credits.
   string recipient = 2;
 
   // batch_denom is the unique ID of credit batch.
@@ -62,6 +64,12 @@ message EventReceive {
 
   // retired_amount is the decimal number of retired credits received.
   string retired_amount = 5;
+
+  // basket_denom is the denom of the basket. when the basket_denom field is
+  // set, it indicates that this event was triggered by the transfer of credits
+  // from a basket. It will not be set if the credits were sent by a user, or by
+  // initial issuance.
+  string basket_denom = 6;
 }
 
 // EventRetire is an event emitted when credits are retired. When credits are

x/ecocredit/server/basket/take.go

@@ -95,6 +95,7 @@ func (k Keeper) Take(ctx context.Context, msg *baskettypes.MsgTake) (*baskettype
 				acct,
 				basketBalance.BatchDenom,
 				amountCreditsNeeded,
+				basket.BasketDenom,
 				retire,
 				msg.RetirementLocation,
 			)
@@ -125,6 +126,7 @@ func (k Keeper) Take(ctx context.Context, msg *baskettypes.MsgTake) (*baskettype
 				acct,
 				basketBalance.BatchDenom,
 				balance,
+				basket.BasketDenom,
 				retire,
 				msg.RetirementLocation,
 			)
@@ -160,7 +162,7 @@ func (k Keeper) Take(ctx context.Context, msg *baskettypes.MsgTake) (*baskettype
 	}, err
 }
 
-func (k Keeper) addCreditBalance(ctx context.Context, owner sdk.AccAddress, batchDenom string, amount math.Dec, retire bool, retirementLocation string) error {
+func (k Keeper) addCreditBalance(ctx context.Context, owner sdk.AccAddress, batchDenom string, amount math.Dec, basketDenom string, retire bool, retirementLocation string) error {
 	sdkCtx := types.UnwrapSDKContext(ctx)
 	store := sdkCtx.KVStore(k.storeKey)
 	if !retire {
@@ -173,6 +175,7 @@ func (k Keeper) addCreditBalance(ctx context.Context, owner sdk.AccAddress, batc
 			Recipient:      owner.String(),
 			BatchDenom:     batchDenom,
 			TradableAmount: amount.String(),
+			BasketDenom:    basketDenom,
 		})
 	} else {
 		err := ecocredit.AddAndSetDecimal(store, ecocredit.RetiredBalanceKey(owner, ecocredit.BatchDenomT(batchDenom)), amount)
@@ -194,6 +197,7 @@ func (k Keeper) addCreditBalance(ctx context.Context, owner sdk.AccAddress, batc
 			Recipient:     owner.String(),
 			BatchDenom:    batchDenom,
 			RetiredAmount: amount.String(),
+			BasketDenom:   basketDenom,
 		})
 		if err != nil {
 			return err