Merge branch 'main' into marko/2250

Author: Manav-Aggarwal

CLAUDE.md

@@ -9,24 +9,28 @@ Rollkit is a sovereign rollup framework built in Go that allows developers to bu
 ## Build and Development Commands
 
 ### Building
+
 - `make build` - Builds the Testapp CLI to `./build/testapp`
 - `make install` - Installs Testapp CLI to your Go bin directory
 - `make build-all` - Builds all Rollkit binaries
 - `make docker-build` - Builds Docker image tagged as `rollkit:local-dev`
 
 ### Testing
+
 - `make test` - Runs unit tests for all go.mod files
 - `make test-integration` - Runs integration tests (15m timeout)
 - `make test-e2e` - Runs end-to-end tests (requires building binaries first)
 - `make test-cover` - Generates code coverage report
 - `make test-all` - Runs all tests including Docker E2E tests
 
 ### Linting and Code Quality
+
 - `make lint` - Runs all linters (golangci-lint, markdownlint, hadolint, yamllint, goreleaser check, actionlint)
 - `make lint-fix` - Auto-fixes linting issues where possible
 - `make vet` - Runs go vet
 
 ### Development Utilities
+
 - `make deps` - Downloads dependencies and runs go mod tidy for all modules
 - `make proto-gen` - Generates protobuf files (requires Docker)
 - `make mock-gen` - Generates mocks using mockery
@@ -35,37 +39,44 @@ Rollkit is a sovereign rollup framework built in Go that allows developers to bu
 ## Code Architecture
 
 ### Core Package Structure
+
 The project uses a zero-dependency core package pattern:
