fix: Make EVM Execution more robust

apps/evm/single/README.md

@@ -31,7 +31,7 @@ This directory contains the implementation of a single EVM sequencer using Rollk
  ```bash
  ./evm-single start \
  --evm.jwt-secret $(cat <path_to>/execution/evm/docker/jwttoken/jwt.hex) \
- --evm.genesis-hash 0xe720f8ec96a43a741b1ab34819acfeb029ce4f083fe73c5a08c1f6a7b17a8568 \
+ --evm.genesis-hash 0x2b8bbb1ea1e04f9c9809b4b278a8687806edc061a356c7dbc491930d8e922503 \
  --rollkit.node.block_time 1s \
  --rollkit.node.aggregator=true \
  --rollkit.signer.passphrase secret

apps/evm/single/chain/genesis.json

@@ -31,6 +31,9 @@
  },
  "0x944fDcD1c868E3cC566C78023CcB38A32cDA836E": {
  "balance": "0x4a47e3c12448f4ad000000"
+ },
+ "0x4567BF59F76c18cEa2131BDA24A7b70744308f54": {
+ "balance": "0x4a47e3c12448f4ad000000"
  }
  },
  "number": "0x0",

apps/evm/single/docker-compose.yml

@@ -6,10 +6,11 @@ services:
  restart: unless-stopped
  image: ghcr.io/paradigmxyz/reth:v1.4.6
  ports:
- - "9001:9001"
- - "30303:30303"
- - "8545:8545"
- - "8551:8551"
+ - "9001:9001" # metrics
+ - "30303:30303" # eth/66 peering
+ - "8545:8545" # rpc
+ - "8551:8551" # engine
+ - "8546:8546" # ws
  volumes:
  - ./chain:/root/chain:ro
  - ./jwttoken:/root/jwt:ro
@@ -26,9 +27,10 @@ services:
  --authrpc.jwtsecret /root/jwt/jwt.hex \
  --http --http.addr 0.0.0.0 --http.port 8545 \
  --http.api "eth,net,web3,txpool" \
+ --ws --ws.addr 0.0.0.0 --ws.port 8546 --ws.api eth,net,web3 \
  --engine.persistence-threshold 0 \
  --engine.memory-block-buffer-target 0 \
- --disable-discovery
+ --disable-discovery \
  --txpool.pending-max-count 200000 \
  --txpool.pending-max-size 200 \
  --txpool.queued-max-count 200000 \
@@ -48,7 +50,7 @@ services:
  - rollkit-network
 
  rollkit-evm-single:
- image: ghcr.io/rollkit/rollkit-evm-single:v0.1.4
+ image: ghcr.io/rollkit/rollkit-evm-single:v0.1.5
  depends_on:
  reth:
  condition: service_started
@@ -61,7 +63,7 @@ services:
  - EVM_ENGINE_URL=http://reth:8551
  - EVM_ETH_URL=http://reth:8545
  - EVM_JWT_SECRET=f747494bb0fb338a0d71f5f9fe5b5034c17cc988c229b59fd71e005ee692e9bf
- - EVM_GENESIS_HASH=0xe720f8ec96a43a741b1ab34819acfeb029ce4f083fe73c5a08c1f6a7b17a8568
+ - EVM_GENESIS_HASH=0x2b8bbb1ea1e04f9c9809b4b278a8687806edc061a356c7dbc491930d8e922503
  - EVM_BLOCK_TIME=1s
  - EVM_SIGNER_PASSPHRASE=secret
  - DA_ADDRESS=http://local-da:7980 # http://localhost:26658 (Use if not using local-da)

execution/evm/docker/chain/genesis.json

@@ -31,6 +31,9 @@
  },
  "0x944fDcD1c868E3cC566C78023CcB38A32cDA836E": {
  "balance": "0x4a47e3c12448f4ad000000"
+ },
+ "0x4567BF59F76c18cEa2131BDA24A7b70744308f54": {
+ "balance": "0x4a47e3c12448f4ad000000"
  }
  },
  "number": "0x0",

execution/evm/docker/docker-compose.yml

@@ -30,6 +30,7 @@ services:
  - "30303:30303" # eth/66 peering
  - "8545:8545" # rpc
  - "8551:8551" # engine
+ - "8546:8546" # ws
  volumes:
  - ./chain:/root/chain:ro
  - ./jwttoken:/root/jwt:ro
@@ -46,6 +47,7 @@ services:
  --authrpc.jwtsecret /root/jwt/jwt.hex \
  --http --http.addr 0.0.0.0 --http.port 8545 \
  --http.api "eth,net,web3,txpool" \
+ --ws --ws.addr 0.0.0.0 --ws.port 8546 --ws.api eth,net,web3 \
  --engine.persistence-threshold 0 \
  --engine.memory-block-buffer-target 0 \
  --disable-discovery \

execution/evm/execution.go

@@ -9,6 +9,7 @@ import (
 	"math/big"
 	"net/http"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/ethereum/go-ethereum/beacon/engine"
@@ -40,6 +41,11 @@ type EngineClient struct {
 	genesisHash common.Hash // Hash of the genesis block
 	initialHeight uint64
 	feeRecipient common.Address // Address to receive transaction fees
+
+	mu sync.Mutex // Mutex to protect concurrent access to block hashes
+	currentHeadBlockHash common.Hash // Store last non-finalized HeadBlockHash
+	currentSafeBlockHash common.Hash // Store last non-finalized SafeBlockHash
+	currentFinalizedBlockHash common.Hash // Store last finalized block hash
 }
 
 // NewEngineExecutionClient creates a new instance of EngineAPIExecutionClient
@@ -168,7 +174,8 @@ func (c *EngineClient) ExecuteTxs(ctx context.Context, txs [][]byte, blockHeight
  }
  err = c.ethClient.SendTransaction(context.Background(), ethTxs[i])
  if err != nil {
- return nil, 0, fmt.Errorf("failed to send transaction: %w", err)
+ // Ignore the error if the transaction fails to be sent since transactions can be invalid and an invalid transaction sent by a client should not crash the node.
+ continue
  }
 	}
 
@@ -264,13 +271,22 @@ func (c *EngineClient) ExecuteTxs(ctx context.Context, txs [][]byte, blockHeight
 }
 
 func (c *EngineClient) setFinal(ctx context.Context, blockHash common.Hash, isFinal bool) error {
-	args := engine.ForkchoiceStateV1{
- HeadBlockHash: blockHash,
- SafeBlockHash: blockHash,
-	}
+	c.mu.Lock()
+	// Update block hashes based on finalization status
 	if isFinal {
- args.FinalizedBlockHash = blockHash
+ c.currentFinalizedBlockHash = blockHash
+	} else {
+ c.currentHeadBlockHash = blockHash
+ c.currentSafeBlockHash = blockHash
+	}
+
+	// Construct forkchoice state
+	args := engine.ForkchoiceStateV1{
+ HeadBlockHash: c.currentHeadBlockHash,
+ SafeBlockHash: c.currentSafeBlockHash,
+ FinalizedBlockHash: c.currentFinalizedBlockHash,
 	}
+	c.mu.Unlock()
 
 	var forkchoiceResult engine.ForkChoiceResponse
 	err := c.engineClient.CallContext(ctx, &forkchoiceResult, "engine_forkchoiceUpdatedV3",
@@ -311,6 +327,7 @@ func (c *EngineClient) getBlockInfo(ctx context.Context, height uint64) (common.
 	return header.Hash(), header.Root, header.GasLimit, header.Time, nil
 }
 
+// decodeSecret decodes a hex-encoded JWT secret string into a byte slice.
 func decodeSecret(jwtSecret string) ([]byte, error) {
 	secret, err := hex.DecodeString(strings.TrimPrefix(jwtSecret, "0x"))
 	if err != nil {
@@ -319,6 +336,7 @@ func decodeSecret(jwtSecret string) ([]byte, error) {
 	return secret, nil
 }
 
+// getAuthToken creates a JWT token signed with the provided secret, valid for 1 hour.
 func getAuthToken(jwtSecret []byte) (string, error) {
 	token := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
  "exp": time.Now().Add(time.Hour * 1).Unix(), // Expires in 1 hour