tidy some jsonnet configs

Author: gosunuts

init/.deploy

@@ -0,0 +1,55 @@
+{
+   "baseFeeVaultMinimumWithdrawalAmount": "0x8ac7230489e80000",
+   "baseFeeVaultRecipient": "ADMIN_ADDRESS",
+   "baseFeeVaultWithdrawalNetwork": 0,
+   "batchInboxAddress": "0xff00000000000000000000000000000000000000",
+   "batchSenderAddress": "BATCHER_ADDRESS",
+   "channelTimeoutBedrock": 300,
+   "channelTimeoutGranite": 0,
+   "daBondSize": 1000000,
+   "daChallengeWindow": 16,
+   "daCommitmentType": "KeccakCommitment",
+   "daResolveWindow": 16,
+   "daResolverRefundPercentage": 0,
+   "eip1559Denominator": 50,
+   "eip1559DenominatorCanyon": 250,
+   "eip1559Elasticity": 6,
+   "enableGovernance": false,
+   "finalSystemOwner": "ADMIN_ADDRESS",
+   "finalizationPeriodSeconds": 12,
+   "fundDevAccounts": false,
+   "gasPriceOracleBaseFeeScalar": 1368,
+   "gasPriceOracleBlobBaseFeeScalar": 810949,
+   "gasPriceOracleOverhead": 2100,
+   "gasPriceOracleScalar": 1000000,
+   "governanceTokenName": "NotApplicable",
+   "governanceTokenSymbol": "NA",
+   "l1ChainID": "L1_CHAIN_ID",
+   "l1FeeVaultMinimumWithdrawalAmount": "0x8ac7230489e80000",
+   "l1FeeVaultRecipient": "ADMIN_ADDRESS",
+   "l1FeeVaultWithdrawalNetwork": 0,
+   "l1StartingBlockTag": "blockhash",
+   "l2BlockTime": "timestamp",
+   "l2ChainID": "L2_CHAIN_ID",
+   "l2GenesisBlockBaseFeePerGas": "0x3b9aca00",
+   "l2GenesisBlockGasLimit": "0x1c9c380",
+   "l2GenesisCanyonTimeOffset": "0x0",
+   "l2GenesisDeltaTimeOffset": "0x0",
+   "l2GenesisEcotoneTimeOffset": "0x0",
+   "l2GenesisFjordTimeOffset": "0x0",
+   "l2GenesisGraniteTimeOffset": "0x0",
+   "l2GenesisInteropTimeOffset": "0x0",
+   "l2GenesisRegolithTimeOffset": "0x0",
+   "maxSequencerDrift": 600,
+   "p2pSequencerAddress": "SEQUENCER_ADDRESS",
+   "proxyAdminOwner": "ADMIN_ADDRESS",
+   "sequencerFeeVaultMinimumWithdrawalAmount": "0x8ac7230489e80000",
+   "sequencerFeeVaultRecipient": "ADMIN_ADDRESS",
+   "sequencerFeeVaultWithdrawalNetwork": 0,
+   "sequencerWindowSize": 3600,
+   "systemConfigStartBlock": 0,
+   "useCustomGasToken": false,
+   "useFaultProof": false,
+   "useInterop": false,
+   "usePlasma": false
+}

init/3_config.jsonnet

@@ -34,27 +34,27 @@ local DevDeployConfig =
   default("fundDevAccounts", "fundDevAccounts", false);
 
 local L2GenesisBlockDeployConfig =
-  default("l2GenesisBlockNonce", "l2GenesisBlockNonce", 0)
+  optional("l2GenesisBlockNonce", "l2GenesisBlockNonce")
   + default("l2GenesisBlockGasLimit", "l2GenesisBlockGasLimit", "0x1c9c380") // 30_000_000
