Merge branch 'pbs-fix' into pbs

flashbots · Aug 16, 2024 · 93c07d0 · 93c07d0
2 parents ba80bce + 468e30b
commit 93c07d0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 14 deletions.
diff --git a/op-node/metrics/metrics.go b/op-node/metrics/metrics.go
@@ -145,8 +145,8 @@ type Metrics struct {
 
 	L1ReorgDepth prometheus.Histogram
 
-	TransactionsSequencedTotal prometheus.Counter
-	TransactionsSequenced      *prometheus.CounterVec
+	TransactionsSequencedTotal       prometheus.Counter
+	TransactionsSequencedSourceTotal *prometheus.CounterVec
 
 	PlasmaMetrics plasma.Metricer
 
@@ -253,9 +253,9 @@ func NewMetrics(procName string) *Metrics {
 			Name:      "transactions_sequenced_total",
 			Help:      "Count of total transactions sequenced",
 		}),
-		TransactionsSequenced: factory.NewCounterVec(prometheus.CounterOpts{
+		TransactionsSequencedSourceTotal: factory.NewCounterVec(prometheus.CounterOpts{
 			Namespace: ns,
-			Name:      "transactions_sequenced",
+			Name:      "transactions_sequenced_source_total",
 			Help:      "Count of transactions sequenced by sources",
 		}, []string{
 			"source",
@@ -551,7 +551,7 @@ func (m *Metrics) CountSequencedTxs(count int) {
 }
 
 func (m *Metrics) CountSequencedTxsBySource(count int, source string) {
-	m.TransactionsSequenced.WithLabelValues(source).Add(float64(count))
+	m.TransactionsSequencedSourceTotal.WithLabelValues(source).Add(float64(count))
 }
 
 func (m *Metrics) RecordL1ReorgDepth(d uint64) {

diff --git a/op-node/rollup/derive/engine_update.go b/op-node/rollup/derive/engine_update.go
@@ -222,22 +222,30 @@ func confirmPayload(
 			return nil, BlockInsertTemporaryErr, fmt.Errorf("failed to get execution payload from engine: %w", err)
 		}
 	}
+	metrics.RecordSequencerProfit(float64(WeiToGwei(engineEnvelope.BlockValue)), opMetrics.PayloadSourceEngine)
+	metrics.RecordPayloadGas(float64(engineEnvelope.ExecutionPayload.GasUsed), opMetrics.PayloadSourceEngine)
+	metrics.CountSequencedTxsBySource(len(engineEnvelope.ExecutionPayload.Transactions), opMetrics.PayloadSourceEngine)
 
 	if builderPayload != nil && builderPayload.success {
-		errTyp, err := insertPayload(ctx, log, eng, fc, updateSafe, agossip, sequencerConductor, builderPayload.envelope)
-		if errTyp == BlockInsertOK {
+		if builderPayload.envelope.ExecutionPayload.GasUsed >= engineEnvelope.ExecutionPayload.GasUsed {
+			log.Info("builder payload has higher gas usage than engine payload", "builder_gas", builderPayload.envelope.ExecutionPayload.GasUsed, "engine_gas", engineEnvelope.ExecutionPayload.GasUsed)
 			metrics.RecordSequencerProfit(float64(WeiToGwei(builderPayload.envelope.BlockValue)), opMetrics.PayloadSourceBuilder)
-			metrics.RecordSequencerPayloadInserted(opMetrics.PayloadSourceBuilder)
 			metrics.RecordPayloadGas(float64(builderPayload.envelope.ExecutionPayload.GasUsed), opMetrics.PayloadSourceBuilder)
-			log.Info("succeessfully inserted payload from builder")
-			return builderPayload.envelope, errTyp, err
+			metrics.CountSequencedTxsBySource(len(builderPayload.envelope.ExecutionPayload.Transactions), opMetrics.PayloadSourceBuilder)
+
+			errTyp, err := insertPayload(ctx, log, eng, fc, updateSafe, agossip, sequencerConductor, builderPayload.envelope)
+			if errTyp == BlockInsertOK {
+				metrics.RecordSequencerPayloadInserted(opMetrics.PayloadSourceBuilder)
+				log.Info("succeessfully inserted payload from builder")
+				return builderPayload.envelope, errTyp, err
+			}
+			log.Error("failed to insert payload from builder", "errType", errTyp, "error", err)
+		} else {
+			log.Warn("builder payload has lower gas usage than engine payload", "builder_gas", builderPayload.envelope.ExecutionPayload.GasUsed, "engine_gas", engineEnvelope.ExecutionPayload.GasUsed)
 		}
-		log.Error("failed to insert payload from builder", "errType", errTyp, "error", err)
 	}
 
-	metrics.RecordSequencerProfit(float64(WeiToGwei(engineEnvelope.BlockValue)), opMetrics.PayloadSourceEngine)
 	metrics.RecordSequencerPayloadInserted(opMetrics.PayloadSourceEngine)
-	metrics.RecordPayloadGas(float64(engineEnvelope.ExecutionPayload.GasUsed), opMetrics.PayloadSourceEngine)
 	errType, err := insertPayload(ctx, log, eng, fc, updateSafe, agossip, sequencerConductor, engineEnvelope)
 	return engineEnvelope, errType, err
 }

diff --git a/ops-bedrock/docker-compose.yml b/ops-bedrock/docker-compose.yml
@@ -327,7 +327,7 @@ services:
       - "--builder.seconds_in_slot=2"
       - "--builder.block_resubmit_interval=200ms"
       - "--builder.submission_offset=1s"
-      - "--verbosity=5"
+      - "--builder.algotype=greedy"
     environment:
       GETH_MINER_RECOMMIT: 100ms
       BUILDER_TX_SIGNING_KEY: "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"