Merge pull request #2012 from OffchainLabs/nethermind-execution-reverted

Add support for nethermind's version of "execution reverted"
OffchainLabs · Dec 11, 2023 · a0e6317 · a0e6317
2 parents 1de9e02 + 8e8788e
commit a0e6317
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/cmd/nitro/nitro.go b/cmd/nitro/nitro.go
@@ -14,7 +14,6 @@ import (
 	"os/signal"
 	"path/filepath"
 	"reflect"
-	"regexp"
 	"strings"
 	"syscall"
 	"time"
@@ -546,7 +545,6 @@ func mainImpl() int {
 	// Validate sequencer's MaxTxDataSize and batchPoster's MaxSize params.
 	// SequencerInbox's maxDataSize is defaulted to 117964 which is 90% of Geth's 128KB tx size limit, leaving ~13KB for proving.
 	seqInboxMaxDataSize := 117964
-	executionRevertedRegexp := regexp.MustCompile("(?i)execution reverted")
 	if nodeConfig.Node.ParentChainReader.Enable {
 		seqInbox, err := bridgegen.NewSequencerInbox(rollupAddrs.SequencerInbox, l1Client)
 		if err != nil {
@@ -556,7 +554,7 @@ func mainImpl() int {
 		res, err := seqInbox.MaxDataSize(&bind.CallOpts{Context: ctx})
 		if err == nil {
 			seqInboxMaxDataSize = int(res.Int64())
-		} else if !executionRevertedRegexp.MatchString(err.Error()) {
+		} else if !headerreader.ExecutionRevertedRegexp.MatchString(err.Error()) {
 			log.Error("error fetching MaxDataSize from sequencer inbox", "err", err)
 			return 1
 		}

diff --git a/staker/rollup_watcher.go b/staker/rollup_watcher.go
@@ -9,14 +9,14 @@ import (
 	"errors"
 	"fmt"
 	"math/big"
-	"regexp"
 	"sync/atomic"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/offchainlabs/nitro/arbutil"
 	"github.com/offchainlabs/nitro/solgen/go/rollupgen"
+	"github.com/offchainlabs/nitro/util/headerreader"
 
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
@@ -72,9 +72,6 @@ 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() {
@@ -83,7 +80,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 executionRevertedRegexp.MatchString(err.Error()) {
+		if headerreader.ExecutionRevertedRegexp.MatchString(err.Error()) {
 			r.unSupportedL3Method.Store(true)
 		} else {
 			return nil, err

diff --git a/staker/execution_reverted_test.go → util/headerreader/execution_reverted_test.go b/staker/execution_reverted_test.go → util/headerreader/execution_reverted_test.go
@@ -1,4 +1,7 @@
-package staker
+// Copyright 2021-2023, Offchain Labs, Inc.
+// For license information, see https://github.com/nitro/blob/master/LICENSE
+
+package headerreader
 
 import (
 	"io"
@@ -13,14 +16,16 @@ func TestExecutionRevertedRegexp(t *testing.T) {
 		"execution reverted: FOO",
 		// besu returns "Execution reverted"
 		"Execution reverted",
+		// nethermind returns "VM execution error."
+		"VM execution error.",
 	}
 	for _, errString := range executionRevertedErrors {
-		if !executionRevertedRegexp.MatchString(errString) {
+		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()) {
+	if ExecutionRevertedRegexp.MatchString(io.ErrUnexpectedEOF.Error()) {
 		t.Fatal("execution reverted regexp matched unexpected EOF")
 	}
 }
diff --git a/util/headerreader/header_reader.go b/util/headerreader/header_reader.go
@@ -8,6 +8,7 @@ import (
 	"errors"
 	"fmt"
 	"math/big"
+	"regexp"
 	"sync"
 	"time"
 
@@ -22,6 +23,9 @@ import (
 	flag "github.com/spf13/pflag"
 )
 
+// A regexp matching "execution reverted" errors returned from the parent chain RPC.
+var ExecutionRevertedRegexp = regexp.MustCompile(`(?i)execution reverted|VM execution error\.?`)
+
 type ArbSysInterface interface {
 	ArbBlockNumber(*bind.CallOpts) (*big.Int, error)
 }