Skip to content

Commit

Permalink
add EIP-4844 fields to TransactionObject (#100)
Browse files Browse the repository at this point in the history 
Extend `TransactionObject` to parse JSON-RPC response post-EIP-4844
with `maxFeePerBlobGas` and `blobVersionedHashes` fields.
  • Loading branch information
@etan-status
etan-status authored Aug 24, 2023
1 parent df78e4b commit ab3dfab
Showing 1 changed file with 23 additions and 22 deletions.
45 changes: 23 additions & 22 deletions web3/ethtypes.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ type
Nonce* = int
CodeHash* = FixedBytes[32]
StorageHash* = FixedBytes[32]
VersionedHash* = FixedBytes[32]

BlockIdentifierKind* = enum
bidNumber
Expand All @@ -58,8 +59,6 @@ type
KZGProof* = FixedBytes[48]
Blob* = FixedBytes[fieldElementsPerBlob * 32]

VersionedHash* = FixedBytes[32]

EthSend* = object
source*: Address # the address the transaction is sent from.
to*: Option[Address] # (optional when creating new contract) the address the transaction is directed to.
Expand Down Expand Up @@ -162,26 +161,28 @@ type
address*: Address
storageKeys*: seq[Hash256]

TransactionObject* = object # A transaction object, or null when no transaction was found:
hash*: TxHash # hash of the transaction.
nonce*: Quantity # TODO: Is int? the number of transactions made by the sender prior to this one.
blockHash*: Option[BlockHash] # hash of the block where this transaction was in. null when its pending.
blockNumber*: Option[Quantity] # block number where this transaction was in. null when its pending.
transactionIndex*: Option[Quantity] # integer of the transactions index position in the block. null when its pending.
`from`*: Address # address of the sender.
to*: Option[Address] # address of the receiver. null when its a contract creation transaction.
value*: UInt256 # value transferred in Wei.
gasPrice*: Quantity # gas price provided by the sender in Wei.
gas*: Quantity # gas provided by the sender.
input*: seq[byte] # the data send along with the transaction.
v*: UInt256 # ECDSA recovery id
r*: UInt256 # ECDSA signature r
s*: UInt256 # ECDSA signature s
`type`*: Option[Quantity] # EIP-2718, with 0x0 for Legacy
chainId*: Option[UInt256] # EIP-159
accessList*: Option[seq[AccessTuple]] # EIP-2930
maxFeePerGas*: Option[Quantity] # EIP-1559
maxPriorityFeePerGas*: Option[Quantity] # EIP-1559
TransactionObject* = object # A transaction object, or null when no transaction was found:
hash*: TxHash # hash of the transaction.
nonce*: Quantity # TODO: Is int? the number of transactions made by the sender prior to this one.
blockHash*: Option[BlockHash] # hash of the block where this transaction was in. null when its pending.
blockNumber*: Option[Quantity] # block number where this transaction was in. null when its pending.
transactionIndex*: Option[Quantity] # integer of the transactions index position in the block. null when its pending.
`from`*: Address # address of the sender.
to*: Option[Address] # address of the receiver. null when its a contract creation transaction.
value*: UInt256 # value transferred in Wei.
gasPrice*: Quantity # gas price provided by the sender in Wei.
gas*: Quantity # gas provided by the sender.
input*: seq[byte] # the data send along with the transaction.
v*: UInt256 # ECDSA recovery id
r*: UInt256 # ECDSA signature r
s*: UInt256 # ECDSA signature s
`type`*: Option[Quantity] # EIP-2718, with 0x0 for Legacy
chainId*: Option[UInt256] # EIP-159
accessList*: Option[seq[AccessTuple]] # EIP-2930
maxFeePerGas*: Option[Quantity] # EIP-1559
maxPriorityFeePerGas*: Option[Quantity] # EIP-1559
maxFeePerBlobGas*: Option[Quantity] # EIP-4844
blobVersionedHashes*: Option[seq[VersionedHash]] # EIP-4844

ReceiptKind* = enum rkRoot, rkStatus
ReceiptObject* = object
Expand Down

0 comments on commit ab3dfab

Please sign in to comment.