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.

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

chore: replace maili with op-alloy #9810

Merged
merged 1 commit into from
Feb 2, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 2 additions & 16 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,8 @@ alloy-rlp = "0.3"
alloy-trie = "0.7.0"

## op-alloy
op-alloy-consensus = "0.9.0"
op-alloy-rpc-types = "0.9.0"
maili-consensus = "0.1.6"

## cli
anstream = "0.6"
Expand Down
2 changes: 1 addition & 1 deletion crates/anvil/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ alloy-transport.workspace = true
alloy-chains.workspace = true
alloy-genesis.workspace = true
alloy-trie.workspace = true
maili-consensus = { workspace = true, features = ["serde"] }
op-alloy-consensus = { workspace = true, features = ["serde"] }

# axum related
axum.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/anvil/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ alloy-eips.workspace = true
alloy-consensus = { workspace = true, features = ["k256", "kzg"] }
alloy-dyn-abi = { workspace = true, features = ["std", "eip712"] }
alloy-trie.workspace = true
maili-consensus = { workspace = true, features = ["serde"] }
op-alloy-consensus = { workspace = true, features = ["serde"] }
alloy-network.workspace = true
serde = { workspace = true, optional = true }
serde_json.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/anvil/core/src/eth/transaction/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use alloy_rpc_types::{
use alloy_serde::{OtherFields, WithOtherFields};
use bytes::BufMut;
use foundry_evm::traces::CallTraceNode;
use maili_consensus::{TxDeposit, DEPOSIT_TX_TYPE_ID};
use op_alloy_consensus::{TxDeposit, DEPOSIT_TX_TYPE_ID};
use revm::{
interpreter::InstructionResult,
primitives::{OptimismFields, TxEnv},
Expand Down
2 changes: 1 addition & 1 deletion crates/anvil/core/src/eth/transaction/optimism.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use alloy_primitives::{Address, Bytes, TxKind, B256, U256};
use alloy_rlp::{Decodable, Encodable, Error as DecodeError, Header as RlpHeader};
use maili_consensus::TxDeposit;
use op_alloy_consensus::TxDeposit;
use serde::{Deserialize, Serialize};

pub const DEPOSIT_TX_TYPE_ID: u8 = 0x7E;
Expand Down
2 changes: 1 addition & 1 deletion crates/anvil/src/eth/backend/mem/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ use foundry_evm::{
traces::TracingInspectorConfig,
};
use futures::channel::mpsc::{unbounded, UnboundedSender};
use maili_consensus::{TxDeposit, DEPOSIT_TX_TYPE_ID};
use op_alloy_consensus::{TxDeposit, DEPOSIT_TX_TYPE_ID};
use parking_lot::{Mutex, RwLock};
use revm::{
db::WrapDatabaseRef,
Expand Down
2 changes: 1 addition & 1 deletion crates/anvil/src/eth/sign.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use alloy_signer_local::PrivateKeySigner;
use anvil_core::eth::transaction::{
optimism::DepositTransaction, TypedTransaction, TypedTransactionRequest,
};
use maili_consensus::TxDeposit;
use op_alloy_consensus::TxDeposit;

/// A transaction signer
#[async_trait::async_trait]
Expand Down