Merge pull request #1955 from OffchainLabs/execution-reverted-case

Match against "execution reverted" case insensitive

staker/execution_reverted_test.go

@@ -0,0 +1,26 @@
+package staker
+
+import (
+	"io"
+	"testing"
+)
+
+func TestExecutionRevertedRegexp(t *testing.T) {
+	executionRevertedErrors := []string{
+		// go-ethereum and most other execution clients return "execution reverted"
+		"execution reverted",
+		// execution clients may decode the EVM revert data as a string and include it in the error
+		"execution reverted: FOO",
+		// besu returns "Execution reverted"
+		"Execution reverted",
+	}
+	for _, errString := range executionRevertedErrors {
+		if !executionRevertedRegexp.MatchString(errString) {
+			t.Fatalf("execution reverted regexp didn't match %q", errString)
+		}
+	}
+	// This regexp should not match random IO errors
+	if executionRevertedRegexp.MatchString(io.ErrUnexpectedEOF.Error()) {
+		t.Fatal("execution reverted regexp matched unexpected EOF")
+	}
+}

staker/rollup_watcher.go

@@ -9,7 +9,7 @@ import (
 	"errors"
 	"fmt"
 	"math/big"
-	"strings"
+	"regexp"
 	"sync/atomic"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -72,6 +72,9 @@ func (r *RollupWatcher) getCallOpts(ctx context.Context) *bind.CallOpts {
 	return &opts
 }
 
+// A regexp matching "execution reverted" errors returned from the parent chain RPC.
+var executionRevertedRegexp = regexp.MustCompile("(?i)execution reverted")
+
 func (r *RollupWatcher) getNodeCreationBlock(ctx context.Context, nodeNum uint64) (*big.Int, error) {
 	callOpts := r.getCallOpts(ctx)
 	if !r.unSupportedL3Method.Load() {
@@ -80,7 +83,7 @@ func (r *RollupWatcher) getNodeCreationBlock(ctx context.Context, nodeNum uint64
 			return createdAtBlock, nil
 		}
 		log.Trace("failed to call getNodeCreationBlockForLogLookup, falling back on node CreatedAtBlock field", "err", err)
-		if strings.Contains(err.Error(), "execution reverted") {
+		if executionRevertedRegexp.MatchString(err.Error()) {
 			r.unSupportedL3Method.Store(true)
 		} else {
 			return nil, err