Merge branch 'develop' into verbose_improve

scroll-tech · Dec 11, 2023 · d67e56f · d67e56f
2 parents f8d51fc + 2e627f7
commit d67e56f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/bridge-history-api/abi/backend_abi.go b/bridge-history-api/abi/backend_abi.go
@@ -45,7 +45,7 @@ var (
 	L2BatchWithdrawERC721Sig  common.Hash
 	L2BatchWithdrawERC1155Sig common.Hash
 
-	// scroll mono repo
+	// scroll monorepo
 
 	// ScrollChainABI holds information about ScrollChain's context and available invokable methods.
 	ScrollChainABI *abi.ABI
@@ -323,7 +323,7 @@ type L1RelayedMessageEvent struct {
 	MessageHash common.Hash
 }
 
-// L2AppendMessageEvent represents a AppendMessage event raised by the L2MessageQueue contract.
+// L2AppendMessageEvent represents an AppendMessage event raised by the L2MessageQueue contract.
 type L2AppendMessageEvent struct {
 	Index       *big.Int
 	MessageHash common.Hash

diff --git a/bridge-history-api/utils/database.go b/bridge-history-api/utils/database.go
@@ -74,6 +74,8 @@ func InitDB(config *config.DBConfig) (*gorm.DB, error) {
 		return nil, pingErr
 	}
 
+	sqlDB.SetConnMaxLifetime(time.Minute * 10)
+	sqlDB.SetConnMaxIdleTime(time.Minute * 5)
 	sqlDB.SetMaxOpenConns(config.MaxOpenNum)
 	sqlDB.SetMaxIdleConns(config.MaxIdleNum)
 

diff --git a/common/database/db.go b/common/database/db.go
@@ -70,6 +70,9 @@ func InitDB(config *Config) (*gorm.DB, error) {
 		return nil, pingErr
 	}
 
+	sqlDB.SetConnMaxLifetime(time.Minute * 10)
+	sqlDB.SetConnMaxIdleTime(time.Minute * 5)
+
 	sqlDB.SetMaxOpenConns(config.MaxOpenNum)
 	sqlDB.SetMaxIdleConns(config.MaxIdleNum)
 

diff --git a/common/version/version.go b/common/version/version.go
@@ -5,7 +5,7 @@ import (
 	"runtime/debug"
 )
 
-var tag = "v4.3.42"
+var tag = "v4.3.43"
 
 var commit = func() string {
 	if info, ok := debug.ReadBuildInfo(); ok {