From 74fc5eca698aea4db45c036bc407833eff28bdac Mon Sep 17 00:00:00 2001 From: HAOYUatHZ Date: Thu, 20 Apr 2023 08:27:31 +0800 Subject: [PATCH 1/2] feat: print ScrollConfig when starting node --- params/config.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/params/config.go b/params/config.go index e05f0f12c0df..958d797895ea 100644 --- a/params/config.go +++ b/params/config.go @@ -453,6 +453,16 @@ func (s ScrollConfig) ZktrieEnabled() bool { return s.UseZktrie } +func (s ScrollConfig) String() string { + if s.MaxTxPerBlock == nil { + return fmt.Sprintf("{useZktrie: %v, maxTxPerBlock: , feeVaultAddress: %v, enableEIP2718:%v, enableEIP1559:%v}", + s.UseZktrie, s.FeeVaultAddress, s.EnableEIP2718, s.EnableEIP1559) + } + + return fmt.Sprintf("{useZktrie: %v, maxTxPerBlock: %v, feeVaultAddress: %v, enableEIP2718:%v, enableEIP1559:%v}", + s.UseZktrie, *s.MaxTxPerBlock, s.FeeVaultAddress, s.EnableEIP2718, s.EnableEIP1559) +} + // IsValidTxCount returns whether the given block's transaction count is below the limit. func (s ScrollConfig) IsValidTxCount(count int) bool { return s.MaxTxPerBlock == nil || count <= *s.MaxTxPerBlock @@ -488,7 +498,7 @@ func (c *ChainConfig) String() string { default: engine = "unknown" } - return fmt.Sprintf("{ChainID: %v Homestead: %v DAO: %v DAOSupport: %v EIP150: %v EIP155: %v EIP158: %v Byzantium: %v Constantinople: %v Petersburg: %v Istanbul: %v, Muir Glacier: %v, Berlin: %v, London: %v, Arrow Glacier: %v, Engine: %v}", + return fmt.Sprintf("{ChainID: %v Homestead: %v DAO: %v DAOSupport: %v EIP150: %v EIP155: %v EIP158: %v Byzantium: %v Constantinople: %v Petersburg: %v Istanbul: %v, Muir Glacier: %v, Berlin: %v, London: %v, Arrow Glacier: %v, Engine: %v, Scroll config: %v}", c.ChainID, c.HomesteadBlock, c.DAOForkBlock, @@ -505,6 +515,7 @@ func (c *ChainConfig) String() string { c.LondonBlock, c.ArrowGlacierBlock, engine, + c.Scroll, ) } From f0370874f19342c9c74cc51a74d566eeca1a1d9f Mon Sep 17 00:00:00 2001 From: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com> Date: Mon, 24 Apr 2023 20:44:16 +0800 Subject: [PATCH 2/2] Update version.go --- params/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/params/version.go b/params/version.go index d8751c1ea2df..672aacf359ab 100644 --- a/params/version.go +++ b/params/version.go @@ -24,7 +24,7 @@ import ( const ( VersionMajor = 3 // Major version component of the current release VersionMinor = 1 // Minor version component of the current release - VersionPatch = 7 // Patch version component of the current release + VersionPatch = 8 // Patch version component of the current release VersionMeta = "alpha" // Version metadata to append to the version string )