Merge pull request #7 from oraidex/add-event-ibc-auto-forward

Dang/Add event ibc auto forward

module/x/gravity/keeper/attestation_handler.go

@@ -475,7 +475,12 @@ func (a AttestationHandler) sendCoinToCosmosAccount(
 	}
 
 	err = a.addToIbcAutoForwardQueue(ctx, claim.CosmosReceiver, coin, sourceChannel, claim)
-
+	// emit chain id for bridge monitor
+	bridgeChainId := strconv.Itoa(int(a.keeper.GetBridgeChainID(ctx, claim.EvmChainPrefix)))
+	ctx.EventManager().EmitEvent(sdk.NewEvent(
+		types.EventTypeSendToCosmosIbcAutoForwardPending,
+		sdk.NewAttribute(types.AttributeKeyBridgeChainID, bridgeChainId),
+	))
 	if err != nil {
 		a.keeper.logger(ctx).Error(
 			"SendToCosmos IBC auto forwarding failed, sending to local gravity account instead with error: ", err.Error(),

module/x/gravity/keeper/ibc_auto_forward.go

@@ -12,6 +12,7 @@ package keeper
 
 import (
 	"fmt"
+	"strconv"
 	"time"
 
 	"github.com/Gravity-Bridge/Gravity-Bridge/module/x/gravity/types"
@@ -205,12 +206,18 @@ func (k Keeper) ProcessNextPendingIbcAutoForward(ctx sdk.Context, evmChainPrefix
 
 	// Make the ibc-transfer attempt
 	wCtx := sdk.WrapSDKContext(ctx)
-	_, recoverableErr := k.ibcTransferKeeper.Transfer(wCtx, &msgTransfer)
+	msgResponse, recoverableErr := k.ibcTransferKeeper.Transfer(wCtx, &msgTransfer)
 	ctx = sdk.UnwrapSDKContext(wCtx)
 
 	// Log + emit event
 	if recoverableErr == nil {
-		k.logEmitIbcForwardSuccessEvent(ctx, *forward, msgTransfer)
+		k.logEmitIbcForwardSuccessEvent(
+			ctx,
+			strconv.Itoa(int(k.GetBridgeChainID(ctx, evmChainPrefix))), // we want to check that tx bridge from
+			*forward,
+			msgTransfer,
+			msgResponse,
+		)
 	} else {
 		// Funds have already been sent to the fallback user, emit a failure log
 		/*
@@ -266,8 +273,10 @@ func thirtyDaysInFuture(ctx sdk.Context) time.Time {
 // EventSendToCosmosExecutedIbcAutoForward type event
 func (k Keeper) logEmitIbcForwardSuccessEvent(
 	ctx sdk.Context,
+	bridgeChainId string,
 	forward types.PendingIbcAutoForward,
 	msgTransfer ibctransfertypes.MsgTransfer,
+	msgTransferResponse *ibctransfertypes.MsgTransferResponse,
 ) {
 	k.logger(ctx).Info("SendToCosmos IBC Auto-Forward", "ibcReceiver", forward.ForeignReceiver, "denom", forward.Token.Denom,
 		"amount", forward.Token.Amount.String(), "ibc-port", msgTransfer.SourcePort, "ibcChannel", forward.IbcChannel,
@@ -284,6 +293,16 @@ func (k Keeper) logEmitIbcForwardSuccessEvent(
 		TimeoutHeight: msgTransfer.TimeoutHeight.String(),
 		TimeoutTime:   fmt.Sprint(msgTransfer.TimeoutTimestamp),
 	})
+	ctx.EventManager().EmitEvents(sdk.Events{
+		sdk.NewEvent(
+			types.EventTypeSendToCosmosIbcAutoForward,
+			sdk.NewAttribute(types.AttributeKeyBridgeChainID, bridgeChainId),
+			sdk.NewAttribute(types.AttributeKeyBatchNonce, fmt.Sprint(forward.EventNonce)),
+			sdk.NewAttribute(types.AttributeKeyIbcAutoForwardSequence, strconv.FormatUint(msgTransferResponse.Sequence, 10)),
+			sdk.NewAttribute(types.AttributeKeyIbcAutoForwardSrcPort, msgTransfer.SourcePort),
+			sdk.NewAttribute(types.AttributeKeyIbcAutoForwardSrcChannel, msgTransfer.SourceChannel),
+		),
+	})
 }
 
 // logEmitIbcForwardFailureEvent logs failed IBC Auto-Forwarding and emits a EventSendToCosmosLocal type event

module/x/gravity/keeper/ibc_callback.go

@@ -2,6 +2,7 @@ package keeper
 
 import (
 	"fmt"
+	"strconv"
 	"strings"
 
 	"github.com/Gravity-Bridge/Gravity-Bridge/module/x/gravity/types"
@@ -175,6 +176,21 @@ func (k Keeper) OnRecvPacket(
 		return channeltypes.NewErrorAcknowledgement(err.Error())
 	}
 
+	ctx.EventManager().EmitEvents(sdk.Events{
+		sdk.NewEvent(
+			types.EventTypeIbcAutoForwardSendToEvmPending,
+			sdk.NewAttribute(types.AttributeKeyIbcAutoForwardSequence, strconv.Itoa(int(packet.Sequence))),
+			sdk.NewAttribute(types.AttributeKeyIbcAutoForwardSrcChannel, packet.SourceChannel),
+			sdk.NewAttribute(types.AttributeKeyIbcAutoForwardSrcPort, packet.SourcePort),
+			sdk.NewAttribute(types.AttributeKeyIbcAutoForwardDstChannel, packet.DestinationChannel),
+			sdk.NewAttribute(types.AttributeKeyIbcAutoForwardDstPort, packet.DestinationPort),
+			sdk.NewAttribute(types.AttributeKeyBridgeChainID, strconv.Itoa(int(k.GetBridgeChainID(ctx, evmChainPrefix)))),
+			sdk.NewAttribute(types.AttributeKeyContract, k.GetBridgeContractAddress(ctx, evmChainPrefix).GetAddress().Hex()),
+			sdk.NewAttribute(types.AttributeKeyOutgoingTXID, strconv.Itoa(int(txID))),
+			sdk.NewAttribute(types.AttributeKeyNonce, fmt.Sprint(txID)),
+		),
+	})
+
 	ctx.EventManager().EmitTypedEvent(
 		&types.EventOutgoingTxId{
 			Message: "send_to_eth",

module/x/gravity/types/events.go

@@ -1,15 +1,18 @@
 package types
 
 const (
-	EventTypeObservation                 = "observation"
-	EventTypeOutgoingBatch               = "outgoing_batch"
-	EventTypeMultisigUpdateRequest       = "multisig_update_request"
-	EventTypeOutgoingBatchCanceled       = "outgoing_batch_canceled"
-	EventTypeOutgoingLogicCallCanceled   = "outgoing_logic_call_canceled"
-	EventTypeBridgeWithdrawalReceived    = "withdrawal_received"
-	EventTypeBridgeDepositReceived       = "deposit_received"
-	EventTypeBridgeWithdrawCanceled      = "withdraw_canceled"
-	EventTypeInvalidSendToCosmosReceiver = "invalid_send_to_cosmos_receiver"
+	EventTypeObservation                       = "observation"
+	EventTypeOutgoingBatch                     = "outgoing_batch"
+	EventTypeMultisigUpdateRequest             = "multisig_update_request"
+	EventTypeOutgoingBatchCanceled             = "outgoing_batch_canceled"
+	EventTypeOutgoingLogicCallCanceled         = "outgoing_logic_call_canceled"
+	EventTypeBridgeWithdrawalReceived          = "withdrawal_received"
+	EventTypeBridgeDepositReceived             = "deposit_received"
+	EventTypeBridgeWithdrawCanceled            = "withdraw_canceled"
+	EventTypeInvalidSendToCosmosReceiver       = "invalid_send_to_cosmos_receiver"
+	EventTypeSendToCosmosIbcAutoForward        = "send_to_cosmos_ibc_auto_forward"
+	EventTypeSendToCosmosIbcAutoForwardPending = "send_to_cosmos_ibc_auto_forward_pending"
+	EventTypeIbcAutoForwardSendToEvmPending    = "ibc_auto_forward_send_to_evm_pending"
 
 	AttributeKeyAttestationID          = "attestation_id"
 	AttributeKeyBatchConfirmKey        = "batch_confirm_key"
@@ -29,6 +32,12 @@ const (
 	AttributeKeyBadEthSignature        = "bad_eth_signature"
 	AttributeKeyBadEthSignatureSubject = "bad_eth_signature_subject"
 
+	AttributeKeyIbcAutoForwardSequence   = "packet_sequence"
+	AttributeKeyIbcAutoForwardSrcPort    = "packet_src_port"
+	AttributeKeyIbcAutoForwardSrcChannel = "packet_src_channel"
+	AttributeKeyIbcAutoForwardDstPort    = "packet_dst_port"
+	AttributeKeyIbcAutoForwardDstChannel = "packet_dst_channel"
+
 	AttributeKeySendToCosmosAmount = "msg_send_to_cosmsos_amount"
 	AttributeKeySendToCosmosNonce  = "msg_send_to_cosmsos_nonce"
 	AttributeKeySendToCosmosToken  = "msg_send_to_cosmsos_token"