update lumen to ev-reth and update logs statements

Author: Manav-Aggarwal

apps/evm/single/docker-compose.yml

@@ -1,10 +1,9 @@
-version: "3.8"
 
 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 +17,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 +38,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 +63,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 +73,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

@@ -322,22 +322,22 @@ func NewManager(
 	}
 
 	if config.DA.BlockTime.Duration == 0 {
-		logger.Info("using default DA block time", "DABlockTime", defaultDABlockTime)
+		logger.Info("using default DA block time, DABlockTime:", defaultDABlockTime)
 		config.DA.BlockTime.Duration = defaultDABlockTime
 	}
 
 	if config.Node.BlockTime.Duration == 0 {
-		logger.Info("using default block time", "BlockTime", defaultBlockTime)
+		logger.Info("using default block time, BlockTime:", defaultBlockTime)
 		config.Node.BlockTime.Duration = defaultBlockTime
 	}
 
 	if config.Node.LazyBlockInterval.Duration == 0 {
-		logger.Info("using default lazy block time", "LazyBlockTime", defaultLazyBlockTime)
+		logger.Info("using default lazy block time, LazyBlockTime:", defaultLazyBlockTime)
 		config.Node.LazyBlockInterval.Duration = defaultLazyBlockTime
 	}
 
 	if config.DA.MempoolTTL == 0 {
-		logger.Info("using default mempool ttl", "MempoolTTL", defaultMempoolTTL)
+		logger.Info("using default mempool ttl, MempoolTTL:", defaultMempoolTTL)
 		config.DA.MempoolTTL = defaultMempoolTTL
 	}
 
