From 38f7b9440c4e89ac5897d14e611f6b2e8ddd0aa8 Mon Sep 17 00:00:00 2001
From: devopsbo3 <69951731+devopsbo3@users.noreply.github.com>
Date: Fri, 10 Nov 2023 12:27:53 -0600
Subject: [PATCH] Revert "core: fix calculation of blob gasprice in tx receipt
 (#28082)"

This reverts commit 7cf8bf905ed7a25a0cce0cd366e0aa1e07df47f5.
---
 core/state_processor.go | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/core/state_processor.go b/core/state_processor.go
index 6a208a1811b2..a2a3165336b9 100644
--- a/core/state_processor.go
+++ b/core/state_processor.go
@@ -24,7 +24,6 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/consensus"
 	"github.com/ethereum/go-ethereum/consensus/misc"
-	"github.com/ethereum/go-ethereum/consensus/misc/eip4844"
 	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/core/vm"
@@ -136,10 +135,8 @@ func applyTransaction(msg *Message, config *params.ChainConfig, gp *GasPool, sta
 	receipt.TxHash = tx.Hash()
 	receipt.GasUsed = result.UsedGas
 
-	if tx.Type() == types.BlobTxType {
-		receipt.BlobGasUsed = uint64(len(tx.BlobHashes()) * params.BlobTxBlobGasPerBlob)
-		receipt.BlobGasPrice = eip4844.CalcBlobFee(*evm.Context.ExcessBlobGas)
-	}
+	receipt.BlobGasUsed = uint64(len(tx.BlobHashes()) * params.BlobTxBlobGasPerBlob)
+	receipt.BlobGasPrice = tx.BlobGasFeeCap()
 
 	// If the transaction created a contract, store the creation address in the receipt.
 	if msg.To == nil {