Use TxManager interface in DriverSetup and BatcherService (ethereum-o…

…ptimism#12040)
celestiaorg · Sep 22, 2024 · de7f8d9 · de7f8d9
1 parent 4c6bc7e
commit de7f8d9
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 4 deletions.
diff --git a/op-batcher/batcher/driver.go b/op-batcher/batcher/driver.go
@@ -80,7 +80,7 @@ type DriverSetup struct {
 	Metr             metrics.Metricer
 	RollupConfig     *rollup.Config
 	Config           BatcherConfig
-	Txmgr            *txmgr.SimpleTxManager
+	Txmgr            txmgr.TxManager
 	L1Client         L1Client
 	EndpointProvider dial.L2EndpointProvider
 	ChannelConfig    ChannelConfigProvider

diff --git a/op-batcher/batcher/service.go b/op-batcher/batcher/service.go
@@ -53,7 +53,7 @@ type BatcherService struct {
 	Metrics          metrics.Metricer
 	L1Client         *ethclient.Client
 	EndpointProvider dial.L2EndpointProvider
-	TxManager        *txmgr.SimpleTxManager
+	TxManager        txmgr.TxManager
 	AltDA            *altda.DAClient
 
 	BatcherConfig

diff --git a/op-batcher/batcher/test_batch_submitter.go b/op-batcher/batcher/test_batch_submitter.go
@@ -37,8 +37,12 @@ func (l *TestBatchSubmitter) JamTxPool(ctx context.Context) error {
 		return err
 	}
 
+	simpleTxMgr, ok := l.Txmgr.(*txmgr.SimpleTxManager)
+	if !ok {
+		return errors.New("txmgr is not a SimpleTxManager")
+	}
 	l.ttm = &txmgr.TestTxManager{
-		SimpleTxManager: l.Txmgr,
+		SimpleTxManager: simpleTxMgr,
 	}
 	l.Log.Info("sending txpool blocking test tx")
 	if err := l.ttm.JamTxPool(ctx, *candidate); err != nil {

diff --git a/op-challenger/sender/sender_test.go b/op-challenger/sender/sender_test.go
@@ -3,6 +3,7 @@ package sender
 import (
 	"context"
 	"fmt"
+	"math/big"
 	"sync"
 	"testing"
 	"time"
@@ -181,3 +182,7 @@ func (s *stubTxMgr) API() rpc.API {
 
 func (s *stubTxMgr) Close() {
 }
+
+func (s *stubTxMgr) SuggestGasPriceCaps(context.Context) (*big.Int, *big.Int, *big.Int, error) {
+	panic("unimplemented")
+}
diff --git a/op-e2e/actions/helpers/l2_proposer.go b/op-e2e/actions/helpers/l2_proposer.go
@@ -84,6 +84,10 @@ func (f fakeTxMgr) API() rpc.API {
 	panic("unimplemented")
 }
 
+func (f fakeTxMgr) SuggestGasPriceCaps(context.Context) (*big.Int, *big.Int, *big.Int, error) {
+	panic("unimplemented")
+}
+
 func NewL2Proposer(t Testing, log log.Logger, cfg *ProposerCfg, l1 *ethclient.Client, rollupCl *sources.RollupClient) *L2Proposer {
 	proposerConfig := proposer.ProposerConfig{
 		PollInterval:           time.Second,

diff --git a/op-service/txmgr/mocks/TxManager.go b/op-service/txmgr/mocks/TxManager.go
diff --git a/op-service/txmgr/txmgr.go b/op-service/txmgr/txmgr.go
@@ -90,6 +90,10 @@ type TxManager interface {
 	// Close the underlying connection
 	Close()
 	IsClosed() bool
+
+	// SuggestGasPriceCaps suggests what the new tip, base fee, and blob base fee should be based on
+	// the current L1 conditions. `blobBaseFee` will be nil if 4844 is not yet active.
+	SuggestGasPriceCaps(ctx context.Context) (tipCap *big.Int, baseFee *big.Int, blobBaseFee *big.Int, err error)
 }
 
 // ETHBackend is the set of methods that the transaction manager uses to resubmit gas & determine
@@ -857,7 +861,7 @@ func (m *SimpleTxManager) increaseGasPrice(ctx context.Context, tx *types.Transa
 }
 
 // SuggestGasPriceCaps suggests what the new tip, base fee, and blob base fee should be based on
-// the current L1 conditions. blobfee will be nil if 4844 is not yet active.
+// the current L1 conditions. `blobBaseFee` will be nil if 4844 is not yet active.
 func (m *SimpleTxManager) SuggestGasPriceCaps(ctx context.Context) (*big.Int, *big.Int, *big.Int, error) {
 	cCtx, cancel := context.WithTimeout(ctx, m.cfg.NetworkTimeout)
 	defer cancel()