Skip to content

Sync master and release branches #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joshuacolvin0 merged 6 commits into from
Nov 19, 2025
Merged

Sync master and release branches #165

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
012636c
update nitro node version to v3.9.0
ganeshvanahalli Nov 13, 2025
3db4a92
update geth port
ganeshvanahalli Nov 13, 2025
4a39ee5
undo port change and dont enable smart contract wallet
ganeshvanahalli Nov 13, 2025
9b0b597
Merge branch 'master' into sync-master-release-13nov2025
ganeshvanahalli Nov 14, 2025
e498979
add delays so that SCW creation tx is processed on parent chain
ganeshvanahalli Nov 14, 2025
6d23f71
update nitro release
ganeshvanahalli Nov 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion test-node.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -eu

NITRO_NODE_VERSION=offchainlabs/nitro-node:v3.8.0-62c0aa7
NITRO_NODE_VERSION=offchainlabs/nitro-node:v3.9.2-52e8959
BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.1.0-0e716c8

# nitro-contract workaround for testnode
Expand Down Expand Up @@ -600,6 +600,7 @@ if $force_init; then

echo == Funding l2 funnel and dev key
docker compose up --wait $INITIAL_SEQ_NODES
sleep 45 # in case we need to create a smart contract wallet, allow for parent chain to recieve the contract creation tx and process it
run_script bridge-funds --ethamount 100000 --wait
run_script send-l2 --ethamount 100 --to l2owner --wait
rollupAddress=`docker compose run --rm --entrypoint sh poster -c "jq -r '.[0].rollup.rollup' /config/deployed_chain_info.json | tail -n 1 | tr -d '\r\n'"`
Expand Down Expand Up @@ -691,6 +692,7 @@ if $force_init; then

echo == Funding l3 funnel and dev key
docker compose up --wait l3node sequencer
sleep 45 # in case we need to create a smart contract wallet, allow for parent chain to recieve the contract creation tx and process it

if $l3_token_bridge; then
echo == Deploying L2-L3 token bridge
Expand Down