fix bug and format config.json

Author: mask-pp

bridge/config.json

@@ -1,53 +1,53 @@
 {
-    "l1_config": {
-      "confirmations": 6,
-      "chain_id": 4,
-      "endpoint": "https://goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161",
-      "l1_messenger_address": "0x0000000000000000000000000000000000000000",
-      "start_height": 0,
-      "relayer_config": {
-        "messenger_contract_address": "0x0000000000000000000000000000000000000000",
-        "sender_config": {
-          "endpoint": "/var/lib/jenkins/workspace/SequencerPipeline/MyPrivateNetwork/geth.ipc",
-          "check_pending_time": 3,
-          "escalate_blocks": 100,
-          "confirmations": 1,
-          "escalate_multiple_num": 11,
-          "escalate_multiple_den": 10,
-          "max_gas_price": 10000000000,
-          "tx_type": "AccessListTx"
-        },
-        "private_key": "abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc1"
-      }
-    },
-    "l2_config": {
-      "confirmations": 1,
-      "chain_id": 53077,
-      "proof_generation_freq": 1,
-      "skipped_opcodes": [
-        "CREATE2",
-        "DELEGATECALL"
-      ],
-      "endpoint": "/var/lib/jenkins/workspace/SequencerPipeline/MyPrivateNetwork/geth.ipc",
-      "l2_messenger_address": "0x0000000000000000000000000000000000000000",
-      "relayer_config": {
-        "messenger_contract_address": "0x0000000000000000000000000000000000000000",
-        "rollup_contract_address": "0x0000000000000000000000000000000000000000",
-        "sender_config": {
-          "endpoint": "https://goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161",
-          "check_pending_time": 10,
-          "escalate_blocks": 100,
-          "confirmations": 6,
-          "escalate_multiple_num": 11,
-          "escalate_multiple_den": 10,
-          "max_gas_price": 10000000000,
-          "tx_type": "DynamicFeeTx"
-        },
-        "private_key": "1212121212121212121212121212121212121212121212121212121212121212"
-      }
-    },
-    "db_config": {
-      "driver_name": "postgres",
-      "dsn": "postgres://admin:123456@localhost/test?sslmode=disable"
+  "l1_config": {
+    "confirmations": 6,
+    "chain_id": 4,
+    "endpoint": "https://goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161",
+    "l1_messenger_address": "0x0000000000000000000000000000000000000000",
+    "start_height": 0,
+    "relayer_config": {
+      "messenger_contract_address": "0x0000000000000000000000000000000000000000",
+      "sender_config": {
+        "endpoint": "/var/lib/jenkins/workspace/SequencerPipeline/MyPrivateNetwork/geth.ipc",
+        "check_pending_time": 3,
+        "escalate_blocks": 100,
+        "confirmations": 1,
+        "escalate_multiple_num": 11,
+        "escalate_multiple_den": 10,
+        "max_gas_price": 10000000000,
+        "tx_type": "AccessListTx"
+      },
+      "private_key": "abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc1"
     }
-  }
+  },
+  "l2_config": {
+    "confirmations": 1,
+    "chain_id": 53077,
+    "proof_generation_freq": 1,
+    "skipped_opcodes": [
+      "CREATE2",
+      "DELEGATECALL"
+    ],
+    "endpoint": "/var/lib/jenkins/workspace/SequencerPipeline/MyPrivateNetwork/geth.ipc",
+    "l2_messenger_address": "0x0000000000000000000000000000000000000000",
+    "relayer_config": {
+      "messenger_contract_address": "0x0000000000000000000000000000000000000000",
+      "rollup_contract_address": "0x0000000000000000000000000000000000000000",
+      "sender_config": {
+        "endpoint": "https://goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161",
+        "check_pending_time": 10,
+        "escalate_blocks": 100,
+        "confirmations": 6,
+        "escalate_multiple_num": 11,
+        "escalate_multiple_den": 10,
+        "max_gas_price": 10000000000,
+        "tx_type": "DynamicFeeTx"
+      },
+      "private_key": "1212121212121212121212121212121212121212121212121212121212121212"
+    }
+  },
+  "db_config": {
+    "driver_name": "postgres",
+    "dsn": "postgres://admin:123456@localhost/test?sslmode=disable"
+  }
+}

coordinator/manager_test.go

@@ -14,13 +14,14 @@ import (
 	"github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/stretchr/testify/assert"
 
-	"scroll-tech/bridge/mock"
 	"scroll-tech/common/docker"
 	"scroll-tech/common/message"
 	"scroll-tech/common/utils"
 	db_config "scroll-tech/database"
 	"scroll-tech/database/orm"
 
+	"scroll-tech/bridge/mock"
+
 	"scroll-tech/coordinator"
 	"scroll-tech/coordinator/config"
 )

database/orm/layer2_message.go

@@ -192,7 +192,7 @@ func (m *layer2MessageOrm) UpdateLayer2StatusAndLayer1Hash(ctx context.Context,
 func (m *layer2MessageOrm) GetLayer2LatestWatchedHeight() (int64, error) {
 	// @note It's not correct, since we may don't have message in some blocks.
 	// But it will only be called at start, some redundancy is acceptable.
-	row := m.db.QueryRow("SELECT MAX(height) FROM layer2_message;")
+	row := m.db.QueryRow("SELECT COALESCE(MAX(height), -1) FROM layer2_message;")
 
 	var height int64
 	if err := row.Scan(&height); err != nil {