Sync with celestia integration (#88)

* Update espresso image to point to integration (#83)

* Update espresso image to point to integration

* update espresso dev node

* Update light client address

---------

Co-authored-by: Jeremy <[email protected]>

* add blobSchedule for new genesis creator requirement (#84)

* add blobSchedule for new genesis creator requirement

* Rename

(cherry picked from commit 01b9f3a)

* Fix caff node test (#85)

* WIP

* WIP

* small fixes

* rename to caff

* fix

* use bc for big numbers

* Send transaction through caff node

---------

Co-authored-by: Sneh Koul <[email protected]>
(cherry picked from commit bfaaf1d)

* Add EspressoTEEVerifier address (#86)

* Add EspressoTEEVerifier address

* Fix the TEE address

---------

Co-authored-by: Jeremy <[email protected]>
(cherry picked from commit b1ce7e1)

* Fix caff node test

(cherry picked from commit 589b44b)

* Remove simple test

---------

Co-authored-by: Sneh Koul <[email protected]>

Author: ImJeremyHe

.github/workflows/smoke-test.yml

@@ -18,7 +18,11 @@ jobs:
   smoke_test:
     strategy:
       matrix:
-        test-script: [./smoke-test.bash]
+        test-script:
+          [
+            ./smoke-test.bash,
+            ./smoke-test-caff-node.bash,
+          ]
 
     runs-on: ubuntu-24.04
 

docker-compose.yaml

@@ -186,22 +186,25 @@ services:
     depends_on:
       - geth
 
-  sequencer-espresso-finality:
+  caff-node:
     pid: host # allow debugging
     image: nitro-node-dev-testnode
     entrypoint: /usr/local/bin/nitro
     ports:
-      - "127.0.0.1:8549:8547"
-      - "127.0.0.1:8550:8548"
+      - "127.0.0.1:8550:8547"
+      - "127.0.0.1:8552:8548"
       - "127.0.0.1:9645:9642"
     volumes:
       - "seqdata_espresso_finality:/home/user/.arbitrum/local/nitro"
       - "l1keystore:/home/user/l1keystore"
       - "config:/config"
       - "tokenbridge-data:/tokenbridge-data"
-    command: --conf.file /config/espresso_finality_sequencer_config.json --node.feed.output.enable --node.feed.output.port 9642  --http.api net,web3,eth,txpool,debug --node.seq-coordinator.my-url  ws://sequencer:8548 --graphql.enable --graphql.vhosts * --graphql.corsdomain *
+    command: --conf.file /config/caff_sequencer_config.json --node.feed.output.enable --node.feed.output.port 9642  --http.api net,web3,eth,txpool,debug --node.seq-coordinator.my-url  ws://sequencer:8548 --graphql.enable --graphql.vhosts * --graphql.corsdomain *
     depends_on:
       - geth
+      - espresso-dev-node
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
 
   sequencer_b:
     pid: host # allow debugging
@@ -411,37 +414,26 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
 
   espresso-dev-node:
-    # TODO: revert to `:main` tag once we are compatible with the marketplace builder
-    image: ghcr.io/espressosystems/espresso-sequencer/espresso-dev-node:20240919-dev-node-legacy-builder
+    image: ghcr.io/espressosystems/espresso-sequencer/espresso-dev-node:main
     ports:
       - "$ESPRESSO_SEQUENCER_API_PORT:$ESPRESSO_SEQUENCER_API_PORT"
       - "$ESPRESSO_BUILDER_PORT:$ESPRESSO_BUILDER_PORT"
       - "$ESPRESSO_DEV_NODE_PORT:$ESPRESSO_DEV_NODE_PORT"
     environment:
-      - ESPRESSO_SEQUENCER_L1_PROVIDER
-      - ESPRESSO_SEQUENCER_ETH_MNEMONIC
-      - ESPRESSO_DEPLOYER_ACCOUNT_INDEX
-      - ESPRESSO_SEQUENCER_API_PORT
       - ESPRESSO_BUILDER_PORT
+      - ESPRESSO_DEPLOYER_ACCOUNT_INDEX
       - ESPRESSO_DEV_NODE_PORT
+      - ESPRESSO_SEQUENCER_API_PORT
+      - ESPRESSO_SEQUENCER_ETH_MNEMONIC
+      - ESPRESSO_SEQUENCER_L1_PROVIDER
+      - ESPRESSO_SEQUENCER_DATABASE_MAX_CONNECTIONS=25
+      - ESPRESSO_SEQUENCER_STORAGE_PATH=/data/espresso
       - RUST_LOG=info
       - RUST_LOG_FORMAT
-      - ESPRESSO_DEPLOYER_ALT_CHAIN_PROVIDERS
-      - ESPRESSO_DEPLOYER_ALT_MNEMONICS
-      - ESPRESSO_SEQUENCER_DEPLOYER_ALT_INDICES
-    depends_on:
-      - geth
-      - sequencer
-    healthcheck:
-      test:
-        [
-          "CMD-SHELL",
-          "curl -fL http://localhost:$ESPRESSO_DEV_NODE_PORT || exit 1",
-        ]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-      start_period: 40s
+    volumes:
+      - espresso_storage:/data/espresso
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
 
   # Reads from sequencer feed, forwards transactions to sequencer
   full-node:
@@ -534,3 +526,4 @@ volumes:
   das-committee-a-data:
   das-committee-b-data:
   das-mirror-data:
+  espresso_storage:

scripts/config.ts

@@ -69,7 +69,14 @@ function writeGethGenesisConfig(argv: any) {
                 "shanghaiTime": 0,
                 "cancunTime": 1706778826,
                 "terminalTotalDifficulty": 0,
-                "terminalTotalDifficultyPassed": true
+                "terminalTotalDifficultyPassed": true,
+                "blobSchedule": {
+                    "cancun": {
+                        "target": 3,
+                        "max": 6,
+                        "baseFeeUpdateFraction": 3338477
+                    }
+                }
         },
         "difficulty": "0",
         "extradata": "0x00000000000000000000000000000000000000000000000000000000000000003f1Eae7D46d88F08fc2F8ed27FCb2AB183EB2d0E0B0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -205,6 +212,9 @@ function writeConfigs(argv: any) {
         "make-assertion-interval": "10s",
         strategy: "MakeNodes",
       },
+      "parent-chain-reader": {
+        enable: true,
+      },
       sequencer: false,
       dangerous: {
         "no-sequencer-coordinator": false,
@@ -399,16 +409,22 @@ function writeConfigs(argv: any) {
       sequencerConfig.node["seq-coordinator"].enable = true;
     }
 
-    if (argv.espresso && argv.enableEspressoFinalityNode) {
-      sequencerConfig.execution.sequencer["enable-espresso-finality-node"] =
-        true;
-      sequencerConfig.execution.sequencer["espresso-finality-node-config"] = {
-        "hotshot-url": argv.espressoUrl,
-        "start-block": 0,
+    if (argv.espresso && argv.enableCaffNode) {
+      sequencerConfig.node.sequencer = false
+      sequencerConfig.node["delayed-sequencer"].enable = false;
+      sequencerConfig.node["parent-chain-reader"].enable = false;
+      sequencerConfig.execution.sequencer["enable-caff-node"] = true;
+      sequencerConfig.execution.sequencer["caff-node-config"] = {
+        "hotshot-urls": [argv.espressoUrl],
+        "next-hotshot-block": 1,
         namespace: 412346,
+        "parent-chain-node-url": argv.l1url,
+        "hotshot-polling-interval": "250ms",
+        "retry-time": "2s",
+        "espresso-tee-verifier-addr": "0xb562622f2D76F355D673560CB88c1dF6088702f1",
       };
       fs.writeFileSync(
-        path.join(consts.configpath, "espresso_finality_sequencer_config.json"),
+        path.join(consts.configpath, "caff_sequencer_config.json"),
         JSON.stringify(sequencerConfig)
       );
     } else {
@@ -524,7 +540,7 @@ function writeL2ChainConfig(argv: any) {
   if (argv.espresso) {
     let chainConfig = l2ChainConfig as any;
     chainConfig.arbitrum["EspressoTEEVerifierAddress"] =
-      "0x5eCF728ffC5C5E802091875f96281B5aeECf6C49";
+      "0xb562622f2D76F355D673560CB88c1dF6088702f1";
   }
   const l2ChainConfigJSON = JSON.stringify(l2ChainConfig);
   fs.writeFileSync(

scripts/index.ts

@@ -40,7 +40,7 @@ async function main() {
       espresso: { boolean: true, decription: 'use Espresso Sequencer for sequencing and DA', default: false },
       espressoUrl: { string: true, description: 'Espresso Sequencer url', default: 'http://espresso-dev-node:41000' },
       lightClientAddress: { string: true, description: 'address of the light client contract', default: ''},
-      enableEspressoFinalityNode: {boolean: true, description: 'enable finality node', default: false},
+      enableCaffNode: {boolean: true, description: 'enable caff node', default: false},
       simpleWithValidator: {boolean: true, description: 'start a simple node that validates', default: false},
     })
     .command(bridgeFundsCommand)

smoke-test-caff-node.bash

@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+
+
+user=user_l2user
+caff_url="ws://caff-node:8548"
+
+./test-node.bash --espresso --latest-espresso-image --validate --tokenbridge --init-force --detach --caff-node
+
+# Start the caff node
+docker compose up -d caff-node --wait --detach
+
+echo "Sending L2 transaction through sequencer"
+./test-node.bash script send-l2 --ethamount 10 --to $user --wait
+
+# Check the balance from caff node's api
+userAddress=$(docker compose run scripts print-address --account $user | tail -n 1 | tr -d '\r\n')
+
+while true; do
+    # Check if the balance on Caff node is greater than 0
+    balance=$(cast balance $userAddress --rpc-url ws://127.0.0.1:8552)
+    # Using bc here because it supports bigint
+    if [ "$(echo "$balance > 0" | bc)" -eq 1 ]; then
+        break
+    fi
+    sleep 1
+done
+
+echo "Sending L2 transaction through caff node"
+./test-node.bash script send-l2 --ethamount 10 --to $user --l2url $caff_url --wait
+
+echo "Sending L2 transaction through sequencer"
+./test-node.bash script send-l2 --ethamount 10 --to $user --wait
+
+echo "Sending L2 transaction through caff node"
+./test-node.bash script send-l2 --ethamount 10 --to $user --l2url $caff_url --wait
+
+echo "Smoke test succeeded."
+docker compose down

smoke-test-espresso-finality-node.bash

@@ -48,9 +48,9 @@ tokenbridge=false
 l3node=false
 consensusclient=false
 redundantsequencers=0
-lightClientAddr=0xb6eb235fa509e3206f959761d11e3777e16d0e98
+lightClientAddr=0xb7fc0e52ec06f125f3afeba199248c79f71c2e3a
 lightClientAddrForL3=0x5e36aa9caaf5f708fca5c04d2d4c776a62b2b258
-enableEspressoFinalityNode=false
+enableCaffNode=false
 espresso=false
 l2_espresso=false
 latest_espresso_image=false
@@ -125,8 +125,8 @@ while [[ $# -gt 0 ]]; do
             l2_espresso=true
             shift
             ;;
-        --espresso-finality-node)
-            enableEspressoFinalityNode=true
+        --caff-node)
+            enableCaffNode=true
             shift
             ;;
         --latest-espresso-image)
@@ -301,7 +301,7 @@ while [[ $# -gt 0 ]]; do
             echo --no-tokenbridge  don\'t build or launch tokenbridge
             echo --no-run          does not launch nodes \(useful with build or init\)
             echo --no-simple       run a full configuration with separate sequencer/batch-poster/validator/relayer
-            echo --enable-finality-node enable espresso finality node
+            echo --enable-caff-node enable espresso caff node
             echo --build-dev-nitro     rebuild dev nitro docker image
             echo --no-build-dev-nitro  don\'t rebuild dev nitro docker image
             echo --build-dev-blockscout     rebuild dev blockscout docker image
@@ -558,9 +558,9 @@ if $force_init; then
     else
         echo == Writing configs
         docker compose run scripts write-config  $anytrustNodeConfigLine --espresso $l2_espresso --lightClientAddress $lightClientAddr
-        if $enableEspressoFinalityNode; then
+        if $enableCaffNode; then
             echo == Writing configs for finality node
-            docker compose run scripts write-config  $anytrustNodeConfigLine  --espresso $l2_espresso  --enableEspressoFinalityNode --lightClientAddress $lightClientAddr
+            docker compose run scripts write-config  $anytrustNodeConfigLine  --espresso $l2_espresso  --enableCaffNode --lightClientAddress $lightClientAddr
         fi
         echo == Initializing redis
         docker compose up --wait redis