update configs for Darwin

scroll-tech · Aug 16, 2024 · ebffab7 · ebffab7
1 parent 11ef777
commit ebffab7
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 12 deletions.
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,8 +9,9 @@
         "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"
       },
@@ -38,11 +36,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 +56,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 +74,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": {

diff --git a/scripts/deterministic/Configuration.sol b/scripts/deterministic/Configuration.sol
@@ -32,6 +32,7 @@ abstract contract Configuration is Script {
     uint256 internal MAX_TX_IN_CHUNK;
     uint256 internal MAX_BLOCK_IN_CHUNK;
     uint256 internal MAX_CHUNK_IN_BATCH;
+    uint256 internal MAX_BATCH_IN_BUNDLE;
     uint256 internal MAX_L1_MESSAGE_GAS_LIMIT;
 
     uint256 internal L1_CONTRACT_DEPLOYMENT_BLOCK;
@@ -106,6 +107,7 @@ abstract contract Configuration is Script {
         MAX_TX_IN_CHUNK = cfg.readUint(".general.MAX_TX_IN_CHUNK");
         MAX_BLOCK_IN_CHUNK = cfg.readUint(".general.MAX_BLOCK_IN_CHUNK");
         MAX_CHUNK_IN_BATCH = cfg.readUint(".general.MAX_CHUNK_IN_BATCH");
+        MAX_BATCH_IN_BUNDLE = cfg.readUint(".general.MAX_BATCH_IN_BUNDLE");
         MAX_L1_MESSAGE_GAS_LIMIT = cfg.readUint(".general.MAX_L1_MESSAGE_GAS_LIMIT");
 
         L1_CONTRACT_DEPLOYMENT_BLOCK = cfg.readUint(".general.L1_CONTRACT_DEPLOYMENT_BLOCK");

diff --git a/scripts/deterministic/DeployScroll.s.sol b/scripts/deterministic/DeployScroll.s.sol
@@ -1051,11 +1051,14 @@ contract DeployScroll is DeterminsticDeployment {
                 MAX_L1_MESSAGE_GAS_LIMIT
             );
         }
-        if (
-            getInitializeCount(L1_MESSAGE_QUEUE_PROXY_ADDR) == 0 || getInitializeCount(L1_MESSAGE_QUEUE_PROXY_ADDR) == 1
-        ) {
+
+        if (getInitializeCount(L1_MESSAGE_QUEUE_PROXY_ADDR) < 2) {
             L1MessageQueueWithGasPriceOracle(L1_MESSAGE_QUEUE_PROXY_ADDR).initializeV2();
         }
+
+        if (getInitializeCount(L1_MESSAGE_QUEUE_PROXY_ADDR) < 3) {
+            L1MessageQueueWithGasPriceOracle(L1_MESSAGE_QUEUE_PROXY_ADDR).initializeV3();
+        }
     }
 
     function initializeL1ScrollMessenger() private {

diff --git a/scripts/deterministic/GenerateConfigs.s.sol b/scripts/deterministic/GenerateConfigs.s.sol
@@ -37,8 +37,6 @@ contract GenerateRollupConfig is DeployScroll {
         vm.writeJson(L1_RPC_ENDPOINT, ROLLUP_CONFIG_PATH, ".l2_config.relayer_config.sender_config.endpoint");
 
         // contracts
-        vm.writeJson(vm.toString(L1_MESSAGE_QUEUE_PROXY_ADDR), ROLLUP_CONFIG_PATH, ".l1_config.l1_message_queue_address");
-        vm.writeJson(vm.toString(L1_SCROLL_CHAIN_PROXY_ADDR), ROLLUP_CONFIG_PATH, ".l1_config.scroll_chain_address");
         vm.writeJson(vm.toString(L1_GAS_PRICE_ORACLE_ADDR), ROLLUP_CONFIG_PATH, ".l1_config.relayer_config.gas_price_oracle_contract_address");
         vm.writeJson(vm.toString(L2_MESSAGE_QUEUE_ADDR), ROLLUP_CONFIG_PATH, ".l2_config.l2_message_queue_address");
         vm.writeJson(vm.toString(L1_SCROLL_CHAIN_PROXY_ADDR), ROLLUP_CONFIG_PATH, ".l2_config.relayer_config.rollup_contract_address");
@@ -53,10 +51,12 @@ contract GenerateRollupConfig is DeployScroll {
         // other
         vm.writeJson(vm.toString(TEST_ENV_MOCK_FINALIZE_ENABLED), ROLLUP_CONFIG_PATH, ".l2_config.relayer_config.enable_test_env_bypass_features");
         vm.writeJson(vm.toString(TEST_ENV_MOCK_FINALIZE_TIMEOUT_SEC), ROLLUP_CONFIG_PATH, ".l2_config.relayer_config.finalize_batch_without_proof_timeout_sec");
+        vm.writeJson(vm.toString(TEST_ENV_MOCK_FINALIZE_TIMEOUT_SEC), ROLLUP_CONFIG_PATH, ".l2_config.relayer_config.finalize_bundle_without_proof_timeout_sec");
 
         vm.writeJson(vm.toString(MAX_BLOCK_IN_CHUNK), ROLLUP_CONFIG_PATH, ".l2_config.chunk_proposer_config.max_block_num_per_chunk");
         vm.writeJson(vm.toString(MAX_TX_IN_CHUNK), ROLLUP_CONFIG_PATH, ".l2_config.chunk_proposer_config.max_tx_num_per_chunk");
         vm.writeJson(vm.toString(MAX_CHUNK_IN_BATCH), ROLLUP_CONFIG_PATH, ".l2_config.batch_proposer_config.max_chunk_num_per_batch");
+        vm.writeJson(vm.toString(MAX_BATCH_IN_BUNDLE), ROLLUP_CONFIG_PATH, ".l2_config.bundle_proposer_config.max_batch_num_per_bundle");
 
         vm.writeJson(SCROLL_DB_CONNECTION_STRING, ROLLUP_CONFIG_PATH, ".db_config.dsn");
     }