status-im/nimbus-eth1
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth1.git synced 2025-02-09 10:44:48 +00:00
Code Issues Projects Releases Wiki Activity

rpc: change receipt status field type to HexQuantityStr

Browse Source
This commit is contained in:
jangko 2022-06-27 13:01:20 +07:00
parent 71ac6b7de5
commit 3f99ece6c5
No known key found for this signature in database
GPG Key ID: 31702AE10541E6B9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nimbus/rpc/rpc_types.nim
View File

@ -91,8 +91,8 @@ type
FilterLog* = object FilterLog* = object
# Returned to user # Returned to user
removed*: bool # true when the log was removed, due to a chain reorganization. false if its a valid log. removed*: bool # true when the log was removed, due to a chain reorganization. false if its a valid log.
logIndex*: Option[int] # integer of the log index position in the block. null when its pending log. logIndex*: Option[HexQuantityStr] # integer of the log index position in the block. null when its pending log.
transactionIndex*: Option[int] # integer of the transactions index position log was created from. null when its pending log. transactionIndex*: Option[HexQuantityStr] # integer of the transactions index position log was created from. null when its pending log.
transactionHash*: Option[Hash256] # hash of the transactions this log was created from. null when its pending log. transactionHash*: Option[Hash256] # hash of the transactions this log was created from. null when its pending log.
blockHash*: Option[Hash256] # hash of the block where this log was in. null when its pending. null when its pending log. blockHash*: Option[Hash256] # hash of the block where this log was in. null when its pending. null when its pending log.
blockNumber*: Option[BlockNumber] # the block number where this log was in. null when its pending. null when its pending log. blockNumber*: Option[BlockNumber] # the block number where this log was in. null when its pending. null when its pending log.
@ -116,7 +116,7 @@ type
logs*: seq[Log] # list of log objects which this transaction generated. logs*: seq[Log] # list of log objects which this transaction generated.
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[HexQuantityStr] # 1 = success, 0 = failure.
effectiveGasPrice*: HexQuantityStr # The actual value per gas deducted from the senders account. effectiveGasPrice*: HexQuantityStr # The actual value per gas deducted from the senders account.
# Before EIP-1559, this is equal to the transaction's gas price. # Before EIP-1559, this is equal to the transaction's gas price.
# After, it is equal to baseFeePerGas + min(maxFeePerGas - baseFeePerGas, maxPriorityFeePerGas). # After, it is equal to baseFeePerGas + min(maxFeePerGas - baseFeePerGas, maxPriorityFeePerGas).

2
nimbus/rpc/rpc_utils.nim
View File

@ -196,7 +196,7 @@ proc populateReceipt*(receipt: Receipt, gasUsed: GasInt, tx: Transaction, txInde
result.root = some(receipt.stateRoot) result.root = some(receipt.stateRoot)
else: else:
# 1 = success, 0 = failure. # 1 = success, 0 = failure.
result.status = some(receipt.status.int) result.status = some(encodeQuantity(receipt.status.uint64))
let normTx = eip1559TxNormalization(tx, header.baseFee.truncate(GasInt), fork) let normTx = eip1559TxNormalization(tx, header.baseFee.truncate(GasInt), fork)
result.effectiveGasPrice = encodeQuantity(normTx.gasPrice.uint64) result.effectiveGasPrice = encodeQuantity(normTx.gasPrice.uint64)