@@ -645,7 +645,7 @@ func (m *Manager) publishBlockInternal(ctx context.Context) error {
 	// If there is use that instead of creating a new block
 	pendingHeader, pendingData, err := m.store.GetBlockData(ctx, newHeight)
 	if err == nil {
-		m.logger.Info("using pending block", "height", newHeight)
+		m.logger.Info("using pending block, height:", newHeight)
 		header = pendingHeader
 		data = pendingData
 	} else {

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/retriever.go

@@ -143,7 +143,7 @@ func (m *Manager) handlePotentialHeader(ctx context.Context, bz []byte, daHeight
 	headerHash := header.Hash().String()
 	m.headerCache.SetDAIncluded(headerHash, daHeight)
 	m.sendNonBlockingSignalToDAIncluderCh()
-	m.logger.Info("header marked as DA included, headerHeight: ", header.Height(), "headerHash: ", headerHash)
+	m.logger.Info(fmt.Sprintf("header marked as DA included, headerHeight: %d, headerHash: %s", header.Height(), headerHash))
 	if !m.headerCache.IsSeen(headerHash) {
 		select {
 		case <-ctx.Done():
@@ -178,7 +178,7 @@ func (m *Manager) handlePotentialData(ctx context.Context, bz []byte, daHeight u
 	dataHashStr := signedData.Data.DACommitment().String()
 	m.dataCache.SetDAIncluded(dataHashStr, daHeight)
 	m.sendNonBlockingSignalToDAIncluderCh()
-	m.logger.Info("signed data marked as DA included, dataHash: ", dataHashStr, "daHeight: ", daHeight, "height: ", signedData.Height())
+	m.logger.Info(fmt.Sprintf("signed data marked as DA included, dataHash: %s, daHeight: %d, height: %d", dataHashStr, daHeight, signedData.Height()))
 	if !m.dataCache.IsSeen(dataHashStr) {
 		select {
 		case <-ctx.Done():

block/submitter.go

@@ -150,14 +150,14 @@ func submitToDA[T any](
 			if m.gasMultiplier > 0 && gasPrice != -1 {
 				gasPrice = gasPrice * m.gasMultiplier
 			}
-			m.logger.Info("retrying DA layer submission with", "backoff", backoff, "gasPrice", gasPrice)
+			m.logger.Info(fmt.Sprintf("retrying DA layer submission with, backoff: %s, gasPrice: %v", backoff, gasPrice))
 		case coreda.StatusContextCanceled:
-			m.logger.Info("DA layer submission canceled due to context cancellation", "attempt", attempt)
+			m.logger.Info(fmt.Sprintf("DA layer submission canceled due to context cancellation, attempt: %d", attempt))
 			return nil
 		case coreda.StatusTooBig:
 			fallthrough
 		default:
-			m.logger.Error("DA layer submission failed", "error", res.Message, "attempt", attempt)
+			m.logger.Error(fmt.Sprintf("DA layer submission failed, error: %s, attempt: %d", res.Message, attempt))
 			// Record failed DA submission (will retry)
 			m.recordDAMetrics("submission", DAModeFail)
 			backoff = m.exponentialBackoff(backoff)

da/cmd/local-da/local.go

@@ -161,7 +161,7 @@ func (d *LocalDA) Commit(ctx context.Context, blobs []coreda.Blob, _ []byte) ([]
 
 // SubmitWithOptions stores blobs in DA layer (options are ignored).
 func (d *LocalDA) SubmitWithOptions(ctx context.Context, blobs []coreda.Blob, gasPrice float64, _ []byte, _ []byte) ([]coreda.ID, error) {
-	d.logger.Info("SubmitWithOptions called, numBlobs: ", len(blobs), "gasPrice: ", gasPrice)
+	d.logger.Info(fmt.Sprintf("SubmitWithOptions called, numBlobs: %d, gasPrice: %f", len(blobs), gasPrice))
 	d.mu.Lock()
 	defer d.mu.Unlock()
 	ids := make([]coreda.ID, len(blobs))
@@ -172,13 +172,13 @@ func (d *LocalDA) SubmitWithOptions(ctx context.Context, blobs []coreda.Blob, ga
 
 		d.data[d.height] = append(d.data[d.height], kvp{ids[i], blob})
 	}
-	d.logger.Info("SubmitWithOptions successful, newHeight: ", d.height, "count: ", len(ids))
+	d.logger.Info(fmt.Sprintf("SubmitWithOptions successful, newHeight: %d, count: %d", d.height, len(ids)))
 	return ids, nil
 }
 
 // Submit stores blobs in DA layer (options are ignored).
 func (d *LocalDA) Submit(ctx context.Context, blobs []coreda.Blob, gasPrice float64, _ []byte) ([]coreda.ID, error) {
-	d.logger.Info("Submit called, numBlobs: ", len(blobs), "gasPrice: ", gasPrice)
+	d.logger.Info(fmt.Sprintf("Submit called, numBlobs: %d, gasPrice: %f", len(blobs), gasPrice))
 	d.mu.Lock()
 	defer d.mu.Unlock()
 	ids := make([]coreda.ID, len(blobs))
@@ -189,7 +189,7 @@ func (d *LocalDA) Submit(ctx context.Context, blobs []coreda.Blob, gasPrice floa
 
 		d.data[d.height] = append(d.data[d.height], kvp{ids[i], blob})
 	}
-	d.logger.Info("Submit successful, newHeight: ", d.height, "count: ", len(ids))
+	d.logger.Info(fmt.Sprintf("Submit successful, newHeight: %d, count: %d", d.height, len(ids)))
 	return ids, nil
 }
 

da/cmd/local-da/main.go

@@ -47,9 +47,9 @@ func main() {
 	da := NewLocalDA(logger, opts...)
 
 	srv := proxy.NewServer(logger, host, port, da)
-	logger.Info("Listening on", "host", host, "port", port, "maxBlobSize", maxBlobSize)
+	logger.Info(fmt.Sprintf("Listening on, host: %s, port: %s, maxBlobSize: %d", host, port, maxBlobSize))
 	if err := srv.Start(context.Background()); err != nil {
-		logger.Error("error while serving", "error", err)
+		logger.Error(fmt.Sprintf("error while serving, error: %v", err))
 	}
 
 	interrupt := make(chan os.Signal, 1)

da/jsonrpc/client.go

@@ -158,7 +158,7 @@ func (api *API) SubmitWithOptions(ctx context.Context, inputBlobs []da.Blob, gas
 			continue
 		}
 		if currentSize+blobLen > maxBlobSize {
-			api.Logger.Info("Blob size limit reached for batch", "maxBlobSize", maxBlobSize, "index", i, "currentSize", currentSize, "nextBlobSize", blobLen)
+			api.Logger.Info(fmt.Sprintf("Blob size limit reached for batch, maxBlobSize: %d, index: %d, currentSize: %d, nextBlobSize: %d", maxBlobSize, i, currentSize, blobLen))
 			break
 		}
 		currentSize += blobLen
@@ -260,7 +260,7 @@ func newClient(ctx context.Context, logger logging.EventLogger, addr string, aut
 		return nil, fmt.Errorf("failed to decode namespace: %w", err)
 	}
 	client.DA.Namespace = namespaceBytes
-	logger.Info("creating new client", "namespace", namespace)
+	logger.Info("creating new client, namepsace: ", namespace)
 	errs := getKnownErrorsMapping()
 	for name, module := range moduleMap(&client) {
 		closer, err := jsonrpc.NewMergeClient(ctx, addr, name, []interface{}{module}, authHeader, jsonrpc.WithErrors(errs))