Merge branch 'main' into marko/grpc_execution

Author: tac0turtle

.github/workflows/test.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   build-ev-node-image:
-    name: Build Rollkit Docker Image
+    name: Build ev-node Docker Image
     # skip building images for merge groups as they are already built on PRs and main
     if: github.event_name != 'merge_group'
     runs-on: ubuntu-latest
@@ -36,7 +36,7 @@ jobs:
           context: .
           push: true
           platforms: linux/amd64,linux/arm64
-          tags: ghcr.io/${{ github.repository_owner }}/evstack:${{ inputs.image-tag }}
+          tags: ghcr.io/${{ github.repository_owner }}/ev-node:${{ inputs.image-tag }}
 
   build-ev-node-evm-single-image:
     name: Build ev-node EVM Single Docker Image

README.md

@@ -8,16 +8,16 @@ Ev-node is the basis of the Evolve Stack. For more in-depth information about Ev
 [![GoDoc](https://godoc.org/github.com/evstack/ev-node?status.svg)](https://godoc.org/github.com/evstack/ev-node)
 <!-- markdownlint-enable MD013 -->
 
-## Using Rollkit
+## Using Evolve
 
 ### Example Implementation: TestApp CLI
 
-The easiest way to understand how to use Rollkit is by exploring our example implementation, TestApp.
+The easiest way to understand how to use Evolve is by exploring our example implementation, TestApp.
 
 Requires Go version >= 1.22.
 
-TestApp is a CLI tool that demonstrates how to run different kinds of nodes using the Rollkit framework.
-It serves as a reference implementation and helps you understand how to build your own Rollkit-based blockchain.
+TestApp is a CLI tool that demonstrates how to run different kinds of nodes using the Evolve framework.
+It serves as a reference implementation and helps you understand how to build your own Evolve-based blockchain.
 
 #### Install
 
@@ -36,17 +36,17 @@ testapp version
 
 #### Quick Start
 
-You can spin up a local TestApp network (powered by Rollkit) with the following command:
+You can spin up a local TestApp network (powered by Evolve) with the following command:
 
 ```bash
 testapp start
 ```
 
-## Building with Rollkit
+## Building with Evolve
 
-Rollkit is the first sovereign application framework that allows you to launch
+Evolve is the first sovereign application framework that allows you to launch
 a sovereign, customizable blockchain as easily as a smart contract.
-TestApp serves as a reference implementation to help you get started with your own Rollkit-based blockchain.
+TestApp serves as a reference implementation to help you get started with your own Evolve-based blockchain.
 
 Check out our tutorials on our [website][docs].
 

apps/evm/single/docker-compose.yml

@@ -1,10 +1,10 @@
-version: "3.8"
+name: "Evolve EVM"
 
 services:
-  rollkit-reth:
-    container_name: rollkit-reth
+  ev-reth:
+    container_name: ev-reth
     restart: unless-stopped
-    image: ghcr.io/evstack/lumen:latest
+    image: ghcr.io/evstack/ev-reth:latest
     ports:
       - "9001:9001" # metrics
       - "30303:30303" # eth/66 peering
@@ -18,7 +18,7 @@ services:
     entrypoint: /bin/sh -c
     command:
       - |
-          lumen node \
+          ev-reth node \
             --chain /root/chain/genesis.json \
             --datadir /home/reth/eth-home \
             --metrics 0.0.0.0:9001 \
@@ -39,22 +39,22 @@ services:
             --txpool.max-account-slots 2048 \
             --txpool.max-new-txns 2048 \
             --txpool.additional-validation-tasks 16 \
-            --rollkit.enable
+            --ev-reth.enable
     networks:
-      - rollkit-network
+      - evolve-network
 
   local-da:
-    image: ghcr.io/rollkit/local-da:v0.1.0
+    image: ghcr.io/evstack/local-da:v0.1.0
     ports:
       - "7980:7980"
     command: ["-listen-all"]
     networks:
-      - rollkit-network
+      - evolve-network
 
-  rollkit-evm-single:
+  ev-node-evm-single:
     image: ghcr.io/evstack/ev-node-evm-single:main
     depends_on:
-      rollkit-reth:
+      ev-reth:
         condition: service_started
       local-da:
         condition: service_started
@@ -64,8 +64,8 @@ services:
     entrypoint: /usr/bin/entrypoint.sh
     command: start
     environment:
-      - EVM_ENGINE_URL=http://rollkit-reth:8551
-      - EVM_ETH_URL=http://rollkit-reth:8545
+      - EVM_ENGINE_URL=http://ev-reth:8551
+      - EVM_ETH_URL=http://ev-reth:8545
       - EVM_JWT_SECRET=f747494bb0fb338a0d71f5f9fe5b5034c17cc988c229b59fd71e005ee692e9bf
       - EVM_GENESIS_HASH=0x2b8bbb1ea1e04f9c9809b4b278a8687806edc061a356c7dbc491930d8e922503
       - EVM_BLOCK_TIME=1s
@@ -74,14 +74,14 @@ services:
       # - DA_AUTH_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJBbGxvdyI6WyJwdWJsaWMiLCJyZWFkIiwid3JpdGUiXSwiTm9uY2UiOiJQcEswTmhyWi9IY05NWkVtUG9sSXNpRTRDcUpMdE9mbWtBMW0zMWFUaEswPSIsIkV4cGlyZXNBdCI6IjAwMDEtMDEtMDFUMDA6MDA6MDBaIn0.gaWh6tS6Rel1XFYclDkapNnZlaZVjrikCRNBxSDkCGk
       # - DA_NAMESPACE=00000000000000000000000000000000000000000008e5f679bf7116c1
     networks:
-      - rollkit-network
+      - evolve-network
 
 volumes:
   evm-single-data:
   reth:
 
 networks:
-  rollkit-network:
+  evolve-network:
     driver: bridge
     ipam:
       config:

block/aggregation.go

@@ -24,7 +24,7 @@ func (m *Manager) AggregationLoop(ctx context.Context, errCh chan<- error) {
 	}
 
 	if delay > 0 {
-		m.logger.Info("waiting to produce block", "delay", delay)
+		m.logger.Info("waiting to produce block, delay:", delay)
 		time.Sleep(delay)
 	}
 

block/aggregation_test.go

@@ -86,7 +86,7 @@ func TestAggregationLoop_Normal_BasicInterval(t *testing.T) {
 		m.logger.Info("AggregationLoop exited")
 	}()
 
-	m.logger.Info("Waiting for blocks...", "duration", waitTime)
+	m.logger.Info("Waiting for blocks..., duration:", waitTime)
 	time.Sleep(waitTime)
 
 	m.logger.Info("Cancelling context")
@@ -98,7 +98,7 @@ func TestAggregationLoop_Normal_BasicInterval(t *testing.T) {
 	publishLock.Lock()
 	defer publishLock.Unlock()
 
-	m.logger.Info("Recorded publish times", "count", len(publishTimes), "times", publishTimes)
+	m.logger.Info("Recorded publish times, count:", len(publishTimes), "times:", publishTimes)
 
 	expectedCallsLow := int(waitTime/blockTime) - 1
 	expectedCallsHigh := int(waitTime/blockTime) + 1

block/manager.go

@@ -656,7 +656,7 @@ func (m *Manager) publishBlockInternal(ctx context.Context) error {
 					m.logger.Info("no batch retrieved from sequencer, skipping block production")
 					return nil
 				}
-				m.logger.Debug("creating empty block, height: ", newHeight)
+				m.logger.Info("creating empty block, height: ", newHeight)
 			} else {
 				m.logger.Warn("failed to get transactions from batch", "error", err)
 				return nil
@@ -665,8 +665,7 @@ func (m *Manager) publishBlockInternal(ctx context.Context) error {
 			if batchData.Before(lastHeaderTime) {
 				return fmt.Errorf("timestamp is not monotonically increasing: %s < %s", batchData.Time, m.getLastBlockTime())
 			}
-			m.logger.Info("creating and publishing block", "height", newHeight)
-			m.logger.Debug("block info", "num_tx", len(batchData.Transactions))
+			m.logger.Info("creating and publishing block", "height", newHeight, "num_tx", len(batchData.Transactions))
 		}
 
 		header, data, err = m.createBlock(ctx, newHeight, lastSignature, lastHeaderHash, batchData)

block/reaper.go

@@ -55,7 +55,7 @@ func (r *Reaper) Start(ctx context.Context) {
 	ticker := time.NewTicker(r.interval)
 	defer ticker.Stop()
 
-	r.logger.Info("Reaper started", "interval", r.interval)
+	r.logger.Info("Reaper started, interval:", r.interval)
 
 	for {
 		select {

block/submitter.go

@@ -125,7 +125,7 @@ func submitToDA[T any](
 			// Record successful DA submission
 			m.recordDAMetrics("submission", DAModeSuccess)
 
-			m.logger.Info(fmt.Sprintf("successfully submitted %s to DA layer", itemType), "gasPrice", gasPrice, "count", res.SubmittedCount)
+			m.logger.Info(fmt.Sprintf("successfully submitted %s to DA layer with gasPrice %v and count %d", itemType, gasPrice, res.SubmittedCount))
 			if res.SubmittedCount == uint64(remLen) {
 				submittedAll = true
 			}

docs/adr/adr-021-lazy-aggregation.md

@@ -65,7 +65,7 @@ Leverage the existing empty batch mechanism and `dataHashForEmptyTxs` to maintai
 					m.logger.Info("No batch retrieved from sequencer, skipping block production")
 					return nil
 				}
-				m.logger.Info("Creating empty block. height", newHeight)
+				m.logger.Info("Creating empty block, height: ", newHeight)
 			} else {
 				return fmt.Errorf("failed to get transactions from batch: %w", err)
 			}

execution/evm/docker/docker-compose-full-node.yml

@@ -1,4 +1,4 @@
-name: "rollkit-reth-full-node"
+name: "ev-reth-full-node"
 
 services:
   jwt-init-full-node:
@@ -18,10 +18,10 @@ services:
         openssl rand -hex 32 | tr -d '\n' > /jwt/jwt.hex;
       fi"
 
-  ev-node-reth-full-node:
-    container_name: rollkit-reth-full-node
+  ev-reth-full-node:
+    container_name: ev-reth-full-node
     restart: unless-stopped
-    image: ghcr.io/evstack/lumen:latest
+    image: ghcr.io/evstack/ev-reth:latest
     depends_on:
       jwt-init-full-node:
         condition: service_completed_successfully
@@ -36,11 +36,11 @@ services:
       - ./jwttoken:/root/jwt:ro
       - reth:/home/reth/eth-home
     environment:
-      - RUST_LOG=warn,lumen_rollkit=info
+      - RUST_LOG=info
     entrypoint: /bin/sh -c
     command:
       - |
-          lumen node \
+          ev-reth node \
             --chain /root/chain/genesis.json \
             --datadir /home/reth/eth-home \
             --metrics 0.0.0.0:9001 \
@@ -61,7 +61,7 @@ services:
             --txpool.max-account-slots 2048 \
             --txpool.max-new-txns 2048 \
             --txpool.additional-validation-tasks 16 \
-            --rollkit.enable
+            --ev-reth.enable
 
 volumes:
   reth: