fix(op-geth): fix nil issue and add metrics

redhdx · Jul 30, 2024 · f0b8112 · f0b8112
1 parent ed7ab15
commit f0b8112
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/core/txpool/bundlepool/bundlepool.go b/core/txpool/bundlepool/bundlepool.go
@@ -36,8 +36,10 @@ const (
 )
 
 var (
-	bundleGauge = metrics.NewRegisteredGauge("bundlepool/bundles", nil)
-	slotsGauge  = metrics.NewRegisteredGauge("bundlepool/slots", nil)
+	bundleGauge         = metrics.NewRegisteredGauge("bundlepool/bundles", nil)
+	slotsGauge          = metrics.NewRegisteredGauge("bundlepool/slots", nil)
+	bundleDeliverAll    = metrics.NewRegisteredCounter("bundle/deliver/all", nil)
+	bundleDeliverFailed = metrics.NewRegisteredCounter("bundle/deliver/failed", nil)
 )
 
 var (
@@ -187,9 +189,11 @@ func (p *BundlePool) AddBundle(bundle *types.Bundle, originBundle *types.SendBun
 			var hash common.Hash
 			err := cli.CallContext(context.Background(), &hash, "eth_sendBundle", *originBundle)
 			if err != nil {
+				bundleDeliverFailed.Inc(1)
 				log.Error("failed to deliver bundle to receiver", "url", url, "err", err)
 			}
 		}()
+		bundleDeliverAll.Inc(1)
 	}
 
 	for p.slots+numSlots(bundle) > p.config.GlobalSlots {

diff --git a/internal/ethapi/api_bundle.go b/internal/ethapi/api_bundle.go
@@ -39,6 +39,11 @@ func (s *PrivateTxBundleAPI) SimulateGaslessBundle(_ context.Context, args types
 		if err := tx.UnmarshalBinary(encodedTx); err != nil {
 			return nil, err
 		}
+		switch tx.Type() {
+		case types.LegacyTxType, types.AccessListTxType, types.DynamicFeeTxType:
+		default:
+			return nil, errors.New(fmt.Sprintf("transaction type %d not supported", tx.Type()))
+		}
 		txs = append(txs, tx)
 	}
 

diff --git a/miner/worker_builder.go b/miner/worker_builder.go
@@ -421,13 +421,12 @@ func (w *worker) simulateGaslessBundle(env *environment, bundle *types.Bundle) (
 			log.Warn("fail to simulate gasless bundle, skipped", "txHash", tx.Hash(), "err", err)
 		} else {
 			txIdx++
+			result = append(result, types.GaslessTxSimResult{
+				Hash:    tx.Hash(),
+				GasUsed: receipt.GasUsed,
+				Valid:   valid,
+			})
 		}
-
-		result = append(result, types.GaslessTxSimResult{
-			Hash:    tx.Hash(),
-			GasUsed: receipt.GasUsed,
-			Valid:   valid,
-		})
 	}
 
 	return &types.SimulateGaslessBundleResp{