update configs

Author: gosunuts

init/3_config.jsonnet

@@ -3,21 +3,21 @@
 
 local config = std.extVar("config");
 
-// if the key is not present in the config, throw an error
+// if not exist conf, 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
+// if not exist conf, return 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
+// if not exist conf, return empty
 local optional(key, conf) =
   if std.objectHas(config, conf) then
     { [key]: config[conf] }
@@ -63,7 +63,7 @@ local GovernanceDeployConfig =
   default("enableGovernance", "enableGovernance", false)
   + default("governanceTokenSymbol", "governanceTokenSymbol", "NA")
   + default("governanceTokenName", "governanceTokenName", "NotApplicable")
-  + optional("governanceTokenOwner", "governanceTokenOwner");
+  + require("governanceTokenOwner", "ADMIN_ADDRESS");
 
 local GasPriceOracleDeployConfig =
   default("gasPriceOracleOverhead", "gasPriceOracleOverhead", 2100)
@@ -101,8 +101,8 @@ local L2CoreDeployConfig =
   + default("finalizationPeriodSeconds", "finalizationPeriodSeconds", 12)
   + default("maxSequencerDrift", "maxSequencerDrift", 600)
   + default("sequencerWindowSize", "sequencerWindowSize", 3600)
-  + default("channelTimeoutBedrock", "channelTimeoutBedrock", 300)
-  + default("channelTimeoutGranite", "channelTimeoutGranite", 0)
+  + default("channelTimeout", "channelTimeout", 300)
+  + optional("channelTimeoutGranite", "channelTimeoutGranite")
   + default("batchInboxAddress", "batchInboxAddress", "0xff00000000000000000000000000000000000000")
   + default("systemConfigStartBlock", "systemConfigStartBlock", 0);
 
@@ -114,28 +114,33 @@ local AltDADeployConfig =
   + default("daBondSize", "daBondSize", 1000000)
   + default("daResolverRefundPercentage", "daResolverRefundPercentage", 0);
 
+local SuperchainL1DeployConfig =
+  require("superchainConfigGuardian", "ADMIN_ADDRESS")
+  + default("requiredProtocolVersion", "requiredProtocolVersion", "0x0000000000000000000000000000000000000000000000000000000000000000")
+  + default("recommendedProtocolVersion", "recommendedProtocolVersion", "0x0000000000000000000000000000000000000000000000000000000000000000");
+
 local OutputOracleDeployConfig =
   default("l2OutputOracleSubmissionInterval", "l2OutputOracleSubmissionInterval", 1800)
-  + default("l2OutputOracleStartingTimestamp", "l2OutputOracleStartingTimestamp", 0)
-  + require("l2OutputOracleStartingBlockNumber", "TIMESTAMP")
+  + require("l2OutputOracleStartingTimestamp", "TIMESTAMP")
+  + default("l2OutputOracleStartingBlockNumber", "l2OutputOracleStartingBlockNumber", 0)
   + require("l2OutputOracleProposer", "PROPOSER_ADDRESS")
   + require("l2OutputOracleChallenger", "ADMIN_ADDRESS");
 
 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");
+  default("useFaultProof", "useFaultProof", true)
+  + default("faultGameAbsolutePrestate", "faultGameAbsolutePrestate", "0x0000000000000000000000000000000000000000000000000000000000000000")
+  + default("faultGameMaxDepth", "faultGameMaxDepth", 73)
+  + default("faultGameClockExtension", "faultGameClockExtension", 18000)
+  + default("faultGameMaxClockDuration", "faultGameMaxClockDuration", 302400)
+  + default("faultGameGenesisBlock", "faultGameGenesisBlock", 0)
+  + default("faultGameGenesisOutputRoot", "faultGameGenesisOutputRoot", "0x0000000000000000000000000000000000000000000000000000000000000000")
+  + default("faultGameSplitDepth", "faultGameSplitDepth", 30)
+  + default("faultGameWithdrawalDelay", "faultGameWithdrawalDelay", 604800)
+  + default("preimageOracleMinProposalSize", "preimageOracleMinProposalSize", 126000)
+  + default("preimageOracleChallengePeriod", "preimageOracleChallengePeriod", 86400)
+  + default("proofMaturityDelaySeconds", "proofMaturityDelaySeconds", 604800)
+  + default("disputeGameFinalityDelaySeconds", "disputeGameFinalityDelaySeconds", 302400)
+  + default("respectedGameType", "respectedGameType", 0);
 
 //-----------------------------------------------------------------------//
 // output
