Display dynamic fee transactions in block explorers

jsonrpc/eth_blockchain_test.go

@@ -191,8 +191,7 @@ func TestEth_Block_GetTransactionByBlockNumberAndIndex(t *testing.T) {
 
 	transaction := toTransaction(
 		block.Transactions[testIndex],
-		argUintPtr(block.Number()),
-		argHashPtr(block.Hash()),
+		block.Header,
 		&testIndex,
 	)
 
@@ -217,8 +216,7 @@ func TestEth_Block_GetTransactionByBlockHashAndIndex(t *testing.T) {
 
 	transaction := toTransaction(
 		block.Transactions[testIndex],
-		argUintPtr(block.Number()),
-		argHashPtr(block.Hash()),
+		block.Header,
 		&testIndex,
 	)
 

jsonrpc/eth_endpoint.go

@@ -361,12 +361,9 @@ func (e *Eth) GetTransactionByHash(hash types.Hash) (interface{}, error) {
 
 		// Find the transaction within the block
 		if txn, idx := types.FindTxByHash(block.Transactions, hash); txn != nil {
-			txn.SetGasPrice(txn.GetGasPrice(block.Header.BaseFee))
-
 			return toTransaction(
 				txn,
-				argUintPtr(block.Number()),
-				argHashPtr(block.Hash()),
+				block.Header,
 				&idx,
 			)
 		}

jsonrpc/helper.go

@@ -56,8 +56,7 @@ func GetTransactionByBlockAndIndex(block *types.Block, index argUint64) (interfa
 
 	return toTransaction(
 		block.Transactions[index],
-		argUintPtr(block.Number()),
-		argHashPtr(block.Hash()),
+		block.Header,
 		&idx,
 	), nil
 }

jsonrpc/txpool_endpoint.go

@@ -51,7 +51,7 @@ func (t *TxPool) ContentFrom(addr types.Address) (interface{}, error) {
 	convertTxMap := func(txs []*types.Transaction) map[uint64]*transaction {
 		result := make(map[uint64]*transaction, len(txs))
 		for _, tx := range txs {
-			result[tx.Nonce()] = toTransaction(tx, nil, &types.ZeroHash, nil)
+			result[tx.Nonce()] = toTransaction(tx, nil, nil)
 		}
 
 		return result
@@ -76,7 +76,7 @@ func (t *TxPool) Content() (interface{}, error) {
 			result[addr] = make(map[uint64]*transaction, len(txs))
 
 			for _, tx := range txs {
-				result[addr][tx.Nonce()] = toTransaction(tx, nil, &types.ZeroHash, nil)
+				result[addr][tx.Nonce()] = toTransaction(tx, nil, nil)
 			}
 		}
 

jsonrpc/types.go

@@ -59,45 +59,43 @@ func (h transactionHash) MarshalText() ([]byte, error) {
 }
 
 func toPendingTransaction(t *types.Transaction) *transaction {
-	return toTransaction(t, nil, nil, nil)
+	return toTransaction(t, nil, nil)
 }
 
 func toTransaction(
 	t *types.Transaction,
-	blockNumber *argUint64,
-	blockHash *types.Hash,
+	header *types.Header,
 	txIndex *int,
 ) *transaction {
 	v, r, s := t.RawSignatureValues()
 	res := &transaction{
-		Nonce:       argUint64(t.Nonce()),
-		Gas:         argUint64(t.Gas()),
-		To:          t.To(),
-		Value:       argBig(*t.Value()),
-		Input:       t.Input(),
-		V:           argBig(*v),
-		R:           argBig(*r),
-		S:           argBig(*s),
-		Hash:        t.Hash(),
-		From:        t.From(),
-		Type:        argUint64(t.Type()),
-		BlockNumber: blockNumber,
-		BlockHash:   blockHash,
-	}
-
-	if t.GasPrice() != nil && t.Type() != types.DynamicFeeTxType {
-		gasPrice := argBig(*(t.GasPrice()))
-		res.GasPrice = &gasPrice
-	}
-
-	if t.GasTipCap() != nil && t.Type() == types.DynamicFeeTxType {
-		gasTipCap := argBig(*(t.GasTipCap()))
-		res.GasTipCap = &gasTipCap
-	}
+		Nonce: argUint64(t.Nonce()),
+		Gas:   argUint64(t.Gas()),
+		To:    t.To(),
+		Value: argBig(*t.Value()),
+		Input: t.Input(),
+		V:     argBig(*v),
+		R:     argBig(*r),
+		S:     argBig(*s),
+		Hash:  t.Hash(),
+		From:  t.From(),
+		Type:  argUint64(t.Type()),
+	}
+
+	if header != nil {
+		res.BlockNumber = argUintPtr(header.Number)
+		res.BlockHash = &header.Hash
+		res.GasPrice = argBigPtr(t.GetGasPrice(header.BaseFee))
+	}
+
+	if t.Type() == types.DynamicFeeTxType {
+		if t.GasTipCap() != nil {
+			res.GasTipCap = argBigPtr(t.GasTipCap())
+		}
 
-	if t.GasFeeCap() != nil && t.Type() == types.DynamicFeeTxType {
-		gasFeeCap := argBig(*(t.GasFeeCap()))
-		res.GasFeeCap = &gasFeeCap
+		if t.GasFeeCap() != nil {
+			res.GasFeeCap = argBigPtr(t.GasFeeCap())
+		}
 	}
 
 	if t.ChainID() != nil {
@@ -195,13 +193,11 @@ func toBlock(b *types.Block, fullTx bool) *block {
 
 	for idx, txn := range b.Transactions {
 		if fullTx {
-			txn.SetGasPrice(txn.GetGasPrice(b.Header.BaseFee))
 			res.Transactions = append(
 				res.Transactions,
 				toTransaction(
 					txn,
-					argUintPtr(b.Number()),
-					argHashPtr(b.Hash()),
+					b.Header,
 					&idx,
 				),
 			)

jsonrpc/types_test.go

@@ -115,7 +115,7 @@ func TestToTransaction_Returns_V_R_S_ValuesWithoutLeading0(t *testing.T) {
 		types.WithFrom(types.Address{}),
 	))
 
-	jsonTx := toTransaction(txn, nil, nil, nil)
+	jsonTx := toTransaction(txn, nil, nil)
 
 	jsonV, _ := jsonTx.V.MarshalText()
 	jsonR, _ := jsonTx.R.MarshalText()
@@ -143,7 +143,7 @@ func TestToTransaction_EIP1559(t *testing.T) {
 		types.WithFrom(types.Address{}),
 	))
 
-	jsonTx := toTransaction(txn, nil, nil, nil)
+	jsonTx := toTransaction(txn, nil, nil)
 
 	jsonV, _ := jsonTx.V.MarshalText()
 	jsonR, _ := jsonTx.R.MarshalText()