diff --git a/Cargo.lock b/Cargo.lock index c361c7b2..6f1e8f29 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12,36 +12,15 @@ dependencies = [ "regex", ] -[[package]] -name = "addr2line" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" -dependencies = [ - "cpp_demangle", - "fallible-iterator", - "gimli 0.29.0", - "memmap2", - "object 0.35.0", - "rustc-demangle", - "smallvec", -] - [[package]] name = "addr2line" version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ - "gimli 0.31.1", + "gimli", ] -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - [[package]] name = "adler2" version = "2.0.0" @@ -59,19 +38,6 @@ dependencies = [ "cpufeatures", ] -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "version_check", - "zerocopy", -] - [[package]] name = "aho-corasick" version = "1.1.3" @@ -81,12 +47,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "allocator-api2" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" - [[package]] name = "alloy-consensus" version = "0.5.4" @@ -99,7 +59,7 @@ dependencies = [ "alloy-serde", "auto_impl", "c-kzg", - "derive_more 1.0.0", + "derive_more", "serde", ] @@ -122,7 +82,7 @@ checksum = "64ffc577390ce50234e02d841214b3dc0bea6aaaae8e04bbf3cb82e9a45da9eb" dependencies = [ "alloy-primitives", "alloy-rlp", - "derive_more 1.0.0", + "derive_more", "serde", ] @@ -138,7 +98,7 @@ dependencies = [ "alloy-rlp", "alloy-serde", "c-kzg", - "derive_more 1.0.0", + "derive_more", "once_cell", "serde", "sha2 0.10.8", @@ -154,7 +114,7 @@ dependencies = [ "alloy-sol-types", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror", "tracing", ] @@ -176,7 +136,7 @@ dependencies = [ "async-trait", "auto_impl", "futures-utils-wasm", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -194,18 +154,19 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "0.8.19" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec878088ec6283ce1e90d280316aadd3d6ce3de06ff63d68953c855e7e447e92" +checksum = "6259a506ab13e1d658796c31e6e39d2e2ee89243bcc505ddc613b35732e0a430" dependencies = [ "alloy-rlp", "bytes", "cfg-if", "const-hex", - "derive_more 1.0.0", + "derive_more", "foldhash", "hashbrown 0.15.2", - "indexmap 2.7.0", + "hex-literal", + "indexmap 2.6.0", "itoa", "k256 0.13.4", "keccak-asm", @@ -213,7 +174,7 @@ dependencies = [ "proptest", "rand 0.8.5", "ruint", - "rustc-hash 2.1.0", + "rustc-hash 2.0.0", "serde", "sha3 0.10.8", "tiny-keccak 2.0.2", @@ -221,9 +182,9 @@ dependencies = [ [[package]] name = "alloy-rlp" -version = "0.3.11" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6c1d995bff8d011f7cd6c81820d51825e6e06d6db73914c1630ecf544d83d6" +checksum = "da0822426598f95e45dd1ea32a738dac057529a709ee645fcc516ffa4cbde08f" dependencies = [ "alloy-rlp-derive", "arrayvec 0.7.6", @@ -232,13 +193,13 @@ dependencies = [ [[package]] name = "alloy-rlp-derive" -version = "0.3.11" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a40e1ef334153322fd878d07e86af7a529bcb86b2439525920a88eba87bcf943" +checksum = "2b09cae092c27b6f1bde952653a22708691802e57bfef4a2973b80bea21efd3f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -254,7 +215,7 @@ dependencies = [ "alloy-rlp", "alloy-serde", "alloy-sol-types", - "derive_more 1.0.0", + "derive_more", "itertools 0.13.0", "serde", "serde_json", @@ -282,7 +243,7 @@ dependencies = [ "auto_impl", "elliptic-curve 0.13.8", "k256 0.13.4", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -300,61 +261,61 @@ dependencies = [ "coins-bip39 0.12.0", "k256 0.13.4", "rand 0.8.5", - "thiserror 1.0.69", + "thiserror", ] [[package]] name = "alloy-sol-macro" -version = "0.8.19" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d039d267aa5cbb7732fa6ce1fd9b5e9e29368f580f80ba9d7a8450c794de4b2" +checksum = "d9d64f851d95619233f74b310f12bcf16e0cbc27ee3762b6115c14a84809280a" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] name = "alloy-sol-macro-expander" -version = "0.8.19" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "620ae5eee30ee7216a38027dec34e0585c55099f827f92f50d11e3d2d3a4a954" +checksum = "6bf7ed1574b699f48bf17caab4e6e54c6d12bc3c006ab33d58b1e227c1c3559f" dependencies = [ "alloy-sol-macro-input", "const-hex", "heck", - "indexmap 2.7.0", + "indexmap 2.6.0", "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", "syn-solidity", "tiny-keccak 2.0.2", ] [[package]] name = "alloy-sol-macro-input" -version = "0.8.19" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad9f7d057e00f8c5994e4ff4492b76532c51ead39353aa2ed63f8c50c0f4d52e" +checksum = "8c02997ccef5f34f9c099277d4145f183b422938ed5322dc57a089fe9b9ad9ee" dependencies = [ "const-hex", "dunce", "heck", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", "syn-solidity", ] [[package]] name = "alloy-sol-types" -version = "0.8.19" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1382302752cd751efd275f4d6ef65877ddf61e0e6f5ac84ef4302b79a33a31a" +checksum = "1174cafd6c6d810711b4e00383037bdb458efc4fe3dbafafa16567e0320c54d8" dependencies = [ "alloy-primitives", "alloy-sol-macro", @@ -417,12 +378,11 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "3.0.7" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" dependencies = [ "anstyle", - "once_cell", "windows-sys 0.59.0", ] @@ -473,9 +433,9 @@ dependencies = [ "anvil_zksync_types", "anyhow", "hex", - "http 1.2.0", + "http 1.1.0", "jsonrpsee", - "thiserror 1.0.69", + "thiserror", "tokio", "tower 0.4.13", "tower-http", @@ -511,39 +471,32 @@ dependencies = [ "anyhow", "async-trait", "backon", - "basic_system", "chrono", "colored", "ethabi 16.0.0", "ethers", "eyre", "flate2", - "forward_system", "futures 0.3.31", "hex", "httptest", - "indexmap 2.7.0", + "indexmap 2.6.0", "itertools 0.13.0", "lazy_static", "maplit", "once_cell", "reqwest 0.11.27", - "ruint", "rustc-hash 1.1.0", "serde", "serde_json", - "system_hooks", "tempdir", "test-case", - "thiserror 1.0.69", + "thiserror", "time", "tokio", "tracing", "tracing-subscriber", - "zk_ee", - "zkos_api", "zksync-web3-rs", - "zksync_basic_types", "zksync_contracts", "zksync_multivm", "zksync_types", @@ -563,41 +516,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" - -[[package]] -name = "ark-bn254" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d69eab57e8d2663efa5c63135b2af4f396d66424f88954c21104125ab6b3e6bc" -dependencies = [ - "ark-ec", - "ark-ff 0.5.0", - "ark-std 0.5.0", -] - -[[package]] -name = "ark-ec" -version = "0.5.0" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d68f2d516162846c1238e755a7c4d131b892b70cc70c471a8e3ca3ed818fce" -dependencies = [ - "ahash", - "ark-ff 0.5.0", - "ark-poly", - "ark-serialize 0.5.0", - "ark-std 0.5.0", - "educe", - "fnv", - "hashbrown 0.15.2", - "itertools 0.13.0", - "num-bigint", - "num-integer", - "num-traits", - "zeroize", -] +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" [[package]] name = "ark-ff" @@ -637,26 +558,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "ark-ff" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a177aba0ed1e0fbb62aa9f6d0502e9b46dad8c2eab04c14258a1212d2557ea70" -dependencies = [ - "ark-ff-asm 0.5.0", - "ark-ff-macros 0.5.0", - "ark-serialize 0.5.0", - "ark-std 0.5.0", - "arrayvec 0.7.6", - "digest 0.10.7", - "educe", - "itertools 0.13.0", - "num-bigint", - "num-traits", - "paste", - "zeroize", -] - [[package]] name = "ark-ff-asm" version = "0.3.0" @@ -677,16 +578,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "ark-ff-asm" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60" -dependencies = [ - "quote", - "syn 2.0.96", -] - [[package]] name = "ark-ff-macros" version = "0.3.0" @@ -712,34 +603,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "ark-ff-macros" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09be120733ee33f7693ceaa202ca41accd5653b779563608f1234f78ae07c4b3" -dependencies = [ - "num-bigint", - "num-traits", - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "ark-poly" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579305839da207f02b89cd1679e50e67b4331e2f9294a57693e5051b7703fe27" -dependencies = [ - "ahash", - "ark-ff 0.5.0", - "ark-serialize 0.5.0", - "ark-std 0.5.0", - "educe", - "fnv", - "hashbrown 0.15.2", -] - [[package]] name = "ark-serialize" version = "0.3.0" @@ -761,30 +624,6 @@ dependencies = [ "num-bigint", ] -[[package]] -name = "ark-serialize" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f4d068aaf107ebcd7dfb52bc748f8030e0fc930ac8e360146ca54c1203088f7" -dependencies = [ - "ark-serialize-derive", - "ark-std 0.5.0", - "arrayvec 0.7.6", - "digest 0.10.7", - "num-bigint", -] - -[[package]] -name = "ark-serialize-derive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - [[package]] name = "ark-std" version = "0.3.0" @@ -805,16 +644,6 @@ dependencies = [ "rand 0.8.5", ] -[[package]] -name = "ark-std" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246a225cc6131e9ee4f24619af0f19d67761fff15d7ccc22e42b80846e69449a" -dependencies = [ - "num-traits", - "rand 0.8.5", -] - [[package]] name = "arrayref" version = "0.3.9" @@ -861,7 +690,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -872,7 +701,7 @@ checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -894,13 +723,13 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "auto_impl" -version = "1.2.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12882f59de5360c748c4cbf569a042d5fb0eb515f7bea9c1f470b47f6ffbd73" +checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -911,9 +740,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "aws-lc-rs" -version = "1.12.1" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ea835662a0af02443aa1396d39be523bbf8f11ee6fad20329607c480bea48c3" +checksum = "f47bb8cc16b669d267eeccf585aea077d0882f4777b1c1f740217885d6e6e5a3" dependencies = [ "aws-lc-sys", "paste", @@ -922,15 +751,16 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.25.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71b2ddd3ada61a305e1d8bb6c005d1eaa7d14d903681edfc400406d523a9b491" +checksum = "a2101df3813227bbaaaa0b04cd61c534c7954b22bd68d399b440be937dc63ff7" dependencies = [ "bindgen", "cc", "cmake", "dunce", "fs_extra", + "libc", "paste", ] @@ -944,7 +774,7 @@ dependencies = [ "axum-core", "bytes", "futures-util", - "http 1.2.0", + "http 1.1.0", "http-body 1.0.1", "http-body-util", "itoa", @@ -956,7 +786,7 @@ dependencies = [ "rustversion", "serde", "sync_wrapper 1.0.2", - "tower 0.5.2", + "tower 0.5.1", "tower-layer", "tower-service", ] @@ -970,7 +800,7 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http 1.2.0", + "http 1.1.0", "http-body 1.0.1", "http-body-util", "mime", @@ -998,11 +828,11 @@ version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ - "addr2line 0.24.2", + "addr2line", "cfg-if", "libc", "miniz_oxide", - "object 0.36.7", + "object", "rustc-demangle", "windows-targets 0.52.6", ] @@ -1043,51 +873,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" -[[package]] -name = "basic_bootloader" -version = "0.1.0" -source = "git+https://github.com/matter-labs/zk_ee.git?branch=main#487662eb1df150aaf4878624a8c04ffed8501969" -dependencies = [ - "arrayvec 0.7.6", - "crypto", - "either", - "evm_interpreter", - "hex", - "iwasm_ee", - "iwasm_interpreter", - "ruint", - "seq-macro", - "system_hooks", - "zk_ee", -] - -[[package]] -name = "basic_system" -version = "0.1.0" -source = "git+https://github.com/matter-labs/zk_ee.git?branch=main#487662eb1df150aaf4878624a8c04ffed8501969" -dependencies = [ - "ark-bn254", - "ark-ec", - "ark-ff 0.5.0", - "ark-serialize 0.5.0", - "arrayvec 0.7.6", - "cfg-if", - "const_for", - "crypto", - "either", - "evm_interpreter", - "hex", - "iwasm_ee", - "iwasm_interpreter", - "miniz_nostd_compression", - "ruint", - "secp256k1 0.1.0", - "serde", - "storage_models", - "system_hooks", - "zk_ee", -] - [[package]] name = "bech32" version = "0.9.1" @@ -1105,9 +890,9 @@ dependencies = [ [[package]] name = "bigdecimal" -version = "0.4.7" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f31f3af01c5c65a07985c804d3366560e6fa7883d640a122819b14ec327482c" +checksum = "8f850665a0385e070b64c38d2354e6c104c8479c59868d1e48a0c13ee2c7a1c1" dependencies = [ "autocfg", "libm", @@ -1116,22 +901,13 @@ dependencies = [ "num-traits", ] -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - [[package]] name = "bindgen" version = "0.69.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" dependencies = [ - "bitflags 2.8.0", + "bitflags 2.6.0", "cexpr", "clang-sys", "itertools 0.12.1", @@ -1144,7 +920,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.96", + "syn 2.0.89", "which", ] @@ -1174,9 +950,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.8.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitvec" @@ -1231,14 +1007,6 @@ dependencies = [ "constant_time_eq", ] -[[package]] -name = "blake2s_u32" -version = "0.1.0" -source = "git+https://github.com/matter-labs/air_compiler#5aee5740532670f7ccbbb7a8418ad0c2eae171a7" -dependencies = [ - "unroll", -] - [[package]] name = "block-buffer" version = "0.9.0" @@ -1309,12 +1077,6 @@ version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" -[[package]] -name = "bytemuck" -version = "1.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3" - [[package]] name = "byteorder" version = "1.5.0" @@ -1323,9 +1085,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.9.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" dependencies = [ "serde", ] @@ -1392,17 +1154,17 @@ checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" dependencies = [ "camino", "cargo-platform", - "semver 1.0.24", + "semver 1.0.23", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror", ] [[package]] name = "cc" -version = "1.2.9" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8293772165d9345bdaaa39b45b2109591e63fe5e6fbc23c6ff930a048aa310b" +checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" dependencies = [ "jobserver", "libc", @@ -1432,9 +1194,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.39" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -1481,9 +1243,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.26" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8eb5e908ef3a6efbe1ed62520fb7287959888c88485abe072543190ecc66783" +checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" dependencies = [ "clap_builder", "clap_derive", @@ -1491,9 +1253,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.26" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b01801b5fc6a0a232407abc821660c9c6d25a1cafc0d4f85f29fb8d9afc121" +checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" dependencies = [ "anstream", "anstyle", @@ -1503,21 +1265,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.24" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] name = "clap_lex" -version = "0.7.4" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" +checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" [[package]] name = "cmake" @@ -1541,7 +1303,7 @@ dependencies = [ "k256 0.13.4", "serde", "sha2 0.10.8", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -1557,7 +1319,7 @@ dependencies = [ "k256 0.13.4", "serde", "sha2 0.10.8", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -1573,7 +1335,7 @@ dependencies = [ "pbkdf2 0.12.2", "rand 0.8.5", "sha2 0.10.8", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -1589,7 +1351,7 @@ dependencies = [ "pbkdf2 0.12.2", "rand 0.8.5", "sha2 0.10.8", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -1609,7 +1371,7 @@ dependencies = [ "serde_derive", "sha2 0.10.8", "sha3 0.10.8", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -1628,7 +1390,7 @@ dependencies = [ "serde", "sha2 0.10.8", "sha3 0.10.8", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -1639,12 +1401,12 @@ checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "colored" -version = "2.2.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" dependencies = [ "lazy_static", - "windows-sys 0.59.0", + "windows-sys 0.48.0", ] [[package]] @@ -1691,12 +1453,6 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" -[[package]] -name = "const_for" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c50fcfdf972929aff202c16b80086aa3cfc6a3a820af714096c58c7c1d0582" - [[package]] name = "constant_time_eq" version = "0.1.5" @@ -1719,15 +1475,6 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" -[[package]] -name = "cpp_demangle" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96e58d342ad113c2b878f16d5d034c03be492ae460cdbc02b7f0f2284d310c7d" -dependencies = [ - "cfg-if", -] - [[package]] name = "cpufeatures" version = "0.2.16" @@ -1761,18 +1508,18 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.14" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.6" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ "crossbeam-epoch", "crossbeam-utils", @@ -1789,18 +1536,18 @@ dependencies = [ [[package]] name = "crossbeam-queue" -version = "0.3.12" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.21" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -1808,20 +1555,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" -[[package]] -name = "crypto" -version = "0.1.0" -source = "git+https://github.com/matter-labs/zk_ee.git?branch=main#487662eb1df150aaf4878624a8c04ffed8501969" -dependencies = [ - "blake2", - "k256 0.13.4", - "modexp", - "p256", - "ripemd", - "sha2 0.10.8", - "sha3 0.10.8", -] - [[package]] name = "crypto-bigint" version = "0.4.9" @@ -1863,7 +1596,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501" dependencies = [ "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -1910,25 +1643,11 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "dashmap" -version = "6.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" -dependencies = [ - "cfg-if", - "crossbeam-utils", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core", -] - [[package]] name = "data-encoding" -version = "2.7.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e60eed09d8c01d3cee5b7d30acb059b76614c918fa0f992e0dd6eeb10daad6f" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "debugid" @@ -1937,7 +1656,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" dependencies = [ "serde", - "uuid 1.12.0", + "uuid 1.11.0", ] [[package]] @@ -1981,17 +1700,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "derive_more" -version = "0.99.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - [[package]] name = "derive_more" version = "1.0.0" @@ -2009,7 +1717,7 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", "unicode-xid", ] @@ -2090,7 +1798,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -2131,18 +1839,6 @@ dependencies = [ "spki 0.7.3", ] -[[package]] -name = "educe" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7bc049e1bd8cdeb31b68bbd586a9464ecf9f3944af3958a7a9d0f8b9799417" -dependencies = [ - "enum-ordinalize", - "proc-macro2", - "quote", - "syn 2.0.96", -] - [[package]] name = "either" version = "1.13.0" @@ -2234,26 +1930,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "enum-ordinalize" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea0dcfa4e54eeb516fe454635a95753ddd39acda650ce703031c6973e315dd5" -dependencies = [ - "enum-ordinalize-derive", -] - -[[package]] -name = "enum-ordinalize-derive" -version = "4.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - [[package]] name = "enum_dispatch" version = "0.3.13" @@ -2263,16 +1939,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.96", -] - -[[package]] -name = "env_filter" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0" -dependencies = [ - "log", + "syn 2.0.89", ] [[package]] @@ -2288,16 +1955,6 @@ dependencies = [ "termcolor", ] -[[package]] -name = "env_logger" -version = "0.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0" -dependencies = [ - "env_filter", - "log", -] - [[package]] name = "envy" version = "0.4.2" @@ -2315,12 +1972,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.10" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -2341,7 +1998,7 @@ dependencies = [ "serde_json", "sha2 0.10.8", "sha3 0.10.8", - "thiserror 1.0.69", + "thiserror", "uuid 0.8.2", ] @@ -2356,7 +2013,7 @@ dependencies = [ "serde", "serde_json", "sha3 0.9.1", - "thiserror 1.0.69", + "thiserror", "uint", ] @@ -2373,7 +2030,7 @@ dependencies = [ "serde", "serde_json", "sha3 0.10.8", - "thiserror 1.0.69", + "thiserror", "uint", ] @@ -2479,7 +2136,7 @@ dependencies = [ "pin-project", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -2501,7 +2158,7 @@ dependencies = [ "reqwest 0.11.27", "serde", "serde_json", - "syn 2.0.96", + "syn 2.0.89", "toml", "walkdir", ] @@ -2519,7 +2176,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -2545,9 +2202,9 @@ dependencies = [ "serde", "serde_json", "strum", - "syn 2.0.96", + "syn 2.0.89", "tempfile", - "thiserror 1.0.69", + "thiserror", "tiny-keccak 2.0.2", "unicode-xid", ] @@ -2561,10 +2218,10 @@ dependencies = [ "chrono", "ethers-core", "reqwest 0.11.27", - "semver 1.0.24", + "semver 1.0.23", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror", "tracing", ] @@ -2588,7 +2245,7 @@ dependencies = [ "reqwest 0.11.27", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror", "tokio", "tracing", "tracing-futures", @@ -2620,7 +2277,7 @@ dependencies = [ "reqwest 0.11.27", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror", "tokio", "tokio-tungstenite", "tracing", @@ -2647,7 +2304,7 @@ dependencies = [ "ethers-core", "rand 0.8.5", "sha2 0.10.8", - "thiserror 1.0.69", + "thiserror", "tracing", ] @@ -2670,12 +2327,12 @@ dependencies = [ "path-slash", "rayon", "regex", - "semver 1.0.24", + "semver 1.0.23", "serde", "serde_json", "solang-parser", "svm-rs", - "thiserror 1.0.69", + "thiserror", "tiny-keccak 2.0.2", "tokio", "tracing", @@ -2683,18 +2340,6 @@ dependencies = [ "yansi 0.5.1", ] -[[package]] -name = "evm_interpreter" -version = "0.1.0" -source = "git+https://github.com/matter-labs/zk_ee.git?branch=main#487662eb1df150aaf4878624a8c04ffed8501969" -dependencies = [ - "arrayvec 0.7.6", - "crypto", - "either", - "ruint", - "zk_ee", -] - [[package]] name = "eyre" version = "0.6.12" @@ -2705,17 +2350,11 @@ dependencies = [ "once_cell", ] -[[package]] -name = "fallible-iterator" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" - [[package]] name = "fastrand" -version = "2.3.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" +checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" [[package]] name = "fastrlp" @@ -2728,17 +2367,6 @@ dependencies = [ "bytes", ] -[[package]] -name = "fastrlp" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce8dba4714ef14b8274c371879b175aa55b16b30f269663f19d576f380018dc4" -dependencies = [ - "arrayvec 0.7.6", - "auto_impl", - "bytes", -] - [[package]] name = "ff" version = "0.12.1" @@ -2759,16 +2387,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "field" -version = "0.1.0" -source = "git+https://github.com/matter-labs/air_compiler#5aee5740532670f7ccbbb7a8418ad0c2eae171a7" -dependencies = [ - "rand 0.8.5", - "seq-macro", - "serde", -] - [[package]] name = "findshlibs" version = "0.10.2" @@ -2829,9 +2447,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "foldhash" -version = "0.1.4" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" [[package]] name = "foreign-types" @@ -2857,26 +2475,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "forward_system" -version = "0.1.0" -source = "git+https://github.com/matter-labs/zk_ee.git?branch=main#487662eb1df150aaf4878624a8c04ffed8501969" -dependencies = [ - "arrayvec 0.7.6", - "basic_bootloader", - "basic_system", - "bincode", - "crypto", - "either", - "evm_interpreter", - "hex", - "ruint", - "seq-macro", - "serde", - "system_hooks", - "zk_ee", -] - [[package]] name = "fs2" version = "0.4.3" @@ -2984,7 +2582,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -3065,16 +2663,6 @@ dependencies = [ "wasi", ] -[[package]] -name = "gimli" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" -dependencies = [ - "fallible-iterator", - "stable_deref_trait", -] - [[package]] name = "gimli" version = "0.31.1" @@ -3083,9 +2671,9 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glob" -version = "0.3.2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gloo-net" @@ -3102,7 +2690,7 @@ dependencies = [ "pin-project", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -3179,7 +2767,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.7.0", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -3197,8 +2785,8 @@ dependencies = [ "fnv", "futures-core", "futures-sink", - "http 1.2.0", - "indexmap 2.7.0", + "http 1.1.0", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -3211,19 +2799,12 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" - [[package]] name = "hashbrown" version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" dependencies = [ - "allocator-api2", "foldhash", "serde", ] @@ -3264,6 +2845,12 @@ 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" @@ -3275,11 +2862,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.11" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -3306,9 +2893,9 @@ dependencies = [ [[package]] name = "http" -version = "1.2.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -3333,7 +2920,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.2.0", + "http 1.1.0", ] [[package]] @@ -3344,7 +2931,7 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", "futures-util", - "http 1.2.0", + "http 1.1.0", "http-body 1.0.1", "pin-project-lite", ] @@ -3373,7 +2960,7 @@ dependencies = [ "form_urlencoded", "futures 0.3.31", "http 0.2.12", - "hyper 0.14.32", + "hyper 0.14.31", "log", "once_cell", "regex", @@ -3391,9 +2978,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.32" +version = "0.14.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" +checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" dependencies = [ "bytes", "futures-channel", @@ -3415,15 +3002,15 @@ dependencies = [ [[package]] name = "hyper" -version = "1.5.2" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0" +checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" dependencies = [ "bytes", "futures-channel", "futures-util", "h2 0.4.7", - "http 1.2.0", + "http 1.1.0", "http-body 1.0.1", "httparse", "httpdate", @@ -3442,7 +3029,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.12", - "hyper 0.14.32", + "hyper 0.14.31", "rustls 0.21.12", "tokio", "tokio-rustls 0.24.1", @@ -3450,19 +3037,19 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.5" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", - "http 1.2.0", - "hyper 1.5.2", + "http 1.1.0", + "hyper 1.5.1", "hyper-util", "log", - "rustls 0.23.21", + "rustls 0.23.19", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.1", + "tokio-rustls 0.26.0", "tower-service", ] @@ -3472,7 +3059,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" dependencies = [ - "hyper 1.5.2", + "hyper 1.5.1", "hyper-util", "pin-project-lite", "tokio", @@ -3486,7 +3073,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper 0.14.32", + "hyper 0.14.31", "native-tls", "tokio", "tokio-native-tls", @@ -3500,7 +3087,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.5.2", + "hyper 1.5.1", "hyper-util", "native-tls", "tokio", @@ -3517,9 +3104,9 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.2.0", + "http 1.1.0", "http-body 1.0.1", - "hyper 1.5.2", + "hyper 1.5.1", "pin-project-lite", "socket2", "tokio", @@ -3665,7 +3252,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -3710,7 +3297,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" dependencies = [ - "parity-scale-codec 3.6.12", + "parity-scale-codec 3.7.0", ] [[package]] @@ -3748,7 +3335,7 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -3769,37 +3356,15 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.7.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", "hashbrown 0.15.2", "serde", ] -[[package]] -name = "inferno" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692eda1cc790750b9f5a5e3921ef9c117fd5498b97cfacbc910693e5b29002dc" -dependencies = [ - "ahash", - "clap", - "crossbeam-channel", - "crossbeam-utils", - "dashmap", - "env_logger 0.11.6", - "indexmap 2.7.0", - "itoa", - "log", - "num-format", - "once_cell", - "quick-xml", - "rgb", - "str_stack", -] - [[package]] name = "inout" version = "0.1.3" @@ -3883,36 +3448,6 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" -[[package]] -name = "iwasm_ee" -version = "0.1.0" -source = "git+https://github.com/matter-labs/zk_ee.git?branch=main#487662eb1df150aaf4878624a8c04ffed8501969" -dependencies = [ - "arrayvec 0.7.6", - "crypto", - "iwasm_interpreter", - "iwasm_specification", - "ruint", - "zk_ee", -] - -[[package]] -name = "iwasm_interpreter" -version = "0.1.0" -source = "git+https://github.com/matter-labs/zk_ee.git?branch=main#487662eb1df150aaf4878624a8c04ffed8501969" -dependencies = [ - "arrayvec 0.7.6", -] - -[[package]] -name = "iwasm_specification" -version = "0.1.0" -source = "git+https://github.com/matter-labs/zk_ee.git?branch=main#487662eb1df150aaf4878624a8c04ffed8501969" -dependencies = [ - "num-derive", - "num-traits", -] - [[package]] name = "jni" version = "0.19.0" @@ -3923,7 +3458,7 @@ dependencies = [ "combine", "jni-sys", "log", - "thiserror 1.0.69", + "thiserror", "walkdir", ] @@ -3944,11 +3479,10 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.77" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ - "once_cell", "wasm-bindgen", ] @@ -3980,16 +3514,16 @@ dependencies = [ "futures-channel", "futures-util", "gloo-net", - "http 1.2.0", + "http 1.1.0", "jsonrpsee-core", "pin-project", - "rustls 0.23.21", + "rustls 0.23.19", "rustls-pki-types", "rustls-platform-verifier", "soketto", - "thiserror 1.0.69", + "thiserror", "tokio", - "tokio-rustls 0.26.1", + "tokio-rustls 0.26.0", "tokio-util", "tracing", "url", @@ -4007,7 +3541,7 @@ dependencies = [ "bytes", "futures-timer", "futures-util", - "http 1.2.0", + "http 1.1.0", "http-body 1.0.1", "http-body-util", "jsonrpsee-types", @@ -4017,7 +3551,7 @@ dependencies = [ "rustc-hash 1.1.0", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror", "tokio", "tokio-stream", "tracing", @@ -4033,16 +3567,16 @@ dependencies = [ "async-trait", "base64 0.22.1", "http-body 1.0.1", - "hyper 1.5.2", - "hyper-rustls 0.27.5", + "hyper 1.5.1", + "hyper-rustls 0.27.3", "hyper-util", "jsonrpsee-core", "jsonrpsee-types", - "rustls 0.23.21", + "rustls 0.23.19", "rustls-platform-verifier", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror", "tokio", "tower 0.4.13", "tracing", @@ -4059,7 +3593,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -4070,10 +3604,10 @@ checksum = "654afab2e92e5d88ebd8a39d6074483f3f2bfdf91c5ac57fe285e7127cdd4f51" dependencies = [ "anyhow", "futures-util", - "http 1.2.0", + "http 1.1.0", "http-body 1.0.1", "http-body-util", - "hyper 1.5.2", + "hyper 1.5.1", "hyper-util", "jsonrpsee-core", "jsonrpsee-types", @@ -4082,7 +3616,7 @@ dependencies = [ "serde", "serde_json", "soketto", - "thiserror 1.0.69", + "thiserror", "tokio", "tokio-stream", "tokio-util", @@ -4097,10 +3631,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c465fbe385238e861fdc4d1c85e04ada6c1fd246161d26385c1b311724d2af" dependencies = [ "beef", - "http 1.2.0", + "http 1.1.0", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -4120,7 +3654,7 @@ version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c28759775f5cb2f1ea9667672d3fe2b0e701d1f4b7b67954e60afe7fd058b5e" dependencies = [ - "http 1.2.0", + "http 1.1.0", "jsonrpsee-client-transport", "jsonrpsee-core", "jsonrpsee-types", @@ -4230,15 +3764,15 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.169" +version = "0.2.166" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" +checksum = "c2ccc108bbc0b1331bd061864e7cd823c0cab660bbe6970e66e2c0614decde36" [[package]] name = "libloading" -version = "0.8.6" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", "windows-targets 0.52.6", @@ -4256,15 +3790,15 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.8.0", + "bitflags 2.6.0", "libc", ] [[package]] name = "linux-raw-sys" -version = "0.4.15" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "litemap" @@ -4284,9 +3818,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.25" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "logos" @@ -4308,7 +3842,7 @@ dependencies = [ "proc-macro2", "quote", "regex-syntax 0.6.29", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -4363,15 +3897,6 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" -[[package]] -name = "memmap2" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" -dependencies = [ - "libc", -] - [[package]] name = "miette" version = "5.10.0" @@ -4380,7 +3905,7 @@ checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e" dependencies = [ "miette-derive", "once_cell", - "thiserror 1.0.69", + "thiserror", "unicode-width", ] @@ -4392,7 +3917,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -4407,39 +3932,27 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_nostd_compression" -version = "0.1.0" -source = "git+https://github.com/matter-labs/zk_ee.git?branch=main#487662eb1df150aaf4878624a8c04ffed8501969" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" -version = "0.8.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ "adler2", ] [[package]] name = "mio" -version = "1.0.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ + "hermit-abi 0.3.9", "libc", "wasi", "windows-sys 0.52.0", ] -[[package]] -name = "modexp" -version = "1.0.0" -source = "git+https://github.com/matter-labs/zk_ee.git?branch=main#487662eb1df150aaf4878624a8c04ffed8501969" - [[package]] name = "multimap" version = "0.10.0" @@ -4479,11 +3992,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "non_determinism_source" -version = "0.1.0" -source = "git+https://github.com/matter-labs/air_compiler#5aee5740532670f7ccbbb7a8418ad0c2eae171a7" - [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -4535,27 +4043,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -[[package]] -name = "num-derive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "num-format" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" -dependencies = [ - "arrayvec 0.7.6", - "itoa", -] - [[package]] name = "num-integer" version = "0.1.46" @@ -4635,7 +4122,7 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -4647,7 +4134,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -4661,24 +4148,11 @@ dependencies = [ [[package]] name = "object" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" -dependencies = [ - "flate2", - "memchr", - "ruzstd 0.6.0", -] - -[[package]] -name = "object" -version = "0.36.7" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ - "flate2", "memchr", - "ruzstd 0.7.3", ] [[package]] @@ -4724,7 +4198,7 @@ version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ - "bitflags 2.8.0", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -4741,7 +4215,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -4773,7 +4247,7 @@ dependencies = [ "js-sys", "once_cell", "pin-project-lite", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -4796,9 +4270,9 @@ checksum = "ad31e9de44ee3538fb9d64fe3376c1362f406162434609e79aea2a41a0af78ab" dependencies = [ "async-trait", "bytes", - "http 1.2.0", + "http 1.1.0", "opentelemetry", - "reqwest 0.12.12", + "reqwest 0.12.9", ] [[package]] @@ -4809,14 +4283,14 @@ checksum = "6b925a602ffb916fb7421276b86756027b37ee708f9dce2dbdcc51739f07e727" dependencies = [ "async-trait", "futures-core", - "http 1.2.0", + "http 1.1.0", "opentelemetry", "opentelemetry-http", "opentelemetry-proto", "opentelemetry_sdk", "prost 0.13.4", - "reqwest 0.12.12", - "thiserror 1.0.69", + "reqwest 0.12.9", + "thiserror", "tokio", "tonic", ] @@ -4855,7 +4329,7 @@ dependencies = [ "percent-encoding", "rand 0.8.5", "serde_json", - "thiserror 1.0.69", + "thiserror", "tokio", "tokio-stream", ] @@ -4866,16 +4340,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" -[[package]] -name = "oracle_provider" -version = "0.1.0" -source = "git+https://github.com/matter-labs/zk_ee.git?branch=main#487662eb1df150aaf4878624a8c04ffed8501969" -dependencies = [ - "ringbuffer", - "risc_v_simulator", - "zk_ee", -] - [[package]] name = "ordered-float" version = "2.10.1" @@ -4887,9 +4351,9 @@ dependencies = [ [[package]] name = "os_info" -version = "3.9.2" +version = "3.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e6520c8cc998c5741ee68ec1dc369fc47e5f0ea5320018ecf2a1ccd6328f48b" +checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" dependencies = [ "log", "serde", @@ -4930,15 +4394,16 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.12" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" +checksum = "8be4817d39f3272f69c59fe05d0535ae6456c2dc2fa1ba02910296c7e0a5c590" dependencies = [ "arrayvec 0.7.6", "bitvec 1.0.1", "byte-slice-cast", "impl-trait-for-tuples", - "parity-scale-codec-derive 3.6.12", + "parity-scale-codec-derive 3.7.0", + "rustversion", "serde", ] @@ -4956,14 +4421,14 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.12" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" +checksum = "8781a75c6205af67215f382092b6e0a4ff3734798523e69073d4bcd294ec767b" dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.89", ] [[package]] @@ -5060,12 +4525,12 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.15" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc" +checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" dependencies = [ "memchr", - "thiserror 2.0.11", + "thiserror", "ucd-trie", ] @@ -5076,7 +4541,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.7.0", + "indexmap 2.6.0", ] [[package]] @@ -5091,35 +4556,35 @@ dependencies = [ [[package]] name = "phf" -version = "0.11.3" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ "phf_macros", - "phf_shared 0.11.3", + "phf_shared 0.11.2", ] [[package]] name = "phf_generator" -version = "0.11.3" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ - "phf_shared 0.11.3", + "phf_shared 0.11.2", "rand 0.8.5", ] [[package]] name = "phf_macros" -version = "0.11.3" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ "phf_generator", - "phf_shared 0.11.3", + "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -5128,43 +4593,43 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" dependencies = [ - "siphasher 0.3.11", + "siphasher", ] [[package]] name = "phf_shared" -version = "0.11.3" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ - "siphasher 1.0.1", + "siphasher", ] [[package]] name = "pin-project" -version = "1.1.8" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916" +checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.8" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb" +checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] name = "pin-project-lite" -version = "0.2.16" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -5198,17 +4663,6 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" -[[package]] -name = "poseidon2" -version = "0.1.0" -source = "git+https://github.com/matter-labs/air_compiler#5aee5740532670f7ccbbb7a8418ad0c2eae171a7" -dependencies = [ - "field", - "non_determinism_source", - "rand 0.8.5", - "unroll", -] - [[package]] name = "powerfmt" version = "0.2.0" @@ -5242,12 +4696,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.29" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6924ced06e1f7dfe3fa48d57b9f74f55d8915f5036121bef647ef4b204895fac" +checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" dependencies = [ "proc-macro2", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -5324,14 +4778,14 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] name = "proc-macro2" -version = "1.0.93" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -5356,7 +4810,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -5367,7 +4821,7 @@ checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" dependencies = [ "bit-set", "bit-vec", - "bitflags 2.8.0", + "bitflags 2.6.0", "lazy_static", "num-traits", "rand 0.8.5", @@ -5416,7 +4870,7 @@ dependencies = [ "prost 0.12.6", "prost-types", "regex", - "syn 2.0.96", + "syn 2.0.89", "tempfile", ] @@ -5430,7 +4884,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -5443,7 +4897,7 @@ dependencies = [ "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -5483,7 +4937,7 @@ dependencies = [ "prost-reflect", "prost-types", "protox-parse", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -5495,7 +4949,7 @@ dependencies = [ "logos", "miette", "prost-types", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -5513,20 +4967,11 @@ dependencies = [ "byteorder", ] -[[package]] -name = "quick-xml" -version = "0.37.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "165859e9e55f79d67b96c5d96f4e88b6f2695a1972849c15a6a3f5c59fc2c003" -dependencies = [ - "memchr", -] - [[package]] name = "quote" -version = "1.0.38" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -5642,11 +5087,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.8" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ - "bitflags 2.8.0", + "bitflags 2.6.0", ] [[package]] @@ -5657,7 +5102,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -5727,7 +5172,7 @@ dependencies = [ "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.32", + "hyper 0.14.31", "hyper-rustls 0.24.2", "hyper-tls 0.5.0", "ipnet", @@ -5759,9 +5204,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.12" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da" +checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" dependencies = [ "base64 0.22.1", "bytes", @@ -5770,11 +5215,11 @@ dependencies = [ "futures-core", "futures-util", "h2 0.4.7", - "http 1.2.0", + "http 1.1.0", "http-body 1.0.1", "http-body-util", - "hyper 1.5.2", - "hyper-rustls 0.27.5", + "hyper 1.5.1", + "hyper-rustls 0.27.3", "hyper-tls 0.6.0", "hyper-util", "ipnet", @@ -5793,7 +5238,6 @@ dependencies = [ "system-configuration 0.6.1", "tokio", "tokio-native-tls", - "tower 0.5.2", "tower-service", "url", "wasm-bindgen", @@ -5823,15 +5267,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "rgb" -version = "0.8.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" -dependencies = [ - "bytemuck", -] - [[package]] name = "ring" version = "0.16.20" @@ -5862,12 +5297,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "ringbuffer" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3df6368f71f205ff9c33c076d170dd56ebf68e8161c733c0caa07a7a5509ed53" - [[package]] name = "ripemd" version = "0.1.3" @@ -5877,22 +5306,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "risc_v_simulator" -version = "0.1.0" -source = "git+https://github.com/matter-labs/air_compiler#5aee5740532670f7ccbbb7a8418ad0c2eae171a7" -dependencies = [ - "addr2line 0.22.0", - "blake2s_u32", - "field", - "inferno", - "memmap2", - "object 0.36.7", - "poseidon2", - "rand 0.8.5", - "ringbuffer", -] - [[package]] name = "rlp" version = "0.5.2" @@ -5923,20 +5336,18 @@ checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746" [[package]] name = "ruint" -version = "1.12.4" +version = "1.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5ef8fb1dd8de3870cb8400d51b4c2023854bbafd5431a3ac7e7317243e22d2f" +checksum = "2c3cc4c2511671f327125da14133d0c5c5d137f006a1017a16f557bc85b16286" dependencies = [ "alloy-rlp", "ark-ff 0.3.0", "ark-ff 0.4.2", "bytes", - "fastrlp 0.3.1", - "fastrlp 0.4.0", + "fastrlp", "num-bigint", - "num-integer", "num-traits", - "parity-scale-codec 3.6.12", + "parity-scale-codec 3.7.0", "primitive-types 0.12.2", "proptest", "rand 0.8.5", @@ -5967,9 +5378,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc-hash" -version = "2.1.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" [[package]] name = "rustc-hex" @@ -5992,20 +5403,20 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ - "semver 1.0.24", + "semver 1.0.23", ] [[package]] name = "rustix" -version = "0.38.43" +version = "0.38.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6" +checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" dependencies = [ - "bitflags 2.8.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -6022,9 +5433,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.21" +version = "0.23.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f287924602bf649d949c63dc8ac8b235fa5387d394020705b80c4eb597ce5b8" +checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1" dependencies = [ "aws-lc-rs", "log", @@ -6069,9 +5480,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.10.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" [[package]] name = "rustls-platform-verifier" @@ -6084,7 +5495,7 @@ dependencies = [ "jni", "log", "once_cell", - "rustls 0.23.21", + "rustls 0.23.19", "rustls-native-certs", "rustls-platform-verifier-android", "rustls-webpki 0.102.8", @@ -6124,9 +5535,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.19" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" [[package]] name = "rusty-fork" @@ -6140,26 +5551,6 @@ dependencies = [ "wait-timeout", ] -[[package]] -name = "ruzstd" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5174a470eeb535a721ae9fdd6e291c2411a906b96592182d05217591d5c5cf7b" -dependencies = [ - "byteorder", - "derive_more 0.99.18", - "twox-hash", -] - -[[package]] -name = "ruzstd" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad02996bfc73da3e301efe90b1837be9ed8f4a462b6ed410aa35d00381de89f" -dependencies = [ - "twox-hash", -] - [[package]] name = "ryu" version = "1.0.18" @@ -6191,8 +5582,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "346a3b32eba2640d17a9cb5927056b08f3de90f65b72fe09402c2ad07d684d0b" dependencies = [ "cfg-if", - "derive_more 1.0.0", - "parity-scale-codec 3.6.12", + "derive_more", + "parity-scale-codec 3.7.0", "scale-info-derive", ] @@ -6205,7 +5596,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -6273,16 +5664,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "secp256k1" -version = "0.1.0" -source = "git+https://github.com/matter-labs/zk_ee.git?branch=main#487662eb1df150aaf4878624a8c04ffed8501969" -dependencies = [ - "cfg-if", - "const_for", - "crypto", -] - [[package]] name = "secp256k1" version = "0.27.0" @@ -6316,7 +5697,7 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.8.0", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -6326,9 +5707,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.14.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" +checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" dependencies = [ "core-foundation-sys", "libc", @@ -6345,9 +5726,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.24" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] @@ -6475,23 +5856,17 @@ dependencies = [ "rand 0.8.5", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror", "time", "url", - "uuid 1.12.0", + "uuid 1.11.0", ] -[[package]] -name = "seq-macro" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" - [[package]] name = "serde" -version = "1.0.217" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] @@ -6508,20 +5883,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.217" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] name = "serde_json" -version = "1.0.135" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "itoa", "memchr", @@ -6579,7 +5954,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.7.0", + "indexmap 2.6.0", "itoa", "ryu", "serde", @@ -6720,13 +6095,13 @@ dependencies = [ [[package]] name = "simple_asn1" -version = "0.6.3" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb" +checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" dependencies = [ "num-bigint", "num-traits", - "thiserror 2.0.11", + "thiserror", "time", ] @@ -6736,12 +6111,6 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" -[[package]] -name = "siphasher" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" - [[package]] name = "slab" version = "0.4.9" @@ -6759,9 +6128,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.8" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -6769,14 +6138,14 @@ dependencies = [ [[package]] name = "soketto" -version = "0.8.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e859df029d160cb88608f5d7df7fb4753fd20fdfb4de5644f3d8b8440841721" +checksum = "37468c595637c10857701c990f93a40ce0e357cedb0953d1c26c8d8027f9bb53" dependencies = [ "base64 0.22.1", "bytes", "futures 0.3.31", - "http 1.2.0", + "http 1.1.0", "httparse", "log", "rand 0.8.5", @@ -6793,7 +6162,7 @@ dependencies = [ "lalrpop", "lalrpop-util", "phf", - "thiserror 1.0.69", + "thiserror", "unicode-xid", ] @@ -6841,23 +6210,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "storage_models" -version = "0.1.0" -source = "git+https://github.com/matter-labs/zk_ee.git?branch=main#487662eb1df150aaf4878624a8c04ffed8501969" -dependencies = [ - "arrayvec 0.7.6", - "either", - "ruint", - "zk_ee", -] - -[[package]] -name = "str_stack" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb" - [[package]] name = "string_cache" version = "0.8.7" @@ -6902,7 +6254,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -6922,11 +6274,11 @@ dependencies = [ "hex", "once_cell", "reqwest 0.11.27", - "semver 1.0.24", + "semver 1.0.23", "serde", "serde_json", "sha2 0.10.8", - "thiserror 1.0.69", + "thiserror", "url", "zip", ] @@ -6944,9 +6296,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.96" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -6955,14 +6307,14 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.8.19" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84e4d83a0a6704561302b917a932484e1cae2d8c6354c64be8b7bac1c1fe057" +checksum = "219389c1ebe89f8333df8bdfb871f6631c552ff399c23cac02480b6088aad8f0" dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -6988,7 +6340,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -7008,7 +6360,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 2.8.0", + "bitflags 2.6.0", "core-foundation", "system-configuration-sys 0.6.0", ] @@ -7033,17 +6385,6 @@ dependencies = [ "libc", ] -[[package]] -name = "system_hooks" -version = "0.1.0" -source = "git+https://github.com/matter-labs/zk_ee.git?branch=main#487662eb1df150aaf4878624a8c04ffed8501969" -dependencies = [ - "crypto", - "evm_interpreter", - "ruint", - "zk_ee", -] - [[package]] name = "tap" version = "1.0.1" @@ -7062,13 +6403,12 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.15.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" dependencies = [ "cfg-if", "fastrand", - "getrandom", "once_cell", "rustix", "windows-sys 0.59.0", @@ -7112,7 +6452,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -7123,7 +6463,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", "test-case-core", ] @@ -7133,16 +6473,7 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl 1.0.69", -] - -[[package]] -name = "thiserror" -version = "2.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" -dependencies = [ - "thiserror-impl 2.0.11", + "thiserror-impl", ] [[package]] @@ -7153,18 +6484,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", -] - -[[package]] -name = "thiserror-impl" -version = "2.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -7188,9 +6508,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.37" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -7211,9 +6531,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.19" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -7249,9 +6569,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.8.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -7264,9 +6584,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.43.0" +version = "1.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" +checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" dependencies = [ "backtrace", "bytes", @@ -7283,13 +6603,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.5.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -7314,19 +6634,20 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.21", + "rustls 0.23.19", + "rustls-pki-types", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.17" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -7351,9 +6672,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.13" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -7390,7 +6711,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.7.0", + "indexmap 2.6.0", "toml_datetime", "winnow 0.5.40", ] @@ -7401,11 +6722,11 @@ version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.7.0", + "indexmap 2.6.0", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.24", + "winnow 0.6.20", ] [[package]] @@ -7420,10 +6741,10 @@ dependencies = [ "base64 0.22.1", "bytes", "h2 0.4.7", - "http 1.2.0", + "http 1.1.0", "http-body 1.0.1", "http-body-util", - "hyper 1.5.2", + "hyper 1.5.1", "hyper-timeout", "hyper-util", "percent-encoding", @@ -7460,15 +6781,14 @@ dependencies = [ [[package]] name = "tower" -version = "0.5.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" +checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" dependencies = [ "futures-core", "futures-util", "pin-project-lite", - "sync_wrapper 1.0.2", - "tokio", + "sync_wrapper 0.1.2", "tower-layer", "tower-service", ] @@ -7479,9 +6799,9 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697" dependencies = [ - "bitflags 2.8.0", + "bitflags 2.6.0", "bytes", - "http 1.2.0", + "http 1.1.0", "pin-project-lite", "tower-layer", "tower-service", @@ -7519,7 +6839,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -7573,9 +6893,9 @@ dependencies = [ [[package]] name = "tracing-serde" -version = "0.2.0" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "704b1aeb7be0d0a84fc9828cae51dab5970fee5088f83d1dd7ee6f6246fc6ff1" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" dependencies = [ "serde", "tracing-core", @@ -7583,9 +6903,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.19" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", @@ -7624,21 +6944,11 @@ dependencies = [ "rand 0.8.5", "rustls 0.21.12", "sha1", - "thiserror 1.0.69", + "thiserror", "url", "utf-8", ] -[[package]] -name = "twox-hash" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if", - "static_assertions", -] - [[package]] name = "typenum" version = "1.17.0" @@ -7696,16 +7006,6 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" -[[package]] -name = "unroll" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad948c1cb799b1a70f836077721a92a35ac177d4daddf4c20a633786d4cf618" -dependencies = [ - "quote", - "syn 1.0.109", -] - [[package]] name = "unsafe-libyaml" version = "0.2.11" @@ -7726,9 +7026,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.12.1" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d" +checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" dependencies = [ "base64 0.22.1", "log", @@ -7785,18 +7085,18 @@ dependencies = [ [[package]] name = "uuid" -version = "1.12.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "744018581f9a3454a9e15beb8a33b017183f1e7c0cd170232a2d1453b23a51c4" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" dependencies = [ "serde", ] [[package]] name = "valuable" -version = "0.1.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "vcpkg" @@ -7830,7 +7130,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "671d3b894d5d0849f0a597f56bf071f42d4f2a1cbcf2f78ca21f870ab7c0cc2b" dependencies = [ - "hyper 0.14.32", + "hyper 0.14.31", "once_cell", "tokio", "tracing", @@ -7845,7 +7145,7 @@ checksum = "6a511871dc5de990a3b2a0e715facfbc5da848c0c0395597a1415029fb7c250a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -7884,48 +7184,47 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.100" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", "once_cell", - "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.100" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", + "once_cell", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.50" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", - "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.100" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7933,31 +7232,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.100" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.100" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" -dependencies = [ - "unicode-ident", -] +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "web-sys" -version = "0.3.77" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", @@ -8229,9 +7525,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.24" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8d71a593cc5c42ad7876e2c1fda56f314f3754c084128833e64f1345ff8a03a" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] @@ -8271,7 +7567,7 @@ dependencies = [ "pharos", "rustc_version 0.4.1", "send_wrapper 0.6.0", - "thiserror 1.0.69", + "thiserror", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -8324,7 +7620,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", "synstructure", ] @@ -8346,7 +7642,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -8366,7 +7662,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", "synstructure", ] @@ -8387,7 +7683,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -8409,7 +7705,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -8432,20 +7728,6 @@ dependencies = [ "zstd", ] -[[package]] -name = "zk_ee" -version = "0.1.0" -source = "git+https://github.com/matter-labs/zk_ee.git?branch=main#487662eb1df150aaf4878624a8c04ffed8501969" -dependencies = [ - "arrayvec 0.7.6", - "bitflags 2.8.0", - "cfg-if", - "crypto", - "derivative", - "ruint", - "serde", -] - [[package]] name = "zk_evm" version = "0.131.0-rc.2" @@ -8566,14 +7848,6 @@ dependencies = [ "zkevm_opcode_defs 0.150.18", ] -[[package]] -name = "zk_os_runner" -version = "0.1.0" -source = "git+https://github.com/matter-labs/zk_ee.git?branch=main#487662eb1df150aaf4878624a8c04ffed8501969" -dependencies = [ - "risc_v_simulator", -] - [[package]] name = "zkevm_opcode_defs" version = "0.131.0" @@ -8592,7 +7866,7 @@ version = "0.132.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0769f7b27d8fb06e715da3290c575cac5d04d10a557faef180e847afce50ac4" dependencies = [ - "bitflags 2.8.0", + "bitflags 2.6.0", "blake2", "ethereum-types 0.14.1", "k256 0.11.6", @@ -8607,7 +7881,7 @@ version = "0.141.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6be7bd5f0e0b61211f544147289640b4712715589d7f2fe5229d92a7a3ac64c0" dependencies = [ - "bitflags 2.8.0", + "bitflags 2.6.0", "blake2", "ethereum-types 0.14.1", "k256 0.13.4", @@ -8622,7 +7896,7 @@ version = "0.150.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5bad437d4891536fdcc0054a3f04562c408817ff19d83b6c27569217692e6e74" dependencies = [ - "bitflags 2.8.0", + "bitflags 2.6.0", "blake2", "ethereum-types 0.14.1", "k256 0.13.4", @@ -8633,17 +7907,6 @@ dependencies = [ "sha3 0.10.8", ] -[[package]] -name = "zkos_api" -version = "0.1.0" -source = "git+https://github.com/matter-labs/zk_ee.git?branch=main#487662eb1df150aaf4878624a8c04ffed8501969" -dependencies = [ - "forward_system", - "oracle_provider", - "risc_v_simulator", - "zk_os_runner", -] - [[package]] name = "zksync-web3-rs" version = "0.1.1" @@ -8652,7 +7915,7 @@ checksum = "15bc9b106393359ac013c2527db318ced4ca838d26ef03488233af557ebe5da8" dependencies = [ "async-trait", "clap", - "env_logger 0.10.2", + "env_logger", "ethers", "ethers-contract", "hex", @@ -8661,7 +7924,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.9.9", - "thiserror 1.0.69", + "thiserror", "tokio", ] @@ -8682,7 +7945,7 @@ dependencies = [ "serde_with", "sha2 0.10.8", "strum", - "thiserror 1.0.69", + "thiserror", "tiny-keccak 2.0.2", "url", ] @@ -8721,7 +7984,7 @@ dependencies = [ "pin-project", "rand 0.8.5", "sha3 0.10.8", - "thiserror 1.0.69", + "thiserror", "time", "tokio", "tracing", @@ -8752,7 +8015,7 @@ checksum = "723e2a4b056cc5af192a83163c89a6951ee75c098cc5c4a4cdc435f4232d88bd" dependencies = [ "anyhow", "rand 0.8.5", - "thiserror 1.0.69", + "thiserror", "zksync_concurrency", ] @@ -8779,11 +8042,11 @@ dependencies = [ "blake2", "hex", "rand 0.8.5", - "secp256k1 0.27.0", + "secp256k1", "serde", "serde_json", "sha2 0.10.8", - "thiserror 1.0.69", + "thiserror", "zksync_basic_types", ] @@ -8836,7 +8099,7 @@ dependencies = [ "hex", "itertools 0.10.5", "once_cell", - "thiserror 1.0.69", + "thiserror", "tracing", "vise", "zk_evm 0.131.0-rc.2", @@ -8900,7 +8163,7 @@ dependencies = [ "prost-reflect", "protox", "quote", - "syn 2.0.96", + "syn 2.0.89", ] [[package]] @@ -8921,7 +8184,7 @@ dependencies = [ "bigdecimal", "blake2", "chrono", - "derive_more 1.0.0", + "derive_more", "hex", "itertools 0.10.5", "num", @@ -8933,7 +8196,7 @@ dependencies = [ "serde_json", "serde_with", "strum", - "thiserror 1.0.69", + "thiserror", "tracing", "zksync_basic_types", "zksync_contracts", @@ -8952,7 +8215,7 @@ dependencies = [ "anyhow", "futures 0.3.31", "once_cell", - "reqwest 0.12.12", + "reqwest 0.12.9", "serde_json", "sha2 0.10.8", "tokio", @@ -8975,7 +8238,7 @@ dependencies = [ "sentry", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror", "time", "tokio", "tracing", @@ -9016,7 +8279,7 @@ dependencies = [ "hex", "pretty_assertions", "serde", - "thiserror 1.0.69", + "thiserror", "tracing", "zksync_contracts", "zksync_system_constants", @@ -9034,10 +8297,10 @@ dependencies = [ "jsonrpsee", "pin-project-lite", "rlp", - "rustls 0.23.21", + "rustls 0.23.19", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror", "tokio", "tracing", "vise", diff --git a/Cargo.toml b/Cargo.toml index 0d59a25d..ca9c3040 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,6 @@ categories = ["cryptography"] ######################### zksync_multivm = { git = "https://github.com/matter-labs/zksync-era.git", rev = "core-v25.4.0" } zksync_contracts = { git = "https://github.com/matter-labs/zksync-era.git", rev = "core-v25.4.0" } -zksync_basic_types = { git = "https://github.com/matter-labs/zksync-era.git", rev = "core-v25.4.0" } zksync_types = { git = "https://github.com/matter-labs/zksync-era.git", rev = "core-v25.4.0" } zksync_vm_interface = { git = "https://github.com/matter-labs/zksync-era.git", rev = "core-v25.4.0" } zksync_web3_decl = { git = "https://github.com/matter-labs/zksync-era.git", rev = "core-v25.4.0", features = [ diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 9414755e..75bbb313 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -17,7 +17,6 @@ zksync_multivm.workspace = true zksync_contracts.workspace = true zksync_types.workspace = true zksync_web3_decl.workspace = true -zksync_basic_types.workspace = true anyhow.workspace = true tokio.workspace = true @@ -43,24 +42,6 @@ flate2.workspace = true thiserror.workspace = true async-trait.workspace = true - -# ZK os dependencies - -forward_system = { git = "https://github.com/matter-labs/zk_ee.git", branch = "main"} -basic_system = { git = "https://github.com/matter-labs/zk_ee.git", branch = "main"} -zk_ee = { git = "https://github.com/matter-labs/zk_ee.git", branch = "main"} -system_hooks = { git = "https://github.com/matter-labs/zk_ee.git", branch = "main"} -zkos_api = { git = "https://github.com/matter-labs/zk_ee.git", branch = "main" } - -#forward_system = { path = "../../../zk_ee/forward_system" } -#basic_system = { path = "../../../zk_ee/basic_system" } -#zk_ee = { path = "../../../zk_ee/zk_ee" } -#system_hooks = { path = "../../../zk_ee/system_hooks" } -#zkos_api = { path = "../../../zk_ee/api" } - - -ruint = { version = "1.12.3", default-features = false, features = ["alloc"]} - [dev-dependencies] maplit.workspace = true ethers.workspace = true diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs index a8f95a5a..674fdf15 100644 --- a/crates/core/src/lib.rs +++ b/crates/core/src/lib.rs @@ -1,4 +1,3 @@ -#![feature(allocator_api)] //! anvil-zksync //! //! The `anvil-zksync` crate provides an in-memory node designed primarily for local testing. diff --git a/crates/core/src/node/zkos.rs b/crates/core/src/node/zkos.rs index f3244f84..8c4b442c 100644 --- a/crates/core/src/node/zkos.rs +++ b/crates/core/src/node/zkos.rs @@ -1,510 +1,36 @@ +#![allow(dead_code)] +#![allow(unused_variables)] + //! Interfaces that use zkos for VM execution. //! This is still experimental code. -use std::{alloc::Global, collections::HashMap, vec}; - use anvil_zksync_config::types::ZKOSConfig; -use basic_system::basic_system::simple_growable_storage::TestingTree; -use forward_system::run::{ - test_impl::{InMemoryPreimageSource, InMemoryTree, TxListSource}, - PreimageType, StorageCommitment, -}; -use ruint::aliases::B160; -use system_hooks::addresses_constants::{ - NOMINAL_TOKEN_BALANCE_STORAGE_ADDRESS, NONCE_HOLDER_HOOK_ADDRESS, -}; -use zk_ee::{common_structs::derive_flat_storage_key, utils::Bytes32}; use zksync_multivm::{ interface::{ storage::{StoragePtr, WriteStorage}, - ExecutionResult, InspectExecutionMode, L1BatchEnv, PushTransactionResult, Refunds, - SystemEnv, TxExecutionMode, VmExecutionLogs, VmExecutionResultAndLogs, VmInterface, - VmInterfaceHistoryEnabled, VmRevertReason, + L1BatchEnv, SystemEnv, VmExecutionResultAndLogs, VmInterface, VmInterfaceHistoryEnabled, }, vm_latest::TracerPointer, HistoryMode, }; -use zksync_types::{ - address_to_h256, web3::keccak256, AccountTreeId, Address, ExecuteTransactionCommon, StorageKey, - StorageLog, StorageLogWithPreviousValue, Transaction, H160, H256, U256, -}; +use zksync_types::{Address, StorageKey, Transaction}; use crate::deps::InMemoryStorage; -use once_cell::sync::Lazy; -use std::sync::Mutex; - -static BATCH_WITNESS: Lazy>>> = Lazy::new(|| { - let m = HashMap::new(); - Mutex::new(m) -}); - -pub fn set_batch_witness(key: u32, value: Vec) { - let mut map = BATCH_WITNESS.lock().unwrap(); - map.insert(key, value); -} pub fn zkos_get_batch_witness(key: &u32) -> Option> { - let map = BATCH_WITNESS.lock().unwrap(); - map.get(key).cloned() -} - -// Helper methods for different convertions. -pub fn bytes32_to_h256(data: Bytes32) -> H256 { - H256::from(data.as_u8_array_ref()) -} - -pub fn h256_to_bytes32(data: &H256) -> Bytes32 { - Bytes32::from(data.as_fixed_bytes().clone()) -} - -pub fn b160_to_h160(data: B160) -> H160 { - H160::from_slice(&data.to_be_bytes_vec()) -} - -pub fn pad_to_word(input: &Vec) -> Vec { - let mut data = input.clone(); - let remainder = input.len().div_ceil(32) * 32 - input.len(); - for _ in 0..remainder { - data.push(0u8); - } - data -} - -pub fn h160_to_b160(data: &H160) -> B160 { - B160::from_be_bytes(data.as_fixed_bytes().clone()) -} - -// Helper methods to add data to the Vec in the format expected by ZKOS. -pub fn append_address(data: &mut Vec, address: &H160) { - let mut pp = vec![0u8; 32]; - let ap1 = address.as_fixed_bytes(); - for i in 0..20 { - pp[i + 12] = ap1[i]; - } - data.append(&mut pp); -} - -pub fn append_u256(data: &mut Vec, payload: &zksync_types::U256) { - let mut pp = [0u8; 32]; - payload.to_big_endian(&mut pp); - - data.append(&mut pp.to_vec()); -} -pub fn append_u64(data: &mut Vec, payload: u64) { - let mut pp = [0u8; 32]; - let pp1 = payload.to_be_bytes(); - for i in 0..8 { - pp[24 + i] = pp1[i]; - } - data.append(&mut pp.to_vec()); -} - -pub fn append_usize(data: &mut Vec, payload: usize) { - let mut pp = [0u8; 32]; - let pp1 = payload.to_be_bytes(); - for i in 0..8 { - pp[24 + i] = pp1[i]; - } - data.append(&mut pp.to_vec()); -} - -/// Iterates over raw storage and creates a tree from it. -pub fn create_tree_from_full_state( - raw_storage: &InMemoryStorage, -) -> (InMemoryTree, InMemoryPreimageSource) { - let original_state = &raw_storage.state; - let mut tree = InMemoryTree { - storage_tree: TestingTree::new_in(Global), - cold_storage: HashMap::new(), - }; - let mut preimage_source = InMemoryPreimageSource { - inner: HashMap::new(), - }; - - for entry in original_state { - let kk = derive_flat_storage_key( - &h160_to_b160(entry.0.address()), - &h256_to_bytes32(entry.0.key()), - ); - let vv = h256_to_bytes32(entry.1); - - tree.storage_tree.insert(&kk, &vv); - tree.cold_storage.insert(kk, vv); - } - - for entry in &raw_storage.factory_deps { - preimage_source.inner.insert( - ( - PreimageType::Bytecode(zk_ee::system::ExecutionEnvironmentType::EVM), - h256_to_bytes32(entry.0), - ), - entry.1.clone(), - ); - } - (tree, preimage_source) -} - -pub fn add_elem_to_tree(tree: &mut InMemoryTree, k: &StorageKey, v: &H256) { - let kk = derive_flat_storage_key(&h160_to_b160(k.address()), &h256_to_bytes32(k.key())); - let vv = h256_to_bytes32(v); - - tree.storage_tree.insert(&kk, &vv); - tree.cold_storage.insert(kk, vv); -} - -// Serialize Transaction to ZKOS format. -// Should match the code in basic_bootloader/src/bootloader/transaction/mod.rs -pub fn transaction_to_zkos_vec(tx: &Transaction) -> Vec { - let mut tx_raw: Vec = vec![]; - let tx_type_id = match tx.tx_format() { - zksync_types::l2::TransactionType::LegacyTransaction => 0u8, - zksync_types::l2::TransactionType::EIP2930Transaction => 1u8, - zksync_types::l2::TransactionType::EIP1559Transaction => 2u8, - zksync_types::l2::TransactionType::EIP712Transaction => todo!(), - zksync_types::l2::TransactionType::PriorityOpTransaction => todo!(), - zksync_types::l2::TransactionType::ProtocolUpgradeTransaction => todo!(), - }; - let common_data = match &tx.common_data { - zksync_types::ExecuteTransactionCommon::L1(_) => todo!(), - zksync_types::ExecuteTransactionCommon::L2(l2_tx_common_data) => l2_tx_common_data, - zksync_types::ExecuteTransactionCommon::ProtocolUpgrade(_) => todo!(), - }; - // tx_type - tx_raw.append(&mut vec![0u8; 31]); - tx_raw.append(&mut vec![tx_type_id; 1]); - - // from - append_address(&mut tx_raw, &common_data.initiator_address); - // to - append_address( - &mut tx_raw, - &tx.execute.contract_address.unwrap_or(H160::zero()), - ); - - let gas_limit = common_data.fee.gas_limit; - // gas limit - append_u256(&mut tx_raw, &gas_limit); - // gas per pubdata limit - append_u256(&mut tx_raw, &common_data.fee.gas_per_pubdata_limit); - - let fee_per_gas = common_data.fee.max_fee_per_gas; - - // max fee per gas - append_u256(&mut tx_raw, &fee_per_gas); - // max priority fee per gas. - // hack for legacy tx (verify!!) - append_u256(&mut tx_raw, &common_data.fee.max_priority_fee_per_gas); - - // paymaster - append_u64(&mut tx_raw, 0); - - // nonce - append_u64(&mut tx_raw, common_data.nonce.0.into()); - - append_u256(&mut tx_raw, &tx.execute.value); - - let mut reserved = [0u64; 4]; - - // Should check chain_id - if tx_type_id == 0 { - reserved[0] = 1; - } - - if tx.execute.contract_address.is_none() { - reserved[1] = 1; - } - - for i in 0..4 { - // reserved - append_u64(&mut tx_raw, reserved[i]); - } - - let signature_u256 = common_data.signature.len().div_ceil(32) as u64; - - let execute_calldata_words = tx.execute.calldata.len().div_ceil(32) as u64; - - let mut current_offset = 19; - - // data offset - append_u64(&mut tx_raw, current_offset * 32); - // lent - current_offset += 1 + execute_calldata_words; - // signature offset (stupid -- this doesn't include the padding!!) - append_u64(&mut tx_raw, current_offset * 32); - current_offset += 1 + signature_u256; - - // factory deps - append_u64(&mut tx_raw, current_offset * 32); - current_offset += 1; - // paymater - append_u64(&mut tx_raw, current_offset * 32); - current_offset += 1; - // reserved - append_u64(&mut tx_raw, current_offset * 32); - - // len - data. - append_usize(&mut tx_raw, tx.execute.calldata.len()); - tx_raw.append(&mut pad_to_word(&tx.execute.calldata)); - - // len - signature. - append_usize(&mut tx_raw, common_data.signature.len()); - tx_raw.append(&mut pad_to_word(&common_data.signature)); - - // factory deps - append_u64(&mut tx_raw, 0); - // paymater - append_u64(&mut tx_raw, 0); - // reserved - append_u64(&mut tx_raw, 0); - tx_raw -} - -pub fn execute_tx_in_zkos( - tx: &Transaction, - tree: &InMemoryTree, - preimage_source: &InMemoryPreimageSource, - storage: &mut StoragePtr, - simulate_only: bool, - batch_env: &L1BatchEnv, - chain_id: u64, - // if zkos_path is passed, it will also compute witness. - zkos_path: Option, -) -> (VmExecutionResultAndLogs, Option>) { - let batch_context = basic_system::basic_system::BasicBlockMetadataFromOracle { - // TODO: get fee from batch_env. - eip1559_basefee: ruint::aliases::U256::from(if simulate_only { 0u64 } else { 1000u64 }), - ergs_price: ruint::aliases::U256::from(1u64), - block_number: batch_env.number.0 as u64, - timestamp: batch_env.timestamp, - gas_per_pubdata: ruint::aliases::U256::from(1u64), - chain_id, - }; - - let storage_commitment = StorageCommitment { - root: *tree.storage_tree.root(), - next_free_slot: tree.storage_tree.next_free_slot, - }; - - let mut tx = tx.clone(); - if simulate_only { - // Currently zkos doesn't do validation when running a simulated transaction. - // This results in lower gas estimation - which might cause issues for the user. - const ZKOS_EXPECTED_VALIDATION_COST: u64 = 6_000; - let new_gas_limit = tx - .gas_limit() - .saturating_sub(U256::from(ZKOS_EXPECTED_VALIDATION_COST)); - match &mut tx.common_data { - ExecuteTransactionCommon::L1(data) => data.gas_limit = new_gas_limit, - ExecuteTransactionCommon::L2(data) => data.fee.gas_limit = new_gas_limit, - ExecuteTransactionCommon::ProtocolUpgrade(data) => data.gas_limit = new_gas_limit, - }; - } - - let tx_raw = transaction_to_zkos_vec(&tx); - - let mut witness = None; - - let (output, dynamic_factory_deps, storage_logs) = if simulate_only { - ( - forward_system::run::simulate_tx( - tx_raw, - storage_commitment, - batch_context, - tree.clone(), - preimage_source.clone(), - ) - .unwrap(), - Default::default(), // dynamic factory deps - vec![], // storage logs - ) - } else { - let tx_source = TxListSource { - transactions: vec![tx_raw].into(), - }; - let batch_output = forward_system::run::run_batch( - batch_context, - storage_commitment, - // FIXME - tree.clone(), - preimage_source.clone(), - tx_source.clone(), - ) - .unwrap(); - - if let Some(zkos_path) = zkos_path { - let result = zkos_api::run_batch_generate_witness( - batch_context, - tree.clone(), - preimage_source.clone(), - tx_source, - storage_commitment, - &zkos_path, - ); - - witness = Some(result.iter().map(|x| x.to_be_bytes()).flatten().collect()); - //set_batch_witness(batch_env.number.0, witness); - } - - let mut storage_ptr = storage.borrow_mut(); - - let mut storage_logs = vec![]; - - // apply storage writes.. - for write in batch_output.storage_writes { - let storage_key = StorageKey::new( - AccountTreeId::new(Address::from_slice(&write.account.to_be_bytes_vec())), - H256::from(write.account_key.as_u8_array_ref()), - ); - let storage_value = H256::from(write.value.as_u8_array_ref()); - let prev_value = storage_ptr.set_value(storage_key, storage_value); - - let storage_log = StorageLog { - // FIXME - should distinguish between initial write and repeated write. - kind: zksync_types::StorageLogKind::InitialWrite, - key: storage_key, - value: storage_value, - }; - storage_logs.push(StorageLogWithPreviousValue { - log: storage_log, - previous_value: prev_value, - }); - } - let mut f_deps = HashMap::new(); - - for factory_dep in batch_output.published_preimages { - f_deps.insert(bytes32_to_h256(factory_dep.0), factory_dep.1); - } - - (batch_output.tx_results[0].clone(), f_deps, storage_logs) - }; - - let (tx_output, gas_refunded) = match output.as_ref() { - Ok(tx_output) => match &tx_output.execution_result { - forward_system::run::ExecutionResult::Success(output) => match &output { - forward_system::run::ExecutionOutput::Call(data) => (data, tx_output.gas_refunded), - forward_system::run::ExecutionOutput::Create(data, _) => { - (data, tx_output.gas_refunded) - } - }, - forward_system::run::ExecutionResult::Revert(data) => { - return ( - VmExecutionResultAndLogs { - result: ExecutionResult::Revert { - output: VmRevertReason::General { - msg: "Transaction reverted".to_string(), - data: data.clone(), - }, - }, - logs: Default::default(), - statistics: Default::default(), - refunds: Refunds { - gas_refunded: tx_output.gas_refunded, - operator_suggested_refund: tx_output.gas_refunded, - }, - dynamic_factory_deps: Default::default(), - }, - witness, - ) - } - }, - Err(invalid_tx) => { - return ( - VmExecutionResultAndLogs { - result: ExecutionResult::Revert { - output: VmRevertReason::General { - msg: format!("{:?}", invalid_tx), - data: vec![], - }, - }, - logs: Default::default(), - statistics: Default::default(), - refunds: Default::default(), - dynamic_factory_deps: Default::default(), - }, - witness, - ) - } - }; - - ( - VmExecutionResultAndLogs { - result: ExecutionResult::Success { - output: tx_output.clone(), - }, - logs: VmExecutionLogs { - storage_logs, - events: Default::default(), - user_l2_to_l1_logs: Default::default(), - system_l2_to_l1_logs: Default::default(), - total_log_queries_count: Default::default(), - }, - statistics: Default::default(), - refunds: Refunds { - gas_refunded, - operator_suggested_refund: gas_refunded, - }, - dynamic_factory_deps, - }, - witness, - ) + None } pub fn zkos_get_nonce_key(account: &Address) -> StorageKey { - let nonce_manager = AccountTreeId::new(b160_to_h160(NONCE_HOLDER_HOOK_ADDRESS)); - - // The `minNonce` (used as nonce for EOAs) is stored in a mapping inside the `NONCE_HOLDER` system contract - let key = address_to_h256(account); - - StorageKey::new(nonce_manager, key) -} - -pub fn zkos_key_for_eth_balance(address: &Address) -> H256 { - address_to_h256(address) -} - -/// Create a `key` part of `StorageKey` to access the balance from ERC20 contract balances -fn zkos_key_for_erc20_balance(address: &Address) -> H256 { - let address_h256 = address_to_h256(address); - - // 20 bytes address first gets aligned to 32 bytes with index of `balanceOf` storage slot - // of default ERC20 contract and to then to 64 bytes. - let slot_index = H256::from_low_u64_be(51); - let mut bytes = [0_u8; 64]; - bytes[..32].copy_from_slice(address_h256.as_bytes()); - bytes[32..].copy_from_slice(slot_index.as_bytes()); - H256(keccak256(&bytes)) -} - -pub fn zkos_storage_key_for_standard_token_balance( - token_contract: AccountTreeId, - address: &Address, -) -> StorageKey { - // We have different implementation of the standard ERC20 contract and native - // eth contract. The key for the balance is different for each. - let key = if token_contract.address() == &b160_to_h160(NOMINAL_TOKEN_BALANCE_STORAGE_ADDRESS) { - zkos_key_for_eth_balance(address) - } else { - zkos_key_for_erc20_balance(address) - }; - - StorageKey::new(token_contract, key) + todo!() } pub fn zkos_storage_key_for_eth_balance(address: &Address) -> StorageKey { - zkos_storage_key_for_standard_token_balance( - AccountTreeId::new(b160_to_h160(NOMINAL_TOKEN_BALANCE_STORAGE_ADDRESS)), - address, - ) + todo!(); } pub struct ZKOsVM { pub storage: StoragePtr, - pub tree: InMemoryTree, - preimage: InMemoryPreimageSource, - transactions: Vec, - system_env: SystemEnv, - batch_env: L1BatchEnv, - config: ZKOSConfig, - witness: Option>, + _phantom: std::marker::PhantomData, } @@ -516,26 +42,12 @@ impl ZKOsVM { raw_storage: &InMemoryStorage, config: &ZKOSConfig, ) -> Self { - let (tree, preimage) = { create_tree_from_full_state(raw_storage) }; - ZKOsVM { - storage, - tree, - preimage, - transactions: vec![], - system_env, - batch_env, - witness: None, - config: config.clone(), - _phantom: Default::default(), - } + todo!() } /// If any keys are updated in storage externally, but not reflected in internal tree. pub fn update_inconsistent_keys(&mut self, inconsistent_nodes: &[&StorageKey]) { - for key in inconsistent_nodes { - let value = self.storage.borrow_mut().read_value(key); - add_elem_to_tree(&mut self.tree, key, &value); - } + todo!() } } @@ -571,10 +83,7 @@ impl VmInterface for ZKOsVM { &mut self, tx: Transaction, ) -> zksync_multivm::interface::PushTransactionResult<'_> { - self.transactions.push(tx); - PushTransactionResult { - compressed_bytecodes: Default::default(), - } + todo!() } fn inspect( @@ -582,52 +91,7 @@ impl VmInterface for ZKOsVM { _dispatcher: &mut Self::TracerDispatcher, execution_mode: zksync_multivm::interface::InspectExecutionMode, ) -> VmExecutionResultAndLogs { - if let InspectExecutionMode::Bootloader = execution_mode { - // This is called at the end of seal block. - // Now is the moment to collect the witness and store it. - - // TODO: add support for multiple transactions. - - if let Some(witness) = self.witness.clone() { - set_batch_witness(self.batch_env.number.0, witness); - } - - return VmExecutionResultAndLogs { - result: ExecutionResult::Success { output: vec![] }, - logs: Default::default(), - statistics: Default::default(), - refunds: Default::default(), - dynamic_factory_deps: Default::default(), - }; - } - let simulate_only = match self.system_env.execution_mode { - TxExecutionMode::VerifyExecute => false, - TxExecutionMode::EstimateFee => true, - TxExecutionMode::EthCall => true, - }; - - // For now we only support one transaction. - assert_eq!( - 1, - self.transactions.len(), - "only one tx per batch supported for now" - ); - - // TODO: add support for multiple transactions. - let tx = self.transactions[0].clone(); - let (result, witness) = execute_tx_in_zkos( - &tx, - &self.tree, - &self.preimage, - &mut self.storage, - simulate_only, - &self.batch_env, - self.system_env.chain_id.as_u64(), - self.config.zkos_bin_path.clone(), - ); - - self.witness = witness; - result + todo!() } fn start_new_l2_block(&mut self, _l2_block_env: zksync_multivm::interface::L2BlockEnv) { diff --git a/rust-toolchain.toml b/rust-toolchain.toml index d456bdf6..73cb934d 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2024-11-12" +channel = "stable" components = ["rustfmt", "clippy"]