Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ConsensusTx field parse #6

Merged
merged 1 commit into from
Apr 16, 2024
Merged

ConsensusTx field parse #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ pub enum Error {
UnexpectedRoot,
InvalidMPTProof,
TrieNotFound,
FieldNotFound,
}

#[derive(Debug)]
Expand Down
157 changes: 156 additions & 1 deletion src/tx.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ use crate::{Error, Field};
use alloy_consensus::{
SignableTransaction, TxEip1559, TxEip2930, TxEip4844, TxEnvelope, TxLegacy, TxType,
};
use alloy_consensus::{Transaction as ConsensusTransaction, TxEip4844Variant};
use alloy_eips::eip2718::Decodable2718;
use alloy_eips::eip2930::AccessList;
use alloy_eips::eip2930::AccessListItem;
use alloy_network::eip2718::Encodable2718;
use alloy_primitives::{Parity, Signature, TxKind, U64};
use alloy_primitives::{ChainId, FixedBytes, Parity, Signature, TxKind, U256, U64};
use alloy_rpc_types::Transaction;

#[derive(Debug, Clone)]
Expand All @@ -21,6 +22,160 @@ impl ConsensusTx {
let tx = TxEnvelope::decode_2718(&mut data).map_err(Error::Rlp)?;
Ok(ConsensusTx(tx))
}

pub fn nonce(&self) -> u64 {
match &self.0 {
TxEnvelope::Legacy(tx) => tx.tx().nonce(),
TxEnvelope::Eip2930(tx) => tx.tx().nonce(),
TxEnvelope::Eip1559(tx) => tx.tx().nonce(),
TxEnvelope::Eip4844(tx) => tx.tx().nonce(),
}
}

pub fn gas_limit(&self) -> u64 {
match &self.0 {
TxEnvelope::Legacy(tx) => tx.tx().gas_limit(),
TxEnvelope::Eip2930(tx) => tx.tx().gas_limit(),
TxEnvelope::Eip1559(tx) => tx.tx().gas_limit(),
TxEnvelope::Eip4844(tx) => tx.tx().gas_limit(),
}
}

pub fn gas_price(&self) -> Option<U256> {
match &self.0 {
TxEnvelope::Legacy(tx) => tx.tx().gas_price(),
TxEnvelope::Eip2930(tx) => tx.tx().gas_price(),
TxEnvelope::Eip1559(tx) => tx.tx().gas_price(),
TxEnvelope::Eip4844(tx) => tx.tx().gas_price(),
}
}

pub fn to(&self) -> TxKind {
match &self.0 {
TxEnvelope::Legacy(tx) => tx.tx().to(),
TxEnvelope::Eip2930(tx) => tx.tx().to(),
TxEnvelope::Eip1559(tx) => tx.tx().to(),
TxEnvelope::Eip4844(tx) => tx.tx().to(),
}
}

pub fn value(&self) -> U256 {
match &self.0 {
TxEnvelope::Legacy(tx) => tx.tx().value(),
TxEnvelope::Eip2930(tx) => tx.tx().value(),
TxEnvelope::Eip1559(tx) => tx.tx().value(),
TxEnvelope::Eip4844(tx) => tx.tx().value(),
}
}

pub fn input(&self) -> &[u8] {
match &self.0 {
TxEnvelope::Legacy(tx) => tx.tx().input(),
TxEnvelope::Eip2930(tx) => tx.tx().input(),
TxEnvelope::Eip1559(tx) => tx.tx().input(),
TxEnvelope::Eip4844(tx) => tx.tx().input(),
}
}

pub fn v(&self) -> u64 {
match &self.0 {
TxEnvelope::Legacy(tx) => tx.signature().v().to_u64(),
TxEnvelope::Eip2930(tx) => tx.signature().v().to_u64(),
TxEnvelope::Eip1559(tx) => tx.signature().v().to_u64(),
TxEnvelope::Eip4844(tx) => tx.signature().v().to_u64(),
}
}