+
 - **core/** - Contains only interfaces and types, no external dependencies
 - **block/** - Block management, creation, validation, and synchronization
 - **p2p/** - Networking layer built on libp2p
 - **sequencing/** - Modular sequencer implementations
 - **testapp/** - Reference implementation for testing
 
 ### Key Interfaces
+
 - **Executor** (core/executor.go) - Handles state transitions
 - **Sequencer** (core/sequencer.go) - Orders transactions
 - **DA** (core/da.go) - Data availability layer abstraction
 
 ### Modular Design
+
 - Each component has an interface in the core package
 - Implementations are in separate packages
 - Components are wired together via dependency injection
 - Multiple go.mod files enable modular builds
 
 ### P2P Architecture
+
 - Built on libp2p with GossipSub and Kademlia DHT
 - Nodes advertise capabilities (full/light, DA layers)
 - Automatic peer discovery with rendezvous points
 
 ## Testing Patterns
 
 ### Test Organization
+
 - Unit tests: `*_test.go` files alongside code
 - Integration tests: `test/integration/`
 - E2E tests: `test/e2e/`
 
 ### Running Specific Tests
+
 ```bash
 # Run a single test
 go test -run TestSpecificFunction ./package/...
@@ -78,44 +89,51 @@ go test -race ./package/...
 ```
 
 ### Mock Generation
+
 - Mocks are defined in `.mockery.yaml`
 - Generate with `make mock-gen`
 - Mocks are placed in `mocks/` directories
 
 ## Code Style Guidelines
 
 ### Go Conventions
+
 - Follow standard Go formatting (enforced by golangci-lint)
 - Use meaningful variable names
 - Keep functions small and focused
 - Document exported types and functions
 - Use context.Context for cancellation
 
 ### Error Handling
+
 - Wrap errors with context using `fmt.Errorf`
 - Return errors early
 - Use custom error types for domain-specific errors
 
 ### Logging
+
 - Use structured logging (look for existing patterns)
 - Include relevant context in log messages
 - Use appropriate log levels
 
 ## Common Development Tasks
 
 ### Adding a New DA Layer
+
 1. Implement the `DA` interface from `core/da.go`
 2. Add configuration in the appropriate config package
 3. Wire it up in the initialization code
 4. Add tests following existing patterns
 
 ### Modifying Protobuf Definitions
+
 1. Edit `.proto` files in `types/pb/`
 2. Run `make proto-gen` to regenerate Go code
 3. Update any affected code
 4. Run tests to ensure compatibility
 
 ### Adding New Tests
+
 1. Place unit tests next to the code being tested
 2. Use table-driven tests where appropriate
 3. Mock external dependencies using mockery
@@ -150,4 +168,4 @@ go test -race ./package/...
 - All tests must pass (`make test-all`)
 - Follow the existing code patterns
 - Update tests when changing functionality
-- Keep commits focused and atomic
+- Keep commits focused and atomic

apps/evm/based/go.mod

@@ -178,7 +178,7 @@ require (
 	github.com/libp2p/go-libp2p-asn-util v0.4.1 // indirect
 	github.com/libp2p/go-libp2p-kad-dht v0.29.1 // indirect
 	github.com/libp2p/go-libp2p-kbucket v0.6.5 // indirect
-	github.com/libp2p/go-libp2p-pubsub v0.14.0 // indirect
+	github.com/libp2p/go-libp2p-pubsub v0.14.1 // indirect
 	github.com/libp2p/go-libp2p-record v0.3.1 // indirect
 	github.com/libp2p/go-libp2p-routing-helpers v0.7.4 // indirect
 	github.com/libp2p/go-msgio v0.3.0 // indirect

apps/evm/based/go.sum

@@ -551,8 +551,8 @@ github.com/libp2p/go-libp2p-kad-dht v0.29.1 h1:RyD1RnnkXOh1gwBCrMQ6ZVfTJECY5yDOY
 github.com/libp2p/go-libp2p-kad-dht v0.29.1/go.mod h1:tZEFTKWCsY0xngypKyAIwNDNZOBiikSUIgd/BjTF5Ms=
 github.com/libp2p/go-libp2p-kbucket v0.6.5 h1:Fsl1YvZcMwqrR4DYrTO02yo9PGYs2HBQIT3lGXFMTxg=
 github.com/libp2p/go-libp2p-kbucket v0.6.5/go.mod h1:U6WOd0BvnSp03IQSrjgM54tg7zh1UUNsXLJqAQzClTA=
-github.com/libp2p/go-libp2p-pubsub v0.14.0 h1:+YxFHOdrk45szLb8G/fVsWwg4pdx0nVUXoZdLvYw2VY=
-github.com/libp2p/go-libp2p-pubsub v0.14.0/go.mod h1:MKPU5vMI8RRFyTP0HfdsF9cLmL1nHAeJm44AxJGJx44=
+github.com/libp2p/go-libp2p-pubsub v0.14.1 h1:XK/rPKZKhPvRrtsjvfwrOZPnQQbGLmaEg7u6qnJfn8U=
+github.com/libp2p/go-libp2p-pubsub v0.14.1/go.mod h1:MKPU5vMI8RRFyTP0HfdsF9cLmL1nHAeJm44AxJGJx44=
 github.com/libp2p/go-libp2p-record v0.3.1 h1:cly48Xi5GjNw5Wq+7gmjfBiG9HCzQVkiZOUZ8kUl+Fg=
 github.com/libp2p/go-libp2p-record v0.3.1/go.mod h1:T8itUkLcWQLCYMqtX7Th6r7SexyUJpIyPgks757td/E=
 github.com/libp2p/go-libp2p-routing-helpers v0.7.4 h1:6LqS1Bzn5CfDJ4tzvP9uwh42IB7TJLNFJA6dEeGBv84=

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 \

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

apps/evm/single/go.mod

@@ -179,7 +179,7 @@ require (
 	github.com/libp2p/go-libp2p-asn-util v0.4.1 // indirect
 	github.com/libp2p/go-libp2p-kad-dht v0.29.1 // indirect
 	github.com/libp2p/go-libp2p-kbucket v0.6.5 // indirect
-	github.com/libp2p/go-libp2p-pubsub v0.14.0 // indirect
+	github.com/libp2p/go-libp2p-pubsub v0.14.1 // indirect
 	github.com/libp2p/go-libp2p-record v0.3.1 // indirect
 	github.com/libp2p/go-libp2p-routing-helpers v0.7.4 // indirect
 	github.com/libp2p/go-msgio v0.3.0 // indirect

apps/evm/single/go.sum

@@ -551,8 +551,8 @@ github.com/libp2p/go-libp2p-kad-dht v0.29.1 h1:RyD1RnnkXOh1gwBCrMQ6ZVfTJECY5yDOY
 github.com/libp2p/go-libp2p-kad-dht v0.29.1/go.mod h1:tZEFTKWCsY0xngypKyAIwNDNZOBiikSUIgd/BjTF5Ms=
 github.com/libp2p/go-libp2p-kbucket v0.6.5 h1:Fsl1YvZcMwqrR4DYrTO02yo9PGYs2HBQIT3lGXFMTxg=
 github.com/libp2p/go-libp2p-kbucket v0.6.5/go.mod h1:U6WOd0BvnSp03IQSrjgM54tg7zh1UUNsXLJqAQzClTA=
-github.com/libp2p/go-libp2p-pubsub v0.14.0 h1:+YxFHOdrk45szLb8G/fVsWwg4pdx0nVUXoZdLvYw2VY=
-github.com/libp2p/go-libp2p-pubsub v0.14.0/go.mod h1:MKPU5vMI8RRFyTP0HfdsF9cLmL1nHAeJm44AxJGJx44=
+github.com/libp2p/go-libp2p-pubsub v0.14.1 h1:XK/rPKZKhPvRrtsjvfwrOZPnQQbGLmaEg7u6qnJfn8U=
+github.com/libp2p/go-libp2p-pubsub v0.14.1/go.mod h1:MKPU5vMI8RRFyTP0HfdsF9cLmL1nHAeJm44AxJGJx44=
 github.com/libp2p/go-libp2p-record v0.3.1 h1:cly48Xi5GjNw5Wq+7gmjfBiG9HCzQVkiZOUZ8kUl+Fg=
 github.com/libp2p/go-libp2p-record v0.3.1/go.mod h1:T8itUkLcWQLCYMqtX7Th6r7SexyUJpIyPgks757td/E=
 github.com/libp2p/go-libp2p-routing-helpers v0.7.4 h1:6LqS1Bzn5CfDJ4tzvP9uwh42IB7TJLNFJA6dEeGBv84=

apps/testapp/go.mod

@@ -85,7 +85,7 @@ require (
 	github.com/libp2p/go-libp2p-asn-util v0.4.1 // indirect
 	github.com/libp2p/go-libp2p-kad-dht v0.29.1 // indirect
 	github.com/libp2p/go-libp2p-kbucket v0.6.5 // indirect
-	github.com/libp2p/go-libp2p-pubsub v0.14.0 // indirect
+	github.com/libp2p/go-libp2p-pubsub v0.14.1 // indirect
 	github.com/libp2p/go-libp2p-record v0.3.1 // indirect
 	github.com/libp2p/go-libp2p-routing-helpers v0.7.4 // indirect
 	github.com/libp2p/go-msgio v0.3.0 // indirect

apps/testapp/go.sum

@@ -254,8 +254,8 @@ github.com/libp2p/go-libp2p-kad-dht v0.29.1 h1:RyD1RnnkXOh1gwBCrMQ6ZVfTJECY5yDOY
 github.com/libp2p/go-libp2p-kad-dht v0.29.1/go.mod h1:tZEFTKWCsY0xngypKyAIwNDNZOBiikSUIgd/BjTF5Ms=
 github.com/libp2p/go-libp2p-kbucket v0.6.5 h1:Fsl1YvZcMwqrR4DYrTO02yo9PGYs2HBQIT3lGXFMTxg=
 github.com/libp2p/go-libp2p-kbucket v0.6.5/go.mod h1:U6WOd0BvnSp03IQSrjgM54tg7zh1UUNsXLJqAQzClTA=
-github.com/libp2p/go-libp2p-pubsub v0.14.0 h1:+YxFHOdrk45szLb8G/fVsWwg4pdx0nVUXoZdLvYw2VY=
-github.com/libp2p/go-libp2p-pubsub v0.14.0/go.mod h1:MKPU5vMI8RRFyTP0HfdsF9cLmL1nHAeJm44AxJGJx44=
+github.com/libp2p/go-libp2p-pubsub v0.14.1 h1:XK/rPKZKhPvRrtsjvfwrOZPnQQbGLmaEg7u6qnJfn8U=
+github.com/libp2p/go-libp2p-pubsub v0.14.1/go.mod h1:MKPU5vMI8RRFyTP0HfdsF9cLmL1nHAeJm44AxJGJx44=
 github.com/libp2p/go-libp2p-record v0.3.1 h1:cly48Xi5GjNw5Wq+7gmjfBiG9HCzQVkiZOUZ8kUl+Fg=
 github.com/libp2p/go-libp2p-record v0.3.1/go.mod h1:T8itUkLcWQLCYMqtX7Th6r7SexyUJpIyPgks757td/E=
 github.com/libp2p/go-libp2p-routing-helpers v0.7.4 h1:6LqS1Bzn5CfDJ4tzvP9uwh42IB7TJLNFJA6dEeGBv84=

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{},