status-im/nimbus-eth1
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth1.git synced 2025-01-11 21:04:11 +00:00
Code Issues Projects Releases Wiki Activity

json rpc: eth_getTransactionReceipt: add effectiveGasPrice field

Browse Source
This commit is contained in:
jangko 2022-04-05 17:32:54 +07:00
parent fdbabf0b80
commit 8d208acaf9
No known key found for this signature in database
GPG Key ID: 31702AE10541E6B9
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nimbus/rpc/p2p.nim
View File

@ -17,7 +17,8 @@ import
../db/[db_chain, state_db], ../db/[db_chain, state_db],
rpc_types, rpc_utils, rpc_types, rpc_utils,
../transaction/call_evm, ../transaction/call_evm,
../utils/tx_pool ../utils/tx_pool,
../chain_config
#[ #[
Note: Note:
@ -387,12 +388,13 @@ proc setupEthRpc*(node: EthereumNode, ctx: EthContext, chain: BaseChainDB, txPoo
var var
idx = 0 idx = 0
prevGasUsed = GasInt(0) prevGasUsed = GasInt(0)
fork = toFork(chain.networkParams.config, header.blockNumber)
for receipt in chain.getReceipts(header.receiptRoot): for receipt in chain.getReceipts(header.receiptRoot):
let gasUsed = receipt.cumulativeGasUsed - prevGasUsed let gasUsed = receipt.cumulativeGasUsed - prevGasUsed
prevGasUsed = receipt.cumulativeGasUsed prevGasUsed = receipt.cumulativeGasUsed
if idx == txDetails.index: if idx == txDetails.index:
return some(populateReceipt(receipt, gasUsed, tx, txDetails.index, header)) return some(populateReceipt(receipt, gasUsed, tx, txDetails.index, header, fork))
idx.inc idx.inc
server.rpc("eth_getUncleByBlockHashAndIndex") do(data: EthHashStr, quantity: HexQuantityStr) -> Option[BlockObject]: server.rpc("eth_getUncleByBlockHashAndIndex") do(data: EthHashStr, quantity: HexQuantityStr) -> Option[BlockObject]:

3
nimbus/rpc/rpc_types.nim
View File

@ -117,6 +117,9 @@ type
logsBloom*: FixedBytes[256] # bloom filter for light clients to quickly retrieve related logs. logsBloom*: FixedBytes[256] # bloom filter for light clients to quickly retrieve related logs.
root*: Option[Hash256] # post-transaction stateroot (pre Byzantium). root*: Option[Hash256] # post-transaction stateroot (pre Byzantium).
status*: Option[int] # 1 = success, 0 = failure. status*: Option[int] # 1 = success, 0 = failure.
effectiveGasPrice*: HexQuantityStr # The actual value per gas deducted from the senders account.
# Before EIP-1559, this is equal to the transaction's gas price.
# After, it is equal to baseFeePerGas + min(maxFeePerGas - baseFeePerGas, maxPriorityFeePerGas).
FilterDataKind* = enum fkItem, fkList FilterDataKind* = enum fkItem, fkList
FilterData* = object FilterData* = object

7
nimbus/rpc/rpc_utils.nim
View File

@ -11,7 +11,7 @@ import hexstrings, eth/[common, rlp, keys, trie/db], stew/byteutils, nimcrypto,
../db/db_chain, strutils, algorithm, options, times, json, ../db/db_chain, strutils, algorithm, options, times, json,
../constants, stint, hexstrings, rpc_types, ../constants, stint, hexstrings, rpc_types,
../utils, ../transaction, ../utils, ../transaction,
../transaction/call_evm ../transaction/call_evm, ../forks
func toAddress*(value: EthAddressStr): EthAddress = hexToPaddedByteArray[20](value.string) func toAddress*(value: EthAddressStr): EthAddress = hexToPaddedByteArray[20](value.string)
@ -170,7 +170,7 @@ proc populateBlockObject*(header: BlockHeader, chain: BaseChainDB, fullTx: bool,
for x in chain.getBlockTransactionHashes(header): for x in chain.getBlockTransactionHashes(header):
result.transactions.add %(x) result.transactions.add %(x)
proc populateReceipt*(receipt: Receipt, gasUsed: GasInt, tx: Transaction, txIndex: int, header: BlockHeader): ReceiptObject = proc populateReceipt*(receipt: Receipt, gasUsed: GasInt, tx: Transaction, txIndex: int, header: BlockHeader, fork: Fork): ReceiptObject =
result.transactionHash = tx.rlpHash result.transactionHash = tx.rlpHash
result.transactionIndex = encodeQuantity(txIndex.uint) result.transactionIndex = encodeQuantity(txIndex.uint)
result.blockHash = header.hash result.blockHash = header.hash
@ -195,3 +195,6 @@ proc populateReceipt*(receipt: Receipt, gasUsed: GasInt, tx: Transaction, txInde
else: else:
# 1 = success, 0 = failure. # 1 = success, 0 = failure.
result.status = some(receipt.status.int) result.status = some(receipt.status.int)
let normTx = eip1559TxNormalization(tx, header.baseFee.truncate(GasInt), fork)
result.effectiveGasPrice = encodeQuantity(normTx.gasPrice.uint64)