ADR 003 implementation: custom EvTransaction using EIP-2718, with sponsorship and atomic batch txs. #103
+5,288
−114
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| [package] | ||
| name = "ev-primitives" | ||
| version = "0.1.0" | ||
| edition = "2021" | ||
| rust-version = "1.82" | ||
| license = "MIT OR Apache-2.0" | ||
|
|
||
| [dependencies] | ||
| alloy-consensus = { workspace = true } | ||
| alloy-eips = { workspace = true, features = ["serde"] } | ||
| alloy-primitives = { workspace = true, features = ["k256", "rlp", "serde"] } | ||
| alloy-serde = { workspace = true } | ||
| alloy-rlp = { workspace = true, features = ["derive"] } | ||
| bytes = { workspace = true } | ||
| reth-codecs = { workspace = true } | ||
| reth-db-api = { workspace = true } | ||
| reth-ethereum-primitives = { workspace = true } | ||
| reth-primitives-traits = { workspace = true, features = ["serde-bincode-compat"] } | ||
| serde = { workspace = true, features = ["derive"] } | ||
|
|
||
| [features] | ||
| serde-bincode-compat = ["reth-primitives-traits/serde-bincode-compat"] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| //! EV-specific primitive types, including the EvNode 0x76 transaction. | ||
| mod pool; | ||
| mod tx; | ||
|
|
||
| pub use pool::{EvPooledTxEnvelope, EvPooledTxType}; | ||
| pub use tx::{ | ||
| Call, EvNodeSignedTx, EvNodeTransaction, EvTxEnvelope, EvTxType, TransactionSigned, | ||
| EVNODE_SPONSOR_DOMAIN, EVNODE_TX_TYPE_ID, | ||
| }; | ||
|
|
||
| use reth_primitives_traits::NodePrimitives; | ||
|
|
||
| /// Block type alias for ev-reth. | ||
| pub type Block = alloy_consensus::Block<TransactionSigned>; | ||
|
|
||
| /// Block body type alias for ev-reth. | ||
| pub type BlockBody = alloy_consensus::BlockBody<TransactionSigned>; | ||
|
|
||
| /// Receipt type alias for ev-reth. | ||
| pub type Receipt = reth_ethereum_primitives::Receipt<EvTxType>; | ||
|
|
||
| /// Helper struct that specifies the ev-reth NodePrimitives types. | ||
| #[derive(Debug, Clone, Default, PartialEq, Eq)] | ||
| pub struct EvPrimitives; | ||
|
|
||
| impl NodePrimitives for EvPrimitives { | ||
| type Block = Block; | ||
| type BlockHeader = alloy_consensus::Header; | ||
| type BlockBody = BlockBody; | ||
| type SignedTx = TransactionSigned; | ||
| type Receipt = Receipt; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| //! Pooled transaction envelope for ev-reth. | ||
| use alloy_consensus::{ | ||
| error::ValueError, | ||
| transaction::{SignerRecoverable, TxHashRef}, | ||
| TransactionEnvelope, | ||
| }; | ||
| use alloy_primitives::{Address, B256}; | ||
| use reth_primitives_traits::{InMemorySize, SignedTransaction}; | ||
|
|
||
| use crate::tx::{EvNodeSignedTx, EvTxEnvelope}; | ||
|
|
||
| /// Pooled transaction envelope with optional blob sidecar support. | ||
| #[derive(Clone, Debug, TransactionEnvelope)] | ||
| #[envelope(tx_type_name = EvPooledTxType)] | ||
| pub enum EvPooledTxEnvelope { | ||
| /// Standard Ethereum pooled transaction envelope (may include blob sidecar). | ||
| #[envelope(flatten)] | ||
| Ethereum(reth_ethereum_primitives::PooledTransactionVariant), | ||
| /// EvNode typed transaction (no sidecar). | ||
| #[envelope(ty = 0x76)] | ||
| EvNode(EvNodeSignedTx), | ||
| } | ||
|
|
||
| impl InMemorySize for EvPooledTxEnvelope { | ||
| fn size(&self) -> usize { | ||
| match self { | ||
| EvPooledTxEnvelope::Ethereum(tx) => tx.size(), | ||
| EvPooledTxEnvelope::EvNode(tx) => tx.size(), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl SignerRecoverable for EvPooledTxEnvelope { | ||
|
There was a problem hiding this comment. only comment really in this file is just adding some docs about why we're implementing all these traits, that might be the most valuable addition. |
||
| fn recover_signer(&self) -> Result<Address, alloy_consensus::crypto::RecoveryError> { | ||
| match self { | ||
| EvPooledTxEnvelope::Ethereum(tx) => tx.recover_signer(), | ||
| EvPooledTxEnvelope::EvNode(tx) => tx | ||
| .signature() | ||
| .recover_address_from_prehash(&tx.tx().executor_signing_hash()) | ||
| .map_err(|_| alloy_consensus::crypto::RecoveryError::new()), | ||
|
There was a problem hiding this comment. is there a corresponding EDIT: I think the answer is no, and the lib itself discards errors intentionally. |
||
| } | ||
| } | ||
|
|
||
| fn recover_signer_unchecked(&self) -> Result<Address, alloy_consensus::crypto::RecoveryError> { | ||
| self.recover_signer() | ||
| } | ||
| } | ||
|
|
||
| impl TxHashRef for EvPooledTxEnvelope { | ||
| fn tx_hash(&self) -> &B256 { | ||
| match self { | ||
| EvPooledTxEnvelope::Ethereum(tx) => tx.tx_hash(), | ||
| EvPooledTxEnvelope::EvNode(tx) => tx.hash(), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl TryFrom<EvTxEnvelope> for EvPooledTxEnvelope { | ||
| type Error = ValueError<reth_ethereum_primitives::TransactionSigned>; | ||
|
|
||
| fn try_from(value: EvTxEnvelope) -> Result<Self, Self::Error> { | ||
| match value { | ||
| EvTxEnvelope::Ethereum(tx) => Ok(Self::Ethereum(tx.try_into()?)), | ||
| EvTxEnvelope::EvNode(tx) => Ok(Self::EvNode(tx)), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl From<EvPooledTxEnvelope> for EvTxEnvelope { | ||
| fn from(value: EvPooledTxEnvelope) -> Self { | ||
| match value { | ||
| EvPooledTxEnvelope::Ethereum(tx) => EvTxEnvelope::Ethereum(tx.into()), | ||
| EvPooledTxEnvelope::EvNode(tx) => EvTxEnvelope::EvNode(tx), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl SignedTransaction for EvPooledTxEnvelope {} | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can we remove this?