From bee8ed8376bcb2248970455b4f000ea23e1f93f4 Mon Sep 17 00:00:00 2001 From: Jean Gal Date: Mon, 7 Apr 2025 13:40:00 -0400 Subject: [PATCH 1/4] Link right versions + wait for sequencer availability --- smoke-test.bash | 8 ++++++++ test-node.bash | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/smoke-test.bash b/smoke-test.bash index 89b36720..5e0c5bcc 100755 --- a/smoke-test.bash +++ b/smoke-test.bash @@ -3,6 +3,14 @@ set -euo pipefail ./test-node.bash --espresso --latest-espresso-image --validate --tokenbridge --init-force --detach +# Wait for the sequencer HTTP to be ready +echo "Waiting for sequencer HTTP to be ready..." +while ! curl -sf http://localhost:8547 > /dev/null; do + echo "Sequencer HTTP is not ready yet. Retrying in 5 seconds..." + sleep 5 +done +echo "Sequencer HTTP is ready!" + # Sending L2 transaction ./test-node.bash script send-l2 --ethamount 100 --to user_l2user --wait diff --git a/test-node.bash b/test-node.bash index e1724191..980f23dd 100755 --- a/test-node.bash +++ b/test-node.bash @@ -7,7 +7,7 @@ NITRO_NODE_VERSION=offchainlabs/nitro-node:v3.2.1-d81324d-dev BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.1.0-0e716c8 # This commit matches v2.1.0 release of nitro-contracts, with additional support to set arb owner through upgrade executor -DEFAULT_NITRO_CONTRACTS_VERSION="99c07a7db2fcce75b751c5a2bd4936e898cda065" +DEFAULT_NITRO_CONTRACTS_VERSION="cff556bc886a4383a3936dce206ceef0b019fd62" DEFAULT_TOKEN_BRIDGE_VERSION="v1.2.2" ESPRESSO_VERSION=ghcr.io/espressosystems/nitro-espresso-integration/nitro-node-dev:integration @@ -317,7 +317,7 @@ done if $espresso; then NITRO_CONTRACTS_REPO=https://github.com/EspressoSystems/nitro-contracts.git - NITRO_CONTRACTS_BRANCH=develop + NITRO_CONTRACTS_BRANCH=v2.1.3-alpha export NITRO_CONTRACTS_REPO export NITRO_CONTRACTS_BRANCH echo "Running espresso mode" From 68e536f161ff240703aab8445dff5496d3f0415d Mon Sep 17 00:00:00 2001 From: Jean Gal Date: Mon, 7 Apr 2025 13:56:44 -0400 Subject: [PATCH 2/4] Change espresso devnode image to match v3.5.2 --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 49da9434..6b4ced98 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -414,7 +414,7 @@ services: - /var/run/docker.sock:/var/run/docker.sock espresso-dev-node: - image: ghcr.io/espressosystems/espresso-sequencer/espresso-dev-node:main + image: ghcr.io/espressosystems/espresso-sequencer/espresso-dev-node:release-goldendoodle ports: - "$ESPRESSO_SEQUENCER_API_PORT:$ESPRESSO_SEQUENCER_API_PORT" - "$ESPRESSO_BUILDER_PORT:$ESPRESSO_BUILDER_PORT" From 8c6f4f43ba04e1e755066a2e3b190b8ca263638a Mon Sep 17 00:00:00 2001 From: Jean Gal Date: Mon, 7 Apr 2025 14:08:21 -0400 Subject: [PATCH 3/4] keep default nitro version --- test-node.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-node.bash b/test-node.bash index 980f23dd..4e2f0920 100755 --- a/test-node.bash +++ b/test-node.bash @@ -7,7 +7,7 @@ NITRO_NODE_VERSION=offchainlabs/nitro-node:v3.2.1-d81324d-dev BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.1.0-0e716c8 # This commit matches v2.1.0 release of nitro-contracts, with additional support to set arb owner through upgrade executor -DEFAULT_NITRO_CONTRACTS_VERSION="cff556bc886a4383a3936dce206ceef0b019fd62" +DEFAULT_NITRO_CONTRACTS_VERSION="99c07a7db2fcce75b751c5a2bd4936e898cda065" DEFAULT_TOKEN_BRIDGE_VERSION="v1.2.2" ESPRESSO_VERSION=ghcr.io/espressosystems/nitro-espresso-integration/nitro-node-dev:integration From e0cb55a5c24cce96360702ab8f9299d269e8ea6e Mon Sep 17 00:00:00 2001 From: Jean Gal Date: Wed, 16 Apr 2025 20:22:42 -0400 Subject: [PATCH 4/4] update docker dev node image to :main --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 6b4ced98..49da9434 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -414,7 +414,7 @@ services: - /var/run/docker.sock:/var/run/docker.sock espresso-dev-node: - image: ghcr.io/espressosystems/espresso-sequencer/espresso-dev-node:release-goldendoodle + 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"