core, internal: expose effectiveGasPrice in receipts (ethereum#23050)

core/tx_pool.go

@@ -553,7 +553,7 @@ func (pool *TxPool) Pending(enforceTips bool) (map[common.Address]types.Transact
  // If the miner requests tip enforcement, cap the lists now
  if enforceTips && !pool.locals.contains(addr) {
  for i, tx := range txs {
- if tx.EffectiveTipIntCmp(pool.gasPrice, pool.priced.urgent.baseFee) < 0 {
+ if tx.EffectiveGasTipIntCmp(pool.gasPrice, pool.priced.urgent.baseFee) < 0 {
  txs = txs[:i]
  break
  }

core/types/transaction.go

@@ -385,8 +385,8 @@ func (tx *Transaction) EffectiveGasTipCmp(other *Transaction, baseFee *big.Int)
  return tx.EffectiveGasTipValue(baseFee).Cmp(other.EffectiveGasTipValue(baseFee))
 }
 
-// EffectiveTipIntCmp compares the effective gasTipCap of a transaction to the given gasTipCap.
-func (tx *Transaction) EffectiveTipIntCmp(other *big.Int, baseFee *big.Int) int {
+// EffectiveGasTipIntCmp compares the effective gasTipCap of a transaction to the given gasTipCap.
+func (tx *Transaction) EffectiveGasTipIntCmp(other *big.Int, baseFee *big.Int) int {
  if baseFee == nil {
  return tx.GasTipCapIntCmp(other)
  }

internal/ethapi/api.go

@@ -2188,7 +2188,17 @@ func (s *PublicTransactionPoolAPI) GetTransactionReceipt(ctx context.Context, ha
  "logsBloom": receipt.Bloom,
  "type": hexutil.Uint(tx.Type()),
  }
-
+ // Assign the effective gas price paid
+ if !s.b.ChainConfig().IsEIP1559(bigblock) {
+ fields["effectiveGasPrice"] = hexutil.Uint64(tx.GasPrice().Uint64())
+ } else {
+ header, err := s.b.HeaderByHash(ctx, blockHash)
+ if err != nil {
+ return nil, err
+ }
+ gasPrice := new(big.Int).Add(header.BaseFee, tx.EffectiveGasTipValue(header.BaseFee))
+ fields["effectiveGasPrice"] = hexutil.Uint64(gasPrice.Uint64())
+ }
  // Assign receipt status or post state.
  if len(receipt.PostState) > 0 {
  fields["root"] = hexutil.Bytes(receipt.PostState)