pub fn r(&self) -> U256 {
match &self.0 {
TxEnvelope::Legacy(tx) => tx.signature().r(),
TxEnvelope::Eip2930(tx) => tx.signature().r(),
TxEnvelope::Eip1559(tx) => tx.signature().r(),
TxEnvelope::Eip4844(tx) => tx.signature().r(),
}
}

pub fn s(&self) -> U256 {
match &self.0 {
TxEnvelope::Legacy(tx) => tx.signature().s(),
TxEnvelope::Eip2930(tx) => tx.signature().s(),
TxEnvelope::Eip1559(tx) => tx.signature().s(),
TxEnvelope::Eip4844(tx) => tx.signature().s(),
}
}

pub fn chain_id(&self) -> Option<ChainId> {
match &self.0 {
TxEnvelope::Legacy(tx) => tx.tx().chain_id(),
TxEnvelope::Eip2930(tx) => tx.tx().chain_id(),
TxEnvelope::Eip1559(tx) => tx.tx().chain_id(),
TxEnvelope::Eip4844(tx) => tx.tx().chain_id(),
}
}

pub fn access_list(&self) -> Option<AccessList> {
match &self.0 {
TxEnvelope::Legacy(_) => None,
TxEnvelope::Eip2930(tx) => Some(tx.tx().access_list.clone()),
TxEnvelope::Eip1559(tx) => Some(tx.tx().access_list.clone()),
TxEnvelope::Eip4844(tx) => match tx.tx() {
TxEip4844Variant::TxEip4844(tx) => Some(tx.access_list.clone()),
TxEip4844Variant::TxEip4844WithSidecar(tx) => Some(tx.tx().access_list.clone()),
},
}
}

pub fn max_fee_per_gas(&self) -> Option<u128> {
match &self.0 {
TxEnvelope::Legacy(_) => None,
TxEnvelope::Eip2930(_) => None,
TxEnvelope::Eip1559(tx) => Some(tx.tx().max_fee_per_gas),
TxEnvelope::Eip4844(tx) => match tx.tx() {
TxEip4844Variant::TxEip4844(tx) => Some(tx.max_fee_per_gas),
TxEip4844Variant::TxEip4844WithSidecar(tx) => Some(tx.tx().max_fee_per_gas),
},
}
}

pub fn max_priority_fee_per_gas(&self) -> Option<u128> {
match &self.0 {
TxEnvelope::Legacy(_) => None,
TxEnvelope::Eip2930(_) => None,
TxEnvelope::Eip1559(tx) => Some(tx.tx().max_priority_fee_per_gas),
TxEnvelope::Eip4844(tx) => match tx.tx() {
TxEip4844Variant::TxEip4844(tx) => Some(tx.max_priority_fee_per_gas),
TxEip4844Variant::TxEip4844WithSidecar(tx) => {
Some(tx.tx().max_priority_fee_per_gas)
}
},
}
}

pub fn blob_versioned_hashes(&self) -> Option<Vec<FixedBytes<32>>> {
match &self.0 {
TxEnvelope::Legacy(_) => None,
TxEnvelope::Eip2930(_) => None,
TxEnvelope::Eip1559(_) => None,
TxEnvelope::Eip4844(tx) => match tx.tx() {
TxEip4844Variant::TxEip4844(tx) => Some(tx.blob_versioned_hashes.clone()),
TxEip4844Variant::TxEip4844WithSidecar(tx) => {
Some(tx.tx().blob_versioned_hashes.clone())
}
},
}
}

pub fn max_fee_per_blob_gas(&self) -> Option<u128> {
match &self.0 {
TxEnvelope::Legacy(_) => None,
TxEnvelope::Eip2930(_) => None,
TxEnvelope::Eip1559(_) => None,
TxEnvelope::Eip4844(tx) => match tx.tx() {
TxEip4844Variant::TxEip4844(tx) => Some(tx.max_fee_per_blob_gas),
TxEip4844Variant::TxEip4844WithSidecar(tx) => Some(tx.tx().max_fee_per_blob_gas),
},
}
}
}

#[derive(Debug, Clone)]
Expand Down