feat: network abstraction and transaction builder

.github/workflows/ci.yml

@@ -52,6 +52,18 @@ jobs:
         if: ${{ matrix.rust != '1.75' }} # MSRV
         run: cargo nextest run --workspace ${{ matrix.flags }}
 
+  doctest:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+      - run: cargo test --workspace --doc
+      - run: cargo test --all-features --workspace --doc
+
   wasm:
     runs-on: ubuntu-latest
     timeout-minutes: 30
@@ -68,6 +80,7 @@ jobs:
         run: |
           cargo hack check --workspace --target wasm32-unknown-unknown \
             --exclude alloy-contract \
+            --exclude alloy-network \
             --exclude alloy-node-bindings \
             --exclude alloy-providers \
             --exclude alloy-signer \

Cargo.toml

@@ -41,10 +41,18 @@ alloy-transport-ipc = { version = "0.1.0", default-features = false, path = "cra
 alloy-transport-ws = { version = "0.1.0", default-features = false, path = "crates/transport-ws" }
 
 alloy-core = { version = "0.6.4", default-features = false, features = ["std"] }
-alloy-dyn-abi = { version = "0.6.4", default-features = false, features = ["std"] }
-alloy-json-abi = { version = "0.6.4", default-features = false, features = ["std"] }
-alloy-primitives = { version = "0.6.4", default-features = false, features = ["std"] }
-alloy-sol-types = { version = "0.6.4", default-features = false, features = ["std"] }
+alloy-dyn-abi = { version = "0.6.4", default-features = false, features = [
+    "std",
+] }
+alloy-json-abi = { version = "0.6.4", default-features = false, features = [
+    "std",
+] }
+alloy-primitives = { version = "0.6.4", default-features = false, features = [
+    "std",
+] }
+alloy-sol-types = { version = "0.6.4", default-features = false, features = [
+    "std",
+] }
 
 alloy-rlp = "0.3"
 
@@ -53,8 +61,13 @@ ethereum_ssz_derive = "0.5"
 ethereum_ssz = "0.5"
 
 # crypto
-elliptic-curve = { version = "0.13", default-features = false, features = ["std"] }
-k256 = { version = "0.13", default-features = false, features = ["ecdsa", "std"] }
+elliptic-curve = { version = "0.13", default-features = false, features = [
+    "std",
+] }
+k256 = { version = "0.13", default-features = false, features = [
+    "ecdsa",
+    "std",
+] }
 sha2 = { version = "0.10", default-features = false, features = ["std"] }
 spki = { version = "0.7", default-features = false, features = ["std"] }
 
@@ -102,5 +115,5 @@ tempfile = "3.10"
 
 # TODO: Keep around until alloy-contract is stable.
 # This should only be used in `alloy-contract` tests.
-# [patch.crates-io]
-# alloy-sol-macro = { git = "https://github.com/alloy-rs/core", rev = "18b0509950c90d9ec38f25913b692ae4cdd6f227" }
+[patch.crates-io]
+alloy-sol-macro = { git = "https://github.com/alloy-rs/core", rev = "ab0cab1047a088be6cffa4e7a2fcde7cf77aa460" }

crates/consensus/Cargo.toml

@@ -12,7 +12,6 @@ repository.workspace = true
 exclude.workspace = true
 
 [dependencies]
-alloy-network.workspace = true
 alloy-primitives = { workspace = true, features = ["rlp"] }
 alloy-rlp.workspace = true
 alloy-eips.workspace = true
@@ -24,10 +23,13 @@ sha2 = { version = "0.10", optional = true }
 arbitrary = { workspace = true, features = ["derive"], optional = true }
 
 [dev-dependencies]
+alloy-signer.workspace = true
 # arbitrary
 arbitrary = { workspace = true, features = ["derive"] }
+k256.workspace = true
+tokio = { workspace = true, features = ["macros"] }
 
 [features]
-k256 = ["alloy-primitives/k256", "alloy-network/k256"]
+k256 = ["alloy-primitives/k256"]
 kzg = ["dep:c-kzg", "dep:sha2", "dep:thiserror"]
 arbitrary = ["dep:arbitrary", "alloy-eips/arbitrary"]

crates/consensus/README.md

@@ -4,8 +4,7 @@ Ethereum consensus interface.
 
 This crate contains constants, types, and functions for implementing Ethereum
 EL consensus and communication. This includes headers, blocks, transactions,
-eip2718 envelopes, eip2930, eip4844, and more. The types in this crate
-implement many of the traits found in [alloy_network].
+[EIP-2718] envelopes, [EIP-2930], [EIP-4844], and more.
 
 In general a type belongs in this crate if it is committed to in the EL block
 header. This includes:
@@ -18,6 +17,8 @@ header. This includes:
 
 [alloy-network]: ../network
 [EIP-2718]: https://eips.ethereum.org/EIPS/eip-2718
+[EIP-2930]: https://eips.ethereum.org/EIPS/eip-2930
+[EIP-4844]: https://eips.ethereum.org/EIPS/eip-4844
 
 ## Provenance
 

crates/consensus/src/header.rs

@@ -1,8 +1,8 @@
+use crate::Sealable;
 use alloy_eips::{
     eip1559::{calc_next_block_base_fee, BaseFeeParams},
     eip4844::{calc_blob_gasprice, calc_excess_blob_gas},
 };
-use alloy_network::Sealable;
 use alloy_primitives::{b256, keccak256, Address, BlockNumber, Bloom, Bytes, B256, B64, U256};
 use alloy_rlp::{
     length_of_length, Buf, BufMut, Decodable, Encodable, EMPTY_LIST_CODE, EMPTY_STRING_CODE,

crates/consensus/src/lib.rs

@@ -21,15 +21,19 @@ mod header;
 pub use header::{Header, EMPTY_OMMER_ROOT_HASH, EMPTY_ROOT_HASH};
 
 mod receipt;
-pub use receipt::{Receipt, ReceiptEnvelope, ReceiptWithBloom};
+pub use receipt::{Receipt, ReceiptEnvelope, ReceiptWithBloom, TxReceipt};
 
 mod transaction;
 pub use transaction::{
-    BlobTransactionSidecar, TxEip1559, TxEip2930, TxEip4844, TxEip4844Variant,
-    TxEip4844WithSidecar, TxEnvelope, TxLegacy, TxType,
+    BlobTransactionSidecar, SignableTransaction, Transaction, TxEip1559, TxEip2930, TxEip4844,
+    TxEip4844Variant, TxEip4844WithSidecar, TxEnvelope, TxLegacy, TxType, TypedTransaction,
 };
 
 #[cfg(feature = "kzg")]
 pub use transaction::BlobTransactionValidationError;
 
-pub use alloy_network::TxKind;
+mod sealed;
+pub use sealed::{Sealable, Sealed};
+
+mod signed;
+pub use signed::Signed;

crates/consensus/src/receipt/mod.rs

@@ -1,14 +1,38 @@
+use alloy_primitives::{Bloom, Log};
+
 mod envelope;
 pub use envelope::ReceiptEnvelope;
 
 mod receipts;
 pub use receipts::{Receipt, ReceiptWithBloom};
 
+/// Receipt is the result of a transaction execution.
+pub trait TxReceipt {
+    /// Returns true if the transaction was successful.
+    fn success(&self) -> bool;
+
+    /// Returns the bloom filter for the logs in the receipt. This operation
+    /// may be expensive.
+    fn bloom(&self) -> Bloom;
+
+    /// Returns the bloom filter for the logs in the receipt, if it is cheap to
+    /// compute.
+    fn bloom_cheap(&self) -> Option<Bloom> {
+        None
+    }
+
+    /// Returns the cumulative gas used in the block after this transaction was executed.
+    fn cumulative_gas_used(&self) -> u64;
+
+    /// Returns the logs emitted by this transaction.
+    fn logs(&self) -> &[Log];
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
     use alloy_eips::eip2718::Encodable2718;
-    use alloy_primitives::{address, b256, bytes, hex, Bytes, Log, LogData};
+    use alloy_primitives::{address, b256, bytes, hex, Bytes, LogData};
     use alloy_rlp::{Decodable, Encodable};
 
     // Test vector from: https://eips.ethereum.org/EIPS/eip-2481

crates/consensus/src/receipt/receipts.rs

@@ -1,3 +1,4 @@
+use super::TxReceipt;
 use alloy_primitives::{Bloom, Log};
 use alloy_rlp::{length_of_length, BufMut, Decodable, Encodable};
 
@@ -28,7 +29,7 @@ impl Receipt {
     }
 }
 
-impl alloy_network::Receipt for Receipt {
+impl TxReceipt for Receipt {
     fn success(&self) -> bool {
         self.success
     }
@@ -51,7 +52,7 @@ impl alloy_network::Receipt for Receipt {
 /// This convenience type allows us to lazily calculate the bloom filter for a
 /// receipt, similar to [`Sealed`].
 ///
-/// [`Sealed`]: ::alloy_network::Sealed
+/// [`Sealed`]: crate::sealed::Sealed
 #[derive(Clone, Debug, PartialEq, Eq, Default)]
 pub struct ReceiptWithBloom {
     /// The receipt.
@@ -60,6 +61,28 @@ pub struct ReceiptWithBloom {
     pub bloom: Bloom,
 }
 
+impl TxReceipt for ReceiptWithBloom {
+    fn success(&self) -> bool {
+        self.receipt.success
+    }
+
+    fn bloom(&self) -> Bloom {
+        self.bloom
+    }
+
+    fn bloom_cheap(&self) -> Option<Bloom> {
+        Some(self.bloom)
+    }
+
+    fn cumulative_gas_used(&self) -> u64 {
+        self.receipt.cumulative_gas_used
+    }
+
+    fn logs(&self) -> &[Log] {
+        &self.receipt.logs
+    }
+}
+
 impl From<Receipt> for ReceiptWithBloom {
     fn from(receipt: Receipt) -> Self {
         let bloom = receipt.bloom_slow();
@@ -135,28 +158,6 @@ impl ReceiptWithBloom {
     }
 }
 
-impl alloy_network::Receipt for ReceiptWithBloom {
-    fn success(&self) -> bool {
-        self.receipt.success
-    }
-
-    fn bloom(&self) -> Bloom {
-        self.bloom
-    }
-
-    fn bloom_cheap(&self) -> Option<Bloom> {
-        Some(self.bloom)
-    }
-
-    fn cumulative_gas_used(&self) -> u64 {
-        self.receipt.cumulative_gas_used
-    }
-
-    fn logs(&self) -> &[Log] {
-        &self.receipt.logs
-    }
-}
-
 impl alloy_rlp::Encodable for ReceiptWithBloom {
     fn encode(&self, out: &mut dyn BufMut) {
         self.encode_fields(out);

crates/network/src/transaction/signed.rs → crates/consensus/src/signed.rs

@@ -1,4 +1,4 @@
-use crate::Transaction;
+use crate::transaction::SignableTransaction;
 use alloy_primitives::{Signature, B256};
 use alloy_rlp::BufMut;
 
@@ -35,9 +35,9 @@ impl<T, Sig> Signed<T, Sig> {
     }
 }
 
-impl<T: Transaction> Signed<T> {
+impl<T: SignableTransaction<Sig>, Sig> Signed<T, Sig> {
     /// Instantiate from a transaction and signature. Does not verify the signature.
-    pub const fn new_unchecked(tx: T, signature: Signature, hash: B256) -> Self {
+    pub const fn new_unchecked(tx: T, signature: Sig, hash: B256) -> Self {
         Self { tx, signature, hash }
     }
 
@@ -59,22 +59,22 @@ impl<T: Transaction> Signed<T> {
     }
 }
 
-impl<T: Transaction> alloy_rlp::Encodable for Signed<T> {
+impl<T: SignableTransaction<Sig>, Sig> alloy_rlp::Encodable for Signed<T, Sig> {
     fn encode(&self, out: &mut dyn BufMut) {
         self.tx.encode_signed(&self.signature, out)
     }
 
     // TODO: impl length
 }
 
-impl<T: Transaction> alloy_rlp::Decodable for Signed<T> {
+impl<T: SignableTransaction<Sig>, Sig> alloy_rlp::Decodable for Signed<T, Sig> {
     fn decode(buf: &mut &[u8]) -> alloy_rlp::Result<Self> {
-        T::decode_signed(buf)
+        <T as SignableTransaction<Sig>>::decode_signed(buf)
     }
 }
 
 #[cfg(feature = "k256")]
-impl<T: Transaction> Signed<T, Signature> {
+impl<T: SignableTransaction<Signature>> Signed<T, Signature> {
     /// Recover the signer of the transaction
     pub fn recover_signer(
         &self,