op-batcher: Remove From field

op-batcher/batcher/batch_submitter.go

@@ -73,7 +73,7 @@ func Main(version string, cliCtx *cli.Context) error {
 				l.Error("error starting metrics server", err)
 			}
 		}()
-		m.StartBalanceMetrics(ctx, l, batchSubmitter.L1Client, batchSubmitter.From)
+		m.StartBalanceMetrics(ctx, l, batchSubmitter.L1Client, batchSubmitter.TxManager.From())
 	}
 
 	rpcCfg := cfg.RPCConfig

op-batcher/batcher/config.go

@@ -3,7 +3,6 @@ package batcher
 import (
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/urfave/cli"
@@ -25,10 +24,9 @@ type Config struct {
 	L1Client   *ethclient.Client
 	L2Client   *ethclient.Client
 	RollupNode *sources.RollupClient
+	TxManager  txmgr.TxManager
 
 	PollInterval time.Duration
-	From         common.Address
-	TxManager    txmgr.TxManager
 
 	// RollupConfig is queried at startup
 	Rollup *rollup.Config

op-batcher/batcher/driver.go

@@ -80,7 +80,6 @@ func NewBatchSubmitterFromCLIConfig(cfg CLIConfig, l log.Logger, m metrics.Metri
 		RollupNode:   rollupClient,
 		PollInterval: cfg.PollInterval,
 		TxManager:    txManager,
-		From:         txManager.From(),
 		Rollup:       rcfg,
 		Channel: ChannelConfig{
 			SeqWindowSize:      rcfg.SeqWindowSize,
@@ -105,13 +104,13 @@ func NewBatchSubmitterFromCLIConfig(cfg CLIConfig, l log.Logger, m metrics.Metri
 // NewBatchSubmitter initializes the BatchSubmitter, gathering any resources
 // that will be needed during operation.
 func NewBatchSubmitter(ctx context.Context, cfg Config, l log.Logger, m metrics.Metricer) (*BatchSubmitter, error) {
-	balance, err := cfg.L1Client.BalanceAt(ctx, cfg.From, nil)
+	balance, err := cfg.L1Client.BalanceAt(ctx, cfg.TxManager.From(), nil)
 	if err != nil {
 		return nil, err
 	}
 
 	cfg.log = l
-	cfg.log.Info("creating batch submitter", "submitter_addr", cfg.From, "submitter_bal", balance)
+	cfg.log.Info("creating batch submitter", "submitter_addr", cfg.TxManager.From(), "submitter_bal", balance)
 
 	cfg.metr = m
 
@@ -349,7 +348,7 @@ func (l *BatchSubmitter) sendTransaction(ctx context.Context, data []byte) (*typ
 	if receipt, err := l.txMgr.Send(ctx, txmgr.TxCandidate{
 		To:       l.Rollup.BatchInboxAddress,
 		TxData:   data,
-		From:     l.From,
+		From:     l.txMgr.From(),
 		GasLimit: intrinsicGas,
 	}); err != nil {
 		l.log.Warn("unable to publish tx", "err", err, "data_size", len(data))

op-batcher/batcher/driver_test.go

-package batcher
-
-import (
-	"context"
-	"math/big"
-	"testing"
-
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-
-	"github.com/ethereum-optimism/optimism/op-node/rollup"
-	"github.com/ethereum-optimism/optimism/op-node/testlog"
-	"github.com/ethereum-optimism/optimism/op-service/txmgr"
-	"github.com/ethereum-optimism/optimism/op-service/txmgr/mocks"
-)
-
-// TestBatchSubmitter_SendTransaction tests the driver's
-// [SendTransaction] external facing function.
-func TestBatchSubmitter_SendTransaction(t *testing.T) {
-	log := testlog.Logger(t, log.LvlCrit)
-	txMgr := mocks.TxManager{}
-	batcherInboxAddress := common.HexToAddress("0x42000000000000000000000000000000000000ff")
-	chainID := big.NewInt(1)
-	sender := common.HexToAddress("0xdeadbeef")
-	bs := BatchSubmitter{
-		Config: Config{
-			log:  log,
-			From: sender,
-			Rollup: &rollup.Config{
-				L1ChainID:         chainID,
-				BatchInboxAddress: batcherInboxAddress,
-			},
-		},
-		txMgr: &txMgr,
-	}
-	txData := []byte{0x00, 0x01, 0x02}
-
-	gasTipCap := big.NewInt(136)
-	gasFeeCap := big.NewInt(137)
-	gas := uint64(1337)
-
-	// Candidate gas should be calculated with [core.IntrinsicGas]
-	intrinsicGas, err := core.IntrinsicGas(txData, nil, false, true, true, false)
-	require.NoError(t, err)
-	candidate := txmgr.TxCandidate{
-		To:       batcherInboxAddress,
-		TxData:   txData,
-		From:     sender,
-		GasLimit: intrinsicGas,
-	}
-
-	tx := types.NewTx(&types.DynamicFeeTx{
-		ChainID:   chainID,
-		Nonce:     0,
-		GasTipCap: gasTipCap,
-		GasFeeCap: gasFeeCap,
-		Gas:       gas,
-		To:        &batcherInboxAddress,
-		Data:      txData,
-	})
-	txHash := tx.Hash()
-
-	expectedReceipt := types.Receipt{
-		Type:              1,
-		PostState:         []byte{},
-		Status:            uint64(1),
-		CumulativeGasUsed: gas,
-		TxHash:            txHash,
-		GasUsed:           gas,
-	}
-
-	txMgr.On("Send", mock.Anything, candidate).Return(&expectedReceipt, nil)
-
-	receipt, err := bs.sendTransaction(context.Background(), tx.Data())
-	require.NoError(t, err)
-	require.Equal(t, receipt, &expectedReceipt)
-}

op-proposer/proposer/l2_output_submitter.go

@@ -137,8 +137,6 @@ type L2OutputSubmitter struct {
 	// is never valid on an alternative L1 chain that would produce different L2 data.
 	// This option is not necessary when higher proposal latency is acceptable and L1 is healthy.
 	allowNonFinalized bool
-	// From is the address to send transactions from
-	from common.Address
 	// How frequently to poll L2 for new finalized outputs
 	pollInterval time.Duration
 }
@@ -250,7 +248,7 @@ func (l *L2OutputSubmitter) FetchNextOutputInfo(ctx context.Context) (*eth.Outpu
 	cCtx, cancel := context.WithTimeout(ctx, defaultDialTimeout)
 	defer cancel()
 	callOpts := &bind.CallOpts{
-		From:    l.from,
+		From:    l.txMgr.From(),
 		Context: cCtx,
 	}
 	nextCheckpointBlock, err := l.l2ooContract.NextBlockNumber(callOpts)
@@ -336,7 +334,7 @@ func (l *L2OutputSubmitter) sendTransaction(ctx context.Context, output *eth.Out
 		TxData:   data,
 		To:       l.l2ooContractAddr,
 		GasLimit: 0,
-		From:     l.from,
+		From:     l.txMgr.From(),
 	})
 	if err != nil {
 		return err