Skip to content

add flag to set max code and init code size #124

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

Open
wants to merge 3 commits into
base: release
Choose a base branch
from
Open

add flag to set max code and init code size #124

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
dfdb02f
add flag to set max code and init code size
b2b-hbb Apr 3, 2025
2ba32f3
refactor flag to not use snake casing and add documentation
b2b-hbb Apr 4, 2025
1b254e8
add escape
b2b-hbb Apr 4, 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
47 changes: 45 additions & 2 deletions scripts/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,8 @@ function writeConfigs(argv: any) {
l3Config.node["delayed-sequencer"]["use-merge-finality"] = false
l3Config.node["batch-poster"].enable = true
l3Config.node["batch-poster"]["redis-url"] = ""
l3Config.node["delayed-sequencer"]["MaxCodeSize"] = argv.maxCodeSize
l3Config.node["delayed-sequencer"]["MaxInitCodeSize"] = argv.maxInitCodeSize
fs.writeFileSync(path.join(consts.configpath, "l3node_config.json"), JSON.stringify(l3Config))

let validationNodeConfig = JSON.parse(JSON.stringify({
Expand Down Expand Up @@ -397,7 +399,9 @@ function writeL2ChainConfig(argv: any) {
"DataAvailabilityCommittee": argv.anytrust,
"InitialArbOSVersion": 32,
"InitialChainOwner": argv.l2owner,
"GenesisBlockNum": 0
"GenesisBlockNum": 0,
"MaxCodeSize": argv.maxCodeSize,
"MaxInitCodeSize": argv.maxInitCodeSize
}
}
const l2ChainConfigJSON = JSON.stringify(l2ChainConfig)
Expand Down Expand Up @@ -430,7 +434,9 @@ function writeL3ChainConfig(argv: any) {
"DataAvailabilityCommittee": false,
"InitialArbOSVersion": 31,
"InitialChainOwner": argv.l2owner,
"GenesisBlockNum": 0
"GenesisBlockNum": 0,
"MaxCodeSize": argv.maxCodeSize,
"MaxInitCodeSize": argv.maxInitCodeSize
}
}
const l3ChainConfigJSON = JSON.stringify(l3ChainConfig)
Expand Down Expand Up @@ -548,6 +554,16 @@ export const writeConfigCommand = {
describe: "DAS committee member B BLS pub key",
default: ""
},
maxCodeSize: {
number: true,
describe: "maximum code size for contracts",
default: 24576
},
maxInitCodeSize: {
number: true,
describe: "maximum init code size for contract creation",
default: 49152
},

},
handler: (argv: any) => {
Expand Down Expand Up @@ -580,6 +596,16 @@ export const writeL2ChainConfigCommand = {
describe: "enable anytrust in chainconfig",
default: false
},
maxCodeSize: {
number: true,
describe: "maximum code size for contracts",
default: 24576
},
maxInitCodeSize: {
number: true,
describe: "maximum init code size for contract creation",
default: 49152
}
},
handler: (argv: any) => {
writeL2ChainConfig(argv)
Expand All @@ -589,6 +615,23 @@ export const writeL2ChainConfigCommand = {
export const writeL3ChainConfigCommand = {
command: "write-l3-chain-config",
describe: "writes l3 chain config file",
builder: {
anytrust: {
boolean: true,
describe: "enable anytrust in chainconfig",
default: false
},
maxCodeSize: {
number: true,
describe: "maximum code size for contracts",
default: 24576
},
maxInitCodeSize: {
number: true,
describe: "maximum init code size for contract creation",
default: 49152
}
},
handler: (argv: any) => {
writeL3ChainConfig(argv)
}
Expand Down
20 changes: 17 additions & 3 deletions test-node.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ devprivkey=b6b15c8cb491557369f3c7d2c287b053eb229daa9c22138887752191c9520659
l1chainid=1337
simple=true
l2anytrust=false
maxCodeSize=24576
maxInitCodeSize=49152

# Use the dev versions of nitro/blockscout
dev_nitro=false
Expand Down Expand Up @@ -278,6 +280,16 @@ while [[ $# -gt 0 ]]; do
simple=false
shift
;;
--max-code-size)
maxCodeSize="$2"
shift
shift
;;
--max-init-code-size)
maxInitCodeSize="$2"
shift
shift
;;
*)
echo Usage: $0 \[OPTIONS..]
echo $0 script [SCRIPT-ARGS]
Expand All @@ -294,6 +306,8 @@ while [[ $# -gt 0 ]]; do
echo --l3-fee-token-decimals Number of decimals to use for custom fee token. Only valid if also '--l3-fee-token' is provided
echo --l3-token-bridge Deploy L2-L3 token bridge. Only valid if also '--l3node' is provided
echo --l2-anytrust run the L2 as an AnyTrust chain
echo --max-code-size Maximum size of contract code in bytes \(default: 24576\)
echo --max-init-code-size Maximum size of contract initialization code in bytes \(default: 49152\)
echo --batchposters batch posters [0-3]
echo --redundantsequencers redundant sequencers [0-3]
echo --detach detach from nodes after running them
Expand Down Expand Up @@ -472,10 +486,10 @@ if $force_init; then

if $l2anytrust; then
echo "== Writing l2 chain config (anytrust enabled)"
docker compose run scripts --l2owner $l2ownerAddress write-l2-chain-config --anytrust
docker compose run scripts --l2owner $l2ownerAddress write-l2-chain-config --anytrust --maxCodeSize $maxCodeSize --maxInitCodeSize $maxInitCodeSize
else
echo == Writing l2 chain config
docker compose run scripts --l2owner $l2ownerAddress write-l2-chain-config
docker compose run scripts --l2owner $l2ownerAddress write-l2-chain-config --maxCodeSize $maxCodeSize --maxInitCodeSize $maxInitCodeSize
fi

sequenceraddress=`docker compose run scripts print-address --account sequencer | tail -n 1 | tr -d '\r\n'`
Expand Down Expand Up @@ -583,7 +597,7 @@ if $force_init; then
echo == Writing l3 chain config
l3owneraddress=`docker compose run scripts print-address --account l3owner | tail -n 1 | tr -d '\r\n'`
echo l3owneraddress $l3owneraddress
docker compose run scripts --l2owner $l3owneraddress write-l3-chain-config
docker compose run scripts --l2owner $l3owneraddress write-l3-chain-config --maxCodeSize $maxCodeSize --maxInitCodeSize $maxInitCodeSize

EXTRA_L3_DEPLOY_FLAG=""
if $l3_custom_fee_token; then
Expand Down