Merge pull request #39 from bnb-chain/develop

fix: bug in profit calculation (#35)

miner/worker.go

@@ -747,7 +747,11 @@ func (w *worker) commitTransaction(env *environment, tx *types.Transaction, rece
 	env.receipts = append(env.receipts, receipt)
 
 	gasUsed := new(big.Int).SetUint64(receipt.GasUsed)
-	env.profit.Add(env.profit, gasUsed.Mul(gasUsed, tx.GasPrice()))
+	effectiveTip, err := tx.EffectiveGasTip(env.header.BaseFee)
+	if err != nil {
+		return nil, err
+	}
+	env.profit.Add(env.profit, gasUsed.Mul(gasUsed, effectiveTip))
 
 	return receipt.Logs, nil
 }
@@ -777,7 +781,15 @@ func (w *worker) commitBlobTransaction(env *environment, tx *types.Transaction,
 	*env.header.BlobGasUsed += receipt.BlobGasUsed
 
 	gasUsed := new(big.Int).SetUint64(receipt.GasUsed)
-	env.profit.Add(env.profit, gasUsed.Mul(gasUsed, tx.GasPrice()))
+	effectiveTip, err := tx.EffectiveGasTip(env.header.BaseFee)
+	if err != nil {
+		return nil, err
+	}
+	env.profit.Add(env.profit, gasUsed.Mul(gasUsed, effectiveTip))
+
+	blobFee := new(big.Int).SetUint64(receipt.BlobGasUsed)
+	blobFee.Mul(blobFee, receipt.BlobGasPrice)
+	env.profit.Add(env.profit, blobFee)
 
 	return receipt.Logs, nil
 }

miner/worker_builder.go

@@ -441,7 +441,17 @@ func (w *worker) simulateBundle(
 		bundleGasUsed += receipt.GasUsed
 
 		txGasUsed := new(big.Int).SetUint64(receipt.GasUsed)
-		txGasFees := new(big.Int).Mul(txGasUsed, tx.GasPrice())
+		effectiveTip, err := tx.EffectiveGasTip(env.header.BaseFee)
+		if err != nil {
+			return nil, err
+		}
+		txGasFees := new(big.Int).Mul(txGasUsed, effectiveTip)
+
+		if tx.Type() == types.BlobTxType {
+			blobFee := new(big.Int).SetUint64(receipt.BlobGasUsed)
+			blobFee.Mul(blobFee, receipt.BlobGasPrice)
+			txGasFees.Add(txGasFees, blobFee)
+		}
 		bundleGasFees.Add(bundleGasFees, txGasFees)
 		sysBalanceAfter := state.GetBalance(consensus.SystemAddress)
 		sysDelta := new(uint256.Int).Sub(sysBalanceAfter, sysBalanceBefore)