diff --git a/Cargo.lock b/Cargo.lock index e84f4af3e..b01dc779f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -71,9 +71,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "alloy-chains" -version = "0.1.51" +version = "0.1.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4e0f0136c085132939da6b753452ebed4efaa73fe523bb855b10c199c2ebfaf" +checksum = "d38fdd69239714d7625cda1e3730773a3c1a8719d506370eb17bb0103b7c2e15" dependencies = [ "alloy-primitives", "num_enum", @@ -176,7 +176,7 @@ dependencies = [ "alloy-sol-types", "serde", "serde_json", - "thiserror 2.0.9", + "thiserror 2.0.10", "tracing", ] @@ -202,7 +202,7 @@ dependencies = [ "futures-utils-wasm", "serde", "serde_json", - "thiserror 2.0.9", + "thiserror 2.0.10", ] [[package]] @@ -220,9 +220,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "0.8.16" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0540fd0355d400b59633c27bd4b42173e59943f28e9d3376b77a24771d432d04" +checksum = "788bb18e8f61d5d9340b52143f27771daf7e1dccbaf2741621d2493f9debf52e" dependencies = [ "alloy-rlp", "arbitrary", @@ -233,7 +233,6 @@ dependencies = [ "derive_more", "foldhash", "hashbrown 0.15.2", - "hex-literal", "indexmap", "itoa", "k256", @@ -279,7 +278,7 @@ dependencies = [ "schnellru", "serde", "serde_json", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", "tracing", "url", @@ -305,7 +304,7 @@ checksum = "5a833d97bf8a5f0f878daf2c8451fff7de7f9de38baa5a45d936ec718d81255a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -366,7 +365,7 @@ dependencies = [ "alloy-rpc-types-engine", "serde", "serde_with", - "thiserror 2.0.9", + "thiserror 2.0.10", ] [[package]] @@ -412,7 +411,7 @@ dependencies = [ "itertools 0.13.0", "serde", "serde_json", - "thiserror 2.0.9", + "thiserror 2.0.10", ] [[package]] @@ -437,28 +436,28 @@ dependencies = [ "auto_impl", "elliptic-curve", "k256", - "thiserror 2.0.9", + "thiserror 2.0.10", ] [[package]] name = "alloy-sol-macro" -version = "0.8.16" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6d1a14b4a9f6078ad9132775a2ebb465b06b387d60f7413ddc86d7bf7453408" +checksum = "a07b74d48661ab2e4b50bb5950d74dbff5e61dd8ed03bb822281b706d54ebacb" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] name = "alloy-sol-macro-expander" -version = "0.8.16" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4436b4b96d265eb17daea26eb31525c3076d024d10901e446790afbd2f7eeaf5" +checksum = "19cc9c7f20b90f9be1a8f71a3d8e283a43745137b0837b1a1cb13159d37cad72" dependencies = [ "alloy-sol-macro-input", "const-hex", @@ -467,31 +466,31 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", "syn-solidity", "tiny-keccak", ] [[package]] name = "alloy-sol-macro-input" -version = "0.8.16" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5f58698a18b96faa8513519de112b79a96010b4ff84264ce54a217c52a8e98b" +checksum = "713b7e6dfe1cb2f55c80fb05fd22ed085a1b4e48217611365ed0ae598a74c6ac" dependencies = [ "const-hex", "dunce", "heck", "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", "syn-solidity", ] [[package]] name = "alloy-sol-types" -version = "0.8.16" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c766e4979fc19d70057150befe8e3ea3f0c4cbc6839b8eaaa250803451692305" +checksum = "e3b478bc9c0c4737a04cd976accde4df7eba0bdc0d90ad6ff43d58bc93cf79c1" dependencies = [ "alloy-primitives", "alloy-sol-macro", @@ -510,7 +509,7 @@ dependencies = [ "futures-utils-wasm", "serde", "serde_json", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", "tower", "tracing", @@ -780,7 +779,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -791,7 +790,7 @@ checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -818,7 +817,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -877,7 +876,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -993,7 +992,7 @@ checksum = "523363cbe1df49b68215efdf500b103ac3b0fb4836aed6d15689a076eadb8fff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -1154,7 +1153,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -1341,7 +1340,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -1352,7 +1351,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -1416,7 +1415,7 @@ checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -1436,7 +1435,7 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", "unicode-xid", ] @@ -1469,7 +1468,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -1540,7 +1539,7 @@ checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -1560,7 +1559,7 @@ checksum = "3bf679796c0322556351f287a51b49e48f7c4986e727b5dd78c972d30e2e16cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -1581,9 +1580,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "5.3.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae" dependencies = [ "concurrent-queue", "parking", @@ -1749,7 +1748,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -1913,12 +1912,6 @@ dependencies = [ "serde", ] -[[package]] -name = "hex-literal" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" - [[package]] name = "hmac" version = "0.12.1" @@ -2155,7 +2148,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -2202,7 +2195,7 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -2362,15 +2355,15 @@ dependencies = [ "kona-std-fpvm", "kona-std-fpvm-proc", "lru", + "maili-protocol", "op-alloy-consensus", "op-alloy-genesis", - "op-alloy-protocol", "op-alloy-rpc-types-engine", "revm", "serde", "serde_json", "spin", - "thiserror 2.0.9", + "thiserror 2.0.10", "tracing", ] @@ -2384,15 +2377,15 @@ dependencies = [ "alloy-rlp", "alloy-rpc-types-engine", "async-trait", + "maili-protocol", "op-alloy-consensus", "op-alloy-genesis", - "op-alloy-protocol", "op-alloy-registry", "op-alloy-rpc-types-engine", "proptest", "serde_json", "spin", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", "tracing", "tracing-subscriber", @@ -2407,11 +2400,11 @@ dependencies = [ "alloy-rlp", "async-trait", "kona-derive", + "maili-protocol", "op-alloy-consensus", "op-alloy-genesis", - "op-alloy-protocol", "op-alloy-rpc-types-engine", - "thiserror 2.0.9", + "thiserror 2.0.10", "tracing", ] @@ -2435,7 +2428,7 @@ dependencies = [ "revm", "serde", "serde_json", - "thiserror 2.0.9", + "thiserror 2.0.10", "tracing", ] @@ -2462,8 +2455,8 @@ dependencies = [ "kona-preimage", "kona-proof", "kona-std-fpvm", + "maili-protocol", "op-alloy-genesis", - "op-alloy-protocol", "op-alloy-rpc-types-engine", "proptest", "reqwest", @@ -2494,7 +2487,7 @@ dependencies = [ "rand", "reqwest", "serde", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", "tracing-subscriber", ] @@ -2508,7 +2501,7 @@ dependencies = [ "async-trait", "rkyv", "serde", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", "tracing", ] @@ -2528,15 +2521,15 @@ dependencies = [ "kona-mpt", "kona-preimage", "lru", + "maili-protocol", "op-alloy-consensus", "op-alloy-genesis", - "op-alloy-protocol", "op-alloy-registry", "op-alloy-rpc-types-engine", "serde", "serde_json", "spin", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", "tracing", ] @@ -2549,7 +2542,7 @@ dependencies = [ "cfg-if", "kona-preimage", "linked_list_allocator", - "thiserror 2.0.9", + "thiserror 2.0.10", "tracing", ] @@ -2562,7 +2555,7 @@ dependencies = [ "kona-std-fpvm", "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -2612,9 +2605,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.20" +version = "1.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" +checksum = "df9b68e50e6e0b26f672573834882eb57759f6db9b3be2ea3c35c91188bb4eaa" dependencies = [ "cc", "pkg-config", @@ -2632,9 +2625,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" [[package]] name = "litemap" @@ -2667,6 +2660,31 @@ dependencies = [ "hashbrown 0.15.2", ] +[[package]] +name = "maili-protocol" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5c90d6f75a08d64f2d8588dca7215ae1307b4f1da1a59abac293db89f28d5a4" +dependencies = [ + "alloc-no-stdlib", + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "alloy-serde", + "alloy-sol-types", + "async-trait", + "brotli", + "derive_more", + "miniz_oxide", + "op-alloy-consensus", + "op-alloy-genesis", + "serde", + "thiserror 2.0.10", + "tracing", + "unsigned-varint", +] + [[package]] name = "memchr" version = "2.7.4" @@ -2731,7 +2749,7 @@ checksum = "1bb5c1d8184f13f7d0ccbeeca0def2f9a181bce2624302793005f5ca8aa62e5e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -2898,14 +2916,14 @@ checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] name = "nybbles" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3409fc85ac27b27d971ea7cd1aabafd2eefa6de7e481c8d4f707225c117e81a" +checksum = "8983bb634df7248924ee0c4c3a749609b5abcb082c28fffe3254b3eb3602b307" dependencies = [ "const-hex", "serde", @@ -2935,9 +2953,9 @@ checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "op-alloy-consensus" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "250244eadaf1a25e0e2ad263110ad2d1b43c2e57ddf4c025e71552d98196a8d3" +checksum = "442518bf0ef88f4d79409527565b8cdee235c891f2e2a829497caec5ed9d8d1c" dependencies = [ "alloy-consensus", "alloy-eips", @@ -2946,14 +2964,14 @@ dependencies = [ "alloy-serde", "derive_more", "serde", - "thiserror 2.0.9", + "thiserror 2.0.10", ] [[package]] name = "op-alloy-genesis" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98334a9cdccc5878e9d5c48afc9cc1b84da58dbc68d41f9488d8f71688b495d3" +checksum = "8a2af7fee1fa297569199b524493e50355eab3f1bff75cef492036eb4a3ffb5e" dependencies = [ "alloy-consensus", "alloy-eips", @@ -2961,39 +2979,23 @@ dependencies = [ "alloy-sol-types", "serde", "serde_repr", - "thiserror 2.0.9", + "thiserror 2.0.10", ] [[package]] name = "op-alloy-protocol" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "753762429c31f838b59c886b31456c9bf02fd38fb890621665523a9087ae06ae" +checksum = "5a144b1ed079913b11c0640f4eaa3d2ac1bdb6cc35e3658a1640e88b241e0c32" dependencies = [ - "alloc-no-stdlib", - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "alloy-rlp", - "alloy-serde", - "alloy-sol-types", - "async-trait", - "brotli", - "derive_more", - "miniz_oxide", - "op-alloy-consensus", - "op-alloy-genesis", - "serde", - "thiserror 2.0.9", - "tracing", - "unsigned-varint", + "maili-protocol", ] [[package]] name = "op-alloy-registry" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812e817159c7f8a451896fb0584132a1413d5579a3fe3f7b8756e333f0eb15ee" +checksum = "94c41c23c452bef5c890269b17459f9f2409f8d083df8a5d978676bcae8b7ce1" dependencies = [ "alloy-primitives", "lazy_static", @@ -3004,9 +3006,9 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types-engine" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43f00d4060a6a38f5bf0a8182b4cc4c7071e2bc96942f414619251b522169eb" +checksum = "f5e2419373bae23ea3f6cf5a49c624d9b644061e2e929d4f9629cbcbffa4964d" dependencies = [ "alloy-eips", "alloy-primitives", @@ -3016,7 +3018,7 @@ dependencies = [ "op-alloy-consensus", "op-alloy-protocol", "serde", - "thiserror 2.0.9", + "thiserror 2.0.10", ] [[package]] @@ -3042,7 +3044,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -3155,35 +3157,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc" dependencies = [ "memchr", - "thiserror 2.0.9", + "thiserror 2.0.10", "ucd-trie", ] [[package]] name = "pin-project" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" +checksum = "1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" +checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] name = "pin-project-lite" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -3321,7 +3323,7 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -3361,7 +3363,7 @@ checksum = "4ee1c9ac207483d5e7db4940700de86a9aae46ef90c48b57f99fe7edb8345e49" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -3381,7 +3383,7 @@ checksum = "ca414edb151b4c8d125c12566ab0d74dc9cdba36fb80eb7b848c15f495fd32d1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -3709,7 +3711,7 @@ checksum = "beb382a4d9f53bd5c0be86b10d8179c3f8a14c30bf774ff77096ed6581e35981" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -3807,9 +3809,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.42" +version = "0.38.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" +checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6" dependencies = [ "bitflags 2.6.0", "errno", @@ -3964,9 +3966,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.13.0" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5" +checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" dependencies = [ "core-foundation-sys", "libc", @@ -4013,7 +4015,7 @@ checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -4037,7 +4039,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -4077,7 +4079,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -4250,7 +4252,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -4308,9 +4310,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.94" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "987bc0be1cdea8b10216bd06e2ca407d40b9543468fafd3ddfb02f36e77f71f3" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", @@ -4319,14 +4321,14 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.8.16" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c74af950d86ec0f5b2ae2d7f1590bbfbcf4603a0a15742d8f98132ac4fe3efd4" +checksum = "31e89d8bf2768d277f40573c83a02a099e96d96dd3104e13ea676194e61ac4b0" dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -4346,7 +4348,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -4401,11 +4403,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.9" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +checksum = "a3ac7f54ca534db81081ef1c1e7f6ea8a3ef428d2fc069097c079443d24124d3" dependencies = [ - "thiserror-impl 2.0.9", + "thiserror-impl 2.0.10", ] [[package]] @@ -4416,18 +4418,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] name = "thiserror-impl" -version = "2.0.9" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" +checksum = "9e9465d30713b56a37ede7185763c3492a91be2f5fa68d958c44e41ab9248beb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -4514,9 +4516,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.42.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ "backtrace", "bytes", @@ -4532,13 +4534,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -4649,7 +4651,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -4855,7 +4857,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", "wasm-bindgen-shared", ] @@ -4890,7 +4892,7 @@ checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5118,7 +5120,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", "synstructure", ] @@ -5140,7 +5142,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -5160,7 +5162,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", "synstructure", ] @@ -5181,7 +5183,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] [[package]] @@ -5203,5 +5205,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.95", ] diff --git a/Cargo.toml b/Cargo.toml index 1734ecde2..553e064dc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -72,6 +72,9 @@ kona-std-fpvm = { path = "crates/proof-sdk/std-fpvm", version = "0.1.2", default kona-preimage = { path = "crates/proof-sdk/preimage", version = "0.2.1", default-features = false } kona-std-fpvm-proc = { path = "crates/proof-sdk/std-fpvm-proc", version = "0.1.2", default-features = false } +# Maili +maili-protocol = { version = "0.1.0", default-features = false } + # Alloy alloy-rlp = { version = "0.3.10", default-features = false } alloy-trie = { version = "0.7.8", default-features = false } @@ -89,11 +92,10 @@ alloy-rpc-types-engine = { version = "0.9.2", default-features = false } alloy-rpc-types-beacon = { version = "0.9.2", default-features = false } # OP Alloy -op-alloy-genesis = { version = "0.9.1", default-features = false } -op-alloy-registry = { version = "0.9.1", default-features = false } -op-alloy-protocol = { version = "0.9.1", default-features = false } -op-alloy-consensus = { version = "0.9.1", default-features = false } -op-alloy-rpc-types-engine = { version = "0.9.1", default-features = false } +op-alloy-genesis = { version = "0.9.2", default-features = false } +op-alloy-registry = { version = "0.9.2", default-features = false } +op-alloy-consensus = { version = "0.9.2", default-features = false } +op-alloy-rpc-types-engine = { version = "0.9.2", default-features = false } # General lru = "0.12.5" diff --git a/bin/client/Cargo.toml b/bin/client/Cargo.toml index 01c1f268a..abcd81dcf 100644 --- a/bin/client/Cargo.toml +++ b/bin/client/Cargo.toml @@ -19,6 +19,9 @@ kona-proof.workspace = true kona-std-fpvm.workspace = true kona-std-fpvm-proc.workspace = true +# Maili +maili-protocol.workspace = true + # Alloy alloy-rlp.workspace = true alloy-eips.workspace = true @@ -27,7 +30,6 @@ alloy-primitives.workspace = true alloy-rpc-types-engine.workspace = true # Op Alloy -op-alloy-protocol.workspace = true op-alloy-consensus.workspace = true op-alloy-genesis = { workspace = true, features = ["serde"] } op-alloy-rpc-types-engine = { workspace = true, features = ["serde"] } diff --git a/bin/host/Cargo.toml b/bin/host/Cargo.toml index a512a5ee2..b9c6d01c0 100644 --- a/bin/host/Cargo.toml +++ b/bin/host/Cargo.toml @@ -20,6 +20,9 @@ kona-preimage = { workspace = true, features = ["std"] } kona-proof = { workspace = true, features = ["std"] } kona-client.workspace = true +# Maili +maili-protocol = { workspace = true, features = ["std", "serde"] } + # Alloy alloy-rlp.workspace = true alloy-eips = { workspace = true, features = ["kzg"] } @@ -34,7 +37,6 @@ alloy-rpc-types-beacon.workspace = true # Op Alloy op-alloy-genesis = { workspace = true, features = ["std", "serde"] } -op-alloy-protocol = { workspace = true, features = ["std", "serde"] } op-alloy-rpc-types-engine = { workspace = true, features = ["serde"] } # Revm diff --git a/bin/host/src/blobs.rs b/bin/host/src/blobs.rs index c21064019..b110e8db7 100644 --- a/bin/host/src/blobs.rs +++ b/bin/host/src/blobs.rs @@ -3,7 +3,7 @@ use alloy_eips::eip4844::{BlobTransactionSidecarItem, IndexedBlobHash}; use alloy_rpc_types_beacon::sidecar::{BeaconBlobBundle, BlobData}; use kona_derive::errors::BlobProviderError; -use op_alloy_protocol::BlockInfo; +use maili_protocol::BlockInfo; use reqwest::Client; /// The config spec engine api method. diff --git a/bin/host/src/fetcher/mod.rs b/bin/host/src/fetcher/mod.rs index 75a87a801..23294234e 100644 --- a/bin/host/src/fetcher/mod.rs +++ b/bin/host/src/fetcher/mod.rs @@ -18,7 +18,7 @@ use alloy_rpc_types::{ use anyhow::{anyhow, Result}; use kona_preimage::{PreimageKey, PreimageKeyType}; use kona_proof::{Hint, HintType}; -use op_alloy_protocol::BlockInfo; +use maili_protocol::BlockInfo; use op_alloy_rpc_types_engine::OpPayloadAttributes; use std::sync::Arc; use tokio::sync::RwLock; diff --git a/book/src/sdk/pipeline/intro.md b/book/src/sdk/pipeline/intro.md index 780f4c42e..b0e681369 100644 --- a/book/src/sdk/pipeline/intro.md +++ b/book/src/sdk/pipeline/intro.md @@ -93,7 +93,7 @@ the [`PipelineBuilder`][builder] to instantiate a [`DerivationPipeline`][dp]. ```rust,ignore // Imports use std::sync::Arc; -use op_alloy_protocol::BlockInfo; +use maili_protocol::BlockInfo; use op_alloy_genesis::RollupConfig; use hilo_providers_alloy::*; diff --git a/book/src/sdk/pipeline/providers.md b/book/src/sdk/pipeline/providers.md index f744fe2c3..56936278a 100644 --- a/book/src/sdk/pipeline/providers.md +++ b/book/src/sdk/pipeline/providers.md @@ -67,7 +67,7 @@ let pipeline = PipelineBuilder::new() ```rust use async_trait::async_trait; use alloy_primitives::Bytes; -use op_alloy_protocol::BlockInfo; +use maili_protocol::BlockInfo; use kona_derive::traits::DataAvailabilityProvider; use kona_derive::errors::PipelineResult; diff --git a/crates/derive/Cargo.toml b/crates/derive/Cargo.toml index e21c8d356..bd2e43ada 100644 --- a/crates/derive/Cargo.toml +++ b/crates/derive/Cargo.toml @@ -12,6 +12,9 @@ homepage.workspace = true workspace = true [dependencies] +# Maili +maili-protocol.workspace = true + # Alloy alloy-eips.workspace = true alloy-rpc-types-engine.workspace = true @@ -21,7 +24,6 @@ alloy-primitives = { workspace = true, features = ["rlp", "k256", "map"] } # Op Alloy op-alloy-genesis.workspace = true -op-alloy-protocol.workspace = true op-alloy-rpc-types-engine.workspace = true op-alloy-consensus = { workspace = true, features = ["k256"] } @@ -47,10 +49,10 @@ alloy-primitives = { workspace = true, features = ["rlp", "k256", "map", "arbitr [features] default = [] serde = [ + "maili-protocol/serde", "alloy-primitives/serde", "alloy-consensus/serde", "op-alloy-consensus/serde", - "op-alloy-protocol/serde", "op-alloy-genesis/serde", "op-alloy-rpc-types-engine/serde", ] diff --git a/crates/derive/src/attributes/stateful.rs b/crates/derive/src/attributes/stateful.rs index 42cc53f70..fc43bfcd1 100644 --- a/crates/derive/src/attributes/stateful.rs +++ b/crates/derive/src/attributes/stateful.rs @@ -13,9 +13,9 @@ use alloy_primitives::{address, Address, Bytes, B256}; use alloy_rlp::Encodable; use alloy_rpc_types_engine::PayloadAttributes; use async_trait::async_trait; +use maili_protocol::{decode_deposit, L1BlockInfoTx, L2BlockInfo, DEPOSIT_EVENT_ABI_HASH}; use op_alloy_consensus::{Hardfork, Hardforks}; use op_alloy_genesis::RollupConfig; -use op_alloy_protocol::{decode_deposit, L1BlockInfoTx, L2BlockInfo, DEPOSIT_EVENT_ABI_HASH}; use op_alloy_rpc_types_engine::OpPayloadAttributes; /// The sequencer fee vault address. @@ -236,8 +236,8 @@ mod tests { use alloc::vec; use alloy_consensus::Header; use alloy_primitives::{Log, LogData, B256, U256, U64}; + use maili_protocol::{BlockInfo, DepositError}; use op_alloy_genesis::SystemConfig; - use op_alloy_protocol::{BlockInfo, DepositError}; fn generate_valid_log() -> Log { let deposit_contract = address!("1111111111111111111111111111111111111111"); diff --git a/crates/derive/src/errors/pipeline.rs b/crates/derive/src/errors/pipeline.rs index ecf4c739e..6a082b030 100644 --- a/crates/derive/src/errors/pipeline.rs +++ b/crates/derive/src/errors/pipeline.rs @@ -3,8 +3,8 @@ use crate::errors::BuilderError; use alloc::string::String; use alloy_primitives::B256; +use maili_protocol::{DepositError, SpanBatchError}; use op_alloy_genesis::SystemConfigUpdateError; -use op_alloy_protocol::{DepositError, SpanBatchError}; use thiserror::Error; /// [crate::ensure] is a short-hand for bubbling up errors in the case of a condition not being met. diff --git a/crates/derive/src/errors/stages.rs b/crates/derive/src/errors/stages.rs index bced73789..81e506bd0 100644 --- a/crates/derive/src/errors/stages.rs +++ b/crates/derive/src/errors/stages.rs @@ -1,6 +1,6 @@ //! Error types for derivation pipeline stages. -use op_alloy_protocol::MAX_SPAN_BATCH_ELEMENTS; +use maili_protocol::MAX_SPAN_BATCH_ELEMENTS; use thiserror::Error; /// A frame decompression error. diff --git a/crates/derive/src/pipeline/builder.rs b/crates/derive/src/pipeline/builder.rs index eb6ba26c9..25d3797cb 100644 --- a/crates/derive/src/pipeline/builder.rs +++ b/crates/derive/src/pipeline/builder.rs @@ -10,8 +10,8 @@ use crate::{ }; use alloc::sync::Arc; use core::fmt::Debug; +use maili_protocol::BlockInfo; use op_alloy_genesis::RollupConfig; -use op_alloy_protocol::BlockInfo; type L1TraversalStage

= L1Traversal

; type L1RetrievalStage = L1Retrieval>; diff --git a/crates/derive/src/pipeline/core.rs b/crates/derive/src/pipeline/core.rs index 2bb1cb46a..afcad8166 100644 --- a/crates/derive/src/pipeline/core.rs +++ b/crates/derive/src/pipeline/core.rs @@ -10,8 +10,8 @@ use crate::{ use alloc::{boxed::Box, collections::VecDeque, sync::Arc}; use async_trait::async_trait; use core::fmt::Debug; +use maili_protocol::{BlockInfo, L2BlockInfo}; use op_alloy_genesis::{RollupConfig, SystemConfig}; -use op_alloy_protocol::{BlockInfo, L2BlockInfo}; use op_alloy_rpc_types_engine::OpAttributesWithParent; /// The derivation pipeline is responsible for deriving L2 inputs from L1 data. @@ -191,8 +191,8 @@ mod tests { use crate::{pipeline::DerivationPipeline, test_utils::*}; use alloc::{string::ToString, sync::Arc}; use alloy_rpc_types_engine::PayloadAttributes; + use maili_protocol::L2BlockInfo; use op_alloy_genesis::{RollupConfig, SystemConfig}; - use op_alloy_protocol::L2BlockInfo; use op_alloy_rpc_types_engine::{OpAttributesWithParent, OpPayloadAttributes}; fn default_test_payload_attributes() -> OpAttributesWithParent { diff --git a/crates/derive/src/sources/blobs.rs b/crates/derive/src/sources/blobs.rs index f97b41d01..2a40221b2 100644 --- a/crates/derive/src/sources/blobs.rs +++ b/crates/derive/src/sources/blobs.rs @@ -11,7 +11,7 @@ use alloy_consensus::{Transaction, TxEip4844Variant, TxEnvelope, TxType}; use alloy_eips::eip4844::IndexedBlobHash; use alloy_primitives::{Address, Bytes}; use async_trait::async_trait; -use op_alloy_protocol::BlockInfo; +use maili_protocol::BlockInfo; /// A data iterator that reads from a blob. #[derive(Debug, Clone)] diff --git a/crates/derive/src/sources/calldata.rs b/crates/derive/src/sources/calldata.rs index f056bf0bc..c2f70766d 100644 --- a/crates/derive/src/sources/calldata.rs +++ b/crates/derive/src/sources/calldata.rs @@ -9,7 +9,7 @@ use alloc::{boxed::Box, collections::VecDeque}; use alloy_consensus::{Transaction, TxEnvelope}; use alloy_primitives::{Address, Bytes}; use async_trait::async_trait; -use op_alloy_protocol::BlockInfo; +use maili_protocol::BlockInfo; /// A data iterator that reads from calldata. #[derive(Debug, Clone)] diff --git a/crates/derive/src/sources/ethereum.rs b/crates/derive/src/sources/ethereum.rs index 22e01bcd5..79fec6c1c 100644 --- a/crates/derive/src/sources/ethereum.rs +++ b/crates/derive/src/sources/ethereum.rs @@ -9,8 +9,8 @@ use crate::{ use alloc::{boxed::Box, fmt::Debug}; use alloy_primitives::Bytes; use async_trait::async_trait; +use maili_protocol::BlockInfo; use op_alloy_genesis::RollupConfig; -use op_alloy_protocol::BlockInfo; /// A factory for creating an Ethereum data source provider. #[derive(Debug, Clone)] @@ -87,8 +87,8 @@ mod tests { use alloy_consensus::TxEnvelope; use alloy_eips::eip2718::Decodable2718; use alloy_primitives::{address, Address}; + use maili_protocol::BlockInfo; use op_alloy_genesis::{RollupConfig, SystemConfig}; - use op_alloy_protocol::BlockInfo; fn default_test_blob_source() -> BlobSource { let chain_provider = TestChainProvider::default(); diff --git a/crates/derive/src/sources/mod.rs b/crates/derive/src/sources/mod.rs index e0c9772d3..da1162acd 100644 --- a/crates/derive/src/sources/mod.rs +++ b/crates/derive/src/sources/mod.rs @@ -5,7 +5,7 @@ //! to iterate over data for a given (L2) [BlockInfo]. //! //! [DataAvailabilityProvider]: crate::traits::DataAvailabilityProvider -//! [BlockInfo]: op_alloy_protocol::BlockInfo +//! [BlockInfo]: maili_protocol::BlockInfo mod blob_data; pub use blob_data::BlobData; diff --git a/crates/derive/src/sources/variant.rs b/crates/derive/src/sources/variant.rs index 44588e39c..47b391437 100644 --- a/crates/derive/src/sources/variant.rs +++ b/crates/derive/src/sources/variant.rs @@ -42,7 +42,7 @@ where mod tests { use super::*; use crate::test_utils::TestChainProvider; - use op_alloy_protocol::BlockInfo; + use maili_protocol::BlockInfo; use crate::{ sources::{BlobData, EthereumDataSourceVariant}, diff --git a/crates/derive/src/stages/attributes_queue.rs b/crates/derive/src/stages/attributes_queue.rs index 48cc9905a..3e15cdd6e 100644 --- a/crates/derive/src/stages/attributes_queue.rs +++ b/crates/derive/src/stages/attributes_queue.rs @@ -11,8 +11,8 @@ use crate::{ use alloc::{boxed::Box, sync::Arc}; use async_trait::async_trait; use core::fmt::Debug; +use maili_protocol::{BlockInfo, L2BlockInfo, SingleBatch}; use op_alloy_genesis::RollupConfig; -use op_alloy_protocol::{BlockInfo, L2BlockInfo, SingleBatch}; use op_alloy_rpc_types_engine::{OpAttributesWithParent, OpPayloadAttributes}; /// [AttributesQueue] accepts batches from the [BatchQueue] stage diff --git a/crates/derive/src/stages/batch/batch_provider.rs b/crates/derive/src/stages/batch/batch_provider.rs index df153a9f3..a6a007909 100644 --- a/crates/derive/src/stages/batch/batch_provider.rs +++ b/crates/derive/src/stages/batch/batch_provider.rs @@ -10,8 +10,8 @@ use crate::{ use alloc::{boxed::Box, sync::Arc}; use async_trait::async_trait; use core::fmt::Debug; +use maili_protocol::{BlockInfo, L2BlockInfo, SingleBatch}; use op_alloy_genesis::RollupConfig; -use op_alloy_protocol::{BlockInfo, L2BlockInfo, SingleBatch}; /// The [BatchProvider] stage is a mux between the [BatchQueue] and [BatchValidator] stages. /// @@ -182,8 +182,8 @@ mod test { types::ResetSignal, }; use alloc::{sync::Arc, vec}; + use maili_protocol::BlockInfo; use op_alloy_genesis::RollupConfig; - use op_alloy_protocol::BlockInfo; #[test] fn test_batch_provider_validator_active() { diff --git a/crates/derive/src/stages/batch/batch_queue.rs b/crates/derive/src/stages/batch/batch_queue.rs index ade774980..df43903eb 100644 --- a/crates/derive/src/stages/batch/batch_queue.rs +++ b/crates/derive/src/stages/batch/batch_queue.rs @@ -9,10 +9,10 @@ use crate::{ use alloc::{boxed::Box, sync::Arc, vec::Vec}; use async_trait::async_trait; use core::fmt::Debug; -use op_alloy_genesis::RollupConfig; -use op_alloy_protocol::{ +use maili_protocol::{ Batch, BatchValidity, BatchWithInclusionBlock, BlockInfo, L2BlockInfo, SingleBatch, }; +use op_alloy_genesis::RollupConfig; /// [BatchQueue] is responsible for o rdering unordered batches /// and gnerating empty batches when the sequence window has passed. @@ -51,7 +51,7 @@ where pub(crate) batches: Vec, /// A set of cached [SingleBatch]es derived from [SpanBatch]es. /// - /// [SpanBatch]: op_alloy_protocol::SpanBatch + /// [SpanBatch]: maili_protocol::SpanBatch pub(crate) next_spans: Vec, /// Used to validate the batches. pub(crate) fetcher: BF, @@ -468,9 +468,9 @@ mod tests { use alloy_eips::{eip2718::Decodable2718, BlockNumHash}; use alloy_primitives::{address, b256, Address, Bytes, TxKind, B256, U256}; use alloy_rlp::{BytesMut, Encodable}; + use maili_protocol::{BatchReader, L1BlockInfoBedrock, L1BlockInfoTx}; use op_alloy_consensus::{OpBlock, OpTxEnvelope, OpTxType, TxDeposit}; use op_alloy_genesis::{ChainGenesis, MAX_RLP_BYTES_PER_CHANNEL_FJORD}; - use op_alloy_protocol::{BatchReader, L1BlockInfoBedrock, L1BlockInfoTx}; use tracing::Level; use tracing_subscriber::layer::SubscriberExt; diff --git a/crates/derive/src/stages/batch/batch_stream.rs b/crates/derive/src/stages/batch/batch_stream.rs index 0576ed9d5..36d22ad63 100644 --- a/crates/derive/src/stages/batch/batch_stream.rs +++ b/crates/derive/src/stages/batch/batch_stream.rs @@ -9,10 +9,10 @@ use crate::{ use alloc::{boxed::Box, collections::VecDeque, sync::Arc}; use async_trait::async_trait; use core::fmt::Debug; -use op_alloy_genesis::RollupConfig; -use op_alloy_protocol::{ +use maili_protocol::{ Batch, BatchValidity, BatchWithInclusionBlock, BlockInfo, L2BlockInfo, SingleBatch, SpanBatch, }; +use op_alloy_genesis::RollupConfig; /// Provides [Batch]es for the [BatchStream] stage. #[async_trait] @@ -226,7 +226,7 @@ mod test { }; use alloc::vec; use alloy_eips::NumHash; - use op_alloy_protocol::{SingleBatch, SpanBatchElement}; + use maili_protocol::{SingleBatch, SpanBatchElement}; use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::test] diff --git a/crates/derive/src/stages/batch/batch_validator.rs b/crates/derive/src/stages/batch/batch_validator.rs index 4a5dd6241..40b7647b7 100644 --- a/crates/derive/src/stages/batch/batch_validator.rs +++ b/crates/derive/src/stages/batch/batch_validator.rs @@ -11,8 +11,8 @@ use crate::{ use alloc::{boxed::Box, sync::Arc, vec::Vec}; use async_trait::async_trait; use core::fmt::Debug; +use maili_protocol::{Batch, BatchValidity, BlockInfo, L2BlockInfo, SingleBatch}; use op_alloy_genesis::RollupConfig; -use op_alloy_protocol::{Batch, BatchValidity, BlockInfo, L2BlockInfo, SingleBatch}; /// The [BatchValidator] stage is responsible for validating the [SingleBatch]es from /// the [BatchStream] [AttributesQueue]'s consumption. @@ -320,8 +320,8 @@ mod test { use alloc::{sync::Arc, vec, vec::Vec}; use alloy_eips::{BlockNumHash, NumHash}; use alloy_primitives::B256; + use maili_protocol::{Batch, BlockInfo, L2BlockInfo, SingleBatch, SpanBatch}; use op_alloy_genesis::RollupConfig; - use op_alloy_protocol::{Batch, BlockInfo, L2BlockInfo, SingleBatch, SpanBatch}; use tracing::Level; use tracing_subscriber::layer::SubscriberExt; diff --git a/crates/derive/src/stages/batch/mod.rs b/crates/derive/src/stages/batch/mod.rs index 6f0bac4f2..9e1e1cff4 100644 --- a/crates/derive/src/stages/batch/mod.rs +++ b/crates/derive/src/stages/batch/mod.rs @@ -5,16 +5,16 @@ //! for streaming [SingleBatch]es from [SpanBatch]es, while the [BatchProvider] stage is responsible //! for ordering and validating the [Batch]es for the [AttributesQueue] stage. //! -//! [Batch]: op_alloy_protocol::Batch -//! [SingleBatch]: op_alloy_protocol::SingleBatch -//! [SpanBatch]: op_alloy_protocol::SpanBatch +//! [Batch]: maili_protocol::Batch +//! [SingleBatch]: maili_protocol::SingleBatch +//! [SpanBatch]: maili_protocol::SpanBatch //! [ChannelReader]: crate::stages::channel::ChannelReader //! [AttributesQueue]: crate::stages::attributes_queue::AttributesQueue use crate::types::PipelineResult; use alloc::boxed::Box; use async_trait::async_trait; -use op_alloy_protocol::{Batch, BlockInfo, L2BlockInfo}; +use maili_protocol::{Batch, BlockInfo, L2BlockInfo}; mod batch_stream; pub use batch_stream::{BatchStream, BatchStreamProvider}; @@ -47,8 +47,8 @@ pub trait NextBatchProvider { /// Returns the number of [SingleBatch]es that are currently buffered in the [BatchStream] /// from a [SpanBatch]. /// - /// [SpanBatch]: op_alloy_protocol::SpanBatch - /// [SingleBatch]: op_alloy_protocol::SingleBatch + /// [SpanBatch]: maili_protocol::SpanBatch + /// [SingleBatch]: maili_protocol::SingleBatch fn span_buffer_size(&self) -> usize; /// Allows the stage to flush the buffer in the [crate::stages::BatchStream] diff --git a/crates/derive/src/stages/channel/channel_assembler.rs b/crates/derive/src/stages/channel/channel_assembler.rs index bb736083d..a0dadce41 100644 --- a/crates/derive/src/stages/channel/channel_assembler.rs +++ b/crates/derive/src/stages/channel/channel_assembler.rs @@ -10,17 +10,17 @@ use alloc::{boxed::Box, sync::Arc}; use alloy_primitives::{hex, Bytes}; use async_trait::async_trait; use core::fmt::Debug; +use maili_protocol::{BlockInfo, Channel}; use op_alloy_genesis::{ RollupConfig, MAX_RLP_BYTES_PER_CHANNEL_BEDROCK, MAX_RLP_BYTES_PER_CHANNEL_FJORD, }; -use op_alloy_protocol::{BlockInfo, Channel}; /// The [ChannelAssembler] stage is responsible for assembling the [Frame]s from the [FrameQueue] /// stage into a raw compressed [Channel]. /// -/// [Frame]: op_alloy_protocol::Frame +/// [Frame]: maili_protocol::Frame /// [FrameQueue]: crate::stages::FrameQueue -/// [Channel]: op_alloy_protocol::Channel +/// [Channel]: maili_protocol::Channel #[derive(Debug)] pub struct ChannelAssembler

where @@ -191,10 +191,10 @@ mod test { test_utils::{CollectingLayer, TestNextFrameProvider, TraceStorage}, }; use alloc::{sync::Arc, vec}; + use maili_protocol::BlockInfo; use op_alloy_genesis::{ RollupConfig, MAX_RLP_BYTES_PER_CHANNEL_BEDROCK, MAX_RLP_BYTES_PER_CHANNEL_FJORD, }; - use op_alloy_protocol::BlockInfo; use tracing::Level; use tracing_subscriber::layer::SubscriberExt; diff --git a/crates/derive/src/stages/channel/channel_bank.rs b/crates/derive/src/stages/channel/channel_bank.rs index 0e6361899..43b66e280 100644 --- a/crates/derive/src/stages/channel/channel_bank.rs +++ b/crates/derive/src/stages/channel/channel_bank.rs @@ -11,8 +11,8 @@ use alloc::{boxed::Box, collections::VecDeque, sync::Arc}; use alloy_primitives::{hex, map::HashMap, Bytes}; use async_trait::async_trait; use core::fmt::Debug; +use maili_protocol::{BlockInfo, Channel, ChannelId, Frame}; use op_alloy_genesis::RollupConfig; -use op_alloy_protocol::{BlockInfo, Channel, ChannelId, Frame}; /// The maximum size of a channel bank. pub(crate) const MAX_CHANNEL_BANK_SIZE: usize = 100_000_000; @@ -429,11 +429,11 @@ mod tests { assert!(channel_bank.channels.is_empty()); assert_eq!(trace_store.lock().iter().filter(|(l, _)| matches!(l, &Level::WARN)).count(), 0); assert_eq!(channel_bank.ingest_frame(frame.clone()), Ok(())); - assert_eq!(channel_bank.size(), op_alloy_protocol::FRAME_OVERHEAD); + assert_eq!(channel_bank.size(), maili_protocol::FRAME_OVERHEAD); assert_eq!(channel_bank.channels.len(), 1); // This should fail since the frame is already ingested. assert_eq!(channel_bank.ingest_frame(frame), Ok(())); - assert_eq!(channel_bank.size(), op_alloy_protocol::FRAME_OVERHEAD); + assert_eq!(channel_bank.size(), maili_protocol::FRAME_OVERHEAD); assert_eq!(channel_bank.channels.len(), 1); assert_eq!(trace_store.lock().iter().filter(|(l, _)| matches!(l, &Level::WARN)).count(), 1); } diff --git a/crates/derive/src/stages/channel/channel_provider.rs b/crates/derive/src/stages/channel/channel_provider.rs index 093e5dcd2..5a747af09 100644 --- a/crates/derive/src/stages/channel/channel_provider.rs +++ b/crates/derive/src/stages/channel/channel_provider.rs @@ -10,8 +10,8 @@ use alloc::{boxed::Box, sync::Arc}; use alloy_primitives::Bytes; use async_trait::async_trait; use core::fmt::Debug; +use maili_protocol::BlockInfo; use op_alloy_genesis::RollupConfig; -use op_alloy_protocol::BlockInfo; /// The [ChannelProvider] stage is a mux between the [ChannelBank] and [ChannelAssembler] stages. /// @@ -163,8 +163,8 @@ mod test { types::ResetSignal, }; use alloc::{sync::Arc, vec}; + use maili_protocol::BlockInfo; use op_alloy_genesis::RollupConfig; - use op_alloy_protocol::BlockInfo; #[test] fn test_channel_provider_assembler_active() { diff --git a/crates/derive/src/stages/channel/channel_reader.rs b/crates/derive/src/stages/channel/channel_reader.rs index 43e24729f..65ac29de0 100644 --- a/crates/derive/src/stages/channel/channel_reader.rs +++ b/crates/derive/src/stages/channel/channel_reader.rs @@ -10,10 +10,10 @@ use alloc::{boxed::Box, sync::Arc}; use alloy_primitives::Bytes; use async_trait::async_trait; use core::fmt::Debug; +use maili_protocol::{Batch, BatchReader, BlockInfo}; use op_alloy_genesis::{ RollupConfig, MAX_RLP_BYTES_PER_CHANNEL_BEDROCK, MAX_RLP_BYTES_PER_CHANNEL_FJORD, }; -use op_alloy_protocol::{Batch, BatchReader, BlockInfo}; use tracing::{debug, warn}; /// The [ChannelReader] provider trait. diff --git a/crates/derive/src/stages/channel/mod.rs b/crates/derive/src/stages/channel/mod.rs index 7e86273f6..d65c3d501 100644 --- a/crates/derive/src/stages/channel/mod.rs +++ b/crates/derive/src/stages/channel/mod.rs @@ -5,16 +5,16 @@ //! is responsible for decoding the [Channel]s into [Batch]es, forwarding the [Batch]es to the //! [BatchQueue] stage. //! -//! [Frame]: op_alloy_protocol::Frame -//! [Channel]: op_alloy_protocol::Channel -//! [Batch]: op_alloy_protocol::Batch +//! [Frame]: maili_protocol::Frame +//! [Channel]: maili_protocol::Channel +//! [Batch]: maili_protocol::Batch //! [FrameQueue]: crate::stages::FrameQueue //! [BatchQueue]: crate::stages::BatchQueue use crate::types::PipelineResult; use alloc::boxed::Box; use async_trait::async_trait; -use op_alloy_protocol::Frame; +use maili_protocol::Frame; pub(crate) mod channel_provider; pub use channel_provider::ChannelProvider; diff --git a/crates/derive/src/stages/frame_queue.rs b/crates/derive/src/stages/frame_queue.rs index ca8328ff4..2506a0290 100644 --- a/crates/derive/src/stages/frame_queue.rs +++ b/crates/derive/src/stages/frame_queue.rs @@ -10,8 +10,8 @@ use alloc::{boxed::Box, collections::VecDeque, sync::Arc}; use alloy_primitives::Bytes; use async_trait::async_trait; use core::fmt::Debug; +use maili_protocol::{BlockInfo, Frame}; use op_alloy_genesis::RollupConfig; -use op_alloy_protocol::{BlockInfo, Frame}; /// Provides data frames for the [FrameQueue] stage. #[async_trait] diff --git a/crates/derive/src/stages/l1_retrieval.rs b/crates/derive/src/stages/l1_retrieval.rs index 9e68c5395..9de491145 100644 --- a/crates/derive/src/stages/l1_retrieval.rs +++ b/crates/derive/src/stages/l1_retrieval.rs @@ -9,7 +9,7 @@ use crate::{ use alloc::boxed::Box; use alloy_primitives::Address; use async_trait::async_trait; -use op_alloy_protocol::BlockInfo; +use maili_protocol::BlockInfo; /// Provides L1 blocks for the [L1Retrieval] stage. /// This is the previous stage in the pipeline. diff --git a/crates/derive/src/stages/l1_traversal.rs b/crates/derive/src/stages/l1_traversal.rs index 82b62d4e2..c14b653be 100644 --- a/crates/derive/src/stages/l1_traversal.rs +++ b/crates/derive/src/stages/l1_traversal.rs @@ -9,8 +9,8 @@ use crate::{ use alloc::{boxed::Box, sync::Arc}; use alloy_primitives::Address; use async_trait::async_trait; +use maili_protocol::BlockInfo; use op_alloy_genesis::{RollupConfig, SystemConfig}; -use op_alloy_protocol::BlockInfo; /// The [L1Traversal] stage of the derivation pipeline. /// diff --git a/crates/derive/src/test_utils/attributes_queue.rs b/crates/derive/src/test_utils/attributes_queue.rs index 7aa381135..e8b34dfa2 100644 --- a/crates/derive/src/test_utils/attributes_queue.rs +++ b/crates/derive/src/test_utils/attributes_queue.rs @@ -10,7 +10,7 @@ use crate::{ use alloc::{boxed::Box, string::ToString, vec::Vec}; use alloy_eips::BlockNumHash; use async_trait::async_trait; -use op_alloy_protocol::{BlockInfo, L2BlockInfo, SingleBatch}; +use maili_protocol::{BlockInfo, L2BlockInfo, SingleBatch}; use op_alloy_rpc_types_engine::OpPayloadAttributes; use thiserror::Error; diff --git a/crates/derive/src/test_utils/batch_provider.rs b/crates/derive/src/test_utils/batch_provider.rs index 1ae1329af..730f55375 100644 --- a/crates/derive/src/test_utils/batch_provider.rs +++ b/crates/derive/src/test_utils/batch_provider.rs @@ -8,7 +8,7 @@ use crate::{ }; use alloc::{boxed::Box, vec::Vec}; use async_trait::async_trait; -use op_alloy_protocol::{Batch, BlockInfo, L2BlockInfo}; +use maili_protocol::{Batch, BlockInfo, L2BlockInfo}; /// A mock provider for the [BatchQueue] stage. #[derive(Debug, Default)] diff --git a/crates/derive/src/test_utils/batch_stream.rs b/crates/derive/src/test_utils/batch_stream.rs index 7ec1daa94..b855eaea3 100644 --- a/crates/derive/src/test_utils/batch_stream.rs +++ b/crates/derive/src/test_utils/batch_stream.rs @@ -10,7 +10,7 @@ use crate::{ }; use alloc::{boxed::Box, vec::Vec}; use async_trait::async_trait; -use op_alloy_protocol::{Batch, BlockInfo}; +use maili_protocol::{Batch, BlockInfo}; /// A mock provider for the [`BatchStream`] stage. /// diff --git a/crates/derive/src/test_utils/blob_provider.rs b/crates/derive/src/test_utils/blob_provider.rs index f5c2e19db..f1e2b6edc 100644 --- a/crates/derive/src/test_utils/blob_provider.rs +++ b/crates/derive/src/test_utils/blob_provider.rs @@ -5,7 +5,7 @@ use alloc::{boxed::Box, vec::Vec}; use alloy_eips::eip4844::{Blob, IndexedBlobHash}; use alloy_primitives::{map::HashMap, B256}; use async_trait::async_trait; -use op_alloy_protocol::BlockInfo; +use maili_protocol::BlockInfo; /// A mock blob provider for testing. #[derive(Debug, Clone, Default)] diff --git a/crates/derive/src/test_utils/chain_providers.rs b/crates/derive/src/test_utils/chain_providers.rs index 33b30d14c..2bf6c4f72 100644 --- a/crates/derive/src/test_utils/chain_providers.rs +++ b/crates/derive/src/test_utils/chain_providers.rs @@ -8,9 +8,9 @@ use alloc::{boxed::Box, string::ToString, sync::Arc, vec::Vec}; use alloy_consensus::{Header, Receipt, TxEnvelope}; use alloy_primitives::{map::HashMap, B256}; use async_trait::async_trait; +use maili_protocol::{BatchValidationProvider, BlockInfo, L2BlockInfo}; use op_alloy_consensus::OpBlock; use op_alloy_genesis::{RollupConfig, SystemConfig}; -use op_alloy_protocol::{BatchValidationProvider, BlockInfo, L2BlockInfo}; use thiserror::Error; /// A mock chain provider for testing. diff --git a/crates/derive/src/test_utils/channel_provider.rs b/crates/derive/src/test_utils/channel_provider.rs index acbc8de71..f9bc06634 100644 --- a/crates/derive/src/test_utils/channel_provider.rs +++ b/crates/derive/src/test_utils/channel_provider.rs @@ -10,7 +10,7 @@ use crate::{ }; use alloc::{boxed::Box, vec::Vec}; use async_trait::async_trait; -use op_alloy_protocol::{BlockInfo, Frame}; +use maili_protocol::{BlockInfo, Frame}; /// A mock [NextFrameProvider] for testing the [ChannelBank] stage. /// diff --git a/crates/derive/src/test_utils/channel_reader.rs b/crates/derive/src/test_utils/channel_reader.rs index 6e4ff00ac..ed8c19f2e 100644 --- a/crates/derive/src/test_utils/channel_reader.rs +++ b/crates/derive/src/test_utils/channel_reader.rs @@ -11,7 +11,7 @@ use crate::{ use alloc::{boxed::Box, vec::Vec}; use alloy_primitives::Bytes; use async_trait::async_trait; -use op_alloy_protocol::BlockInfo; +use maili_protocol::BlockInfo; /// A mock [ChannelReaderProvider] for testing the [ChannelReader] stage. /// diff --git a/crates/derive/src/test_utils/data_availability_provider.rs b/crates/derive/src/test_utils/data_availability_provider.rs index d17ca43d6..8f179d33f 100644 --- a/crates/derive/src/test_utils/data_availability_provider.rs +++ b/crates/derive/src/test_utils/data_availability_provider.rs @@ -5,7 +5,7 @@ use alloc::{boxed::Box, vec::Vec}; use alloy_primitives::Bytes; use async_trait::async_trait; use core::fmt::Debug; -use op_alloy_protocol::BlockInfo; +use maili_protocol::BlockInfo; /// Mock data availability provider #[derive(Debug, Default)] diff --git a/crates/derive/src/test_utils/frame_queue.rs b/crates/derive/src/test_utils/frame_queue.rs index 6f13e9f68..8a1db6180 100644 --- a/crates/derive/src/test_utils/frame_queue.rs +++ b/crates/derive/src/test_utils/frame_queue.rs @@ -9,7 +9,7 @@ use crate::{ use alloc::{boxed::Box, vec::Vec}; use alloy_primitives::Bytes; use async_trait::async_trait; -use op_alloy_protocol::BlockInfo; +use maili_protocol::BlockInfo; /// A mock [FrameQueueProvider] for testing the [FrameQueue] stage. /// diff --git a/crates/derive/src/test_utils/frames.rs b/crates/derive/src/test_utils/frames.rs index 9c4a8eb0a..cc91fa82a 100644 --- a/crates/derive/src/test_utils/frames.rs +++ b/crates/derive/src/test_utils/frames.rs @@ -8,8 +8,8 @@ use crate::{ }; use alloc::{sync::Arc, vec, vec::Vec}; use alloy_primitives::Bytes; +use maili_protocol::{BlockInfo, Frame, DERIVATION_VERSION_0}; use op_alloy_genesis::RollupConfig; -use op_alloy_protocol::{BlockInfo, Frame, DERIVATION_VERSION_0}; /// A [FrameQueue] builder. #[derive(Debug, Default)] diff --git a/crates/derive/src/test_utils/macros.rs b/crates/derive/src/test_utils/macros.rs index b629bf591..5e39b60b3 100644 --- a/crates/derive/src/test_utils/macros.rs +++ b/crates/derive/src/test_utils/macros.rs @@ -1,14 +1,14 @@ //! Macros used across test utilities. -/// A shorthand syntax for constructing [op_alloy_protocol::Frame]s. +/// A shorthand syntax for constructing [maili_protocol::Frame]s. #[macro_export] macro_rules! frame { ($id:expr, $number:expr, $data:expr, $is_last:expr) => { - op_alloy_protocol::Frame { id: [$id; 16], number: $number, data: $data, is_last: $is_last } + maili_protocol::Frame { id: [$id; 16], number: $number, data: $data, is_last: $is_last } }; } -/// A shorthand syntax for constructing a list of [op_alloy_protocol::Frame]s. +/// A shorthand syntax for constructing a list of [maili_protocol::Frame]s. #[macro_export] macro_rules! frames { ($id:expr, $number:expr, $data:expr, $count:expr) => {{ diff --git a/crates/derive/src/test_utils/pipeline.rs b/crates/derive/src/test_utils/pipeline.rs index c55e17665..23217239b 100644 --- a/crates/derive/src/test_utils/pipeline.rs +++ b/crates/derive/src/test_utils/pipeline.rs @@ -7,8 +7,8 @@ use crate::{ types::PipelineResult, }; use alloc::{boxed::Box, sync::Arc}; +use maili_protocol::{BlockInfo, L2BlockInfo}; use op_alloy_genesis::RollupConfig; -use op_alloy_protocol::{BlockInfo, L2BlockInfo}; use op_alloy_rpc_types_engine::OpAttributesWithParent; // Re-export these types used internally to the test pipeline. diff --git a/crates/derive/src/test_utils/sys_config_fetcher.rs b/crates/derive/src/test_utils/sys_config_fetcher.rs index 113bdfffe..7b6bd2c8b 100644 --- a/crates/derive/src/test_utils/sys_config_fetcher.rs +++ b/crates/derive/src/test_utils/sys_config_fetcher.rs @@ -7,9 +7,9 @@ use crate::{ use alloc::{boxed::Box, string::ToString, sync::Arc}; use alloy_primitives::map::HashMap; use async_trait::async_trait; +use maili_protocol::{BatchValidationProvider, L2BlockInfo}; use op_alloy_consensus::OpBlock; use op_alloy_genesis::{RollupConfig, SystemConfig}; -use op_alloy_protocol::{BatchValidationProvider, L2BlockInfo}; use thiserror::Error; /// A mock implementation of the `SystemConfigL2Fetcher` for testing. diff --git a/crates/derive/src/traits/attributes.rs b/crates/derive/src/traits/attributes.rs index 42d0b3f23..9f7640e00 100644 --- a/crates/derive/src/traits/attributes.rs +++ b/crates/derive/src/traits/attributes.rs @@ -4,7 +4,7 @@ use crate::types::PipelineResult; use alloc::boxed::Box; use alloy_eips::BlockNumHash; use async_trait::async_trait; -use op_alloy_protocol::{L2BlockInfo, SingleBatch}; +use maili_protocol::{L2BlockInfo, SingleBatch}; use op_alloy_rpc_types_engine::{OpAttributesWithParent, OpPayloadAttributes}; /// [AttributesProvider] is a trait abstraction that generalizes the [BatchQueue] stage. diff --git a/crates/derive/src/traits/data_sources.rs b/crates/derive/src/traits/data_sources.rs index 18e51bf99..d0f5fa62f 100644 --- a/crates/derive/src/traits/data_sources.rs +++ b/crates/derive/src/traits/data_sources.rs @@ -7,7 +7,7 @@ use alloy_eips::eip4844::{Blob, IndexedBlobHash}; use alloy_primitives::Bytes; use async_trait::async_trait; use core::fmt::Display; -use op_alloy_protocol::BlockInfo; +use maili_protocol::BlockInfo; /// The BlobProvider trait specifies the functionality of a data source that can provide blobs. #[async_trait] diff --git a/crates/derive/src/traits/pipeline.rs b/crates/derive/src/traits/pipeline.rs index a07f601a4..b47ce321d 100644 --- a/crates/derive/src/traits/pipeline.rs +++ b/crates/derive/src/traits/pipeline.rs @@ -3,8 +3,8 @@ use alloc::boxed::Box; use async_trait::async_trait; use core::iter::Iterator; +use maili_protocol::L2BlockInfo; use op_alloy_genesis::{RollupConfig, SystemConfig}; -use op_alloy_protocol::L2BlockInfo; use op_alloy_rpc_types_engine::OpAttributesWithParent; use crate::{errors::PipelineErrorKind, traits::OriginProvider, types::StepResult}; diff --git a/crates/derive/src/traits/providers.rs b/crates/derive/src/traits/providers.rs index fad1410d9..1f9ddd541 100644 --- a/crates/derive/src/traits/providers.rs +++ b/crates/derive/src/traits/providers.rs @@ -6,8 +6,8 @@ use alloy_consensus::{Header, Receipt, TxEnvelope}; use alloy_primitives::B256; use async_trait::async_trait; use core::fmt::Display; +use maili_protocol::{BatchValidationProvider, BlockInfo}; use op_alloy_genesis::{RollupConfig, SystemConfig}; -use op_alloy_protocol::{BatchValidationProvider, BlockInfo}; /// Describes the functionality of a data source that can provide information from the blockchain. #[async_trait] diff --git a/crates/derive/src/traits/reset.rs b/crates/derive/src/traits/reset.rs index 07184ff64..a28c77462 100644 --- a/crates/derive/src/traits/reset.rs +++ b/crates/derive/src/traits/reset.rs @@ -2,8 +2,8 @@ use alloc::boxed::Box; use async_trait::async_trait; +use maili_protocol::BlockInfo; use op_alloy_genesis::SystemConfig; -use op_alloy_protocol::BlockInfo; /// Provides the [BlockInfo] and [SystemConfig] for the stack to reset the stages. #[async_trait] diff --git a/crates/derive/src/traits/stages.rs b/crates/derive/src/traits/stages.rs index d4716178a..fe467b0bc 100644 --- a/crates/derive/src/traits/stages.rs +++ b/crates/derive/src/traits/stages.rs @@ -2,7 +2,7 @@ use alloc::boxed::Box; use async_trait::async_trait; -use op_alloy_protocol::BlockInfo; +use maili_protocol::BlockInfo; use crate::types::{PipelineResult, Signal}; diff --git a/crates/derive/src/types/signals.rs b/crates/derive/src/types/signals.rs index 105d82856..8e83c5a10 100644 --- a/crates/derive/src/types/signals.rs +++ b/crates/derive/src/types/signals.rs @@ -4,8 +4,8 @@ //! of the pipeline. They allow the pipeline driver to perform actions such as //! resetting all stages in the pipeline through message passing. +use maili_protocol::{BlockInfo, L2BlockInfo}; use op_alloy_genesis::SystemConfig; -use op_alloy_protocol::{BlockInfo, L2BlockInfo}; /// A signal to send to the pipeline. #[derive(Debug, Clone, Copy, PartialEq, Eq)] diff --git a/crates/driver/Cargo.toml b/crates/driver/Cargo.toml index 9cee831f0..04e7d8897 100644 --- a/crates/driver/Cargo.toml +++ b/crates/driver/Cargo.toml @@ -15,6 +15,9 @@ workspace = true # Workspace kona-derive.workspace = true +# Maili +maili-protocol.workspace = true + # Alloy alloy-rlp.workspace = true alloy-consensus.workspace = true @@ -22,7 +25,6 @@ alloy-primitives.workspace = true # OP Alloy op-alloy-genesis.workspace = true -op-alloy-protocol.workspace = true op-alloy-consensus.workspace = true op-alloy-rpc-types-engine.workspace = true diff --git a/crates/driver/src/core.rs b/crates/driver/src/core.rs index 7fc73e2e4..3e190e8cf 100644 --- a/crates/driver/src/core.rs +++ b/crates/driver/src/core.rs @@ -10,9 +10,9 @@ use kona_derive::{ traits::{Pipeline, SignalReceiver}, types::Signal, }; +use maili_protocol::L2BlockInfo; use op_alloy_consensus::{OpBlock, OpTxEnvelope, OpTxType}; use op_alloy_genesis::RollupConfig; -use op_alloy_protocol::L2BlockInfo; use op_alloy_rpc_types_engine::OpAttributesWithParent; use crate::{DriverError, DriverPipeline, DriverResult, Executor, PipelineCursor, TipCursor}; diff --git a/crates/driver/src/cursor.rs b/crates/driver/src/cursor.rs index 4f89c57d2..4b970fcd3 100644 --- a/crates/driver/src/cursor.rs +++ b/crates/driver/src/cursor.rs @@ -3,7 +3,7 @@ use alloc::collections::{btree_map::BTreeMap, vec_deque::VecDeque}; use alloy_consensus::{Header, Sealed}; use alloy_primitives::{map::HashMap, B256}; -use op_alloy_protocol::{BlockInfo, L2BlockInfo}; +use maili_protocol::{BlockInfo, L2BlockInfo}; use crate::TipCursor; diff --git a/crates/driver/src/errors.rs b/crates/driver/src/errors.rs index dc6e5e8c1..f7b95d2db 100644 --- a/crates/driver/src/errors.rs +++ b/crates/driver/src/errors.rs @@ -1,7 +1,7 @@ //! Contains driver-related error types. use kona_derive::errors::PipelineErrorKind; -use op_alloy_protocol::FromBlockError; +use maili_protocol::FromBlockError; use thiserror::Error; /// A [Result] type for the [DriverError]. @@ -19,7 +19,7 @@ where /// An error returned by the executor. #[error("Executor error: {0}")] Executor(E), - /// An error returned by the conversion from a block to an [op_alloy_protocol::L2BlockInfo]. + /// An error returned by the conversion from a block to an [maili_protocol::L2BlockInfo]. #[error("From block error: {0}")] FromBlock(#[from] FromBlockError), /// Error decoding or encoding RLP. diff --git a/crates/driver/src/pipeline.rs b/crates/driver/src/pipeline.rs index a949f65a6..a7785c600 100644 --- a/crates/driver/src/pipeline.rs +++ b/crates/driver/src/pipeline.rs @@ -2,7 +2,7 @@ use alloc::boxed::Box; use async_trait::async_trait; -use op_alloy_protocol::L2BlockInfo; +use maili_protocol::L2BlockInfo; use op_alloy_rpc_types_engine::OpAttributesWithParent; use kona_derive::{ diff --git a/crates/driver/src/tip.rs b/crates/driver/src/tip.rs index 2d0b31cbc..29a43353f 100644 --- a/crates/driver/src/tip.rs +++ b/crates/driver/src/tip.rs @@ -2,7 +2,7 @@ use alloy_consensus::{Header, Sealed}; use alloy_primitives::B256; -use op_alloy_protocol::L2BlockInfo; +use maili_protocol::L2BlockInfo; /// A cursor that keeps track of the L2 tip block. #[derive(Debug, Clone)] diff --git a/crates/proof-sdk/proof/Cargo.toml b/crates/proof-sdk/proof/Cargo.toml index 375d19ef4..48598497b 100644 --- a/crates/proof-sdk/proof/Cargo.toml +++ b/crates/proof-sdk/proof/Cargo.toml @@ -19,6 +19,9 @@ kona-driver.workspace = true kona-preimage.workspace = true kona-executor.workspace = true +# Maili +maili-protocol.workspace = true + # Alloy alloy-rlp.workspace = true alloy-eips.workspace = true @@ -27,7 +30,6 @@ alloy-primitives.workspace = true # Op Alloy op-alloy-registry.workspace = true -op-alloy-protocol.workspace = true op-alloy-consensus.workspace = true op-alloy-genesis = { workspace = true, features = ["serde"] } op-alloy-rpc-types-engine = { workspace = true, features = ["serde"] } diff --git a/crates/proof-sdk/proof/src/errors.rs b/crates/proof-sdk/proof/src/errors.rs index 27bdc4db9..bc734ab81 100644 --- a/crates/proof-sdk/proof/src/errors.rs +++ b/crates/proof-sdk/proof/src/errors.rs @@ -4,7 +4,7 @@ use alloc::string::{String, ToString}; use kona_derive::errors::{PipelineError, PipelineErrorKind}; use kona_mpt::OrderedListWalkerError; use kona_preimage::errors::PreimageOracleError; -use op_alloy_protocol::{FromBlockError, OpBlockConversionError}; +use maili_protocol::{FromBlockError, OpBlockConversionError}; use thiserror::Error; /// Error from an oracle-backed provider. diff --git a/crates/proof-sdk/proof/src/l1/blob_provider.rs b/crates/proof-sdk/proof/src/l1/blob_provider.rs index 5d66d7f92..44a813427 100644 --- a/crates/proof-sdk/proof/src/l1/blob_provider.rs +++ b/crates/proof-sdk/proof/src/l1/blob_provider.rs @@ -8,7 +8,7 @@ use alloy_primitives::keccak256; use async_trait::async_trait; use kona_derive::traits::BlobProvider; use kona_preimage::{CommsClient, PreimageKey, PreimageKeyType}; -use op_alloy_protocol::BlockInfo; +use maili_protocol::BlockInfo; /// An oracle-backed blob provider. #[derive(Debug, Clone)] diff --git a/crates/proof-sdk/proof/src/l1/chain_provider.rs b/crates/proof-sdk/proof/src/l1/chain_provider.rs index 9f9cfb8bc..0cf9c8196 100644 --- a/crates/proof-sdk/proof/src/l1/chain_provider.rs +++ b/crates/proof-sdk/proof/src/l1/chain_provider.rs @@ -10,7 +10,7 @@ use async_trait::async_trait; use kona_derive::traits::ChainProvider; use kona_mpt::{OrderedListWalker, TrieNode, TrieProvider}; use kona_preimage::{CommsClient, PreimageKey, PreimageKeyType}; -use op_alloy_protocol::BlockInfo; +use maili_protocol::BlockInfo; /// The oracle-backed L1 chain provider for the client program. #[derive(Debug, Clone)] diff --git a/crates/proof-sdk/proof/src/l1/pipeline.rs b/crates/proof-sdk/proof/src/l1/pipeline.rs index b2e1719b5..9e89973ce 100644 --- a/crates/proof-sdk/proof/src/l1/pipeline.rs +++ b/crates/proof-sdk/proof/src/l1/pipeline.rs @@ -18,8 +18,8 @@ use kona_derive::{ }; use kona_driver::{DriverPipeline, PipelineCursor}; use kona_preimage::CommsClient; +use maili_protocol::{BlockInfo, L2BlockInfo}; use op_alloy_genesis::{RollupConfig, SystemConfig}; -use op_alloy_protocol::{BlockInfo, L2BlockInfo}; use op_alloy_rpc_types_engine::OpAttributesWithParent; /// An oracle-backed derivation pipeline. diff --git a/crates/proof-sdk/proof/src/l2/chain_provider.rs b/crates/proof-sdk/proof/src/l2/chain_provider.rs index 224eedba1..a6b1eecb1 100644 --- a/crates/proof-sdk/proof/src/l2/chain_provider.rs +++ b/crates/proof-sdk/proof/src/l2/chain_provider.rs @@ -11,9 +11,9 @@ use kona_derive::traits::L2ChainProvider; use kona_executor::TrieDBProvider; use kona_mpt::{OrderedListWalker, TrieHinter, TrieNode, TrieProvider}; use kona_preimage::{CommsClient, PreimageKey, PreimageKeyType}; +use maili_protocol::{to_system_config, BatchValidationProvider, L2BlockInfo}; use op_alloy_consensus::{OpBlock, OpTxEnvelope}; use op_alloy_genesis::{RollupConfig, SystemConfig}; -use op_alloy_protocol::{to_system_config, BatchValidationProvider, L2BlockInfo}; /// The oracle-backed L2 chain provider for the client program. #[derive(Debug, Clone)] diff --git a/crates/proof-sdk/proof/src/sync.rs b/crates/proof-sdk/proof/src/sync.rs index 0cb804f05..2cc63844b 100644 --- a/crates/proof-sdk/proof/src/sync.rs +++ b/crates/proof-sdk/proof/src/sync.rs @@ -9,7 +9,7 @@ use core::fmt::Debug; use kona_derive::traits::ChainProvider; use kona_driver::{PipelineCursor, TipCursor}; use kona_preimage::CommsClient; -use op_alloy_protocol::BatchValidationProvider; +use maili_protocol::BatchValidationProvider; /// Constructs a [`PipelineCursor`] from the caching oracle, boot info, and providers. pub async fn new_pipeline_cursor(