diff --git a/.github/workflows/smoke-test.yml b/.github/workflows/smoke-test.yml index 5031cae6..bf012487 100644 --- a/.github/workflows/smoke-test.yml +++ b/.github/workflows/smoke-test.yml @@ -24,7 +24,7 @@ jobs: ./smoke-test-l3.bash, ./smoke-test-nitro-simple.bash, ./smoke-test-full-node.bash, - ./smoke-test-espresso-finality-node.bash, + ./smoke-test-caff-node.bash, ./smoke-test-altlayer.bash, ./smoke-test-caldera.bash, ] diff --git a/docker-compose.yaml b/docker-compose.yaml index f8916e87..1334e779 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -186,7 +186,7 @@ services: depends_on: - geth - sequencer-espresso-finality: + caff-node: pid: host # allow debugging image: nitro-node-dev-testnode entrypoint: /usr/local/bin/nitro @@ -199,7 +199,7 @@ services: - "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 diff --git a/scripts/config.ts b/scripts/config.ts index 0850034e..d985eb0c 100644 --- a/scripts/config.ts +++ b/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", @@ -400,15 +407,15 @@ function writeConfigs(argv: any) { } if (argv.espresso && argv.enableEspressoFinalityNode) { - sequencerConfig.execution.sequencer["enable-espresso-finality-node"] = + sequencerConfig.execution.sequencer["enable-caff-node"] = true; - sequencerConfig.execution.sequencer["espresso-finality-node-config"] = { + sequencerConfig.execution.sequencer["caff-node-config"] = { "hotshot-url": argv.espressoUrl, "start-block": 0, namespace: 412346, }; fs.writeFileSync( - path.join(consts.configpath, "espresso_finality_sequencer_config.json"), + path.join(consts.configpath, "caff_sequencer_config.json"), JSON.stringify(sequencerConfig) ); } else { diff --git a/smoke-test-espresso-finality-node.bash b/smoke-test-caff-node.bash similarity index 87% rename from smoke-test-espresso-finality-node.bash rename to smoke-test-caff-node.bash index 3597c20e..aaeb820f 100755 --- a/smoke-test-espresso-finality-node.bash +++ b/smoke-test-caff-node.bash @@ -15,8 +15,8 @@ listen_to_sequencer_feed() { ./test-node.bash --espresso --latest-espresso-image --validate --tokenbridge --init-force --detach --espresso-finality-node -# Start the espresso finality node -docker compose up -d sequencer-espresso-finality --wait --detach +# Start the caff node +docker compose up -d caff-node --wait --detach # Sending L2 transaction ./test-node.bash script send-l2 --ethamount 100 --to user_l2user --wait