feat(node/e2e-tests): add restart tests

.github/workflows/node_e2e_kurtosis_tests.yaml

@@ -74,6 +74,9 @@ jobs:
       - name: kurtosis tests for node with ${{ matrix.devnet-config }} devnet
         run: just test-e2e-kurtosis "${{ matrix.devnet-config }}" node/kurtosis
 
+      - name: restart tests for node with ${{ matrix.devnet-config }} devnet
+        run: just test-e2e-kurtosis "${{ matrix.devnet-config }}" node/restart
+
       - # Temp fix
         # https://github.com/docker/build-push-action/issues/252
         # https://github.com/moby/buildkit/issues/1896

.github/workflows/node_e2e_sysgo_tests.yaml

@@ -42,6 +42,6 @@ jobs:
       - name: common tests for node with sysgo orchestrator
         run: just test-e2e-sysgo node/common
 
-      - name: sysgo specific tests for node with sysgo orchestrator
-        run: just test-e2e-sysgo node/sysgo
+      - name: restart tests for node with sysgo orchestrator
+        run: just test-e2e-sysgo node/restart
 

tests/go.mod

@@ -282,4 +282,4 @@ require (
 
 replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101511.1-dev.1.0.20250608235258-6005dd53e1b5
 
-replace github.com/ethereum-optimism/optimism => github.com/theochap/optimism v0.0.0-20250821094606-dcf1d4ae79e2
+replace github.com/ethereum-optimism/optimism => github.com/theochap/optimism v0.0.0-20250821131302-b9d84951d8a2

tests/go.sum

@@ -820,8 +820,8 @@ github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45
 github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a h1:1ur3QoCqvE5fl+nylMaIr9PVV1w343YRDtsy+Rwu7XI=
 github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48=
 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
-github.com/theochap/optimism v0.0.0-20250821094606-dcf1d4ae79e2 h1:jm3hRbJ/gGCacYL3hLXhNeEkcERM/b0PtG8Ln0AibK4=
-github.com/theochap/optimism v0.0.0-20250821094606-dcf1d4ae79e2/go.mod h1:e3NFRvdqDjley6QNvYcB9u03VHRfrGbH8q2vD2O784o=
+github.com/theochap/optimism v0.0.0-20250821131302-b9d84951d8a2 h1:01cSLnxifF2C4P7T/UdvUoi2sei+7lGZlkXabbiHToI=
+github.com/theochap/optimism v0.0.0-20250821131302-b9d84951d8a2/go.mod h1:e3NFRvdqDjley6QNvYcB9u03VHRfrGbH8q2vD2O784o=
 github.com/tklauser/go-sysconf v0.3.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZb78yU=
 github.com/tklauser/go-sysconf v0.3.14/go.mod h1:1ym4lWMLUOhuBOPGtRcJm7tEGX4SCYNEEEtghGG/8uY=
 github.com/tklauser/numcpus v0.8.0 h1:Mx4Wwe/FjZLeQsK/6kt2EOepwwSl7SmJrK5bV/dXYgY=

tests/node/common/conductor_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-devstack/stack"
 	"github.com/ethereum-optimism/optimism/op-service/testlog"
 	"github.com/ethereum/go-ethereum/log"
-	kona_presets "github.com/op-rs/kona/node/presets"
+	node_utils "github.com/op-rs/kona/node/utils"
 	"github.com/stretchr/testify/require"
 )
 
@@ -27,7 +27,7 @@ func TestConductorLeadershipTransfer(gt *testing.T) {
 	t := devtest.SerialT(gt)
 	logger := testlog.Logger(t, log.LevelInfo).With("Test", "TestConductorLeadershipTransfer")
 
-	sys := kona_presets.NewMixedOpKonaWithConductors(t)
+	sys := node_utils.NewMixedOpKonaWithConductors(t)
 	tracer := t.Tracer()
 	ctx := t.Ctx()
 	logger.Info("Started Conductor Leadership Transfer test")

tests/node/common/init_test.go

@@ -4,10 +4,10 @@ import (
 	"testing"
 
 	"github.com/ethereum-optimism/optimism/op-devstack/presets"
-	kona_presets "github.com/op-rs/kona/node/presets"
+	node_utils "github.com/op-rs/kona/node/utils"
 )
 
 // TestMain creates the test-setups against the shared backend
 func TestMain(m *testing.M) {
-	presets.DoMain(m, kona_presets.WithMixedOpKona(0, 1, 0, 2))
+	presets.DoMain(m, node_utils.WithMixedOpKona(0, 1, 0, 2))
 }

tests/node/common/p2p_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/apis"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 	"github.com/libp2p/go-libp2p/core/peer"
-	kona_presets "github.com/op-rs/kona/node/presets"
+	node_utils "github.com/op-rs/kona/node/utils"
 	"github.com/stretchr/testify/require"
 )
 
