From 325df8e66718bd5b48e23b00a7de3828d718c7ed Mon Sep 17 00:00:00 2001
From: tok-kkk <yunshi@renproject.io>
Date: Tue, 11 Oct 2022 11:45:25 +1100
Subject: [PATCH] fix chain id validation logic to support homestead signer

---
 chain/evm/client.go | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/chain/evm/client.go b/chain/evm/client.go
index 07ae2040..bf88f96a 100644
--- a/chain/evm/client.go
+++ b/chain/evm/client.go
@@ -31,7 +31,11 @@ type Client struct {
 func NewClient(rpcURL string, chainID *big.Int) (*Client, error) {
 	client, err := ethclient.Dial(rpcURL)
 	if err != nil {
-		return nil, fmt.Errorf(fmt.Sprintf("dialing url: %v", rpcURL))
+		return nil, fmt.Errorf("dialing url: %v", rpcURL)
+	}
+	clientChainID, err := client.ChainID(context.Background())
+	if err != nil {
+		return nil, fmt.Errorf("mismatched chain id: expected %v, got %v", chainID, clientChainID)
 	}
 	return &Client{
 		client,
@@ -55,20 +59,24 @@ func (client *Client) Tx(ctx context.Context, txID pack.Bytes) (account.Tx, pack
 	if err != nil {
 		return nil, pack.NewU64(0), fmt.Errorf(fmt.Sprintf("fetching tx by hash '%v': %v", txID, err))
 	}
-	chainID := tx.ChainId()
-	if client.ChainID != nil {
-		if chainID == nil {
-			return nil, 0, fmt.Errorf("nil chain ID")
-		}
-		if chainID.Cmp(client.ChainID) != 0 {
-			return nil, 0, fmt.Errorf("invalid chain ID, expected = %v, got = %v", client.ChainID.String(), chainID.String())
+
+	// Check the chain id for replay-protected tx.
+	if tx.Protected() {
+		chainID := tx.ChainId()
+		if client.ChainID != nil {
+			if chainID == nil {
+				return nil, 0, fmt.Errorf("nil chain ID")
+			}
+			if chainID.Cmp(client.ChainID) != 0 {
+				return nil, 0, fmt.Errorf("invalid chain ID, expected = %v, got = %v", client.ChainID.String(), chainID.String())
+			}
 		}
 	}
 
 	// If the transaction is still pending, use default EIP-155 Signer.
 	pendingTx := Tx{
 		EthTx:  tx,
-		Signer: types.NewEIP155Signer(chainID),
+		Signer: types.NewEIP155Signer(client.ChainID),
 	}
 	if pending {
 		// Transaction has not been included in a block yet.
@@ -93,7 +101,7 @@ func (client *Client) Tx(ctx context.Context, txID pack.Bytes) (account.Tx, pack
 	// Transaction has been confirmed.
 	confirmedTx := Tx{
 		tx,
-		types.LatestSignerForChainID(chainID),
+		types.LatestSignerForChainID(client.ChainID),
 	}
 
 	header, err := client.EthClient.HeaderByNumber(ctx, nil)