From 3b9a0c035f09a9f750e8a902f757c2389f2b2496 Mon Sep 17 00:00:00 2001
From: Bret Palsson <bretep@gmail.com>
Date: Wed, 8 Sep 2021 21:55:31 -0700
Subject: [PATCH] Refactor transaction signing

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

diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go
index 9c35b95f2..dfd3c185b 100644
--- a/core/types/transaction_signing.go
+++ b/core/types/transaction_signing.go
@@ -45,14 +45,10 @@ func MakeSigner(config *params.ChainConfig, blockNumber *big.Int) Signer {
 	// required to validate transactions on mainnet
 	chainID := big.NewInt(1)
 
-	// Set the chainId to Pulsechain
-	if config.IsPrimordialPulse(blockNumber) {
-		chainID = config.ChainID
-	}
-
 	switch {
 	case config.IsPrimordialPulse(blockNumber):
-		signer = NewEIP155Signer(chainID)
+		// Set the chainId to Pulsechain
+		signer = NewEIP155Signer(config.ChainID)
 	case config.IsLondon(blockNumber):
 		signer = NewLondonSigner(config.ChainID)
 	case config.IsBerlin(blockNumber):