avoid outputing an empty string as "revert_reason" to error logs

Signed-off-by: Masanori Yoshida <[email protected]>
datachainlab · May 26, 2024 · 71c6368 · 71c6368
1 parent a30383b
commit 71c6368
Showing 1 changed file with 17 additions and 25 deletions.
diff --git a/pkg/relay/ethereum/tx.go b/pkg/relay/ethereum/tx.go
@@ -66,22 +66,18 @@ func (c *Chain) SendMsgs(msgs []sdk.Msg) ([]core.MsgID, error) {
 
 			estimatedGas, err := c.client.EstimateGasFromTx(ctx, tx)
 			if err != nil {
-				var revertReason, rawErrorData string
-				if reason, data, err := c.getRevertReasonFromEstimateGas(err); err != nil {
+				if revertReason, rawErrorData, err := c.getRevertReasonFromEstimateGas(err); err != nil {
 					// Raw error data may be available even if revert reason isn't available.
-					rawErrorData = hex.EncodeToString(data)
-					logger.Error("failed to get revert reason", err,
-						logAttrRawErrorData, rawErrorData,
-					)
+					logger.Logger = logger.With(logAttrRawErrorData, hex.EncodeToString(rawErrorData))
+					logger.Error("failed to get revert reason", err)
 				} else {
-					revertReason = reason
-					rawErrorData = hex.EncodeToString(data)
+					logger.Logger = logger.With(
+						logAttrRawErrorData, hex.EncodeToString(rawErrorData),
+						logAttrRevertReason, revertReason,
+					)
 				}
 
-				logger.Error("failed to estimate gas", err,
-					logAttrRevertReason, revertReason,
-					logAttrRawErrorData, rawErrorData,
-				)
+				logger.Error("failed to estimate gas", err)
 				return nil, err
 			}
 
@@ -124,23 +120,19 @@ func (c *Chain) SendMsgs(msgs []sdk.Msg) ([]core.MsgID, error) {
 		}
 
 		if receipt.Status == gethtypes.ReceiptStatusFailed {
-			var revertReason, rawErrorData string
-			if reason, data, err := c.getRevertReasonFromReceipt(ctx, receipt); err != nil {
+			if revertReason, rawErrorData, err := c.getRevertReasonFromReceipt(ctx, receipt); err != nil {
 				// Raw error data may be available even if revert reason isn't available.
-				rawErrorData = hex.EncodeToString(data)
-				logger.Error("failed to get revert reason", err,
-					logAttrRawErrorData, rawErrorData,
-				)
+				logger.Logger = logger.With(logAttrRawErrorData, hex.EncodeToString(rawErrorData))
+				logger.Error("failed to get revert reason", err)
 			} else {
-				revertReason = reason
-				rawErrorData = hex.EncodeToString(data)
+				logger.Logger = logger.With(
+					logAttrRawErrorData, hex.EncodeToString(rawErrorData),
+					logAttrRevertReason, revertReason,
+				)
 			}
 
-			err := fmt.Errorf("tx execution reverted: revertReason=%s, rawErrorData=%x, msgIndex=%d, txHash=%s", revertReason, rawErrorData, i, tx.Hash())
-			logger.Error("tx execution reverted", err,
-				logAttrRevertReason, revertReason,
-				logAttrRawErrorData, rawErrorData,
-			)
+			err := errors.New("tx execution reverted")
+			logger.Error("tx execution reverted", err)
 			return nil, err
 		}
 		logger.Info("successfully sent tx")