feat: remove dsn strings from configs (#34)

scroll-tech · Sep 4, 2024 · 3a2ab27 · 3a2ab27
1 parent 9adfdf5
commit 3a2ab27
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 18 deletions.
diff --git a/docker/templates/bridge-history-config.json b/docker/templates/bridge-history-config.json
@@ -42,7 +42,7 @@
     "PufferGatewayAddr": "0x0000000000000000000000000000000000000000"
   },
   "db": {
-    "dsn": null,
+    "dsn": "",
     "driverName": "postgres",
     "maxOpenNum": 200,
     "maxIdleNum": 20

diff --git a/docker/templates/chain-monitor-config.json b/docker/templates/chain-monitor-config.json
@@ -51,7 +51,7 @@
   },
   "db_config": {
     "driver_name": "postgres",
-    "dsn": null,
+    "dsn": "",
     "maxOpenNum": 100,
     "maxIdleNum": 20
   }

diff --git a/docker/templates/coordinator-config.json b/docker/templates/coordinator-config.json
@@ -25,7 +25,7 @@
   },
   "db": {
     "driver_name": "postgres",
-    "dsn": null,
+    "dsn": "",
     "maxOpenNum": 200,
     "maxIdleNum": 20
   },

diff --git a/docker/templates/rollup-config.json b/docker/templates/rollup-config.json
@@ -91,7 +91,7 @@
   },
   "db_config": {
     "driver_name": "postgres",
-    "dsn": null,
+    "dsn": "",
     "maxOpenNum": 50,
     "maxIdleNum": 20
   }

diff --git a/scripts/deterministic/Configuration.sol b/scripts/deterministic/Configuration.sol
@@ -61,11 +61,7 @@ abstract contract Configuration is Script {
     address internal L2GETH_SIGNER_ADDRESS;
 
     // db
-    string internal ROLLUP_NODE_DB_CONNECTION_STRING;
-    string internal CHAIN_MONITOR_DB_CONNECTION_STRING;
-    string internal BRIDGE_HISTORY_DB_CONNECTION_STRING;
     string internal ROLLUP_EXPLORER_BACKEND_DB_CONNECTION_STRING;
-    string internal COORDINATOR_DB_CONNECTION_STRING;
 
     // genesis
     uint256 internal L2_MAX_ETH_SUPPLY;
@@ -138,9 +134,6 @@ abstract contract Configuration is Script {
 
         L2GETH_SIGNER_ADDRESS = cfg.readAddress(".sequencer.L2GETH_SIGNER_ADDRESS");
 
-        ROLLUP_NODE_DB_CONNECTION_STRING = cfg.readString(".db.ROLLUP_NODE_DB_CONNECTION_STRING");
-        CHAIN_MONITOR_DB_CONNECTION_STRING = cfg.readString(".db.CHAIN_MONITOR_DB_CONNECTION_STRING");
-        BRIDGE_HISTORY_DB_CONNECTION_STRING = cfg.readString(".db.BRIDGE_HISTORY_DB_CONNECTION_STRING");
         ROLLUP_EXPLORER_BACKEND_DB_CONNECTION_STRING = cfg.readString(".db.ROLLUP_EXPLORER_DB_CONNECTION_STRING");
 
         L2_MAX_ETH_SUPPLY = cfg.readUint(".genesis.L2_MAX_ETH_SUPPLY");

diff --git a/scripts/deterministic/GenerateConfigs.s.sol b/scripts/deterministic/GenerateConfigs.s.sol
@@ -56,8 +56,6 @@ contract GenerateRollupConfig is DeployScroll {
         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_BATCH_IN_BUNDLE), ROLLUP_CONFIG_PATH, ".l2_config.bundle_proposer_config.max_batch_num_per_bundle");
-
-        vm.writeJson(ROLLUP_NODE_DB_CONNECTION_STRING, ROLLUP_CONFIG_PATH, ".db_config.dsn");
     }
 }
 
@@ -87,7 +85,6 @@ contract GenerateCoordinatorConfig is DeployScroll {
         vm.writeFile(COORDINATOR_CONFIG_PATH, template);
 
         vm.writeJson(vm.toString(CHAIN_ID_L2), COORDINATOR_CONFIG_PATH, ".l2.chain_id");
-        vm.writeJson(COORDINATOR_DB_CONNECTION_STRING, COORDINATOR_CONFIG_PATH, ".db.dsn");
         vm.writeJson(COORDINATOR_JWT_SECRET_KEY, COORDINATOR_CONFIG_PATH, ".auth.secret");
     }
 }
@@ -144,9 +141,6 @@ contract GenerateChainMonitorConfig is DeployScroll {
         vm.writeJson(vm.toString(L2_ERC1155_GATEWAY_PROXY_ADDR), CHAIN_MONITOR_CONFIG_PATH, ".l2_config.l2_contracts.l2_gateways.erc1155_gateway");
         vm.writeJson(vm.toString(L2_SCROLL_MESSENGER_PROXY_ADDR), CHAIN_MONITOR_CONFIG_PATH, ".l2_config.l2_contracts.scroll_messenger");
         vm.writeJson(vm.toString(L2_MESSAGE_QUEUE_ADDR), CHAIN_MONITOR_CONFIG_PATH, ".l2_config.l2_contracts.message_queue");
-
-        // misc
-        vm.writeJson(CHAIN_MONITOR_DB_CONNECTION_STRING, CHAIN_MONITOR_CONFIG_PATH, ".db_config.dsn");
     }
 }
 
@@ -206,7 +200,6 @@ contract GenerateBridgeHistoryConfig is DeployScroll {
         vm.writeJson(L2_RPC_ENDPOINT, BRIDGE_HISTORY_CONFIG_PATH, ".L2.endpoint");
 
         // others
-        vm.writeJson(BRIDGE_HISTORY_DB_CONNECTION_STRING, BRIDGE_HISTORY_CONFIG_PATH, ".db.dsn");
         vm.writeJson(vm.toString(L1_CONTRACT_DEPLOYMENT_BLOCK), BRIDGE_HISTORY_CONFIG_PATH, ".L1.startHeight");
     }
 }