add jsonnet code

Author: gosunuts

init/3_config.jsonnet

@@ -1,20 +1,23 @@
 //-----------------------------------------------------------------------//
-// args and funcs
+// args / funcs
 
 local config = std.extVar("config");
 
+// if the key is not present in the config, throw an error
 local require(key, conf) =
   if std.objectHas(config, conf) then
     { [key]: config[conf] }
   else
     error "required field not found :" + conf;
 
+// if the key is not present in the config, use the default value
 local default(key, conf, default) =
   if std.objectHas(config, conf) then
     { [key]: config[conf] }
   else
     { [key]: default };
 
+// if the key is not present in the config, use empty object
 local optional(key, conf) =
   if std.objectHas(config, conf) then
     { [key]: config[conf] }
@@ -24,6 +27,9 @@ local optional(key, conf) =
 //-----------------------------------------------------------------------//
 // elements
 
+local L1StartingBlockTag =
+  require("l1StartingBlockTag", "l1StartingBlockTag");
+
 local DevDeployConfig =
   default("fundDevAccounts", "fundDevAccounts", false);
 
@@ -53,7 +59,7 @@ local L2VaultsDeployConfig =
   + default("l1FeeVaultWithdrawalNetwork", "l1FeeVaultWithdrawalNetwork", 0)
   + default("sequencerFeeVaultWithdrawalNetwork", "sequencerFeeVaultWithdrawalNetwork", 0);
 
-local GovConfig =
+local GovernanceDeployConfig =
   default("enableGovernance", "enableGovernance", false)
   + default("governanceTokenSymbol", "governanceTokenSymbol", "NA")
   + default("governanceTokenName", "governanceTokenName", "NotApplicable")
@@ -69,7 +75,6 @@ local GasTokenDeployConfig =
   default("useCustomGasToken", "useCustomGasToken", false)
   + optional("customGasTokenAddress", "customGasTokenAddress");
 
-// OperatorDeployConfig
 local OperatorDeployConfig =
   require("p2pSequencerAddress", "SEQUENCER_ADDRESS")
   + require("batchSenderAddress", "BATCHER_ADDRESS");
@@ -101,27 +106,52 @@ local L2CoreDeployConfig =
   + default("batchInboxAddress", "batchInboxAddress", "0xff00000000000000000000000000000000000000")
   + default("systemConfigStartBlock", "systemConfigStartBlock", 0);
 
-local AltDaConfig =
+local AltDADeployConfig =
   default("usePlasma", "usePlasma", false)
   + default("daCommitmentType", "daCommitmentType", "KeccakCommitment")
   + default("daChallengeWindow", "daChallengeWindow", 16)
   + default("daResolveWindow", "daResolveWindow", 16)
   + default("daBondSize", "daBondSize", 1000000)
   + default("daResolverRefundPercentage", "daResolverRefundPercentage", 0);
 
+local OutputOracleDeployConfig =
+  optional("l2OutputOracleSubmissionInterval", "l2OutputOracleSubmissionInterval")
+  + optional("l2OutputOracleStartingTimestamp", "l2OutputOracleStartingTimestamp")
+  + optional("l2OutputOracleStartingBlockNumber", "l2OutputOracleStartingBlockNumber")
+  + optional("l2OutputOracleProposer", "l2OutputOracleProposer")
+  + optional("l2OutputOracleChallenger", "l2OutputOracleChallenger");
+
+local FaultProofDeployConfig =
+  default("useFaultProof", "useFaultProof", false)
+  + optional("faultGameAbsolutePrestate", "faultGameAbsolutePrestate")
+  + optional("faultGameMaxDepth", "faultGameMaxDepth")
+  + optional("faultGameClockExtension", "faultGameClockExtension")
+  + optional("faultGameMaxClockDuration", "faultGameMaxClockDuration")
+  + optional("faultGameGenesisBlock", "faultGameGenesisBlock")
+  + optional("faultGameGenesisOutputRoot", "faultGameGenesisOutputRoot")
+  + optional("faultGameSplitDepth", "faultGameSplitDepth")
+  + optional("faultGameWithdrawalDelay", "faultGameWithdrawalDelay")
+  + optional("preimageOracleMinProposalSize", "preimageOracleMinProposalSize")
+  + optional("preimageOracleChallengePeriod", "preimageOracleChallengePeriod")
+  + optional("proofMaturityDelaySeconds", "proofMaturityDelaySeconds")
+  + optional("disputeGameFinalityDelaySeconds", "disputeGameFinalityDelaySeconds")
+  + optional("respectedGameType", "respectedGameType");
+
 //-----------------------------------------------------------------------//
 // output
-# l1StartingBlockTag: blockhash
 
-DevDeployConfig
+L1StartingBlockTag
++ DevDeployConfig
 + L2GenesisBlockDeployConfig
 + OwnershipDeployConfig
 + L2VaultsDeployConfig
-+ GovConfig
++ GovernanceDeployConfig
 + GasPriceOracleDeployConfig
 + GasTokenDeployConfig
 + OperatorDeployConfig
 + EIP1559DeployConfig
 + UpgradeScheduleDeployConfig
 + L2CoreDeployConfig
-+ AltDaConfig
++ AltDADeployConfig
++ OutputOracleDeployConfig
++ FaultProofDeployConfig

init/3_generate_config.sh

@@ -10,26 +10,13 @@ blockhash=$(echo "$block" | awk '/hash/ { print $2 }')
 # 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",
-    l1ChainID: "$L1_CHAIN_ID",
-    l2ChainID: "$L2_CHAIN_ID",
-    l2BlockTime: "$timestamp",
-    blockHash: "$blockhash"
-  }' > /config/.deploy
-
-  # --ext-str block="$block" \
-  # --ext-str timestamp="$timestamp" \
-  # --ext-str blockhash="$blockhash" \
-  # --ext-str L1_CHAIN_ID="$L1_CHAIN_ID" \
-  # --ext-str L2_CHAIN_ID="$L2_CHAIN_ID" \
-  # --ext-str SEQUENCER_ADDRESS="$SEQUENCER_ADDRESS" \
-  # --ext-str BATCHER_ADDRESS="$BATCHER_ADDRESS" \
-  # --ext-str PROPOSER_ADDRESS="$PROPOSER_ADDRESS" \
-  # --ext-str ADMIN_ADDRESS="$ADMIN_ADDRESS" \
-  # --ext-str DEPLOYMENT_CONTEXT="$DEPLOYMENT_CONTEXT" \
-  # --ext-str GOVERNANCE_TOKEN_SYMBOL="${GOVERNANCE_TOKEN_SYMBOL:-''}" \
-  # --ext-str ALT_DA_SERVER="${ALT_DA_SERVER:-''}" \
+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

init/3_sample.sh

@@ -1,11 +1,10 @@
-jsonnet 3_config.jsonnet \
-  --ext-code config='{
-    ADMIN_ADDRESS: "abcd",
-    SEQUENCER_ADDRESS: "abcd",
-    BATCHER_ADDRESS: "abcd",
-    l2GenesisBlockNonce: "1",
-    l2GenesisBlockGasUsed: "0",
-    l1ChainID: "1",
-    l2ChainID: "10",
-    l2BlockTime: "0x0",
-  }' > .deploy
+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",
+}' > .deploy