Merge pull request #4773 from...

Merge pull request #4773 from ethereum-optimism/zhwrd/01-23-INF-22_explicity_set_chainId_in_op-signer_SendTransaction

INF-22 explicity set chainId in op-signer SendTransaction

op-batcher/batcher/batch_submitter.go

@@ -57,7 +57,7 @@ func Main(version string) func(cliCtx *cli.Context) error {
 			signer := func(chainID *big.Int) SignerFn {
 				return func(ctx context.Context, rawTx types.TxData) (*types.Transaction, error) {
 					tx := types.NewTx(rawTx)
-					return signerClient.SignTransaction(ctx, tx)
+					return signerClient.SignTransaction(ctx, chainID, tx)
 				}
 			}
 			bs, err := NewBatchSubmitterWithSigner(cfg, common.HexToAddress(cfg.SignerConfig.Address), signer, l)

op-proposer/proposer/l2_output_submitter.go

@@ -176,7 +176,7 @@ func NewL2OutputSubmitter(cfg CLIConfig, l log.Logger) (*L2OutputSubmitter, erro
 				if address.String() != cfg.SignerConfig.Address {
 					return nil, fmt.Errorf("attempting to sign for %s, expected %s: ", address, cfg.SignerConfig.Address)
 				}
-				return signerClient.SignTransaction(ctx, tx)
+				return signerClient.SignTransaction(ctx, chainID, tx)
 			}
 		}
 	} else {

op-signer/client/client.go

@@ -5,6 +5,7 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
+	"math/big"
 	"net/http"
 	"os"
 	"time"
@@ -88,8 +89,8 @@ func (s *SignerClient) pingVersion() (string, error) {
 	return v, nil
 }
 
-func (s *SignerClient) SignTransaction(ctx context.Context, tx *types.Transaction) (*types.Transaction, error) {
-	args := NewTransactionArgsFromTransaction(tx)
+func (s *SignerClient) SignTransaction(ctx context.Context, chainId *big.Int, tx *types.Transaction) (*types.Transaction, error) {
+	args := NewTransactionArgsFromTransaction(chainId, tx)
 
 	var result hexutil.Bytes
 	if err := s.client.CallContext(ctx, &result, "eth_signTransaction", args); err != nil {

op-signer/client/transaction_args.go

@@ -31,7 +31,7 @@ type TransactionArgs struct {
 }
 
 // NewTransactionArgsFromTransaction creates a TransactionArgs struct from an EIP-1559 transaction
-func NewTransactionArgsFromTransaction(tx *types.Transaction) *TransactionArgs {
+func NewTransactionArgsFromTransaction(chainId *big.Int, tx *types.Transaction) *TransactionArgs {
 	data := hexutil.Bytes(tx.Data())
 	nonce := hexutil.Uint64(tx.Nonce())
 	gas := hexutil.Uint64(tx.Gas())
@@ -42,7 +42,7 @@ func NewTransactionArgsFromTransaction(tx *types.Transaction) *TransactionArgs {
 		Value:                (*hexutil.Big)(tx.Value()),
 		Gas:                  &gas,
 		To:                   tx.To(),
-		ChainID:              (*hexutil.Big)(tx.ChainId()),
+		ChainID:              (*hexutil.Big)(chainId),
 		MaxFeePerGas:         (*hexutil.Big)(tx.GasFeeCap()),
 		MaxPriorityFeePerGas: (*hexutil.Big)(tx.GasTipCap()),
 		AccessList:           &accesses,