chore(consensus): Migrate deposit source to maili-common (#377)

Migrates deposit source types to `maili-common` --------- Co-authored-by: refcell <[email protected]>
alloy-rs · Jan 13, 2025 · 3e721aa · 3e721aa
1 parent 8a45317
commit 3e721aa
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 149 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -62,10 +62,10 @@ alloy-sol-types = { version = "0.8.12", default-features = false }
 alloy-primitives = { version = "0.8.12", default-features = false }
 
 # Maili
-maili-provider = { version = "0.1.0", default-features = false }
-maili-protocol = { version = "0.1.0", default-features = false }
-maili-registry = { version = "0.1.0", default-features = false }
-maili-rpc-types-engine = { version = "0.1.0", default-features = false }
+maili-provider = { version = "0.1.3", default-features = false }
+maili-protocol = { version = "0.1.3", default-features = false }
+maili-registry = { version = "0.1.3", default-features = false }
+maili-common = { version = "0.1.3", default-features = false }
 
 # Revm
 revm = "19.0.0"

diff --git a/crates/consensus/Cargo.toml b/crates/consensus/Cargo.toml
@@ -21,6 +21,9 @@ alloy-eips.workspace = true
 alloy-consensus.workspace = true
 alloy-primitives = { workspace = true, features = ["rlp"] }
 
+# Maili
+maili-common.workspace = true
+
 # misc
 thiserror.workspace = true
 derive_more = { workspace = true, features = ["display"] }
@@ -44,7 +47,12 @@ alloy-primitives = { workspace = true, features = ["rand", "arbitrary"] }
 
 [features]
 default = ["std"]
-std = ["alloy-eips/std", "alloy-consensus/std", "derive_more/std"]
+std = [
+    "alloy-eips/std",
+    "alloy-consensus/std",
+    "maili-common/std",
+    "derive_more/std",
+]
 k256 = ["alloy-primitives/k256", "alloy-consensus/k256"]
 kzg = ["alloy-eips/kzg", "alloy-consensus/kzg", "std"]
 arbitrary = [
@@ -55,5 +63,12 @@ arbitrary = [
     "alloy-primitives/rand",
     "alloy-primitives/arbitrary",
 ]
-serde = ["dep:serde", "dep:alloy-serde", "alloy-primitives/serde", "alloy-consensus/serde", "alloy-eips/serde"]
+serde = [
+    "dep:serde",
+    "dep:alloy-serde",
+    "alloy-primitives/serde",
+    "alloy-consensus/serde",
+    "alloy-eips/serde",
+    "maili-common/serde",
+]
 serde-bincode-compat = ["serde_with"]
diff --git a/crates/consensus/src/hardforks/ecotone.rs b/crates/consensus/src/hardforks/ecotone.rs
@@ -5,8 +5,9 @@
 use alloc::{string::String, vec::Vec};
 use alloy_eips::eip2718::Encodable2718;
 use alloy_primitives::{address, hex, Address, Bytes, TxKind, B256, U256};
+use maili_common::UpgradeDepositSource;
 
-use crate::{Hardfork, TxDeposit, UpgradeDepositSource};
+use crate::{Hardfork, TxDeposit};
 
 /// The Ecotone network upgrade transactions.
 #[derive(Debug, Default, Clone, Copy)]

diff --git a/crates/consensus/src/hardforks/fjord.rs b/crates/consensus/src/hardforks/fjord.rs
@@ -5,8 +5,9 @@
 use alloc::{string::String, vec::Vec};
 use alloy_eips::eip2718::Encodable2718;
 use alloy_primitives::{address, hex, Address, Bytes, TxKind, B256, U256};
+use maili_common::UpgradeDepositSource;
 
-use crate::{Hardfork, TxDeposit, UpgradeDepositSource};
+use crate::{Hardfork, TxDeposit};
 
 /// The Fjord network upgrade transactions.
 #[derive(Debug, Default, Clone, Copy)]

diff --git a/crates/consensus/src/lib.rs b/crates/consensus/src/lib.rs
@@ -14,9 +14,8 @@ pub use receipt::{OpDepositReceipt, OpDepositReceiptWithBloom, OpReceiptEnvelope
 
 mod transaction;
 pub use transaction::{
-    DepositSourceDomain, DepositSourceDomainIdentifier, DepositTransaction, L1InfoDepositSource,
-    OpPooledTransaction, OpTxEnvelope, OpTxType, OpTypedTransaction, TxDeposit,
-    UpgradeDepositSource, UserDepositSource, DEPOSIT_TX_TYPE_ID,
+    DepositTransaction, OpPooledTransaction, OpTxEnvelope, OpTxType, OpTypedTransaction, TxDeposit,
+    DEPOSIT_TX_TYPE_ID,
 };
 
 pub mod eip1559;

diff --git a/crates/consensus/src/transaction/mod.rs b/crates/consensus/src/transaction/mod.rs
@@ -15,12 +15,6 @@ pub use typed::OpTypedTransaction;
 mod pooled;
 pub use pooled::OpPooledTransaction;
 
-mod source;
-pub use source::{
-    DepositSourceDomain, DepositSourceDomainIdentifier, L1InfoDepositSource, UpgradeDepositSource,
-    UserDepositSource,
-};
-
 #[cfg(feature = "serde")]
 pub use deposit::serde_deposit_tx_rpc;
 

diff --git a/crates/consensus/src/transaction/source.rs b/crates/consensus/src/transaction/source.rs
diff --git a/crates/rpc-types-engine/Cargo.toml b/crates/rpc-types-engine/Cargo.toml
@@ -25,7 +25,6 @@ alloy-rpc-types-engine.workspace = true
 
 # Maili
 maili-protocol.workspace = true
-maili-rpc-types-engine = { workspace = true, default-features = false }
 
 # Encoding
 snap = { workspace = true, optional = true }
@@ -55,14 +54,12 @@ std = [
   "alloy-rpc-types-engine/std",
   "op-alloy-consensus/std",
   "maili-protocol/std",
-  "maili-rpc-types-engine/std",
 ]
 serde = [
   "dep:serde",
   "dep:alloy-serde",
   "maili-protocol/serde",
   "alloy-rpc-types-engine/serde",
-  "maili-rpc-types-engine/serde",
 ]
 arbitrary = [
   "std",

diff --git a/crates/rpc-types-engine/src/lib.rs b/crates/rpc-types-engine/src/lib.rs
@@ -10,7 +10,6 @@
 extern crate alloc;
 
 pub use alloy_rpc_types_engine::ForkchoiceUpdateVersion;
-pub use maili_rpc_types_engine::*;
 
 mod attributes;
 pub use attributes::{OpAttributesWithParent, OpPayloadAttributes};