WIP - tidy configs

Author: gosunuts

init/3_generate_config.sh

@@ -47,9 +47,9 @@ config=$(cat << EOL
   "l2BlockTime": 2,
   "l1BlockTime": 12,
 
-  "maxSequencerDrift": 300,
-  "sequencerWindowSize": 200,
-  "channelTimeout": 120,
+  "maxSequencerDrift": 600,
+  "sequencerWindowSize": 3600,
+  "channelTimeout": 300,
 
   "p2pSequencerAddress": "$SEQUENCER_ADDRESS",
   "batchInboxAddress": "$BatchInboxAddress",
@@ -78,50 +78,46 @@ config=$(cat << EOL
   "l1FeeVaultWithdrawalNetwork": 0,
   "sequencerFeeVaultWithdrawalNetwork": 0,
 
-  "gasPriceOracleBaseFeeScalar": 1368,
-  "gasPriceOracleBlobBaseFeeScalar": 810949,
+  "gasPriceOracleOverhead": 0,
+  "gasPriceOracleScalar": 1000000,
 
 $govConfig
 
+  "l2GenesisBlockGasLimit": "0x1c9c380",
+  "l2GenesisBlockBaseFeePerGas": "0x3b9aca00",
+  "l2GenesisRegolithTimeOffset": "0x0",
+
   "eip1559Denominator": 50,
   "eip1559DenominatorCanyon": 250,
   "eip1559Elasticity": 6,
 
-  "l2GenesisBlockGasLimit": "0x1c9c380",
-  "l2GenesisBlockBaseFeePerGas": "0x3b9aca00",
-  "l2GenesisRegolithTimeOffset": "0x0",
-  "l2GenesisDeltaTimeOffset": "0x0",
-  "l2GenesisEcotoneTimeOffset": "0x0",
-  "l1CancunTimeOffset": "0x0",  
+  "l2GenesisDeltaTimeOffset": null,
   "l2GenesisCanyonTimeOffset": "0x0",
 
   "systemConfigStartBlock": 0,
 
-  "requiredProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "recommendedProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
-
-  "faultGameAbsolutePrestate": "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "faultGameMaxDepth": 50,
-  "faultGameClockExtension": 0,
-  "faultGameMaxClockDuration": 1200,
+  "requiredProtocolVersion": "0x0000000000000000000000000000000000000004000000000000000000000001",
+  "recommendedProtocolVersion": "0x0000000000000000000000000000000000000004000000000000000000000001",
+  "fundDevAccounts": false,
+  "faultGameAbsolutePrestate": "0x037ef3c1a487960b0e633d3e513df020c43432769f41a634d18a9595cbf53c55",
+  "faultGameMaxDepth": 73,
+  "faultGameClockExtension": 10800,
+  "faultGameMaxClockDuration": 302400,
   "faultGameGenesisBlock": 0,
   "faultGameGenesisOutputRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "faultGameSplitDepth": 14,
+  "faultGameSplitDepth": 30,
   "faultGameWithdrawalDelay": 604800,
-
-  "preimageOracleMinProposalSize": 18000,
-  "preimageOracleChallengePeriod": 120,
-
-  "fundDevAccounts": false,
-  "useFaultProofs": false,
+  "preimageOracleMinProposalSize": 126000,
+  "preimageOracleChallengePeriod": 86400,
   "proofMaturityDelaySeconds": 604800,
-  "disputeGameFinalityDelaySeconds": 604800,
-  "respectedGameType": 0
-}
+  "disputeGameFinalityDelaySeconds": 302400,
+  "respectedGameType": 0,
+  "useFaultProofs": true
+} 
 EOL
 )
 
 # Write the config file
 cd ~/optimism/packages/contracts-bedrock && \
 mkdir -p ./deployments/$DEPLOYMENT_CONTEXT && \
-echo "$config" > ./deployments/$DEPLOYMENT_CONTEXT/config.json
+echo "$config" > ./deployments/$DEPLOYMENT_CONTEXT/.deploy

init/4_deploy_contract.sh

@@ -4,18 +4,20 @@ set -eu
 echo "[4/5] : deploy contract"
 
 cd ~/optimism/packages/contracts-bedrock && \
-DEPLOY_CONFIG_PATH="./deployments/$DEPLOYMENT_CONTEXT/config.json" \
+DEPLOY_CONFIG_PATH="./deployments/$DEPLOYMENT_CONTEXT/.deploy" \
 forge script scripts/Deploy.s.sol:Deploy \
   --private-key $ADMIN_PRIVATE_KEY \
   --broadcast \
   --rpc-url $L1_RPC_URL \
-  --priority-gas-price $PRIORITY_GAS_PRICE \
-  --slow
+  --priority-gas-price $PRIORITY_GAS_PRICE
 
-echo "run upgrader"
+echo "[ deploy contract done! run upgrader ]"
 
+cd ~/optimism/packages/contracts-bedrock && \
 CONTRACT_ADDRESSES_PATH="./deployments/$L1_CHAIN_ID-deploy.json" \
-DEPLOY_CONFIG_PATH="./deployments/$DEPLOYMENT_CONTEXT/config.json" \
+DEPLOY_CONFIG_PATH="./deployments/$DEPLOYMENT_CONTEXT/.deploy" \
 forge script scripts/L2Genesis.s.sol:L2Genesis \
   --sig 'runWithAllUpgrades()' \
-  --rpc-url $L1_RPC_URL
+  --chain-id $L2_CHAIN_ID \
+  --rpc-url $L1_RPC_URL \
+  --private-key $ADMIN_PRIVATE_KEY

init/5_export_genesis.sh

@@ -5,7 +5,7 @@ echo "[5/5] : export genesis files"
 
 cd ~/optimism/op-node
 go run cmd/main.go genesis l2 \
-  --deploy-config ../packages/contracts-bedrock/deployments/$DEPLOYMENT_CONTEXT/config.json \
+  --deploy-config ../packages/contracts-bedrock/deployments/$DEPLOYMENT_CONTEXT/.deploy \
   --l1-deployments ../packages/contracts-bedrock/deployments/$L1_CHAIN_ID-deploy.json \
   --outfile.l2 /config/genesis.json \
   --outfile.rollup /config/rollup.json \

init/Dockerfile

@@ -15,7 +15,7 @@ RUN curl -fsSL https://deb.nodesource.com/setup_20.x | sudo -E bash -
 RUN apt-get install -y nodejs && npm install -g pnpm
 
 # install foundry
-ENV FOUNDRY_VERSION=${FOUNDRY_VERSION:-nightly}
+ENV FOUNDRY_VERSION=${FOUNDRY_VERSION:-nightly-ef62fdbab638a275fc19a2ff8fe8951c3bd1d9aa}
 RUN curl -L https://foundry.paradigm.xyz | sudo -E bash -
 RUN . ~/.bashrc && foundryup -v "$FOUNDRY_VERSION"
 ENV PATH="~/.foundry/bin:${PATH}"