feat: enable Darwin for deterministic deployment (#25)

Co-authored-by: Xi Lin <zimpha@gmail.com> Co-authored-by: Morty <yiweichi1@gmail.com>
scroll-tech · Aug 28, 2024 · 560aad6 · 560aad6
1 parent 9fe3780
commit 560aad6
Show file tree

Hide file tree

Showing 64 changed files with 5,158 additions and 1,152 deletions.
diff --git a/.env.example b/.env.example
@@ -1,6 +1,7 @@
 ### NOTE: DO NOT USE THIS FILE IF USING TESTNET'S .ENV
 ETHERSCAN_API_KEY=ABC123ABC123ABC123ABC123ABC123ABC1
 
+MAINNET_FORK_RPC=
 RINKEBY_RPC=https://eth-rinkeby.alchemyapi.io/v2/<YOUR ALCHEMY KEY>
 SCROLL_L1_RPC=https://prealpha.scroll.io/l1
 SCROLL_L2_RPC=https://prealpha.scroll.io/l2

diff --git a/.gitignore b/.gitignore
@@ -20,4 +20,5 @@ broadcast
 # Visual Studio Code
 .vscode
 
-volume
+volume
+.DS_Store
diff --git a/docker/Dockerfile.deploy b/docker/Dockerfile.deploy
@@ -23,6 +23,7 @@ RUN foundryup -v nightly-56dbd20c7179570c53b6c17ff34daa7273a4ddae
 # copy dependencies
 COPY ./lib /contracts/lib
 COPY ./node_modules/@openzeppelin /contracts/node_modules/@openzeppelin
+COPY ./node_modules/hardhat /contracts/node_modules/hardhat
 
 # copy configurations
 COPY foundry.toml /contracts/foundry.toml

diff --git a/docker/Dockerfile.gen-configs b/docker/Dockerfile.gen-configs
@@ -23,6 +23,7 @@ RUN foundryup -v nightly-56dbd20c7179570c53b6c17ff34daa7273a4ddae
 # copy dependencies
 COPY ./lib /contracts/lib
 COPY ./node_modules/@openzeppelin /contracts/node_modules/@openzeppelin
+COPY ./node_modules/hardhat /contracts/node_modules/hardhat
 
 # copy configurations
 COPY foundry.toml /contracts/foundry.toml

diff --git a/docker/config-example.toml b/docker/config-example.toml
@@ -9,6 +9,7 @@ CHAIN_ID_L2 = 222222
 MAX_TX_IN_CHUNK = 100
 MAX_BLOCK_IN_CHUNK = 100
 MAX_CHUNK_IN_BATCH = 15
+MAX_BATCH_IN_BUNDLE = 30
 MAX_L1_MESSAGE_GAS_LIMIT = 10000000
 
 L1_CONTRACT_DEPLOYMENT_BLOCK = 0

diff --git a/docker/templates/coordinator-config.json b/docker/templates/coordinator-config.json
@@ -4,11 +4,13 @@
     "session_attempts": 100,
     "chunk_collection_time_sec": 3600,
     "batch_collection_time_sec": 600,
+    "bundle_collection_time_sec": 600,
     "verifier": {
-      "fork_name": "bernoulli",
+      "fork_name": "darwin",
       "mock_mode": false,
       "params_path": "/verifier/params",
-      "assets_path": "/verifier/assets"
+      "assets_path_lo": "/verifier/assets/lo",
+      "assets_path_hi": "/verifier/assets/hi"
     },
     "max_verifier_workers": 4,
     "min_prover_version": "v4.3.41"

diff --git a/docker/templates/genesis.json b/docker/templates/genesis.json
@@ -16,6 +16,7 @@
     "shanghaiBlock": 0,
     "bernoulliBlock": 0,
     "curieBlock": 0,
+    "darwinTime": 0,
     "clique": {
       "period": 3,
       "epoch": 30000

diff --git a/docker/templates/rollup-config.json b/docker/templates/rollup-config.json
@@ -1,9 +1,6 @@
 {
   "l1_config": {
-    "confirmations": "0x0",
     "endpoint": null,
-    "l1_message_queue_address": null,
-    "scroll_chain_address": null,
     "start_height": 0,
     "relayer_config": {
       "gas_price_oracle_contract_address": null,
@@ -12,16 +9,20 @@
         "escalate_blocks": 100,
         "escalate_multiple_num": 11,
         "escalate_multiple_den": 10,
+        "min_gas_tip": 1,
         "max_gas_price": 10000000000000,
-        "tx_type": "LegacyTx",
+        "tx_type": "DynamicFeeTx",
         "check_pending_time": 3,
         "confirmations": "0x0"
       },
       "gas_oracle_config": {
         "min_gas_price": 0,
         "gas_price_diff": 50000,
         "l1_base_fee_weight": 0.086,
-        "l1_blob_base_fee_weight": 0.030
+        "l1_blob_base_fee_weight": 0.030,
+        "check_committed_batches_window_minutes": 5,
+        "l1_base_fee_default": 15000000000,
+        "l1_blob_base_fee_default": 1
       },
       "gas_oracle_sender_private_key": null
     }
@@ -38,11 +39,13 @@
         "escalate_blocks": 4,
         "escalate_multiple_num": 12,
         "escalate_multiple_den": 10,
+        "min_gas_tip": 100000000,
         "max_gas_price": 200000000000,
         "max_blob_gas_price": 200000000000,
         "tx_type": "DynamicFeeTx",
         "check_pending_time": 10,
-        "confirmations": "0x0"
+        "confirmations": "0x0",
+        "max_pending_blob_txs": 3
       },
       "gas_oracle_config": {
         "min_gas_price": 0,
@@ -56,12 +59,14 @@
       },
       "enable_test_env_bypass_features": null,
       "finalize_batch_without_proof_timeout_sec": null,
+      "finalize_bundle_without_proof_timeout_sec": null,
       "gas_oracle_sender_private_key": null,
       "commit_sender_private_key": null,
       "finalize_sender_private_key": null,
       "l1_commit_gas_limit_multiplier": 1.2
     },
     "chunk_proposer_config": {
+      "propose_interval_milliseconds": 100,
       "max_block_num_per_chunk": null,
       "max_tx_num_per_chunk": null,
       "max_l1_commit_gas_per_chunk": 5000000,
@@ -72,12 +77,17 @@
       "max_uncompressed_batch_bytes_size": 634880
     },
     "batch_proposer_config": {
+      "propose_interval_milliseconds": 1000,
       "max_chunk_num_per_batch": null,
       "max_l1_commit_gas_per_batch": 5000000,
       "max_l1_commit_calldata_size_per_batch": 110000,
       "batch_timeout_sec": 2700,
       "gas_cost_increase_multiplier": 1.2,
       "max_uncompressed_batch_bytes_size": 634880
+    },
+    "bundle_proposer_config": {
+      "max_batch_num_per_bundle": 20,
+      "bundle_timeout_sec": 36000
     }
   },
   "db_config": {