Skip to content

Fix --l2-anytrust: bump pinned nitro image and use the renamed AnyTrust binaries #209

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 3 commits into from
Aug 27, 2026
Merged

Fix --l2-anytrust: bump pinned nitro image and use the renamed AnyTrust binaries #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d45fbae
Use proper bin names
pmikolajczyk41 Aug 26, 2026
00349ff
Update node version
pmikolajczyk41 Aug 26, 2026
d46fe1b
Fix config.ts
pmikolajczyk41 Aug 26, 2026
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
8 changes: 4 additions & 4 deletions docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ services:

datool:
image: nitro-node-dev-testnode
entrypoint: /usr/local/bin/datool
entrypoint: /usr/local/bin/anytrusttool
volumes:
- "config:/config"
- "das-committee-a-data:/das-committee-a"
Expand All @@ -400,7 +400,7 @@ services:
das-committee-a:
pid: host # allow debugging
image: nitro-node-dev-testnode
entrypoint: /usr/local/bin/daserver
entrypoint: /usr/local/bin/anytrustserver
ports:
- "127.0.0.1:9876:9876"
- "127.0.0.1:9877:9877"
Expand All @@ -413,7 +413,7 @@ services:
das-committee-b:
pid: host # allow debugging
image: nitro-node-dev-testnode
entrypoint: /usr/local/bin/daserver
entrypoint: /usr/local/bin/anytrustserver
ports:
- "127.0.0.1:8876:9876"
- "127.0.0.1:8877:9877"
Expand All @@ -426,7 +426,7 @@ services:
das-mirror:
pid: host # allow debugging
image: nitro-node-dev-testnode
entrypoint: /usr/local/bin/daserver
entrypoint: /usr/local/bin/anytrustserver
ports:
- "127.0.0.1:7877:9877"
volumes:
Expand Down
23 changes: 12 additions & 11 deletions scripts/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,9 @@ function writeConfigs(argv: any) {
"jwtsecret": valJwtSecret,
}
},
"data-availability": createDataAvailabilityConfig(argv, argv.anytrust)
"da": {
"anytrust": createDataAvailabilityConfig(argv, argv.anytrust)
}
},
"execution": {
"sequencer": {
Expand All @@ -350,13 +352,12 @@ function writeConfigs(argv: any) {
}

if (argv.referenceDA) {
(baseConfig as any).node["da"] = {
"external-provider": {
"enable": true,
"with-writer": false,
"rpc": {
"url": "http://referenceda-provider:9880"
}
// Assign into node.da rather than replacing it, so the anytrust config set above survives.
(baseConfig as any).node["da"]["external-provider"] = {
"enable": true,
"with-writer": false,
"rpc": {
"url": "http://referenceda-provider:9880"
}
}
}
Expand All @@ -382,7 +383,7 @@ function writeConfigs(argv: any) {
simpleConfig.node["batch-poster"]["redis-url"] = ""
simpleConfig.execution["sequencer"].enable = true
if (argv.anytrust) {
simpleConfig.node["data-availability"]["rpc-aggregator"].enable = true
simpleConfig.node["da"]["anytrust"]["rpc-aggregator"].enable = true
}
if (argv.txfiltering) {
applyTxFilteringConfig(simpleConfig);
Expand Down Expand Up @@ -425,7 +426,7 @@ function writeConfigs(argv: any) {
posterConfig.node["seq-coordinator"].enable = true
posterConfig.node["batch-poster"].enable = true
if (argv.anytrust) {
posterConfig.node["data-availability"]["rpc-aggregator"].enable = true
posterConfig.node["da"]["anytrust"]["rpc-aggregator"].enable = true
}
if (argv.referenceDA) {
posterConfig.node["da"]["external-provider"]["with-writer"] = true
Expand All @@ -439,7 +440,7 @@ function writeConfigs(argv: any) {
// use the same account for l2 and l3 staker
// l3Config.node.staker["parent-chain-wallet"].account = namedAddress("l3owner")
l3Config.node["batch-poster"]["parent-chain-wallet"].account = namedAddress("l3sequencer")
l3Config.node["data-availability"] = createDataAvailabilityConfig(argv, false)
l3Config.node["da"]["anytrust"] = createDataAvailabilityConfig(argv, false)
l3Config.chain.id = 333333
const l3ChainInfoFile = path.join(consts.configpath, "l3_chain_info.json")
l3Config.chain["info-files"] = [l3ChainInfoFile]
Expand Down
4 changes: 2 additions & 2 deletions 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.9.6-91bf578}
: ${NITRO_NODE_VERSION:=offchainlabs/nitro-node:v3.11.3-beb2108}
BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.1.0-0e716c8

# nitro-contract workaround for testnode
Expand Down Expand Up @@ -604,7 +604,7 @@ if $l2anytrust; then
das_bls_b=`docker compose run --rm --entrypoint sh datool -c "cat /das-committee-b/keys/das_bls.pub"`

run_script write-l2-das-keyset-config --dasBlsA $das_bls_a --dasBlsB $das_bls_b
docker compose run --rm --entrypoint sh datool -c "/usr/local/bin/datool dumpkeyset --conf.file /config/l2_das_keyset.json | grep 'Keyset: ' | awk '{ printf \"%s\", \$2 }' > /config/l2_das_keyset.hex"
docker compose run --rm --entrypoint sh datool -c "/usr/local/bin/anytrusttool dumpkeyset --conf.file /config/l2_das_keyset.json | grep 'Keyset: ' | awk '{ printf \"%s\", \$2 }' > /config/l2_das_keyset.hex"
run_script set-valid-keyset

anytrustNodeConfigLine="--anytrust --dasBlsA $das_bls_a --dasBlsB $das_bls_b"
Expand Down
Loading