cleanup

Author: mmsqe

rpc/backend/call_tx.go

@@ -148,8 +148,8 @@ func (b *Backend) SendRawTransaction(data hexutil.Bytes) (common.Hash, error) {
 	syncCtx := b.ClientCtx.WithBroadcastMode(flags.BroadcastSync)
 	rsp, err := syncCtx.BroadcastTx(txBytes)
 	if rsp != nil && rsp.Code != 0 {
-		if HandleBroadcastRawLog(rsp.RawLog, txHash) {
-			b.Logger.Debug("transaction temporarily rejected or queued", "hash", txHash.Hex())
+		if shouldSkip, msg := HandleBroadcastRawLog(rsp.RawLog, txHash); shouldSkip {
+			b.Logger.Debug(msg, "hash", txHash.Hex())
 			return txHash, nil
 		}
 		err = errorsmod.ABCIError(rsp.Codespace, rsp.Code, rsp.RawLog)

rpc/backend/sign_tx.go

@@ -104,8 +104,8 @@ func (b *Backend) SendTransaction(args evmtypes.TransactionArgs) (common.Hash, e
 	syncCtx := b.ClientCtx.WithBroadcastMode(flags.BroadcastSync)
 	rsp, err := syncCtx.BroadcastTx(txBytes)
 	if rsp != nil && rsp.Code != 0 {
-		if HandleBroadcastRawLog(rsp.RawLog, txHash) {
-			b.Logger.Debug("transaction temporarily rejected or queued", "hash", txHash.Hex())
+		if shouldSkip, msg := HandleBroadcastRawLog(rsp.RawLog, txHash); shouldSkip {
+			b.Logger.Debug(msg, "hash", txHash.Hex())
 			return txHash, nil
 		}
 		err = errorsmod.ABCIError(rsp.Codespace, rsp.Code, rsp.RawLog)

rpc/backend/utils.go

@@ -298,17 +298,18 @@ func GetHexProofs(proof *crypto.ProofOps) []string {
 // HandleBroadcastRawLog checks the RawLog for known temporary rejection or nonce gap error.
 // NOTE: make sure it sync with the latest go-ethereum logic when upgrade:
 // https://github.com/ethereum/go-ethereum/blob/master/core/txpool/locals/errors.go#L29
-func HandleBroadcastRawLog(rawLog string, txHash common.Hash) bool {
+func HandleBroadcastRawLog(rawLog string, txHash common.Hash) (bool, string) {
+	if strings.Contains(rawLog, mempool.ErrNonceGap.Error()) {
+		return true, "transaction queued due to nonce gap"
+	}
 	switch rawLog {
 	case legacypool.ErrOutOfOrderTxFromDelegated.Error(),
 		txpool.ErrInflightTxLimitReached.Error(),
 		legacypool.ErrAuthorityReserved.Error(),
 		txpool.ErrUnderpriced.Error(),
 		legacypool.ErrTxPoolOverflow.Error(),
 		legacypool.ErrFutureReplacePending.Error():
-		return true
-	case mempool.ErrNonceGap.Error():
-		return true
+		return true, "transaction temporarily rejected or queued"
 	}
-	return false
+	return false, ""
 }

rpc/backend/utils_test.go

@@ -13,17 +13,27 @@ import (
 
 func TestHandleBroadcastRawLog(t *testing.T) {
 	txHash := common.HexToHash("0x123")
-	cases := []string{
-		legacypool.ErrOutOfOrderTxFromDelegated.Error(),
-		txpool.ErrInflightTxLimitReached.Error(),
-		legacypool.ErrAuthorityReserved.Error(),
-		txpool.ErrUnderpriced.Error(),
-		legacypool.ErrTxPoolOverflow.Error(),
-		legacypool.ErrFutureReplacePending.Error(),
-		mempool.ErrNonceGap.Error(),
+	tmpErrMsg := "transaction temporarily rejected or queued"
+	cases := []struct {
+		rawLog  string
+		wantMsg string
+	}{
+		{legacypool.ErrOutOfOrderTxFromDelegated.Error(), tmpErrMsg},
+		{txpool.ErrInflightTxLimitReached.Error(), tmpErrMsg},
+		{legacypool.ErrAuthorityReserved.Error(), tmpErrMsg},
+		{txpool.ErrUnderpriced.Error(), tmpErrMsg},
+		{legacypool.ErrTxPoolOverflow.Error(), tmpErrMsg},
+		{legacypool.ErrFutureReplacePending.Error(), tmpErrMsg},
+		{mempool.ErrNonceGap.Error(), "transaction queued due to nonce gap"},
 	}
-	for _, rawLog := range cases {
-		require.True(t, HandleBroadcastRawLog(rawLog, txHash), "expected true for: %s", rawLog)
+
+	for _, tc := range cases {
+		ok, msg := HandleBroadcastRawLog(tc.rawLog, txHash)
+		require.True(t, ok, "expected true for: %s", tc.rawLog)
+		require.Equal(t, tc.wantMsg, msg, "unexpected message for: %s", tc.rawLog)
 	}
-	require.False(t, HandleBroadcastRawLog("some other error", txHash))
+
+	ok, msg := HandleBroadcastRawLog("some other error", txHash)
+	require.False(t, ok)
+	require.Equal(t, "", msg)
 }