@@ -58,7 +58,7 @@ func arePeers(t devtest.T, node *dsl.L2CLNode, otherNodeId peer.ID) {
 func TestP2PMinimal(gt *testing.T) {
 	t := devtest.ParallelT(gt)
 
-	out := kona_presets.NewMixedOpKona(t)
+	out := node_utils.NewMixedOpKona(t)
 
 	nodes := out.L2CLNodes()
 	firstNode := nodes[0]
@@ -83,7 +83,7 @@ func TestP2PMinimal(gt *testing.T) {
 func TestP2PProtocols(gt *testing.T) {
 	t := devtest.ParallelT(gt)
 
-	out := kona_presets.NewMixedOpKona(t)
+	out := node_utils.NewMixedOpKona(t)
 
 	nodes := out.L2CLNodes()
 
@@ -97,7 +97,7 @@ func TestP2PProtocols(gt *testing.T) {
 func TestP2PChainID(gt *testing.T) {
 	t := devtest.ParallelT(gt)
 
-	out := kona_presets.NewMixedOpKona(t)
+	out := node_utils.NewMixedOpKona(t)
 
 	nodes := out.L2CLKonaNodes()
 	chainID := nodes[0].PeerInfo().ChainID
@@ -120,7 +120,7 @@ func TestP2PChainID(gt *testing.T) {
 func TestNetworkConnectivity(gt *testing.T) {
 	t := devtest.ParallelT(gt)
 
-	out := kona_presets.NewMixedOpKona(t)
+	out := node_utils.NewMixedOpKona(t)
 
 	nodes := out.L2CLNodes()
 	numNodes := len(nodes)

tests/node/common/rpc_test.go

@@ -9,15 +9,15 @@ import (
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum-optimism/optimism/op-service/apis"
 	"github.com/ethereum/go-ethereum/common"
-	kona_presets "github.com/op-rs/kona/node/presets"
+	node_utils "github.com/op-rs/kona/node/utils"
 	"github.com/stretchr/testify/require"
 )
 
 // Check that the node p2p RPC endpoints are working.
 func TestP2PPeers(gt *testing.T) {
 	t := devtest.SerialT(gt)
 
-	out := kona_presets.NewMixedOpKona(t)
+	out := node_utils.NewMixedOpKona(t)
 
 	p2pPeersAndPeerStats(t, out)
 
@@ -27,19 +27,19 @@ func TestP2PPeers(gt *testing.T) {
 }
 
 // Ensure that the `opp2p_peers` and `opp2p_self` RPC endpoints return the same information.
-func p2pSelfAndPeers(t devtest.T, out *kona_presets.MixedOpKonaPreset) {
+func p2pSelfAndPeers(t devtest.T, out *node_utils.MixedOpKonaPreset) {
 	nodes := out.L2CLKonaNodes()
 	var wg sync.WaitGroup
 	for _, node := range nodes {
 		wg.Add(1)
 		go func(node *dsl.L2CLNode) {
 			defer wg.Done()
-			clRPC := GetNodeRPCEndpoint(node)
+			clRPC := node_utils.GetNodeRPCEndpoint(node)
 			clName := node.Escape().ID().Key()
 
 			// Gather the peers for the node.
 			peers := &apis.PeerDump{}
-			require.NoError(t, SendRPCRequest(clRPC, "opp2p_peers", peers, true), "failed to send RPC request to node %s: %s", clName)
+			require.NoError(t, node_utils.SendRPCRequest(clRPC, "opp2p_peers", peers, true), "failed to send RPC request to node %s: %s", clName)
 
 			// Check that every peer's info matches the node's info.
 			for _, peer := range peers.Peers {
@@ -48,9 +48,9 @@ func p2pSelfAndPeers(t devtest.T, out *kona_presets.MixedOpKonaPreset) {
 				for _, node := range nodes {
 					// We get the peer's info.
 					otherPeerInfo := &apis.PeerInfo{}
-					otherCLRPC := GetNodeRPCEndpoint(&node)
+					otherCLRPC := node_utils.GetNodeRPCEndpoint(&node)
 					otherCLName := node.Escape().ID().Key()
-					require.NoError(t, SendRPCRequest(otherCLRPC, "opp2p_self", otherPeerInfo), "failed to send RPC request to node %s: %s", clName)
+					require.NoError(t, node_utils.SendRPCRequest(otherCLRPC, "opp2p_self", otherPeerInfo), "failed to send RPC request to node %s: %s", clName)
 
 					// These checks fail for the op-node. It seems that their p2p handler is flaky and doesn't always return the correct peer info.
 					if otherPeerInfo.PeerID == peer.PeerID {
@@ -85,21 +85,21 @@ func p2pSelfAndPeers(t devtest.T, out *kona_presets.MixedOpKonaPreset) {
 }
 
 // Check that the `opp2p_peers` and `opp2p_peerStats` RPC endpoints return coherent information.
-func p2pPeersAndPeerStats(t devtest.T, out *kona_presets.MixedOpKonaPreset) {
+func p2pPeersAndPeerStats(t devtest.T, out *node_utils.MixedOpKonaPreset) {
 	nodes := out.L2CLNodes()
 	var wg sync.WaitGroup
 	for _, node := range nodes {
 		wg.Add(1)
 		go func(node *dsl.L2CLNode) {
 			defer wg.Done()
-			clRPC := GetNodeRPCEndpoint(node)
+			clRPC := node_utils.GetNodeRPCEndpoint(node)
 			clName := node.Escape().ID().Key()
 
 			peers := &apis.PeerDump{}
-			require.NoError(t, SendRPCRequest(clRPC, "opp2p_peers", peers, true), "failed to send RPC request to node %s: %s", clName)
+			require.NoError(t, node_utils.SendRPCRequest(clRPC, "opp2p_peers", peers, true), "failed to send RPC request to node %s: %s", clName)
 
 			peerStats := &apis.PeerStats{}
-			require.NoError(t, SendRPCRequest(clRPC, "opp2p_peerStats", peerStats), "failed to send RPC request to node %s: %s", clName)
+			require.NoError(t, node_utils.SendRPCRequest(clRPC, "opp2p_peerStats", peerStats), "failed to send RPC request to node %s: %s", clName)
 
 			require.Equal(t, peers.TotalConnected, peerStats.Connected, "totalConnected mismatch node %s", clName)
 			require.Equal(t, len(peers.Peers), int(peers.TotalConnected), "peer count mismatch node %s", clName)
@@ -108,14 +108,14 @@ func p2pPeersAndPeerStats(t devtest.T, out *kona_presets.MixedOpKonaPreset) {
 	wg.Wait()
 }
 
-func p2pBanPeer(t devtest.T, out *kona_presets.MixedOpKonaPreset) {
+func p2pBanPeer(t devtest.T, out *node_utils.MixedOpKonaPreset) {
 	nodes := out.L2CLNodes()
 	for _, node := range nodes {
-		clRPC := GetNodeRPCEndpoint(&node)
+		clRPC := node_utils.GetNodeRPCEndpoint(&node)
 		clName := node.Escape().ID().Key()
 
 		peers := &apis.PeerDump{}
-		require.NoError(t, SendRPCRequest(clRPC, "opp2p_peers", peers, true), "failed to send RPC request to node %s: %s", clName)
+		require.NoError(t, node_utils.SendRPCRequest(clRPC, "opp2p_peers", peers, true), "failed to send RPC request to node %s: %s", clName)
 
 		connectedPeers := peers.TotalConnected
 
@@ -129,11 +129,11 @@ func p2pBanPeer(t devtest.T, out *kona_presets.MixedOpKonaPreset) {
 
 		require.NotEmpty(t, peerToBan, "no connected peer found")
 
-		require.NoError(t, SendRPCRequest[any](clRPC, "opp2p_blockPeer", nil, peerToBan), "failed to send RPC request to node %s: %s", clName)
+		require.NoError(t, node_utils.SendRPCRequest[any](clRPC, "opp2p_blockPeer", nil, peerToBan), "failed to send RPC request to node %s: %s", clName)
 
 		// Check that the peer is banned.
 		peersAfterBan := &apis.PeerDump{}
-		require.NoError(t, SendRPCRequest(clRPC, "opp2p_peers", peersAfterBan, true), "failed to send RPC request to node %s: %s", clName)
+		require.NoError(t, node_utils.SendRPCRequest(clRPC, "opp2p_peers", peersAfterBan, true), "failed to send RPC request to node %s: %s", clName)
 
 		require.Equal(t, connectedPeers, peersAfterBan.TotalConnected, "totalConnected mismatch node %s", clName)
 
@@ -149,23 +149,23 @@ func p2pBanPeer(t devtest.T, out *kona_presets.MixedOpKonaPreset) {
 		require.True(t, contains, "peer %s not banned", peerToBan)
 
 		// Try to unban the peer.
-		require.NoError(t, SendRPCRequest[any](clRPC, "opp2p_unblockPeer", nil, peerToBan), "failed to send RPC request to node %s: %s", clName)
+		require.NoError(t, node_utils.SendRPCRequest[any](clRPC, "opp2p_unblockPeer", nil, peerToBan), "failed to send RPC request to node %s: %s", clName)
 
 		// Check that the peer is unbanned.
 		peersAfterUnban := &apis.PeerDump{}
-		require.NoError(t, SendRPCRequest(clRPC, "opp2p_peers", peersAfterUnban, true), "failed to send RPC request to node %s: %s", clName)
+		require.NoError(t, node_utils.SendRPCRequest(clRPC, "opp2p_peers", peersAfterUnban, true), "failed to send RPC request to node %s: %s", clName)
 
 		require.Equal(t, connectedPeers, peersAfterUnban.TotalConnected, "totalConnected mismatch node %s", clName)
 		require.NotContains(t, peersAfterUnban.BannedPeers, peerToBan, "peer %s is banned", peerToBan)
 	}
 }
 
 func rollupConfig(t devtest.T, node *dsl.L2CLNode) *rollup.Config {
-	clRPC := GetNodeRPCEndpoint(node)
+	clRPC := node_utils.GetNodeRPCEndpoint(node)
 	clName := node.Escape().ID().Key()
 
 	rollupConfig := &rollup.Config{}
-	require.NoError(t, SendRPCRequest(clRPC, "optimism_rollupConfig", rollupConfig), "failed to send RPC request to node %s: %s", clName)
+	require.NoError(t, node_utils.SendRPCRequest(clRPC, "optimism_rollupConfig", rollupConfig), "failed to send RPC request to node %s: %s", clName)
 
 	return rollupConfig
 }
@@ -181,7 +181,7 @@ func rollupConfigMatches(t devtest.T, configA *rollup.Config, configB *rollup.Co
 func TestRollupConfig(gt *testing.T) {
 	t := devtest.ParallelT(gt)
 
-	out := kona_presets.NewMixedOpKona(t)
+	out := node_utils.NewMixedOpKona(t)
 
 	rollupConfigs := make([]*rollup.Config, 0)
 

tests/node/common/sync_test.go

@@ -8,14 +8,14 @@ import (
 	"github.com/ethereum-optimism/optimism/op-devstack/devtest"
 	"github.com/ethereum-optimism/optimism/op-devstack/dsl"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
-	kona_presets "github.com/op-rs/kona/node/presets"
+	node_utils "github.com/op-rs/kona/node/utils"
 )
 
 // Check that all the nodes in the network are synced to the local safe block and can catch up to the sequencer node.
 func TestL2SafeSync(gt *testing.T) {
 	t := devtest.ParallelT(gt)
 
-	out := kona_presets.NewMixedOpKona(t)
+	out := node_utils.NewMixedOpKona(t)
 
 	nodes := out.L2CLNodes()
 
@@ -33,7 +33,7 @@ func TestL2SafeSync(gt *testing.T) {
 func TestL2UnsafeSync(gt *testing.T) {
 	t := devtest.ParallelT(gt)
 
-	out := kona_presets.NewMixedOpKona(t)
+	out := node_utils.NewMixedOpKona(t)
 
 	nodes := out.L2CLNodes()
 
@@ -52,7 +52,7 @@ func TestL2FinalizedSync(gt *testing.T) {
 	t := devtest.ParallelT(gt)
 	t.Skip("Skipping finalized sync test")
 
-	out := kona_presets.NewMixedOpKona(t)
+	out := node_utils.NewMixedOpKona(t)
 
 	nodes := out.L2CLNodes()
 
@@ -66,7 +66,7 @@ func TestL2FinalizedSync(gt *testing.T) {
 }
 
 func isSequencer(node *dsl.L2CLNode) bool {
-	return strings.Contains(node.Escape().ID().Key(), string(kona_presets.Sequencer))
+	return strings.Contains(node.Escape().ID().Key(), string(node_utils.Sequencer))
 }
 
 func filterSequencer(nodes []dsl.L2CLNode) []dsl.L2CLNode {
@@ -82,7 +82,7 @@ func filterSequencer(nodes []dsl.L2CLNode) []dsl.L2CLNode {
 func TestSyncWithSequencer(gt *testing.T) {
 	t := devtest.ParallelT(gt)
 
-	out := kona_presets.NewMixedOpKona(t)
+	out := node_utils.NewMixedOpKona(t)
 
 	nodes := out.L2CLValidatorNodes()
 

tests/node/kurtosis/cpu_monitor_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-devstack/dsl"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 	"github.com/kurtosis-tech/kurtosis/api/golang/engine/lib/kurtosis_context"
-	kona_presets "github.com/op-rs/kona/node/presets"
+	node_utils "github.com/op-rs/kona/node/utils"
 	"github.com/stretchr/testify/require"
 )
 
@@ -59,7 +59,7 @@ func GetCPUStats(t devtest.T, ctx context.Context, serviceName string) {
 // Run this test only in kurtosis.
 func TestKurtosisCPUMonitor(gt *testing.T) {
 	t := devtest.ParallelT(gt)
-	out := kona_presets.NewMixedOpKona(t)
+	out := node_utils.NewMixedOpKona(t)
 
 	out.T.Gate().Equal(os.Getenv("DEVSTACK_ORCHESTRATOR"), "sysext", "this test is only valid in kurtosis")
 

tests/node/kurtosis/engine_test.go

@@ -8,14 +8,14 @@ import (
 	"github.com/ethereum-optimism/optimism/op-devstack/devtest"
 	"github.com/ethereum-optimism/optimism/op-devstack/dsl"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
-	kona_presets "github.com/op-rs/kona/node/presets"
+	node_utils "github.com/op-rs/kona/node/utils"
 	"github.com/stretchr/testify/require"
 )
 
 func TestEngine(gt *testing.T) {
 	t := devtest.ParallelT(gt)
 
-	out := kona_presets.NewMixedOpKona(t)
+	out := node_utils.NewMixedOpKona(t)
 
 	out.T.Gate().Equal(os.Getenv("DEVSTACK_ORCHESTRATOR"), "sysext", "this test is only valid in kurtosis")
 

tests/node/kurtosis/init_test.go

@@ -4,10 +4,10 @@ import (
 	"testing"
 
 	"github.com/ethereum-optimism/optimism/op-devstack/presets"
-	kona_presets "github.com/op-rs/kona/node/presets"
+	node_utils "github.com/op-rs/kona/node/utils"
 )
 
 // TestMain creates the test-setups against the shared backend
 func TestMain(m *testing.M) {
-	presets.DoMain(m, kona_presets.WithMixedOpKona(0, 1, 0, 2))
+	presets.DoMain(m, node_utils.WithMixedOpKona(0, 1, 0, 2))
 }