From 348a4887245d229f754db0e839cfca04f255491e Mon Sep 17 00:00:00 2001 From: Ethen Pociask Date: Mon, 9 Dec 2024 12:08:55 +0700 Subject: [PATCH 1/4] chore: Bump contracts commit to v2.1.0 --- rollupcreator/Dockerfile | 2 +- test-node.bash | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rollupcreator/Dockerfile b/rollupcreator/Dockerfile index e33f2e1..2b78533 100644 --- a/rollupcreator/Dockerfile +++ b/rollupcreator/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update && \ WORKDIR /workspace # Clone the repository and checkout the specified branch RUN git clone --no-checkout https://github.com/layr-labs/nitro-contracts.git ./ -RUN git checkout a2de1c3ef227bde09b0b6ebfe272c66f441345f9 +RUN git checkout 85aa27d11776bcbadf7f09aebdf71562bcb76e51 # Install Foundry RUN curl -L https://foundry.paradigm.xyz | bash diff --git a/test-node.bash b/test-node.bash index e78a4ff..d2642a8 100755 --- a/test-node.bash +++ b/test-node.bash @@ -7,7 +7,7 @@ BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.0.0-c8db5b1 # This commit matches the v1.2.1 contracts, with additional support for CacheManger deployment. # Once v1.2.2 is released, we can switch to that version. -DEFAULT_NITRO_CONTRACTS_VERSION="4fb6492ba3892863b3b66cd1335b49152cf9d975" +DEFAULT_NITRO_CONTRACTS_VERSION="85aa27d11776bcbadf7f09aebdf71562bcb76e51" DEFAULT_TOKEN_BRIDGE_VERSION="v1.2.1" # Set default versions if not overriden by provided env vars From 99d425358eb9324f70b793ace9db807789e41a9f Mon Sep 17 00:00:00 2001 From: Ethen Pociask Date: Mon, 9 Dec 2024 17:30:13 +0700 Subject: [PATCH 2/4] chore: Bump contracts commit to v2.1.0 - update proxy to v1.6.0 --- docker-compose.yaml | 14 +++++++------- scripts/config.ts | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 29c5653..7de54cc 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -363,17 +363,17 @@ services: eigenda_proxy: container_name: eigenda-proxy - image: ghcr.io/layr-labs/eigenda-proxy:v1.4.1 + image: ghcr.io/layr-labs/eigenda-proxy:v1.6.0 environment: - EIGENDA_PROXY_ADDR=0.0.0.0 - EIGENDA_PROXY_PORT=4242 - - MEMSTORE_ENABLED=false - - MEMSTORE_EXPIRATION=45m - - EIGENDA_PROXY_SIGNER_PRIVATE_KEY_HEX=$PRIVATE_KEY + - EIGENDA_PROXY_MEMSTORE_ENABLED=false + - EIGENDA_PROXY_MEMSTORE_EXPIRATION=45m + - EIGENDA_PROXY_EIGENDA_SIGNER_PRIVATE_KEY_HEX=$PRIVATE_KEY - EIGENDA_PROXY_EIGENDA_DISPERSER_RPC=disperser-holesky.eigenda.xyz:443 - - EIGENDA_PROXY_SERVICE_MANAGER_ADDR=0xD4A7E1Bd8015057293f0D0A557088c286942e84b - - EIGENDA_PROXY_ETH_RPC=https://ethereum-holesky-rpc.publicnode.com - - EIGENDA_PROXY_ETH_CONFIRMATION_DEPTH=0 + - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0xD4A7E1Bd8015057293f0D0A557088c286942e84b + - EIGENDA_PROXY_EIGENDA_ETH_RPC=https://ethereum-holesky-rpc.publicnode.com + - EIGENDA_PROXY_EIGENDA_CONFIRMATION_DEPTH=0 - EIGENDA_PROXY_METRICS_ADDR=0.0.0.0 - EIGENDA_PROXY_METRICS_ENABLED=true - EIGENDA_PROXY_METRICS_PORT=7300 diff --git a/scripts/config.ts b/scripts/config.ts index 217f0d6..b765ba3 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -207,6 +207,7 @@ function writeConfigs(argv: any) { "max-delay": "15m", "wait-for-max-delay": false, "max-eigenda-batch-size": 16_000_000, // 16MB + "enable-eigenda-failover": false, "l1-block-bound": "ignore", "parent-chain-wallet" : { "account": namedAddress("sequencer"), From 2f69e2656474b0ffd756965ed5160f39b034afb5 Mon Sep 17 00:00:00 2001 From: Ethen Pociask Date: Sun, 22 Dec 2024 19:58:17 +0700 Subject: [PATCH 3/4] fix: CI --- .github/workflows/ci.yml | 5 ++++- docker-compose.yaml | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2ea3c2e..4e7a81b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,6 +8,7 @@ on: push: branches: - master + - main - develop @@ -34,4 +35,6 @@ jobs: restore-keys: ${{ runner.os }}-buildx- - name: Startup Nitro testnode - run: ${{ github.workspace }}/.github/workflows/testnode.bash + env: + EIGENDA_SIGNER_PRIVATE_KEY: ${{ secrets.EIGENDA_SIGNER_PRIVATE_KEY }} + run: EIGENDA_SIGNER_PRIVATE_KEY=$EIGENDA_SIGNER_PRIVATE_KEY ${{ github.workspace }}/.github/workflows/testnode.bash diff --git a/docker-compose.yaml b/docker-compose.yaml index 7de54cc..cac38a2 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -363,13 +363,13 @@ services: eigenda_proxy: container_name: eigenda-proxy - image: ghcr.io/layr-labs/eigenda-proxy:v1.6.0 + image: ghcr.io/layr-labs/eigenda-proxy:v1.6.1 environment: - EIGENDA_PROXY_ADDR=0.0.0.0 - EIGENDA_PROXY_PORT=4242 - EIGENDA_PROXY_MEMSTORE_ENABLED=false - EIGENDA_PROXY_MEMSTORE_EXPIRATION=45m - - EIGENDA_PROXY_EIGENDA_SIGNER_PRIVATE_KEY_HEX=$PRIVATE_KEY + - EIGENDA_PROXY_EIGENDA_SIGNER_PRIVATE_KEY_HEX=$EIGENDA_SIGNER_PRIVATE_KEY - EIGENDA_PROXY_EIGENDA_DISPERSER_RPC=disperser-holesky.eigenda.xyz:443 - EIGENDA_PROXY_EIGENDA_SERVICE_MANAGER_ADDR=0xD4A7E1Bd8015057293f0D0A557088c286942e84b - EIGENDA_PROXY_EIGENDA_ETH_RPC=https://ethereum-holesky-rpc.publicnode.com From 4e970716d3e98ed95812aff4499797a8ae273939 Mon Sep 17 00:00:00 2001 From: Ethen Pociask Date: Sun, 22 Dec 2024 20:09:09 +0700 Subject: [PATCH 4/4] fix: CI - bump NITRO NODE version --- test-node.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-node.bash b/test-node.bash index d2642a8..f1fbd20 100755 --- a/test-node.bash +++ b/test-node.bash @@ -2,7 +2,7 @@ set -e -NITRO_NODE_VERSION=ghcr.io/layr-labs/nitro-eigenda:latest +NITRO_NODE_VERSION=ghcr.io/layr-labs/nitro-eigenda:eigenda-v3.2.1-linux-amd64 BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.0.0-c8db5b1 # This commit matches the v1.2.1 contracts, with additional support for CacheManger deployment.