From b5c6f781b423d19bcb45ff9f04f4c12c8d84a0d9 Mon Sep 17 00:00:00 2001 From: sveitser Date: Thu, 8 Aug 2024 17:03:24 +0200 Subject: [PATCH] Misc small testnode fixes - Use `develop` branch of nitro-contracts - Remove `node.espresso` argument that was removed in nitro - Remove trailing `-f` argument from docker build command - Default to `leveldb` db backend to avoid panic from new default backend `pebble`. --- scripts/config.ts | 5 ++--- test-node.bash | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/config.ts b/scripts/config.ts index b064ac28..be84b412 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -180,7 +180,6 @@ function writeConfigs(argv: any) { "strategy": "MakeNodes", }, "sequencer": false, - "espresso": false, "dangerous": { "no-sequencer-coordinator": false, "disable-blob-reader": true, @@ -247,7 +246,8 @@ function writeConfigs(argv: any) { "forwarding-target": "null", }, "persistent": { - "chain": "local" + "chain": "local", + "db-engine": "leveldb" }, "ws": { "addr": "0.0.0.0" @@ -296,7 +296,6 @@ function writeConfigs(argv: any) { sequencerConfig.node["delayed-sequencer"].enable = true if (argv.espresso) { - sequencerConfig.node.espresso = true sequencerConfig.execution.sequencer.espresso = true sequencerConfig.execution.sequencer["hotshot-url"] = argv.espressoUrl sequencerConfig.node.feed.output.enable = true diff --git a/test-node.bash b/test-node.bash index f27e0c5a..3e4db1d8 100755 --- a/test-node.bash +++ b/test-node.bash @@ -6,7 +6,7 @@ NITRO_NODE_VERSION=offchainlabs/nitro-node:v3.0.1-cf4b74e-dev ESPRESSO_VERSION=ghcr.io/espressosystems/nitro-espresso-integration/nitro-node-dev:integration BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.0.0-c8db5b1 -DEFAULT_NITRO_CONTRACTS_VERSION="deploy" +DEFAULT_NITRO_CONTRACTS_VERSION="develop" DEFAULT_TOKEN_BRIDGE_VERSION="v1.2.2" # Set default versions if not overriden by provided env vars @@ -301,7 +301,7 @@ if $force_build; then echo execute from a sub-directory of nitro or use NITRO_SRC environment variable exit 1 fi - docker build "$NITRO_SRC" -t nitro-node-dev --target nitro-node-dev -f + docker build "$NITRO_SRC" -t nitro-node-dev --target nitro-node-dev fi if $dev_build_blockscout; then if $blockscout; then