Merge branch 'fix/delegated_code_failed_witness_missing' of github.com:scroll-tech/go-ethereum into fix/delegated_code_failed_witness_missing

georgehao · georgehao · commit 7cf4624d694a · 2026-01-19T17:49:20.000+08:00
diff --git a/crypto/ecies/ecies.go b/crypto/ecies/ecies.go
@@ -285,7 +285,7 @@ func (prv *PrivateKey) Decrypt(c, s1, s2 []byte) (m []byte, err error) {
 	switch c[0] {
 	case 2, 3, 4:
 		rLen = (prv.PublicKey.Curve.Params().BitSize + 7) / 4
-		if len(c) < (rLen + hLen + 1) {
+		if len(c) < (rLen + hLen + params.BlockSize) {
 			return nil, ErrInvalidMessage
 		}
 	default:
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 = 10        // Minor version component of the current release
-	VersionPatch = 2         // Patch version component of the current release
+	VersionPatch = 3         // 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
`@@ -285,7 +285,7 @@ func (prv *PrivateKey) Decrypt(c, s1, s2 []byte) (m []byte, err error) {`
`285`	`285`	`switch c[0] {`
`286`	`286`	`case 2, 3, 4:`
`287`	`287`	`rLen = (prv.PublicKey.Curve.Params().BitSize + 7) / 4`
`288`		`- if len(c) < (rLen + hLen + 1) {`
	`288`	`+ if len(c) < (rLen + hLen + params.BlockSize) {`
`289`	`289`	`return nil, ErrInvalidMessage`
`290`	`290`	`}`
`291`	`291`	`default:`
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 = 10 // Minor version component of the current release`
`27`		`- VersionPatch = 2 // Patch version component of the current release`
	`27`	`+ VersionPatch = 3 // Patch version component of the current release`
`28`	`28`	`VersionMeta = "mainnet" // Version metadata to append to the version string`
`29`	`29`	`)`
`30`	`30`