-  + default("l2GenesisBlockDifficulty", "l2GenesisBlockDifficulty", "0x0")
-  + default("l2GenesisBlockMixHash", "l2GenesisBlockMixHash", "0x0000000000000000000000000000000000000000000000000000000000000000")
-  + default("l2GenesisBlockNumber", "l2GenesisBlockNumber", 0)
-  + default("l2GenesisBlockGasUsed", "l2GenesisBlockGasUsed", 0)
-  + default("l2GenesisBlockParentHash", "l2GenesisBlockParentHash", "0x0000000000000000000000000000000000000000000000000000000000000000")
+  + optional("l2GenesisBlockDifficulty", "l2GenesisBlockDifficulty")
+  + optional("l2GenesisBlockMixHash", "l2GenesisBlockMixHash")
+  + optional("l2GenesisBlockNumber", "l2GenesisBlockNumber")
+  + optional("l2GenesisBlockGasUsed", "l2GenesisBlockGasUsed")
+  + optional("l2GenesisBlockParentHash", "l2GenesisBlockParentHash")
   + default("l2GenesisBlockBaseFeePerGas", "l2GenesisBlockBaseFeePerGas", "0x3b9aca00") // 1_000_000_000
-  + default("l2GenesisBlockExtraData", "l2GenesisBlockExtraData", "0x426544524f434b");
+  + optional("l2GenesisBlockExtraData", "l2GenesisBlockExtraData");
 
 local OwnershipDeployConfig =
   require("proxyAdminOwner", "ADMIN_ADDRESS")
   + require("finalSystemOwner", "ADMIN_ADDRESS");
 
 local L2VaultsDeployConfig =
-  default("baseFeeVaultRecipient", "ADMIN_ADDRESS", "0x0000000000000000000000000000000000000000")
-  + default("l1FeeVaultRecipient", "ADMIN_ADDRESS", "0x0000000000000000000000000000000000000000")
-  + default("sequencerFeeVaultRecipient", "ADMIN_ADDRESS", "0x0000000000000000000000000000000000000000")
-  + default("baseFeeVaultMinimumWithdrawalAmount", "baseFeeVaultMinimumWithdrawalAmount", "0x8ac7230489e80000")
-  + default("l1FeeVaultMinimumWithdrawalAmount", "l1FeeVaultMinimumWithdrawalAmount", "0x8ac7230489e80000")
-  + default("sequencerFeeVaultMinimumWithdrawalAmount", "sequencerFeeVaultMinimumWithdrawalAmount", "0x8ac7230489e80000")
+  require("baseFeeVaultRecipient", "ADMIN_ADDRESS")
+  + require("l1FeeVaultRecipient", "ADMIN_ADDRESS")
+  + require("sequencerFeeVaultRecipient", "ADMIN_ADDRESS")
+  + default("baseFeeVaultMinimumWithdrawalAmount", "baseFeeVaultMinimumWithdrawalAmount", "0x8ac7230489e80000") # 10000000000000000000
+  + default("l1FeeVaultMinimumWithdrawalAmount", "l1FeeVaultMinimumWithdrawalAmount", "0x8ac7230489e80000") # 10000000000000000000
+  + default("sequencerFeeVaultMinimumWithdrawalAmount", "sequencerFeeVaultMinimumWithdrawalAmount", "0x8ac7230489e80000") #10000000000000000000
   + default("baseFeeVaultWithdrawalNetwork", "baseFeeVaultWithdrawalNetwork", 0)
   + default("l1FeeVaultWithdrawalNetwork", "l1FeeVaultWithdrawalNetwork", 0)
   + default("sequencerFeeVaultWithdrawalNetwork", "sequencerFeeVaultWithdrawalNetwork", 0);

init/3_sample.sh

@@ -1,10 +1,10 @@
 jsonnet ./3_config.jsonnet --ext-code config='{
-  ADMIN_ADDRESS: "$ADMIN_ADDRESS",
-  BATCHER_ADDRESS: "$BATCHER_ADDRESS",
-  SEQUENCER_ADDRESS: "$SEQUENCER_ADDRESS",
-  TIMESTAMP: "$timestamp",
-  l1ChainID: "$L1_CHAIN_ID",
-  l2ChainID: "$L2_CHAIN_ID",
-  l2BlockTime: "$timestamp",
-  l1StartingBlockTag: "$blockhash",
+  ADMIN_ADDRESS: "ADMIN_ADDRESS",
+  BATCHER_ADDRESS: "BATCHER_ADDRESS",
+  SEQUENCER_ADDRESS: "SEQUENCER_ADDRESS",
+  TIMESTAMP: "timestamp",
+  l1ChainID: "L1_CHAIN_ID",
+  l2ChainID: "L2_CHAIN_ID",
+  l2BlockTime: "timestamp",
+  l1StartingBlockTag: "blockhash",
 }' > .deploy