Merge pull request ethereum#6 from 0rac1e/symbiosis/master

check chainid on nil
nikicat · Apr 20, 2023 · 3c00391 · 3c00391
2 parents ecb5810 + f9ac8c9
commit 3c00391
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/core/types/transaction_marshalling.go b/core/types/transaction_marshalling.go
@@ -264,7 +264,7 @@ func (t *Transaction) UnmarshalJSON(input []byte) error {
 		}
 
 	default:
-		if dec.ChainID.ToInt().Uint64() == 324 || dec.ChainID.ToInt().Uint64() == 42161 {
+		if dec.ChainID != nil && dec.ChainID.ToInt() != nil && (dec.ChainID.ToInt().Uint64() == 324 || dec.ChainID.ToInt().Uint64() == 42161) {
 			return nil
 		}
 		return ErrTxTypeNotSupported