From 224053896063b0895b436d4f0b892e6b9fd5a0f0 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Wed, 19 Mar 2025 11:29:43 +0100
Subject: [PATCH] core/types: improve chainID assertion

---
 core/types/transaction_signing.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go
index 9b782147c5..01aa67c6ba 100644
--- a/core/types/transaction_signing.go
+++ b/core/types/transaction_signing.go
@@ -189,8 +189,8 @@ type modernSigner struct {
 }
 
 func newModernSigner(chainID *big.Int, fork forks.Fork) Signer {
-	if chainID == nil {
-		panic("nil chainID")
+	if chainID == nil || chainID.Sign() <= 0 {
+		panic(fmt.Sprintf("invalid chainID %v", chainID))
 	}
 	s := &modernSigner{
 		chainID: chainID,