Merge branch 'node-real:devel' into devel

chainstack · Dec 20, 2023 · dd7109d · dd7109d
2 parents ef957f0 + 3533e04
commit dd7109d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/core/genesis_write.go b/core/genesis_write.go
@@ -38,7 +38,6 @@ import (
 	"github.com/ledgerwatch/erigon/consensus/serenity"
 	"github.com/ledgerwatch/erigon/core/rawdb"
 	"github.com/ledgerwatch/erigon/core/state"
-	"github.com/ledgerwatch/erigon/core/systemcontracts"
 	"github.com/ledgerwatch/erigon/core/types"
 	"github.com/ledgerwatch/erigon/crypto"
 	"github.com/ledgerwatch/erigon/eth/ethconfig"
@@ -98,7 +97,6 @@ func WriteGenesisBlock(tx kv.RwTx, genesis *types.Genesis, overrideShanghaiTime
 			config.ShanghaiTime = overrideShanghaiTime
 		}
 	}
-	systemcontracts.GenesisHash = storedHash
 	if (storedHash == libcommon.Hash{}) {
 		custom := true
 		if genesis == nil {

diff --git a/eth/backend.go b/eth/backend.go
@@ -220,6 +220,7 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
 		genesisSpec := config.Genesis
 		if h != (libcommon.Hash{}) { // fallback to db content
 			chainConfig = genesisSpec.Config
+			systemcontracts.GenesisHash = h
 			genesis = rawdb.ReadBlock(tx, h, 0)
 		} else {
 			var genesisErr error

diff --git a/turbo/logging/logging.go b/turbo/logging/logging.go
@@ -148,7 +148,7 @@ func initSeparatedLogging(
 	lumberjack := &lumberjack.Logger{
 		Filename:   path.Join(dirPath, filePrefix+".log"),
 		MaxSize:    100, // megabytes
-		MaxBackups: 3,
+		MaxBackups: 10,
 		MaxAge:     28, //days
 	}
 	userLog := log.StreamHandler(lumberjack, dirFormat)