@@ -153,5 +158,6 @@ L1StartingBlockTag
 + UpgradeScheduleDeployConfig
 + L2CoreDeployConfig
 + AltDADeployConfig
++ SuperchainL1DeployConfig
 + OutputOracleDeployConfig
 + FaultProofDeployConfig

init/3_generate_config.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -eu
 
 echo "[3/5] : generate config"
 
@@ -7,43 +8,46 @@ 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
+base_address="0xff00000000000000000000000000000000000000"
+BatchInboxAddress="${base_address%${base_address: -${#L2_CHAIN_ID}}}$L2_CHAIN_ID"
+
+# basic config
+config="{"
+config+="ADMIN_ADDRESS: \"$ADMIN_ADDRESS\", "
+config+="BATCHER_ADDRESS: \"$BATCHER_ADDRESS\", "
+config+="SEQUENCER_ADDRESS: \"$SEQUENCER_ADDRESS\", "
+config+="PROPOSER_ADDRESS: \"$PROPOSER_ADDRESS\", "
+config+="TIMESTAMP: $timestamp, "
+config+="l1StartingBlockTag: \"$blockhash\", "
+config+="l1ChainID: $L1_CHAIN_ID, "
+config+="l2ChainID: $L2_CHAIN_ID"
+config+="batchInboxAddress: \"$BatchInboxAddress\""
+
+# Governance config
 if [ -n "$GOVERNANCE_TOKEN_SYMBOL" ]; then
-  extCode+=", "
-  extCode+="enableGovernance: true, "
-  extCode+="governanceTokenSymbol: \"$GOVERNANCE_TOKEN_SYMBOL\", "
-  extCode+="governanceTokenName: \"$GOVERNANCE_TOKEN_SYMBOL\", "
-  extCode+="governanceTokenOwner: \"$ADMIN_ADDRESS\""
+  config+=", "
+  config+="enableGovernance: true, "
+  config+="governanceTokenSymbol: \"$GOVERNANCE_TOKEN_SYMBOL\", "
+  config+="governanceTokenName: \"$GOVERNANCE_TOKEN_SYMBOL\", "
+  config+="governanceTokenOwner: \"$ADMIN_ADDRESS\""
 fi
 
-# Alt DA
+# Alt DA config
 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"
+  config+=", "
+  config+="altDAServer: \"$ALT_DA_SERVER\", "
+  config+="usePlasma: true, "
+  config+="daCommitmentType: \"KeccakCommitment\", ",
+  config+="daChallengeWindow: 16, ",
+  config+="daResolveWindow: 16, ",
+  config+="daBondSize: 1000000, ",
+  config+="daResolverRefundPercentage: 0"
 fi
 
-# Fault proof - TODO
-
-extCode+="}"
+config+="}"
 
 # Generate the configuration using Jsonnet
 cd ~/optimism/packages/contracts-bedrock && \
 mkdir -p ./deployments/$DEPLOYMENT_CONTEXT && \
-jsonnet /script/3_config.jsonnet --ext-code config="$extCode" > /config/.deploy
+jsonnet /script/3_config.jsonnet --ext-code config="$config" > ./deployments/$DEPLOYMENT_CONTEXT/.deploy && \
+cp ./deployments/$DEPLOYMENT_CONTEXT/.deploy /config/.deploy

init/4_deploy_contract.sh

@@ -15,7 +15,7 @@ echo "[deploy contract done!]"
 
 CONTRACT_ADDRESSES_PATH="./deployments/$L1_CHAIN_ID-deploy.json" \
 DEPLOY_CONFIG_PATH="./deployments/$DEPLOYMENT_CONTEXT/.deploy" \
-FORK="ecotone" \
+FORK="fjord" \
 forge script scripts/L2Genesis.s.sol:L2Genesis \
   --sig 'runWithStateDump()' \
   --rpc-url $L1_RPC_URL

init/5_export_genesis.sh

@@ -10,7 +10,7 @@ cd ~/optimism/op-node
   --outfile.l2 /config/genesis.json \
   --outfile.rollup /config/rollup.json \
   --l1-rpc $L1_RPC_URL \
-  --l2-allocs ../packages/contracts-bedrock/state-dump-$DEPLOYMENT_CONTEXT-ecotone.json
+  --l2-allocs ../packages/contracts-bedrock/state-dump-$DEPLOYMENT_CONTEXT-fjord.json
 
 cp ../packages/contracts-bedrock/deployments/$L1_CHAIN_ID-deploy.json /config/deploy.json