Skip to content

Commit 68a8bf0

Browse files
Only update arbos version to 60 for tx filtering tests
1 parent ada0571 commit 68a8bf0

2 files changed

Lines changed: 15 additions & 7 deletions

File tree

scripts/config.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ function writeL2ChainConfig(argv: any) {
473473
"EnableArbOS": true,
474474
"AllowDebugPrecompiles": true,
475475
"DataAvailabilityCommittee": argv.anytrust,
476-
"InitialArbOSVersion": 60,
476+
"InitialArbOSVersion": argv.txfiltering ? 60 : 40,
477477
"InitialChainOwner": argv.l2owner,
478478
"GenesisBlockNum": 0
479479
}
@@ -506,7 +506,7 @@ function writeL3ChainConfig(argv: any) {
506506
"EnableArbOS": true,
507507
"AllowDebugPrecompiles": true,
508508
"DataAvailabilityCommittee": false,
509-
"InitialArbOSVersion": 60,
509+
"InitialArbOSVersion": 40,
510510
"InitialChainOwner": argv.l2owner,
511511
"GenesisBlockNum": 0
512512
}
@@ -748,6 +748,11 @@ export const writeL2ChainConfigCommand = {
748748
boolean: true,
749749
describe: "enable anytrust in chainconfig",
750750
default: false
751+
},
752+
txfiltering: {
753+
boolean: true,
754+
describe: "enable transaction filtering (requires ArbOS version 60)",
755+
default: false
751756
}
752757
},
753758
handler: (argv: any) => {

test-node.bash

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -523,14 +523,17 @@ if $force_init; then
523523

524524
l2ownerAddress=`run_script print-address --account l2owner | tail -n 1 | tr -d '\r\n'`
525525

526+
l2ChainConfigFlags=""
526527
if $l2anytrust; then
527-
echo "== Writing l2 chain config (anytrust enabled)"
528-
run_script --l2owner $l2ownerAddress write-l2-chain-config --anytrust
529-
else
530-
echo "== Writing l2 chain config"
531-
run_script --l2owner $l2ownerAddress write-l2-chain-config
528+
l2ChainConfigFlags="$l2ChainConfigFlags --anytrust"
529+
fi
530+
if $l2txfiltering; then
531+
l2ChainConfigFlags="$l2ChainConfigFlags --txfiltering"
532532
fi
533533

534+
echo "== Writing l2 chain config"
535+
run_script --l2owner $l2ownerAddress write-l2-chain-config $l2ChainConfigFlags
536+
534537
sequenceraddress=`run_script print-address --account sequencer | tail -n 1 | tr -d '\r\n'`
535538
l2ownerKey=`run_script print-private-key --account l2owner | tail -n 1 | tr -d '\r\n'`
536539
wasmroot=`docker compose run --rm --entrypoint sh sequencer -c "cat /home/user/target/machines/latest/module-root.txt"`

0 commit comments

Comments
 (0)