tidy jsonnet code

Author: gosunuts

init/.deploy

@@ -52,9 +52,9 @@ local L2VaultsDeployConfig =
   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("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);
@@ -97,7 +97,7 @@ local UpgradeScheduleDeployConfig =
 local L2CoreDeployConfig =
   require("l1ChainID", "l1ChainID")
   + require("l2ChainID", "l2ChainID")
-  + require("l2BlockTime", "l2BlockTime")
+  + require("l2BlockTime", "TIMESTAMP")
   + default("finalizationPeriodSeconds", "finalizationPeriodSeconds", 12)
   + default("maxSequencerDrift", "maxSequencerDrift", 600)
   + default("sequencerWindowSize", "sequencerWindowSize", 3600)
@@ -115,11 +115,11 @@ local AltDADeployConfig =
   + default("daResolverRefundPercentage", "daResolverRefundPercentage", 0);
 
 local OutputOracleDeployConfig =
-  optional("l2OutputOracleSubmissionInterval", "l2OutputOracleSubmissionInterval")
-  + optional("l2OutputOracleStartingTimestamp", "l2OutputOracleStartingTimestamp")
-  + optional("l2OutputOracleStartingBlockNumber", "l2OutputOracleStartingBlockNumber")
-  + optional("l2OutputOracleProposer", "l2OutputOracleProposer")
-  + optional("l2OutputOracleChallenger", "l2OutputOracleChallenger");
+  default("l2OutputOracleSubmissionInterval", "l2OutputOracleSubmissionInterval", 1800)
+  + default("l2OutputOracleStartingTimestamp", "l2OutputOracleStartingTimestamp", 0)
+  + require("l2OutputOracleStartingBlockNumber", "TIMESTAMP")
+  + require("l2OutputOracleProposer", "PROPOSER_ADDRESS")
+  + require("l2OutputOracleChallenger", "ADMIN_ADDRESS");
 
 local FaultProofDeployConfig =
   default("useFaultProof", "useFaultProof", false)

init/3_config.jsonnet

@@ -7,16 +7,43 @@ block=$(cast block finalized --rpc-url "$L1_RPC_URL")
 timestamp=$(echo "$block" | awk '/timestamp/ { print $2 }')
 blockhash=$(echo "$block" | awk '/hash/ { print $2 }')
 
+# make necessary args
+extCode="{"
+extCode+="ADMIN_ADDRESS: \"$ADMIN_ADDRESS\", "
+extCode+="BATCHER_ADDRESS: \"$BATCHER_ADDRESS\", "
+extCode+="SEQUENCER_ADDRESS: \"$SEQUENCER_ADDRESS\", "
+extCode+="PROPOSER_ADDRESS: \"$PROPOSER_ADDRESS\", "
+extCode+="TIMESTAMP: \"$timestamp\", "
+extCode+="l1StartingBlockTag: \"$blockhash\", "
+extCode+="l1ChainID: $L1_CHAIN_ID, "
+extCode+="l2ChainID: $L2_CHAIN_ID"
+
+# Governance
+if [ -n "$GOVERNANCE_TOKEN_SYMBOL" ]; then
+  extCode+=", "
+  extCode+="enableGovernance: true, "
+  extCode+="governanceTokenSymbol: \"$GOVERNANCE_TOKEN_SYMBOL\", "
+  extCode+="governanceTokenName: \"$GOVERNANCE_TOKEN_SYMBOL\", "
+  extCode+="governanceTokenOwner: \"$ADMIN_ADDRESS\""
+fi
+
+# Alt DA
+if [ -n "${ALT_DA_SERVER}" ]; then
+  extCode+=", "
+  extCode+="altDAServer: \"$ALT_DA_SERVER\", "
+  extCode+="usePlasma: true, "
+  extCode+="daCommitmentType: \"KeccakCommitment\", ",
+  extCode+="daChallengeWindow: 16, ",
+  extCode+="daResolveWindow: 16, ",
+  extCode+="daBondSize: 1000000, ",
+  extCode+="daResolverRefundPercentage: 0"
+fi
+
+# Fault proof - TODO
+
+extCode+="}"
+
 # Generate the configuration using Jsonnet
 cd ~/optimism/packages/contracts-bedrock && \
 mkdir -p ./deployments/$DEPLOYMENT_CONTEXT && \
-jsonnet /script/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",
-}' > /config/.deploy
+jsonnet /script/3_config.jsonnet --ext-code config="$extCode" > /config/.deploy