From 536034a77f108a7d88995be600aa310a0f349316 Mon Sep 17 00:00:00 2001
From: KNWR <24398939+KNWR@users.noreply.github.com>
Date: Fri, 22 Dec 2023 15:47:32 -0500
Subject: [PATCH] Extract L1 API call to method:
 GetBlobSidecarsByRefAndIndexedDataHashes (#9)

* Extract L1 API call to method: GetBlobSidecarsByRefAndIndexedDataHashes

* Fix function declaration & add godoc comments
---
 op-service/sources/l1_beacon_client.go | 20 ++++++++++++++++----
 op-service/txmgr/txmgr.go              |  3 ++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/op-service/sources/l1_beacon_client.go b/op-service/sources/l1_beacon_client.go
index 75a6149108b3b..1f08868d46cd4 100644
--- a/op-service/sources/l1_beacon_client.go
+++ b/op-service/sources/l1_beacon_client.go
@@ -51,6 +51,7 @@ func (cl *L1BeaconClient) apiReq(ctx context.Context, dest any, method string) e
 	return nil
 }
 
+// GetTimeToSlotFn returns a function that converts a timestamp to a slot number.
 func (cl *L1BeaconClient) GetTimeToSlotFn(ctx context.Context) (TimeToSlotFn, error) {
 	cl.initLock.Lock()
 	defer cl.initLock.Unlock()
@@ -74,9 +75,9 @@ func (cl *L1BeaconClient) GetTimeToSlotFn(ctx context.Context) (TimeToSlotFn, er
 	return cl.timeToSlotFn, nil
 }
 
-// BlobsByRefAndIndexedDataHashes fetches blobs that were confirmed in the given L1 block with the
-// given indexed hashes. The order of the returned blobs will match the order of `dataHashes`.
-func (cl *L1BeaconClient) BlobsByRefAndIndexedDataHashes(ctx context.Context, ref eth.L1BlockRef, dataHashes []eth.IndexedDataHash) ([]*eth.Blob, error) {
+// GetBlobSidecarsByRefAndIndexedDataHashes fetches blob sidecars that were confirmed in the given L1 block with the
+// given indexed hashes.
+func (cl *L1BeaconClient) GetBlobSidecarsByRefAndIndexedDataHashes(ctx context.Context, ref eth.L1BlockRef, dataHashes []eth.IndexedDataHash) ([]*eth.BlobSidecar, error) {
 	slotFn, err := cl.GetTimeToSlotFn(ctx)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get time to slot function: %w", err)
@@ -103,13 +104,24 @@ func (cl *L1BeaconClient) BlobsByRefAndIndexedDataHashes(ctx context.Context, re
 		return nil, fmt.Errorf("expected %v sidecars but got %v", len(dataHashes), len(resp.Data))
 	}
 
+	return resp.Data, nil
+}
+
+// BlobsByRefAndIndexedDataHashes fetches blobs that were confirmed in the given L1 block with the
+// given indexed hashes. The order of the returned blobs will match the order of `dataHashes`.
+func (cl *L1BeaconClient) BlobsByRefAndIndexedDataHashes(ctx context.Context, ref eth.L1BlockRef, dataHashes []eth.IndexedDataHash) ([]*eth.Blob, error) {
+	blobSidecars, err := cl.GetBlobSidecarsByRefAndIndexedDataHashes(ctx, ref, dataHashes)
+	if err != nil {
+		return nil, err
+	}
+
 	out := make([]*eth.Blob, len(dataHashes))
 	for i, ih := range dataHashes {
 		// The beacon node api makes no guarantees on order of the returned blob sidecars, so
 		// search for the sidecar that matches the current indexed hash to ensure blobs are
 		// returned in the same order.
 		var sidecar *eth.BlobSidecar
-		for _, sc := range resp.Data {
+		for _, sc := range blobSidecars {
 			if uint64(sc.Index) == ih.Index {
 				sidecar = sc
 				break
diff --git a/op-service/txmgr/txmgr.go b/op-service/txmgr/txmgr.go
index f9daa53b7a830..1576cc3c5662e 100644
--- a/op-service/txmgr/txmgr.go
+++ b/op-service/txmgr/txmgr.go
@@ -37,6 +37,7 @@ var (
 	blobPriceBumpPercent = big.NewInt(100 + blobPriceBump)
 
 	oneHundred = big.NewInt(100)
+	ninetyNine = big.NewInt(99)
 	two        = big.NewInt(2)
 )
 
@@ -706,7 +707,7 @@ func (m *SimpleTxManager) checkLimits(tip, basefee, bumpedTip, bumpedFee *big.In
 
 // calcThresholdValue returns ceil(x * priceBumpPercent / 100)
 // It guarantees that x is increased by at least 1
-func calcThresholdValue(x *big.Int) *big.Int {
+func calcThresholdValue(x *big.Int, isBlobTx bool) *big.Int {
 	var percent *big.Int
 	if isBlobTx {
 		percent = blobPriceBumpPercent