Merge branch 'develop' into new-zkevm

colinlyguo · web-flow · commit 05b94c077247 · 2024-04-05T11:48:53.000+08:00
diff --git a/core/state/dump.go b/core/state/dump.go
@@ -107,6 +107,7 @@ func (d iterativeDump) OnAccount(addr common.Address, account DumpAccount) {
 		Root:             account.Root,
 		KeccakCodeHash:   account.KeccakCodeHash,
 		PoseidonCodeHash: account.PoseidonCodeHash,
+		CodeSize:         account.CodeSize,
 		Code:             account.Code,
 		Storage:          account.Storage,
 		SecureKey:        account.SecureKey,
diff --git a/params/version.go b/params/version.go
@@ -24,7 +24,7 @@ import (
 const (
 	VersionMajor = 5         // Major version component of the current release
 	VersionMinor = 1         // Minor version component of the current release
-	VersionPatch = 31        // Patch version component of the current release
+	VersionPatch = 32        // Patch version component of the current release
 	VersionMeta  = "mainnet" // Version metadata to append to the version string
 )
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import (`
`24`	`24`	`const (`
`25`	`25`	`VersionMajor = 5 // Major version component of the current release`
`26`	`26`	`VersionMinor = 1 // Minor version component of the current release`
`27`		`- VersionPatch = 31 // Patch version component of the current release`
	`27`	`+ VersionPatch = 32 // Patch version component of the current release`
`28`	`28`	`VersionMeta = "mainnet" // Version metadata to append to the version string`
`29`	`29`	`)`
`30`	`30`