Skip to content

Commit 31225b6

Browse files
Tristan-Wilsonbragaigor
authored andcommitted
Updates for CustomDA config changes
This change supports config changes from OffchainLabs/nitro#3949 - Remove deprecated parent-chain-node-url and sequencer-inbox-address from node.data-availability (no longer valid for node config) - Remove mode field from node.da config (DAConfig no longer has mode) - Move parent-chain-node-url and sequencer-inbox-address in daserver configs (l2_das_committee.json, l2_das_mirror.json) from data-availability.* to parent-chain.{node-url,sequencer-inbox-address}
1 parent fb55e75 commit 31225b6

1 file changed

Lines changed: 8 additions & 10 deletions

File tree

scripts/config.ts

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,6 @@ function writeConfigs(argv: any) {
268268
"enable": true,
269269
"urls": ["http://das-mirror:9877"],
270270
},
271-
// TODO Fix das config to not need this redundant config
272-
"parent-chain-node-url": argv.l1url,
273-
"sequencer-inbox-address": "not_set"
274271
}
275272
},
276273
"execution": {
@@ -292,11 +289,8 @@ function writeConfigs(argv: any) {
292289
},
293290
}
294291

295-
baseConfig.node["data-availability"]["sequencer-inbox-address"] = ethers.utils.hexlify(getChainInfo()[0]["rollup"]["sequencer-inbox"]);
296-
297292
if (argv.referenceDA) {
298293
(baseConfig as any).node["da"] = {
299-
"mode": "external",
300294
"external-provider": {
301295
"enable": true,
302296
"with-writer": false,
@@ -480,8 +474,10 @@ function writeL2DASCommitteeConfig(argv: any) {
480474
"enable": true,
481475
"enable-expiry": true
482476
},
483-
"sequencer-inbox-address": sequencerInboxAddr,
484-
"parent-chain-node-url": argv.l1url
477+
},
478+
"parent-chain": {
479+
"node-url": argv.l1url,
480+
"sequencer-inbox-address": sequencerInboxAddr
485481
},
486482
"enable-rest": true,
487483
"enable-rpc": true,
@@ -504,8 +500,6 @@ function writeL2DASMirrorConfig(argv: any, sequencerInboxAddr: string) {
504500
"enable": true,
505501
"enable-expiry": false
506502
},
507-
"sequencer-inbox-address": sequencerInboxAddr,
508-
"parent-chain-node-url": argv.l1url,
509503
"rest-aggregator": {
510504
"enable": true,
511505
"sync-to-storage": {
@@ -517,6 +511,10 @@ function writeL2DASMirrorConfig(argv: any, sequencerInboxAddr: string) {
517511
"urls": ["http://das-committee-a:9877", "http://das-committee-b:9877"],
518512
}
519513
},
514+
"parent-chain": {
515+
"node-url": argv.l1url,
516+
"sequencer-inbox-address": sequencerInboxAddr
517+
},
520518
"enable-rest": true,
521519
"enable-rpc": false,
522520
"log-level": "INFO",

0 commit comments

Comments
 (0)