Skip to content

Commit eddcdd9

Browse files
authored
chore: Update Maili Deps (op-rs#908)
1 parent 7dbae6d commit eddcdd9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+221
-178
lines changed

Cargo.lock

Lines changed: 115 additions & 84 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,10 @@ kona-preimage = { path = "crates/proof-sdk/preimage", version = "0.2.1", default
7676
kona-std-fpvm-proc = { path = "crates/proof-sdk/std-fpvm-proc", version = "0.1.2", default-features = false }
7777

7878
# Maili
79-
maili-protocol = { version = "0.1.2", default-features = false }
80-
maili-registry = { version = "0.1.2", default-features = false }
79+
maili-genesis = { version = "0.1.5", default-features = false }
80+
maili-protocol = { version = "0.1.5", default-features = false }
81+
maili-registry = { version = "0.1.5", default-features = false }
82+
maili-consensus = { version = "0.1.5", default-features = false }
8183

8284
# Alloy
8385
alloy-rlp = { version = "0.3.10", default-features = false }
@@ -97,9 +99,8 @@ alloy-rpc-types-beacon = { version = "0.9.2", default-features = false }
9799
alloy-sol-types = { version = "0.8.18", default-features = false }
98100

99101
# OP Alloy
100-
op-alloy-genesis = { version = "0.9.2", default-features = false }
101-
op-alloy-consensus = { version = "0.9.2", default-features = false }
102-
op-alloy-rpc-types-engine = { version = "0.9.2", default-features = false }
102+
op-alloy-consensus = { version = "0.9.4", default-features = false }
103+
op-alloy-rpc-types-engine = { version = "0.9.4", default-features = false }
103104

104105
# General
105106
lru = "0.12.5"

bin/client/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ kona-std-fpvm-proc.workspace = true
2222

2323
# Maili
2424
maili-protocol.workspace = true
25+
maili-genesis = { workspace = true, features = ["serde"] }
2526

2627
# Alloy
2728
alloy-rlp.workspace = true
@@ -32,7 +33,6 @@ alloy-rpc-types-engine.workspace = true
3233

3334
# Op Alloy
3435
op-alloy-consensus.workspace = true
35-
op-alloy-genesis = { workspace = true, features = ["serde"] }
3636
op-alloy-rpc-types-engine = { workspace = true, features = ["serde"] }
3737

3838
# Revm

bin/host/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ alloy-primitives = { workspace = true, features = ["serde"] }
3636
alloy-rpc-types-beacon.workspace = true
3737

3838
# Op Alloy
39-
op-alloy-genesis = { workspace = true, features = ["std", "serde"] }
39+
maili-genesis = { workspace = true, features = ["std", "serde"] }
4040
op-alloy-rpc-types-engine = { workspace = true, features = ["serde"] }
4141

4242
# Revm

bin/host/src/single/cli.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use clap::{
1515
builder::styling::{AnsiColor, Color, Style},
1616
Parser,
1717
};
18-
use op_alloy_genesis::RollupConfig;
18+
use maili_genesis::RollupConfig;
1919
use reqwest::Client;
2020
use serde::Serialize;
2121
use std::{path::PathBuf, sync::Arc};

book/src/sdk/pipeline/intro.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ the [`PipelineBuilder`][builder] to instantiate a [`DerivationPipeline`][dp].
9494
// Imports
9595
use std::sync::Arc;
9696
use maili_protocol::BlockInfo;
97-
use op_alloy_genesis::RollupConfig;
97+
use maili_genesis::RollupConfig;
9898
use hilo_providers_alloy::*;
9999
100100
// Use a default rollup config.

book/src/sdk/pipeline/providers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ required trait implementations are the providers stubbed with `todo!()`.
2323

2424
```rust
2525
use std::sync::Arc;
26-
use op_alloy_genesis::RollupConfig;
26+
use maili_genesis::RollupConfig;
2727
use kona_derive::pipeline::PipelineBuilder;
2828
use kona_derive::attributes::StatefulAttributesBuilder;
2929

crates/derive/Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ workspace = true
1313

1414
[dependencies]
1515
# Maili
16+
maili-genesis.workspace = true
1617
maili-protocol.workspace = true
1718

1819
# Alloy
@@ -23,7 +24,6 @@ alloy-consensus = { workspace = true, features = ["k256"] }
2324
alloy-primitives = { workspace = true, features = ["rlp", "k256", "map"] }
2425

2526
# Op Alloy
26-
op-alloy-genesis.workspace = true
2727
op-alloy-rpc-types-engine.workspace = true
2828
op-alloy-consensus = { workspace = true, features = ["k256"] }
2929

@@ -41,6 +41,7 @@ spin.workspace = true
4141
proptest.workspace = true
4242
serde_json.workspace = true
4343
maili-registry.workspace = true
44+
maili-consensus.workspace = true
4445
tokio = { workspace = true, features = ["full"] }
4546
tracing-subscriber = { workspace = true, features = ["fmt"] }
4647
tracing = { workspace = true, features = ["std"] }
@@ -50,10 +51,10 @@ alloy-primitives = { workspace = true, features = ["rlp", "k256", "map", "arbitr
5051
default = []
5152
serde = [
5253
"maili-protocol/serde",
54+
"maili-genesis/serde",
5355
"alloy-primitives/serde",
5456
"alloy-consensus/serde",
5557
"op-alloy-consensus/serde",
56-
"op-alloy-genesis/serde",
5758
"op-alloy-rpc-types-engine/serde",
5859
]
5960
test-utils = [

crates/derive/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ The intended way of working with `kona-derive` is to use the [`DerivationPipelin
1515

1616
```rust,ignore
1717
use std::sync::Arc;
18-
use op_alloy_genesis::RollupConfig;
18+
use maili_genesis::RollupConfig;
1919
use kona_derive::sources::EthereumDataSource;
2020
use kona_derive::pipeline::PipelineBuilder;
2121
use kona_derive::attributes::StatefulAttributesBuilder;

crates/derive/src/attributes/stateful.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ use alloy_primitives::{address, Address, Bytes, B256};
1313
use alloy_rlp::Encodable;
1414
use alloy_rpc_types_engine::PayloadAttributes;
1515
use async_trait::async_trait;
16+
use maili_genesis::RollupConfig;
1617
use maili_protocol::{decode_deposit, L1BlockInfoTx, L2BlockInfo, DEPOSIT_EVENT_ABI_HASH};
1718
use op_alloy_consensus::{Hardfork, Hardforks};
18-
use op_alloy_genesis::RollupConfig;
1919
use op_alloy_rpc_types_engine::OpPayloadAttributes;
2020

2121
/// The sequencer fee vault address.
@@ -236,8 +236,8 @@ mod tests {
236236
use alloc::vec;
237237
use alloy_consensus::Header;
238238
use alloy_primitives::{Log, LogData, B256, U256, U64};
239+
use maili_genesis::SystemConfig;
239240
use maili_protocol::{BlockInfo, DepositError};
240-
use op_alloy_genesis::SystemConfig;
241241

242242
fn generate_valid_log() -> Log {
243243
let deposit_contract = address!("1111111111111111111111111111111111111111");

0 commit comments

Comments
 (0)