From e41e324b9544925b7ed5637cfc2d90df18a4c0e0 Mon Sep 17 00:00:00 2001 From: Chris Buckland Date: Mon, 2 Sep 2024 16:00:49 +0100 Subject: [PATCH 01/12] Test commit --- .github/workflows/testnode.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/testnode.bash b/.github/workflows/testnode.bash index 1e4140c4..157d4cc8 100755 --- a/.github/workflows/testnode.bash +++ b/.github/workflows/testnode.bash @@ -18,6 +18,7 @@ while [[ $# -gt 0 ]]; do esac done + # TODO once develop is merged into nitro-contract's master, remove the NITRO_CONTRACTS_BRANCH env var if [ "$pos" = true ]; then echo "Running with --pos" From ab44f67a7da6e4606733dca5059f4b4435a9804c Mon Sep 17 00:00:00 2001 From: Chris Buckland Date: Mon, 2 Sep 2024 16:02:21 +0100 Subject: [PATCH 02/12] Test passing all the args through --- .github/workflows/testnode.bash | 40 +++++++++++++++++---------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/.github/workflows/testnode.bash b/.github/workflows/testnode.bash index 157d4cc8..b03557ae 100755 --- a/.github/workflows/testnode.bash +++ b/.github/workflows/testnode.bash @@ -5,27 +5,29 @@ # Start the test node and get PID, to terminate it once send-l2 is done. cd ${GITHUB_WORKSPACE} -while [[ $# -gt 0 ]]; do - case $1 in - --pos) - pos=true - shift - ;; - *) - echo "Unknown option $1" - exit 1 - ;; - esac -done +# while [[ $# -gt 0 ]]; do +# case $1 in +# --pos) +# pos=true +# shift +# ;; +# *) +# echo "Unknown option $1" +# exit 1 +# ;; +# esac +# done -# TODO once develop is merged into nitro-contract's master, remove the NITRO_CONTRACTS_BRANCH env var -if [ "$pos" = true ]; then - echo "Running with --pos" - ./test-node.bash --init-force --l3node --no-simple --detach --pos -else - ./test-node.bash --init-force --l3node --no-simple --detach -fi +./test-node.bash "$@" + +# # TODO once develop is merged into nitro-contract's master, remove the NITRO_CONTRACTS_BRANCH env var +# if [ "$pos" = true ]; then +# echo "Running with --pos" +# ./test-node.bash --init-force --l3node --no-simple --detach --pos +# else +# ./test-node.bash --init-force --l3node --no-simple --detach +# fi if [ $? -ne 0 ]; then echo "test-node.bash failed" From 21b591328283b7d2854be48026bcd2624bf8016d Mon Sep 17 00:00:00 2001 From: Chris Buckland Date: Mon, 2 Sep 2024 16:08:07 +0100 Subject: [PATCH 03/12] Test tokenbridge and l3node startups --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 35dc8f60..efd1c3bb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,6 +16,8 @@ jobs: strategy: matrix: pos: [true, false] + l3node: [true, false] + tokenbridge: [true, false] steps: - name: Checkout @@ -36,4 +38,4 @@ jobs: restore-keys: ${{ runner.os }}-buildx- - name: Startup Nitro testnode - run: ${{ github.workspace }}/.github/workflows/testnode.bash ${{ matrix.pos == true && '--pos' || '' }} + run: ${{ github.workspace }}/.github/workflows/testnode.bash --init-force ${{ matrix.l3node == true && '--l3node' || '' }} ${{ matrix.tokenbridge == true && '--tokenbridge' || '--no-tokenbridge' }} --no-simple --detach ${{ matrix.pos == true && '--pos' || '' }} From cf7feed0d69263430dece118439dc37187ed6596 Mon Sep 17 00:00:00 2001 From: Chris Buckland Date: Mon, 2 Sep 2024 16:12:05 +0100 Subject: [PATCH 04/12] Changed the runner names --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index efd1c3bb..924fdf4b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,9 +15,9 @@ jobs: runs-on: ubuntu-8 strategy: matrix: - pos: [true, false] - l3node: [true, false] - tokenbridge: [true, false] + pos: [pos, no-pos] + l3node: [l3node, no-l3node] + tokenbridge: [tokenbridge, no-tokenbridge] steps: - name: Checkout @@ -38,4 +38,4 @@ jobs: restore-keys: ${{ runner.os }}-buildx- - name: Startup Nitro testnode - run: ${{ github.workspace }}/.github/workflows/testnode.bash --init-force ${{ matrix.l3node == true && '--l3node' || '' }} ${{ matrix.tokenbridge == true && '--tokenbridge' || '--no-tokenbridge' }} --no-simple --detach ${{ matrix.pos == true && '--pos' || '' }} + run: ${{ github.workspace }}/.github/workflows/testnode.bash --init-force ${{ matrix.l3node == 'l3node' && '--l3node' || '' }} ${{ matrix.tokenbridge == 'tokenbridge' && '--tokenbridge' || '--no-tokenbridge' }} --no-simple --detach ${{ matrix.pos == 'pos' && '--pos' || '' }} From 432f0eea884e49549f1476ee1b948ab6d38156c5 Mon Sep 17 00:00:00 2001 From: Chris Buckland Date: Mon, 2 Sep 2024 16:12:38 +0100 Subject: [PATCH 05/12] Cleanup in ci bash --- .github/workflows/testnode.bash | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/.github/workflows/testnode.bash b/.github/workflows/testnode.bash index b03557ae..33c6b551 100755 --- a/.github/workflows/testnode.bash +++ b/.github/workflows/testnode.bash @@ -5,30 +5,8 @@ # Start the test node and get PID, to terminate it once send-l2 is done. cd ${GITHUB_WORKSPACE} -# while [[ $# -gt 0 ]]; do -# case $1 in -# --pos) -# pos=true -# shift -# ;; -# *) -# echo "Unknown option $1" -# exit 1 -# ;; -# esac -# done - - ./test-node.bash "$@" -# # TODO once develop is merged into nitro-contract's master, remove the NITRO_CONTRACTS_BRANCH env var -# if [ "$pos" = true ]; then -# echo "Running with --pos" -# ./test-node.bash --init-force --l3node --no-simple --detach --pos -# else -# ./test-node.bash --init-force --l3node --no-simple --detach -# fi - if [ $? -ne 0 ]; then echo "test-node.bash failed" docker compose logs --tail=1000 From a809fee5356f71ecd5d496316e59940581dca647 Mon Sep 17 00:00:00 2001 From: Chris Buckland Date: Mon, 2 Sep 2024 16:44:35 +0100 Subject: [PATCH 06/12] Dont test for l3 tx if no l3node --- .github/workflows/testnode.bash | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/testnode.bash b/.github/workflows/testnode.bash index 33c6b551..d89bfd14 100755 --- a/.github/workflows/testnode.bash +++ b/.github/workflows/testnode.bash @@ -13,9 +13,15 @@ if [ $? -ne 0 ]; then exit 1 fi + START=$(date +%s) L2_TRANSACTION_SUCCEEDED=false -L3_TRANSACTION_SUCCEEDED=false +L3_TRANSACTION_SUCCEEDED=true +for arg in "$@"; do + if [ "$arg" = "--l3node" ]; then + L3_TRANSACTION_SUCCEEDED=false + fi +done SUCCEEDED=false while true; do From daaae0de5b62742d8330929a3aabfbdb2f89546c Mon Sep 17 00:00:00 2001 From: Chris Buckland Date: Mon, 2 Sep 2024 16:45:52 +0100 Subject: [PATCH 07/12] Added l3 node comment --- .github/workflows/testnode.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/testnode.bash b/.github/workflows/testnode.bash index d89bfd14..83fdd86f 100755 --- a/.github/workflows/testnode.bash +++ b/.github/workflows/testnode.bash @@ -16,6 +16,7 @@ fi START=$(date +%s) L2_TRANSACTION_SUCCEEDED=false +# if we're not running an l3node then we just set l3 to success by default L3_TRANSACTION_SUCCEEDED=true for arg in "$@"; do if [ "$arg" = "--l3node" ]; then From c7b3f6eb25ac231f7656288166f6df6c6b43ce73 Mon Sep 17 00:00:00 2001 From: Chris Buckland Date: Wed, 18 Sep 2024 12:25:28 +0200 Subject: [PATCH 08/12] Added some testing for l3node with custom fee token --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 924fdf4b..34126b32 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: pos: [pos, no-pos] - l3node: [l3node, no-l3node] + l3node: [l3node, l3node6, no-l3node] tokenbridge: [tokenbridge, no-tokenbridge] steps: @@ -38,4 +38,4 @@ jobs: restore-keys: ${{ runner.os }}-buildx- - name: Startup Nitro testnode - run: ${{ github.workspace }}/.github/workflows/testnode.bash --init-force ${{ matrix.l3node == 'l3node' && '--l3node' || '' }} ${{ matrix.tokenbridge == 'tokenbridge' && '--tokenbridge' || '--no-tokenbridge' }} --no-simple --detach ${{ matrix.pos == 'pos' && '--pos' || '' }} + run: ${{ github.workspace }}/.github/workflows/testnode.bash --init-force ${{ (matrix.l3node == 'l3node' && '--l3node') || (matrix.l3node == 'l3node6' && '--l3node --l3-fee-token --l3-token-bridge --l3-fee-token-decimals 6') || '' }} ${{ matrix.tokenbridge == 'tokenbridge' && '--tokenbridge' || '--no-tokenbridge' }} --no-simple --detach ${{ matrix.pos == 'pos' && '--pos' || '' }} From 97200666e5a9301138c4634f062e9a6dcb7acfd9 Mon Sep 17 00:00:00 2001 From: Chris Buckland Date: Wed, 18 Sep 2024 12:28:55 +0200 Subject: [PATCH 09/12] Rename token6 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 34126b32..fd2eb2a4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: pos: [pos, no-pos] - l3node: [l3node, l3node6, no-l3node] + l3node: [l3node, l3node-token-6, no-l3node] tokenbridge: [tokenbridge, no-tokenbridge] steps: @@ -38,4 +38,4 @@ jobs: restore-keys: ${{ runner.os }}-buildx- - name: Startup Nitro testnode - run: ${{ github.workspace }}/.github/workflows/testnode.bash --init-force ${{ (matrix.l3node == 'l3node' && '--l3node') || (matrix.l3node == 'l3node6' && '--l3node --l3-fee-token --l3-token-bridge --l3-fee-token-decimals 6') || '' }} ${{ matrix.tokenbridge == 'tokenbridge' && '--tokenbridge' || '--no-tokenbridge' }} --no-simple --detach ${{ matrix.pos == 'pos' && '--pos' || '' }} + run: ${{ github.workspace }}/.github/workflows/testnode.bash --init-force ${{ (matrix.l3node == 'l3node' && '--l3node') || (matrix.l3node == 'l3node-token-6' && '--l3node --l3-fee-token --l3-token-bridge --l3-fee-token-decimals 6') || '' }} ${{ matrix.tokenbridge == 'tokenbridge' && '--tokenbridge' || '--no-tokenbridge' }} --no-simple --detach ${{ matrix.pos == 'pos' && '--pos' || '' }} From c09fa7525277510c5354fd649856cd175a744afa Mon Sep 17 00:00:00 2001 From: Chris Buckland Date: Wed, 18 Sep 2024 13:23:44 +0200 Subject: [PATCH 10/12] Set lower transfer amounts --- .github/workflows/testnode.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/testnode.bash b/.github/workflows/testnode.bash index 83fdd86f..be7e6961 100755 --- a/.github/workflows/testnode.bash +++ b/.github/workflows/testnode.bash @@ -27,14 +27,14 @@ SUCCEEDED=false while true; do if [ "$L2_TRANSACTION_SUCCEEDED" = false ]; then - if ${GITHUB_WORKSPACE}/test-node.bash script send-l2 --ethamount 100 --to user_l2user --wait; then + if ${GITHUB_WORKSPACE}/test-node.bash script send-l2 --ethamount 2 --to user_l2user --wait; then echo "Sending l2 transaction succeeded" L2_TRANSACTION_SUCCEEDED=true fi fi if [ "$L3_TRANSACTION_SUCCEEDED" = false ]; then - if ${GITHUB_WORKSPACE}/test-node.bash script send-l3 --ethamount 100 --to user_l3user --wait; then + if ${GITHUB_WORKSPACE}/test-node.bash script send-l3 --ethamount 2 --to user_l3user --wait; then echo "Sending l3 transaction succeeded" L3_TRANSACTION_SUCCEEDED=true fi From 20b5d14a0dd6d3ec1132b86a9522559311f1bb78 Mon Sep 17 00:00:00 2001 From: Lee Bousfield Date: Tue, 24 Sep 2024 15:15:20 -0500 Subject: [PATCH 11/12] Update to nitro v3.2.1 --- blockscout | 2 +- scripts/config.ts | 2 +- test-node.bash | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/blockscout b/blockscout index a9782723..cca5c1a8 160000 --- a/blockscout +++ b/blockscout @@ -1 +1 @@ -Subproject commit a9782723bcaefdfa44fd353474903b1b457b132d +Subproject commit cca5c1a8442ff8a34c39a957ab7e9e3381af911b diff --git a/scripts/config.ts b/scripts/config.ts index 6edded2c..a131fae9 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -344,7 +344,7 @@ function writeL2ChainConfig(argv: any) { "EnableArbOS": true, "AllowDebugPrecompiles": true, "DataAvailabilityCommittee": false, - "InitialArbOSVersion": 31, + "InitialArbOSVersion": 32, "InitialChainOwner": argv.l2owner, "GenesisBlockNum": 0 } diff --git a/test-node.bash b/test-node.bash index f18e5d07..0e4b0e4c 100755 --- a/test-node.bash +++ b/test-node.bash @@ -2,7 +2,7 @@ set -eu -NITRO_NODE_VERSION=offchainlabs/nitro-node:v3.1.0-7d1d84c-dev +NITRO_NODE_VERSION=offchainlabs/nitro-node:v3.2.1-d81324d BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.1.0-0e716c8 DEFAULT_NITRO_CONTRACTS_VERSION="v2.0.0" From 72141dd495ad965aa2a23723ea3e755037903ad7 Mon Sep 17 00:00:00 2001 From: Lee Bousfield Date: Tue, 24 Sep 2024 17:28:51 -0500 Subject: [PATCH 12/12] Update blockscout pin to arbitrum branch --- blockscout | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blockscout b/blockscout index cca5c1a8..60d60cb3 160000 --- a/blockscout +++ b/blockscout @@ -1 +1 @@ -Subproject commit cca5c1a8442ff8a34c39a957ab7e9e3381af911b +Subproject commit 60d60cb331b0289d39c7480379a14a86100af37a