diff --git a/Cargo.lock b/Cargo.lock index 4be9824e..f7d5622c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -42,6 +42,17 @@ dependencies = [ "libc", ] +[[package]] +name = "ark-std" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" +dependencies = [ + "colored", + "num-traits", + "rand", +] + [[package]] name = "array-init" version = "2.1.0" @@ -284,8 +295,9 @@ checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "bus-mapping" version = "0.1.0" -source = "git+https://github.com/smtmfft/zkevm-circuits.git?branch=feature/root-circuit#5079e0b52ec881d1b6bbc9ae8ef48b879c92404d" +source = "git+https://github.com/smtmfft/zkevm-circuits.git?branch=feature/root-circuit#f01e930651c46c0cf261a0cdb8f1302d274a4a6e" dependencies = [ + "ark-std", "eth-types", "ethers-core", "ethers-providers", @@ -299,6 +311,7 @@ dependencies = [ "serde_json", "strum", "strum_macros", + "tokio", ] [[package]] @@ -371,9 +384,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.1.7" +version = "4.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f3061d6db6d8fcbbd4b05e057f2acace52e64e96b498c08c2d7a4e65addd340" +checksum = "c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5" dependencies = [ "bitflags", "clap_derive", @@ -386,9 +399,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.1.7" +version = "4.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34d122164198950ba84a918270a3bb3f7ededd25e15f7451673d986f55bd2667" +checksum = "44bec8e5c9d09e439c4335b1af0abaab56dcf3b94999a936e1bb47b9134288f0" dependencies = [ "heck", "proc-macro-error", @@ -473,6 +486,17 @@ dependencies = [ "thiserror", ] +[[package]] +name = "colored" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" +dependencies = [ + "atty", + "lazy_static", + "winapi", +] + [[package]] name = "const-oid" version = "0.9.2" @@ -530,9 +554,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" dependencies = [ "cfg-if", "crossbeam-utils", @@ -540,9 +564,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -551,9 +575,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.13" +version = "0.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" dependencies = [ "autocfg", "cfg-if", @@ -564,9 +588,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" dependencies = [ "cfg-if", ] @@ -866,6 +890,25 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "enr" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "492a7e5fc2504d5fdce8e124d3e263b244a68b283cac67a69eda0cd43e0aebad" +dependencies = [ + "base64 0.13.1", + "bs58", + "bytes", + "hex", + "k256", + "log", + "rand", + "rlp", + "serde", + "sha3 0.10.6", + "zeroize", +] + [[package]] name = "env_logger" version = "0.9.3" @@ -925,7 +968,7 @@ dependencies = [ [[package]] name = "eth-types" version = "0.1.0" -source = "git+https://github.com/smtmfft/zkevm-circuits.git?branch=feature/root-circuit#5079e0b52ec881d1b6bbc9ae8ef48b879c92404d" +source = "git+https://github.com/smtmfft/zkevm-circuits.git?branch=feature/root-circuit#f01e930651c46c0cf261a0cdb8f1302d274a4a6e" dependencies = [ "ethers-core", "ethers-signers", @@ -997,9 +1040,9 @@ dependencies = [ [[package]] name = "ethers-core" -version = "1.0.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade3e9c97727343984e1ceada4fdab11142d2ee3472d2c67027d56b1251d4f15" +checksum = "94573efbaddb420037ffc2be6540d86ec17efd715ae8c1b4792ac6d6865b157f" dependencies = [ "arrayvec", "bytes", @@ -1008,8 +1051,10 @@ dependencies = [ "elliptic-curve", "ethabi", "generic-array 0.14.6", + "getrandom", "hex", "k256", + "num_enum", "open-fastrlp", "proc-macro2", "rand", @@ -1019,6 +1064,7 @@ dependencies = [ "serde_json", "strum", "syn", + "tempfile", "thiserror", "tiny-keccak", "unicode-xid", @@ -1026,13 +1072,14 @@ dependencies = [ [[package]] name = "ethers-providers" -version = "1.0.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a9e0597aa6b2fdc810ff58bc95e4eeaa2c219b3e615ed025106ecb027407d8" +checksum = "585c96fbae569931aa0fab963a010d4c98d2757028ec840809b98032d9543d18" dependencies = [ "async-trait", "auto_impl", - "base64 0.13.1", + "base64 0.21.0", + "enr", "ethers-core", "futures-channel", "futures-core", @@ -1063,9 +1110,9 @@ dependencies = [ [[package]] name = "ethers-signers" -version = "1.0.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f41ced186867f64773db2e55ffdd92959e094072a1d09a5e5e831d443204f98" +checksum = "52b8308a63f1c00ecf001a75c9b192499d87324c310c6fd9e772d20bdfbf366b" dependencies = [ "async-trait", "coins-bip32", @@ -1077,12 +1124,13 @@ dependencies = [ "rand", "sha2 0.10.6", "thiserror", + "tracing", ] [[package]] name = "external-tracer" version = "0.1.0" -source = "git+https://github.com/smtmfft/zkevm-circuits.git?branch=feature/root-circuit#5079e0b52ec881d1b6bbc9ae8ef48b879c92404d" +source = "git+https://github.com/smtmfft/zkevm-circuits.git?branch=feature/root-circuit#f01e930651c46c0cf261a0cdb8f1302d274a4a6e" dependencies = [ "eth-types", "geth-utils", @@ -1096,6 +1144,15 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + [[package]] name = "ff" version = "0.12.1" @@ -1247,7 +1304,7 @@ dependencies = [ [[package]] name = "gadgets" version = "0.1.0" -source = "git+https://github.com/smtmfft/zkevm-circuits.git?branch=feature/root-circuit#5079e0b52ec881d1b6bbc9ae8ef48b879c92404d" +source = "git+https://github.com/smtmfft/zkevm-circuits.git?branch=feature/root-circuit#f01e930651c46c0cf261a0cdb8f1302d274a4a6e" dependencies = [ "digest 0.7.6", "eth-types", @@ -1287,7 +1344,7 @@ dependencies = [ [[package]] name = "geth-utils" version = "0.1.0" -source = "git+https://github.com/smtmfft/zkevm-circuits.git?branch=feature/root-circuit#5079e0b52ec881d1b6bbc9ae8ef48b879c92404d" +source = "git+https://github.com/smtmfft/zkevm-circuits.git?branch=feature/root-circuit#f01e930651c46c0cf261a0cdb8f1302d274a4a6e" dependencies = [ "env_logger", "gobuild", @@ -1771,7 +1828,7 @@ dependencies = [ [[package]] name = "keccak256" version = "0.1.0" -source = "git+https://github.com/smtmfft/zkevm-circuits.git?branch=feature/root-circuit#5079e0b52ec881d1b6bbc9ae8ef48b879c92404d" +source = "git+https://github.com/smtmfft/zkevm-circuits.git?branch=feature/root-circuit#f01e930651c46c0cf261a0cdb8f1302d274a4a6e" dependencies = [ "env_logger", "eth-types", @@ -1902,9 +1959,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" dependencies = [ "autocfg", ] @@ -1930,7 +1987,7 @@ dependencies = [ [[package]] name = "mock" version = "0.1.0" -source = "git+https://github.com/smtmfft/zkevm-circuits.git?branch=feature/root-circuit#5079e0b52ec881d1b6bbc9ae8ef48b879c92404d" +source = "git+https://github.com/smtmfft/zkevm-circuits.git?branch=feature/root-circuit#f01e930651c46c0cf261a0cdb8f1302d274a4a6e" dependencies = [ "eth-types", "ethers-core", @@ -2891,10 +2948,10 @@ dependencies = [ ] [[package]] -name = "sha-1" -version = "0.10.1" +name = "sha1" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if", "cpufeatures", @@ -3103,6 +3160,19 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +[[package]] +name = "tempfile" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" +dependencies = [ + "cfg-if", + "fastrand", + "redox_syscall", + "rustix", + "windows-sys 0.42.0", +] + [[package]] name = "termcolor" version = "1.2.0" @@ -3185,9 +3255,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.25.0" +version = "1.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" +checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" dependencies = [ "autocfg", "bytes", @@ -3199,7 +3269,7 @@ dependencies = [ "pin-project-lite", "socket2", "tokio-macros", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -3226,9 +3296,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.17.2" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181" +checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd" dependencies = [ "futures-util", "log", @@ -3327,9 +3397,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "tungstenite" -version = "0.17.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" +checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788" dependencies = [ "base64 0.13.1", "byteorder", @@ -3339,7 +3409,7 @@ dependencies = [ "log", "rand", "rustls", - "sha-1", + "sha1", "thiserror", "url", "utf-8", @@ -3735,7 +3805,7 @@ checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" [[package]] name = "zkevm-circuits" version = "0.1.0" -source = "git+https://github.com/smtmfft/zkevm-circuits.git?branch=feature/root-circuit#5079e0b52ec881d1b6bbc9ae8ef48b879c92404d" +source = "git+https://github.com/smtmfft/zkevm-circuits.git?branch=feature/root-circuit#f01e930651c46c0cf261a0cdb8f1302d274a4a6e" dependencies = [ "array-init", "bus-mapping",