optimism: set chain-ID of pre-bedrock relayed txs

protolambda · Jun 7, 2023 · 5d616c1 · 5d616c1
1 parent a22cadc
commit 5d616c1
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
@@ -1473,6 +1473,10 @@ func newRPCTransaction(tx *types.Transaction, blockHash common.Hash, blockNumber
 			result.Nonce = hexutil.Uint64(*receipt.DepositNonce)
 		}
 	case types.LegacyTxType:
+		if v.Sign() == 0 && r.Sign() == 0 && s.Sign() == 0 { // pre-bedrock relayed tx does not have a signature
+			result.ChainID = (*hexutil.Big)(new(big.Int).Set(config.ChainID))
+			break
+		}
 		// if a legacy transaction has an EIP-155 chain id, include it explicitly
 		if id := tx.ChainId(); id.Sign() != 0 {
 			result.ChainID = (*hexutil.Big)(id)