Manav-Aggarwal · Jul 1, 2025 · Jun 25, 2025 · Jun 25, 2025 · Jun 25, 2025 · Jun 25, 2025
diff --git a/apps/evm/single/README.md b/apps/evm/single/README.md
@@ -46,7 +46,7 @@ Note: Replace `<path_to>` with the actual path to the rollkit repository. If you
 
 The sequencer can be configured using various command-line flags. The most important ones are:
 
-- `--rollkit.node.aggregator`: Set to true to run in aggregator mode
+- `--rollkit.node.aggregator`: Set to true to run in sequencer mode
 - `--rollkit.signer.passphrase`: Passphrase for the signer
 - `--evm.jwt-secret`: JWT secret for EVM communication
 - `--evm.genesis-hash`: Genesis hash of the EVM chain
@@ -85,7 +85,7 @@ The sequencer can be configured using various command-line flags. The most impor
     ```bash
     ./evm-single start \
        --home ~/.evm-single-full-node \
-       --evm.jwt-secret $(cat ../../../execution/evm/docker/jwttoken/jwt.hex) \
+       --evm.jwt-secret $(cat <path_to>/execution/evm/docker/jwttoken/jwt.hex) \
        --evm.genesis-hash 0x2b8bbb1ea1e04f9c9809b4b278a8687806edc061a356c7dbc491930d8e922503 \
        --rollkit.rpc.address=127.0.0.1:46657 \
        --rollkit.p2p.listen_address=/ip4/127.0.0.1/tcp/7677 \

diff --git a/apps/evm/single/docker-compose.yml b/apps/evm/single/docker-compose.yml
@@ -52,14 +52,14 @@ services:
       - rollkit-network
 
   rollkit-evm-single:
-    image: ghcr.io/rollkit/rollkit-evm-single:v0.1.6
+    image: ghcr.io/rollkit/rollkit-evm-single:pr-2394
     depends_on:
       rollkit-reth:
         condition: service_started
       local-da:
         condition: service_started
     volumes:
-      - evm-single-data:/data
+      - evm-single-data:/root/.evm-single/
     entrypoint: /usr/bin/entrypoint.sh
     environment:
       - EVM_ENGINE_URL=http://rollkit-reth:8551

diff --git a/execution/evm/execution.go b/execution/evm/execution.go
@@ -181,16 +181,21 @@ func (c *EngineClient) ExecuteTxs(ctx context.Context, txs [][]byte, blockHeight
 		txsPayload[i] = "0x" + hex.EncodeToString(tx)
 	}
 
-	_, _, prevGasLimit, _, err := c.getBlockInfo(ctx, blockHeight-1)
+	prevBlockHash, _, prevGasLimit, prevTimestamp, err := c.getBlockInfo(ctx, blockHeight-1)
 	if err != nil {
 		return nil, 0, fmt.Errorf("failed to get block info: %w", err)
 	}
 
+	ts := uint64(timestamp.Unix())
+	if ts <= prevTimestamp {
+		ts = prevTimestamp + 1 // Subsequent blocks must have a higher timestamp.
+	}
+
 	c.mu.Lock()
 	args := engine.ForkchoiceStateV1{
-		HeadBlockHash:      c.currentHeadBlockHash,
-		SafeBlockHash:      c.currentSafeBlockHash,
-		FinalizedBlockHash: c.currentFinalizedBlockHash,
+		HeadBlockHash:      prevBlockHash,
+		SafeBlockHash:      prevBlockHash,
+		FinalizedBlockHash: prevBlockHash,
 	}
 	c.mu.Unlock()
 
@@ -200,7 +205,7 @@ func (c *EngineClient) ExecuteTxs(ctx context.Context, txs [][]byte, blockHeight
 	// Create rollkit-compatible payload attributes with flattened structure
 	rollkitPayloadAttrs := map[string]interface{}{
 		// Standard Ethereum payload attributes (flattened) - using camelCase as expected by JSON
-		"timestamp":             uint64(timestamp.Unix()),
+		"timestamp":             ts,
 		"prevRandao":            c.derivePrevRandao(blockHeight),
 		"suggestedFeeRecipient": c.feeRecipient,
 		"withdrawals":           []*types.Withdrawal{},

diff --git a/execution/evm/test_helpers.go b/execution/evm/test_helpers.go
@@ -188,3 +188,43 @@ func GetGenesisHash(t *testing.T) string {
 	require.NotEmpty(t, result.Result.Hash)
 	return result.Result.Hash
 }
+
+// SetupTestRethEngineFullNode sets up a Reth full node test environment using Docker Compose with the full node configuration.
+// This function is specifically for setting up full nodes that connect to ports 8555/8561.
+func SetupTestRethEngineFullNode(t *testing.T, dockerPath, jwtFilename string) string {
+	t.Helper()
+	dockerAbsPath, err := filepath.Abs(dockerPath)
+	require.NoError(t, err)
+	jwtPath := filepath.Join(dockerAbsPath, "jwttoken")
+	err = os.MkdirAll(jwtPath, 0750)
+	require.NoError(t, err)
+	jwtSecret, err := generateJWTSecret()
+	require.NoError(t, err)
+	jwtFile := filepath.Join(jwtPath, jwtFilename)
+	err = os.WriteFile(jwtFile, []byte(jwtSecret), 0600)
+	require.NoError(t, err)
+	t.Cleanup(func() { _ = os.Remove(jwtFile) })
+
+	// Use the full node compose file
+	composeFilePath := filepath.Join(dockerAbsPath, "docker-compose-full-node.yml")
+	identifier := tc.StackIdentifier(strings.ToLower(t.Name()) + "_fullnode")
+	identifier = tc.StackIdentifier(strings.ReplaceAll(string(identifier), "/", "_"))
+	identifier = tc.StackIdentifier(strings.ReplaceAll(string(identifier), " ", "_"))
+	compose, err := tc.NewDockerComposeWith(tc.WithStackFiles(composeFilePath), identifier)
+	require.NoError(t, err, "Failed to create docker compose for full node")
+	t.Cleanup(func() {
+		ctx := context.Background()
+		err := compose.Down(ctx, tc.RemoveOrphans(true), tc.RemoveVolumes(true))
+		if err != nil {
+			t.Logf("Warning: Failed to tear down docker-compose environment: %v", err)
+		}
+	})
+	ctx := context.Background()
+	err = compose.Up(ctx, tc.Wait(true))
+	require.NoError(t, err, "Failed to start docker compose for full node")
+
+	// Wait for full node Reth container (ports 8555, 8561)
+	err = waitForRethContainer(t, jwtSecret, "http://localhost:8555", "http://localhost:8561")
+	require.NoError(t, err)
+	return jwtSecret
+}
diff --git a/test/e2e/evm_aggregator_e2e_test.go b/test/e2e/evm_aggregator_e2e_test.go