diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 921fa446a..e13a98bab 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -34,9 +34,11 @@ jobs: uses: ./.github/actions/setup - name: Run e2e tests run: | - git clone https://github.com/edgeandnode/nitro - pushd nitro + git clone https://github.com/OffchainLabs/nitro-testnode/ + pushd nitro-testnode + git checkout c47cb8c643bc8e63ff096f7f88f9152064d1532a git submodule update --init --recursive - ./test-node.bash --init --no-blockscout --detach + sed -i'' -e 's/^\(.*dev.period.*\)/# \1/' docker-compose.yaml + ./test-node.bash --init --batchposters 0 --redundantsequencers 0 --detach popd L1_NETWORK=localnitrol1 L2_NETWORK=localnitrol2 yarn test:e2e diff --git a/packages/contracts/tasks/deployment/nitro.ts b/packages/contracts/tasks/deployment/nitro.ts index 7c89bb08b..b5819f26a 100644 --- a/packages/contracts/tasks/deployment/nitro.ts +++ b/packages/contracts/tasks/deployment/nitro.ts @@ -21,7 +21,7 @@ task(TASK_NITRO_FUND_ACCOUNTS, 'Funds protocol accounts on Arbitrum Nitro testno // - L1 > https://github.com/OffchainLabs/nitro/blob/01c558c06ad9cbaa083bebe3e51960e195c3fd6b/test-node.bash#L136 // - L2 > https://github.com/OffchainLabs/nitro/blob/01c558c06ad9cbaa083bebe3e51960e195c3fd6b/testnode-scripts/config.ts#L22 const genesisAccountPrivateKey = - taskArgs.privateKey ?? 'e887f7d17d07cc7b8004053fb8826f6657084e88904bb61590e498ca04704cf2' + taskArgs.privateKey ?? 'b6b15c8cb491557369f3c7d2c287b053eb229daa9c22138887752191c9520659' const genesisAccount = new hre.ethers.Wallet(genesisAccountPrivateKey) // Get protocol accounts @@ -95,7 +95,7 @@ subtask(TASK_NITRO_FETCH_DEPLOYMENT_FILE, 'Fetches nitro deployment file from a .setAction(async (taskArgs) => { console.log(`Attempting to fetch deployment file from testnode...`) - const command = `docker exec $(docker ps -qf "name=sequencer") cat /workspace/localNetwork.json > ${taskArgs.deploymentFile}` + const command = `docker container cp $(docker ps -alqf "name=tokenbridge" --format "{{.ID}}"):/workspace/localNetwork.json .` const stdOut = execSync(command) console.log(stdOut.toString())