Improve evidence logging

CoreumFoundation · Feb 8, 2024 · c4aabf5 · c4aabf5
1 parent 2aed90c
commit c4aabf5
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 deletions.
diff --git a/relayer/client/bridge.go b/relayer/client/bridge.go
@@ -1139,12 +1139,7 @@ func (b *BridgeClient) autoFillSignSubmitAndAwaitXRPLTx(
 		return err
 	}
 
-	b.log.Info(
-		ctx,
-		"Submitting XRPL transaction",
-		zap.String("txHash", tx.GetHash().String()),
-		zap.Any("tx", tx),
-	)
+	b.log.Info(ctx, "Submitting XRPL transaction", zap.String("txHash", tx.GetHash().String()))
 	if err = b.xrplRPCClient.SubmitAndAwaitSuccess(ctx, tx); err != nil {
 		return err
 	}

diff --git a/relayer/logger/yaml_console.go b/relayer/logger/yaml_console.go
@@ -7,6 +7,7 @@ import (
 	"strings"
 	"time"
 
+	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
@@ -450,6 +451,15 @@ func (c *yamlConsoleEncoder) appendCustomTypes(value interface{}) bool {
 		c.AppendString(addr.String())
 		return true
 	}
+	if intVal, ok := value.(sdk.Int); ok { //nolint:staticcheck //the type is deprecated by still used
+		c.AppendString(intVal.String())
+		return true
+	}
+	if intVal, ok := value.(sdkmath.Int); ok {
+		c.AppendString(intVal.String())
+		return true
+	}
+
 	return false
 }
 

diff --git a/relayer/processes/xrpl_to_coreum.go b/relayer/processes/xrpl_to_coreum.go
@@ -149,6 +149,7 @@ func (o *XRPLToCoreumProcess) processIncomingTx(ctx context.Context, tx rippleda
 
 	_, err = o.contractClient.SendXRPLToCoreumTransferEvidence(ctx, o.cfg.RelayerCoreumAddress, evidence)
 	if err == nil {
+		o.log.Info(ctx, "Successfully sent XRPL to Coreum transfer evidence", zap.Any("evidence", evidence))
 		return nil
 	}
 
@@ -240,7 +241,7 @@ func (o *XRPLToCoreumProcess) sendXRPLTicketsAllocationTransactionResultEvidence
 		evidence,
 	)
 
-	return o.handleEvidenceSubmissionError(ctx, err, tx, evidence.XRPLTransactionResultEvidence)
+	return o.handleOperationEvidenceSubmissionError(ctx, err, tx, evidence.XRPLTransactionResultEvidence)
 }
 
 func (o *XRPLToCoreumProcess) sendXRPLTrustSetTransactionResultEvidence(
@@ -265,7 +266,7 @@ func (o *XRPLToCoreumProcess) sendXRPLTrustSetTransactionResultEvidence(
 		evidence,
 	)
 
-	return o.handleEvidenceSubmissionError(ctx, err, tx, evidence.XRPLTransactionResultEvidence)
+	return o.handleOperationEvidenceSubmissionError(ctx, err, tx, evidence.XRPLTransactionResultEvidence)
 }
 
 func (o *XRPLToCoreumProcess) sendCoreumToXRPLTransferTransactionResultEvidence(
@@ -290,7 +291,7 @@ func (o *XRPLToCoreumProcess) sendCoreumToXRPLTransferTransactionResultEvidence(
 		evidence,
 	)
 
-	return o.handleEvidenceSubmissionError(ctx, err, tx, evidence.XRPLTransactionResultEvidence)
+	return o.handleOperationEvidenceSubmissionError(ctx, err, tx, evidence.XRPLTransactionResultEvidence)
 }
 
 func (o *XRPLToCoreumProcess) sendKeysRotationTransactionResultEvidence(
@@ -325,19 +326,22 @@ func (o *XRPLToCoreumProcess) sendKeysRotationTransactionResultEvidence(
 		evidence,
 	)
 
-	return o.handleEvidenceSubmissionError(ctx, err, tx, evidence.XRPLTransactionResultEvidence)
+	return o.handleOperationEvidenceSubmissionError(ctx, err, tx, evidence.XRPLTransactionResultEvidence)
 }
 
-func (o *XRPLToCoreumProcess) handleEvidenceSubmissionError(
+func (o *XRPLToCoreumProcess) handleOperationEvidenceSubmissionError(
 	ctx context.Context,
 	err error,
 	tx rippledata.TransactionWithMetaData,
 	evidence coreum.XRPLTransactionResultEvidence,
 ) error {
 	if err == nil {
-		if evidence.TransactionResult != coreum.TransactionResultAccepted {
-			o.log.Info(ctx, "Transaction was rejected", zap.String("txResult", tx.MetaData.TransactionResult.String()))
-		}
+		o.log.Info(
+			ctx,
+			"Successfully sent operation evidence",
+			zap.String("txResult", tx.MetaData.TransactionResult.String()),
+			zap.Any("evidence", evidence),
+		)
 		return nil
 	}
 	if IsExpectedEvidenceSubmissionError(err) {