diff --git a/Cargo.lock b/Cargo.lock index 6b41015..d1b1794 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9,7 +9,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" dependencies = [ "lazy_static", - "regex 1.7.3", + "regex 1.8.1", ] [[package]] @@ -56,7 +56,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.9", "once_cell", "version_check", ] @@ -90,6 +90,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "aho-corasick" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +dependencies = [ + "memchr", +] + [[package]] name = "android_system_properties" version = "0.1.5" @@ -101,48 +110,57 @@ dependencies = [ [[package]] name = "anstream" -version = "0.2.6" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" dependencies = [ "anstyle", "anstyle-parse", + "anstyle-query", "anstyle-wincon", - "concolor-override", - "concolor-query", + "colorchoice", "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "0.3.5" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" [[package]] name = "anstyle-parse" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" dependencies = [ "utf8parse", ] +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + [[package]] name = "anstyle-wincon" -version = "0.2.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" dependencies = [ "anstyle", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "anvil" version = "0.1.0" -source = "git+https://github.com/foundry-rs/foundry#0e7ff88c276dcad195b0b0a4c038db2869ed650b" +source = "git+https://github.com/foundry-rs/foundry#e48db344378c73f4a612cb5c7614b6fff933b7f6" dependencies = [ "anvil-core", "anvil-rpc", @@ -152,7 +170,7 @@ dependencies = [ "axum", "bytes", "chrono", - "clap 4.2.1", + "clap 4.2.7", "clap_complete", "clap_complete_fig", "ctrlc", @@ -186,7 +204,7 @@ dependencies = [ [[package]] name = "anvil-core" version = "0.1.0" -source = "git+https://github.com/foundry-rs/foundry#0e7ff88c276dcad195b0b0a4c038db2869ed650b" +source = "git+https://github.com/foundry-rs/foundry#e48db344378c73f4a612cb5c7614b6fff933b7f6" dependencies = [ "bytes", "ethers-core", @@ -205,7 +223,7 @@ dependencies = [ [[package]] name = "anvil-rpc" version = "0.1.0" -source = "git+https://github.com/foundry-rs/foundry#0e7ff88c276dcad195b0b0a4c038db2869ed650b" +source = "git+https://github.com/foundry-rs/foundry#e48db344378c73f4a612cb5c7614b6fff933b7f6" dependencies = [ "serde", "serde_json", @@ -214,13 +232,13 @@ dependencies = [ [[package]] name = "anvil-server" version = "0.1.0" -source = "git+https://github.com/foundry-rs/foundry#0e7ff88c276dcad195b0b0a4c038db2869ed650b" +source = "git+https://github.com/foundry-rs/foundry#e48db344378c73f4a612cb5c7614b6fff933b7f6" dependencies = [ "anvil-rpc", "async-trait", "axum", "bytes", - "clap 4.2.1", + "clap 4.2.7", "futures", "hyper", "parity-tokio-ipc", @@ -236,9 +254,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "ariadne" @@ -436,6 +454,17 @@ dependencies = [ "tracing", ] +[[package]] +name = "ark-pallas" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e945e1c8d86aa869853944ce6ecf072c2dac623b88c94e68792901b06190e53" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-std", +] + [[package]] name = "ark-poly" version = "0.3.0" @@ -535,6 +564,18 @@ dependencies = [ "rand 0.8.5", ] +[[package]] +name = "ark-vesta" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2666857534c298a6ed92d7258f3289f66651a98948abe80aad0b599c160291c" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-pallas", + "ark-std", +] + [[package]] name = "arrayref" version = "0.3.7" @@ -573,7 +614,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2 1.0.56", "quote 1.0.26", - "syn 2.0.13", + "syn 2.0.15", ] [[package]] @@ -609,9 +650,9 @@ dependencies = [ [[package]] name = "auto_impl" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a8c1df849285fbacd587de7818cc7d13be6cd2cbcd47a04fb1801b0e2706e33" +checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89" dependencies = [ "proc-macro-error", "proc-macro2 1.0.56", @@ -702,17 +743,11 @@ dependencies = [ "cc", "cfg-if 1.0.0", "libc", - "miniz_oxide", + "miniz_oxide 0.6.2", "object", "rustc-demangle", ] -[[package]] -name = "base16ct" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" - [[package]] name = "base16ct" version = "0.2.0" @@ -823,6 +858,7 @@ checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ "funty", "radium 0.7.0", + "serde", "tap", "wyz", ] @@ -945,9 +981,9 @@ checksum = "b4ae4235e6dac0694637c763029ecea1a2ec9e4e06ec2729bd21ba4d9c863eb7" [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" [[package]] name = "byte-slice-cast" @@ -1017,9 +1053,9 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.15.3" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a1ec454bc3eead8719cb56e15dbbfecdbc14e4b3a3ae4936cc6e31f5fc0d07" +checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", @@ -1086,13 +1122,13 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.23" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", "bitflags", - "clap_derive 3.2.18", + "clap_derive 3.2.25", "clap_lex 0.2.4", "indexmap", "once_cell", @@ -1103,9 +1139,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.2.1" +version = "4.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3" +checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938" dependencies = [ "clap_builder", "clap_derive 4.2.0", @@ -1114,9 +1150,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.2.1" +version = "4.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f" +checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" dependencies = [ "anstream", "anstyle", @@ -1130,11 +1166,11 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.2.0" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c22dcfb410883764b29953103d9ef7bb8fe21b3fa1158bc99986c2067294bd" +checksum = "1a19591b2ab0e3c04b588a0e04ddde7b9eaa423646d1b4a8092879216bf47473" dependencies = [ - "clap 4.2.1", + "clap 4.2.7", ] [[package]] @@ -1143,15 +1179,15 @@ version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3af28956330989baa428ed4d3471b853715d445c62de21b67292e22cf8a41fa" dependencies = [ - "clap 4.2.1", + "clap 4.2.7", "clap_complete", ] [[package]] name = "clap_derive" -version = "3.2.18" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" dependencies = [ "heck", "proc-macro-error", @@ -1169,7 +1205,7 @@ dependencies = [ "heck", "proc-macro2 1.0.56", "quote 1.0.26", - "syn 2.0.13", + "syn 2.0.15", ] [[package]] @@ -1207,9 +1243,9 @@ dependencies = [ "bs58", "coins-core", "digest 0.10.6", - "getrandom 0.2.8", + "getrandom 0.2.9", "hmac", - "k256 0.13.0", + "k256", "lazy_static", "serde", "sha2 0.10.6", @@ -1218,21 +1254,19 @@ dependencies = [ [[package]] name = "coins-bip39" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb68f3b6c3fee83828ecd8d463f360a397c32aaeb35bd931c01e5ddf5631c69" +checksum = "84f4d04ee18e58356accd644896aeb2094ddeafb6a713e056cef0c0a8e468c15" dependencies = [ "bitvec 0.17.4", "coins-bip32", - "getrandom 0.2.8", - "hex", + "getrandom 0.2.9", "hmac", "once_cell", "pbkdf2 0.12.1", "rand 0.8.5", "sha2 0.10.6", "thiserror", - "tracing", ] [[package]] @@ -1251,10 +1285,16 @@ dependencies = [ "serde", "serde_derive", "sha2 0.10.6", - "sha3 0.10.6", + "sha3 0.10.8", "thiserror", ] +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + [[package]] name = "comfy-table" version = "6.1.4" @@ -1267,21 +1307,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "concolor-override" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" - -[[package]] -name = "concolor-query" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" -dependencies = [ - "windows-sys 0.45.0", -] - [[package]] name = "console" version = "0.14.1" @@ -1291,7 +1316,7 @@ dependencies = [ "encode_unicode", "lazy_static", "libc", - "regex 1.7.3", + "regex 1.8.1", "terminal_size 0.1.17", "unicode-width", "winapi", @@ -1323,12 +1348,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "convert_case" -version = "0.6.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" -dependencies = [ - "unicode-segmentation", -] +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "core-foundation-sys" @@ -1338,9 +1360,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181" +checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" dependencies = [ "libc", ] @@ -1365,9 +1387,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -1439,21 +1461,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-bigint" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" -dependencies = [ - "generic-array 0.14.7", - "rand_core 0.6.4", - "subtle 2.4.1", - "zeroize", -] - -[[package]] -name = "crypto-bigint" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2538c4e68e52548bacb3e83ac549f903d44f011ac9d5abb5e132e67d0808f7" +checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" dependencies = [ "generic-array 0.14.7", "rand_core 0.6.4", @@ -1491,27 +1501,6 @@ dependencies = [ "subtle 2.4.1", ] -[[package]] -name = "csv" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad" -dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" -dependencies = [ - "memchr", -] - [[package]] name = "ctr" version = "0.9.2" @@ -1555,7 +1544,7 @@ dependencies = [ "proc-macro2 1.0.56", "quote 1.0.26", "scratch", - "syn 2.0.13", + "syn 2.0.15", ] [[package]] @@ -1572,23 +1561,14 @@ checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" dependencies = [ "proc-macro2 1.0.56", "quote 1.0.26", - "syn 2.0.13", + "syn 2.0.15", ] [[package]] name = "der" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" -dependencies = [ - "const-oid", -] - -[[package]] -name = "der" -version = "0.7.1" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc906908ea6458456e5eaa160a9c08543ec3d1e6f71e2235cedd660cb65f9df0" +checksum = "05e58dffcdcc8ee7b22f0c1f71a69243d7c2d9ad87b5a14361f2424a1565c219" dependencies = [ "const-oid", "zeroize", @@ -1611,8 +1591,10 @@ version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ + "convert_case", "proc-macro2 1.0.56", "quote 1.0.26", + "rustc_version 0.4.0", "syn 1.0.109", ] @@ -1659,6 +1641,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer 0.10.4", + "const-oid", "crypto-common", "subtle 2.4.1", ] @@ -1686,39 +1669,28 @@ dependencies = [ [[package]] name = "dunce" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c" - -[[package]] -name = "ecdsa" -version = "0.14.8" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" -dependencies = [ - "der 0.6.1", - "elliptic-curve 0.12.3", - "rfc6979 0.3.1", - "signature 1.6.4", -] +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "ecdsa" -version = "0.16.2" +version = "0.16.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "644d3b8674a5fc5b929ae435bca85c2323d85ccb013a5509c2ac9ee11a6284ba" +checksum = "a48e5d537b8a30c0b023116d981b16334be1485af7ca68db3a2b7024cbc957fd" dependencies = [ - "der 0.7.1", - "elliptic-curve 0.13.2", - "rfc6979 0.4.0", - "signature 2.0.0", + "der", + "digest 0.10.6", + "elliptic-curve", + "rfc6979", + "signature", ] [[package]] name = "educe" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0188e3c3ba8df5753894d54461f0e39bc91741dc5b22e1c46999ec2c71f4e4" +checksum = "079044df30bb07de7d846d41a184c4b00e66ebdac93ee459253474f3a47e50ae" dependencies = [ "enum-ordinalize", "proc-macro2 1.0.56", @@ -1734,38 +1706,19 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "elliptic-curve" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" -dependencies = [ - "base16ct 0.1.1", - "crypto-bigint 0.4.9", - "der 0.6.1", - "digest 0.10.6", - "ff 0.12.1", - "generic-array 0.14.7", - "group 0.12.1", - "rand_core 0.6.4", - "sec1 0.3.0", - "subtle 2.4.1", - "zeroize", -] - -[[package]] -name = "elliptic-curve" -version = "0.13.2" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea5a92946e8614bb585254898bb7dd1ddad241ace60c52149e3765e34cc039d" +checksum = "75c71eaa367f2e5d556414a8eea812bc62985c879748d6403edabd9cb03f16e7" dependencies = [ - "base16ct 0.2.0", - "crypto-bigint 0.5.1", + "base16ct", + "crypto-bigint", "digest 0.10.6", - "ff 0.13.0", + "ff", "generic-array 0.14.7", - "group 0.13.0", + "group", "pkcs8", "rand_core 0.6.4", - "sec1 0.7.1", + "sec1", "subtle 2.4.1", "zeroize", ] @@ -1796,19 +1749,19 @@ dependencies = [ [[package]] name = "enr" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb4d5fbf6f56acecd38f5988eb2e4ae412008a2a30268c748c701ec6322f39d4" +checksum = "cf56acd72bb22d2824e66ae8e9e5ada4d0de17a69c7fd35569dde2ada8ec9116" dependencies = [ "base64 0.13.1", "bytes", "hex", - "k256 0.13.0", + "k256", "log", "rand 0.8.5", "rlp", "serde", - "sha3 0.10.6", + "sha3 0.10.8", "zeroize", ] @@ -1826,15 +1779,26 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "enumn" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48016319042fb7c87b78d2993084a831793a897a5cd1a2a67cab9d1eeb4b7d76" +dependencies = [ + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.15", +] + [[package]] name = "errno" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -1864,7 +1828,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.6", - "sha3 0.10.6", + "sha3 0.10.8", "thiserror", "uuid", ] @@ -1878,10 +1842,10 @@ dependencies = [ "ethereum-types 0.13.1", "hex", "once_cell", - "regex 1.7.3", + "regex 1.8.1", "serde", "serde_json", - "sha3 0.10.6", + "sha3 0.10.8", "thiserror", "uint", ] @@ -1895,10 +1859,10 @@ dependencies = [ "ethereum-types 0.14.1", "hex", "once_cell", - "regex 1.7.3", + "regex 1.8.1", "serde", "serde_json", - "sha3 0.10.6", + "sha3 0.10.8", "thiserror", "uint", ] @@ -1976,9 +1940,9 @@ dependencies = [ [[package]] name = "ethers" -version = "2.0.2" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697aba1bec98cb86e7bebd69f9bb365218871464137af9e93e7a72bd6dc421d0" +checksum = "8d5486fdc149826f38c388f26a7df72534ee3f20d3a3f72539376fa7b3bbc43d" dependencies = [ "ethers-addressbook", "ethers-contract", @@ -1992,9 +1956,9 @@ dependencies = [ [[package]] name = "ethers-addressbook" -version = "2.0.2" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0b603812e5e4d63521c691cbc1f34743879e96a1ee96c6594639d7fa0cf6fbc" +checksum = "1c66a426b824a0f6d1361ad74b6b01adfd26c44ee1e14c3662dcf28406763ec5" dependencies = [ "ethers-core", "once_cell", @@ -2004,9 +1968,9 @@ dependencies = [ [[package]] name = "ethers-contract" -version = "2.0.2" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4e8ed7c2b2a22e07b65ae0eb426c948a7448f1be15c66e4813e02c423751fc9" +checksum = "dfa43e2e69632492d7b38e59465d125a0066cf4c477390ece00d3acbd11b338b" dependencies = [ "ethers-contract-abigen", "ethers-contract-derive", @@ -2023,25 +1987,25 @@ dependencies = [ [[package]] name = "ethers-contract-abigen" -version = "2.0.2" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf0984f4ec4e267fd27b7c9fa2f73e72c5c98491a73f777290654154d104f723" +checksum = "2edb8fdbf77459819a443234b461171a024476bfc12f1853b889a62c6e1185ff" dependencies = [ "Inflector", "dunce", "ethers-core", "ethers-etherscan", "eyre", - "getrandom 0.2.8", + "getrandom 0.2.9", "hex", "prettyplease", "proc-macro2 1.0.56", "quote 1.0.26", - "regex 1.7.3", + "regex 1.8.1", "reqwest", "serde", "serde_json", - "syn 1.0.109", + "syn 2.0.15", "tokio", "toml 0.7.3", "url", @@ -2050,45 +2014,45 @@ dependencies = [ [[package]] name = "ethers-contract-derive" -version = "2.0.2" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914e9211077a1b590af1ee6b8dfbd54515c808119546c95da69479908dc3d4de" +checksum = "939b0c37746929f869285ee37d270b7c998d80cc7404c2e20dda8efe93e3b295" dependencies = [ + "Inflector", "ethers-contract-abigen", "ethers-core", "hex", "proc-macro2 1.0.56", "quote 1.0.26", - "syn 1.0.109", + "serde_json", + "syn 2.0.15", ] [[package]] name = "ethers-core" -version = "2.0.2" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40bf114f1017ace0f622f1652f59c2c5e1abfe7d88891cca0c43da979b351de0" +checksum = "198ea9efa8480fa69f73d31d41b1601dace13d053c6fe4be6f5878d9dfcf0108" dependencies = [ "arrayvec 0.7.2", "bytes", "cargo_metadata", "chrono", - "convert_case", - "elliptic-curve 0.13.2", + "elliptic-curve", "ethabi 18.0.0", "generic-array 0.14.7", - "getrandom 0.2.8", + "getrandom 0.2.9", "hex", - "k256 0.13.0", + "k256", "num_enum", "once_cell", "open-fastrlp", - "proc-macro2 1.0.56", "rand 0.8.5", "rlp", "serde", "serde_json", "strum", - "syn 1.0.109", + "syn 2.0.15", "tempfile", "thiserror", "tiny-keccak", @@ -2097,13 +2061,13 @@ dependencies = [ [[package]] name = "ethers-etherscan" -version = "2.0.2" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8920b59cf81e357df2c8102d6a9dc81c2d68f7409543ff3b6868851ecf007807" +checksum = "196a21d6939ab78b7a1e4c45c2b33b0c2dd821a2e1af7c896f06721e1ba2a0c7" dependencies = [ "ethers-core", "ethers-solc", - "getrandom 0.2.8", + "getrandom 0.2.9", "reqwest", "semver 1.0.17", "serde", @@ -2114,9 +2078,9 @@ dependencies = [ [[package]] name = "ethers-middleware" -version = "2.0.2" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54b30f67c1883ed68bd38aedbdd321831382c12e1b95089c8261c79bb85e4da" +checksum = "75594cc450992fc7de701c9145de612325fd8a18be765b8ae78767ba2b74876f" dependencies = [ "async-trait", "auto_impl", @@ -2141,9 +2105,9 @@ dependencies = [ [[package]] name = "ethers-providers" -version = "2.0.2" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2fa0857eaad0c1678f982a2f4cfbe33ebd51d273cc93de0182b7c693f2a84a1" +checksum = "1009041f40476b972b5d79346cc512e97c662b1a0a2f78285eabe9a122909783" dependencies = [ "async-trait", "auto_impl", @@ -2155,7 +2119,7 @@ dependencies = [ "futures-core", "futures-timer", "futures-util", - "getrandom 0.2.8", + "getrandom 0.2.9", "hashers", "hex", "http", @@ -2180,14 +2144,14 @@ dependencies = [ [[package]] name = "ethers-signers" -version = "2.0.2" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5caa7cad4f444931d0ed45818e609847781582399eff0be5c089e8666475c7fb" +checksum = "c3bd11ad6929f01f01be74bb00d02bbd6552f22de030865c898b340a3a592db1" dependencies = [ "async-trait", "coins-bip32", "coins-bip39", - "elliptic-curve 0.13.2", + "elliptic-curve", "eth-keystore", "ethers-core", "hex", @@ -2199,15 +2163,15 @@ dependencies = [ [[package]] name = "ethers-solc" -version = "2.0.2" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "139542f51f4c405d0dd7e97c34232140a14e8744d1cf121777355567187259e4" +checksum = "2284784306de73d8ad1bc792ecc1b87da0268185683698d60fd096d23d168c99" dependencies = [ "cfg-if 1.0.0", "dunce", "ethers-core", "futures-util", - "getrandom 0.2.8", + "getrandom 0.2.9", "glob", "hex", "home", @@ -2216,7 +2180,7 @@ dependencies = [ "once_cell", "path-slash", "rayon", - "regex 1.7.3", + "regex 1.8.1", "semver 1.0.17", "serde", "serde_json", @@ -2312,16 +2276,6 @@ dependencies = [ "libc", ] -[[package]] -name = "ff" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" -dependencies = [ - "rand_core 0.6.4", - "subtle 2.4.1", -] - [[package]] name = "ff" version = "0.13.0" @@ -2416,12 +2370,12 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.7.1", ] [[package]] @@ -2433,7 +2387,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "forge" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry#0e7ff88c276dcad195b0b0a4c038db2869ed650b" +source = "git+https://github.com/foundry-rs/foundry#e48db344378c73f4a612cb5c7614b6fff933b7f6" dependencies = [ "comfy-table", "ethers", @@ -2448,7 +2402,7 @@ dependencies = [ "parking_lot", "proptest", "rayon", - "regex 1.7.3", + "regex 1.8.1", "rlp", "semver 1.0.17", "serde", @@ -2462,7 +2416,7 @@ dependencies = [ [[package]] name = "forge-fmt" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry#0e7ff88c276dcad195b0b0a4c038db2869ed650b" +source = "git+https://github.com/foundry-rs/foundry#e48db344378c73f4a612cb5c7614b6fff933b7f6" dependencies = [ "ariadne", "ethers-core", @@ -2471,6 +2425,7 @@ dependencies = [ "semver 1.0.17", "solang-parser", "thiserror", + "tracing", ] [[package]] @@ -2485,9 +2440,9 @@ dependencies = [ [[package]] name = "foundry-common" version = "0.1.0" -source = "git+https://github.com/foundry-rs/foundry#0e7ff88c276dcad195b0b0a4c038db2869ed650b" +source = "git+https://github.com/foundry-rs/foundry#e48db344378c73f4a612cb5c7614b6fff933b7f6" dependencies = [ - "clap 4.2.1", + "clap 4.2.7", "comfy-table", "dunce", "ethers-core", @@ -2499,7 +2454,7 @@ dependencies = [ "foundry-config", "is-terminal", "once_cell", - "regex 1.7.3", + "regex 1.8.1", "reqwest", "semver 1.0.17", "serde", @@ -2514,7 +2469,7 @@ dependencies = [ [[package]] name = "foundry-config" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry#0e7ff88c276dcad195b0b0a4c038db2869ed650b" +source = "git+https://github.com/foundry-rs/foundry#e48db344378c73f4a612cb5c7614b6fff933b7f6" dependencies = [ "Inflector", "dirs-next", @@ -2528,7 +2483,7 @@ dependencies = [ "once_cell", "open-fastrlp", "path-slash", - "regex 1.7.3", + "regex 1.8.1", "reqwest", "semver 1.0.17", "serde", @@ -2543,7 +2498,7 @@ dependencies = [ [[package]] name = "foundry-evm" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry#0e7ff88c276dcad195b0b0a4c038db2869ed650b" +source = "git+https://github.com/foundry-rs/foundry#e48db344378c73f4a612cb5c7614b6fff933b7f6" dependencies = [ "auto_impl", "bytes", @@ -2569,13 +2524,14 @@ dependencies = [ "tokio", "tracing", "url", + "walkdir", "yansi", ] [[package]] name = "foundry-macros" version = "0.1.0" -source = "git+https://github.com/foundry-rs/foundry#0e7ff88c276dcad195b0b0a4c038db2869ed650b" +source = "git+https://github.com/foundry-rs/foundry#e48db344378c73f4a612cb5c7614b6fff933b7f6" dependencies = [ "ethers-core", "foundry-common", @@ -2585,17 +2541,17 @@ dependencies = [ [[package]] name = "foundry-macros-impl" version = "0.0.0" -source = "git+https://github.com/foundry-rs/foundry#0e7ff88c276dcad195b0b0a4c038db2869ed650b" +source = "git+https://github.com/foundry-rs/foundry#e48db344378c73f4a612cb5c7614b6fff933b7f6" dependencies = [ "proc-macro2 1.0.56", "quote 1.0.26", - "syn 2.0.13", + "syn 2.0.15", ] [[package]] name = "foundry-utils" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry#0e7ff88c276dcad195b0b0a4c038db2869ed650b" +source = "git+https://github.com/foundry-rs/foundry#e48db344378c73f4a612cb5c7614b6fff933b7f6" dependencies = [ "ethers-addressbook", "ethers-contract", @@ -2710,7 +2666,7 @@ version = "0.1.0" dependencies = [ "anvil", "anyhow", - "clap 4.2.1", + "clap 4.2.7", "ethers", "fusion-api", "fusion-config", @@ -2743,7 +2699,7 @@ version = "0.1.0" dependencies = [ "anyhow", "babyjubjub-rs", - "clap 4.2.1", + "clap 4.2.7", "ethers-core", "fusion-api", "fusion-config", @@ -2819,7 +2775,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2 1.0.56", "quote 1.0.26", - "syn 2.0.13", + "syn 2.0.15", ] [[package]] @@ -2904,9 +2860,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -2923,9 +2879,9 @@ checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" [[package]] name = "git2" -version = "0.16.1" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc" +checksum = "8b7905cdfe33d31a88bb2e8419ddd054451f5432d1da9eaf2ac7804ee1ea12d5" dependencies = [ "bitflags", "libc", @@ -2950,7 +2906,7 @@ dependencies = [ "bstr", "fnv", "log", - "regex 1.7.3", + "regex 1.8.1", ] [[package]] @@ -2965,33 +2921,22 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "group" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" -dependencies = [ - "ff 0.12.1", - "rand_core 0.6.4", - "subtle 2.4.1", -] - [[package]] name = "group" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ - "ff 0.13.0", + "ff", "rand_core 0.6.4", "subtle 2.4.1", ] [[package]] name = "h2" -version = "0.3.16" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" +checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" dependencies = [ "bytes", "fnv", @@ -3103,6 +3048,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" @@ -3114,11 +3065,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747309b4b440c06d57b0b25f2aee03ee9b5e5397d288c60e21fc709bb98a7408" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -3169,9 +3120,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.25" +version = "0.14.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" +checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" dependencies = [ "bytes", "futures-channel", @@ -3206,9 +3157,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.54" +version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c17cc76786e99f8d2f055c11159e7f0091c42474dcc3189fbab96072e873e6d" +checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -3310,7 +3261,7 @@ dependencies = [ "console 0.15.5", "lazy_static", "number_prefix", - "regex 1.7.3", + "regex 1.8.1", ] [[package]] @@ -3339,13 +3290,13 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" dependencies = [ "hermit-abi 0.3.1", "libc", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -3356,14 +3307,14 @@ checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" [[package]] name = "is-terminal" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ "hermit-abi 0.3.1", "io-lifetimes", "rustix", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -3421,36 +3372,23 @@ dependencies = [ [[package]] name = "k256" -version = "0.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b" -dependencies = [ - "cfg-if 1.0.0", - "ecdsa 0.14.8", - "elliptic-curve 0.12.3", - "sha2 0.10.6", - "sha3 0.10.6", -] - -[[package]] -name = "k256" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955890845095ccf31ef83ad41a05aabb4d8cc23dc3cac5a9f5c89cf26dd0da75" +checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc" dependencies = [ "cfg-if 1.0.0", - "ecdsa 0.16.2", - "elliptic-curve 0.13.2", + "ecdsa", + "elliptic-curve", "once_cell", "sha2 0.10.6", - "signature 2.0.0", + "signature", ] [[package]] name = "keccak" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" +checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" dependencies = [ "cpufeatures", ] @@ -3468,9 +3406,9 @@ dependencies = [ [[package]] name = "lalrpop" -version = "0.19.9" +version = "0.19.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f34313ec00c2eb5c3c87ca6732ea02dcf3af99c3ff7a8fb622ffb99c9d860a87" +checksum = "0a1cbf952127589f2851ab2046af368fd20645491bb4b376f04b7f94d7a9837b" dependencies = [ "ascii-canvas", "bit-set", @@ -3480,8 +3418,7 @@ dependencies = [ "itertools 0.10.5", "lalrpop-util", "petgraph", - "pico-args", - "regex 1.7.3", + "regex 1.8.1", "regex-syntax 0.6.29", "string_cache", "term", @@ -3491,11 +3428,11 @@ dependencies = [ [[package]] name = "lalrpop-util" -version = "0.19.9" +version = "0.19.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5c1f7869c94d214466c5fd432dfed12c379fd87786768d36455892d46b18edd" +checksum = "d3c48237b9604c5a4702de6b824e02006c3214327564636aef27c1028a8fa0ed" dependencies = [ - "regex 1.7.3", + "regex 1.8.1", ] [[package]] @@ -3509,15 +3446,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.140" +version = "0.2.142" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" [[package]] name = "libgit2-sys" -version = "0.14.2+1.5.1" +version = "0.15.1+1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" +checksum = "fb4577bde8cdfc7d6a2a4bcb7b049598597de33ffd337276e9c7db6cd4a2cee7" dependencies = [ "cc", "libc", @@ -3533,9 +3470,9 @@ checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" [[package]] name = "libz-sys" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" +checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" dependencies = [ "cc", "libc", @@ -3554,9 +3491,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.3.1" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" +checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" [[package]] name = "lock_api" @@ -3648,6 +3585,15 @@ dependencies = [ "adler", ] +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + [[package]] name = "mio" version = "0.8.6" @@ -3816,23 +3762,23 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.11" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.11" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.56", "quote 1.0.26", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] @@ -3914,9 +3860,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13a384337e997e6860ffbaa83708b2ef329fd8c54cb67a5f64d421e0f943254f" +checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213" dependencies = [ "num-traits 0.2.15", ] @@ -3946,9 +3892,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "637935964ff85a605d114591d4d2c13c5d1ba2806dae97cea6bf180238a749ac" +checksum = "5ddb756ca205bd108aee3c62c6d3c994e1df84a59b9d6d4a5ea42ee1fd5a9a28" dependencies = [ "arrayvec 0.7.2", "bitvec 1.0.1", @@ -4097,7 +4043,7 @@ dependencies = [ "proc-macro2 1.0.56", "proc-macro2-diagnostics", "quote 1.0.26", - "syn 2.0.13", + "syn 2.0.15", ] [[package]] @@ -4108,9 +4054,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.5.7" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1403e8401ad5dedea73c626b99758535b342502f8d1e361f4a2dd952749122" +checksum = "cb779fcf4bb850fbbb0edc96ff6cf34fd90c4b1a112ce042653280d9a7364048" dependencies = [ "thiserror", "ucd-trie", @@ -4131,9 +4077,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.5.7" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be99c4c1d2fc2769b1d00239431d711d08f6efedcecb8b6e30707160aee99c15" +checksum = "502b62a6d0245378b04ffe0a7fb4f4419a4815fce813bd8a0ec89a56e07d67b1" dependencies = [ "pest", "pest_generator", @@ -4141,26 +4087,26 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.7" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e56094789873daa36164de2e822b3888c6ae4b4f9da555a1103587658c805b1e" +checksum = "451e629bf49b750254da26132f1a5a9d11fd8a95a3df51d15c4abd1ba154cb6c" dependencies = [ "pest", "pest_meta", "proc-macro2 1.0.56", "quote 1.0.26", - "syn 2.0.13", + "syn 1.0.109", ] [[package]] name = "pest_meta" -version = "2.5.7" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6733073c7cff3d8459fda0e42f13a047870242aed8b509fe98000928975f359e" +checksum = "bcec162c71c45e269dfc3fc2916eaeb97feab22993a21bcce4721d08cd7801a6" dependencies = [ "once_cell", "pest", - "sha2 0.10.6", + "sha1", ] [[package]] @@ -4234,12 +4180,6 @@ dependencies = [ "siphasher", ] -[[package]] -name = "pico-args" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468" - [[package]] name = "pin-project" version = "1.0.12" @@ -4274,19 +4214,19 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkcs8" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d2820d87d2b008616e5c27212dd9e0e694fb4c6b522de06094106813328cb49" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ - "der 0.7.1", + "der", "spki", ] [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "poseidon-rs" @@ -4313,12 +4253,12 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "prettyplease" -version = "0.1.25" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" +checksum = "1ceca8aaf45b5c46ec7ed39fff75f57290368c1846d33d24a122ca81416ab058" dependencies = [ "proc-macro2 1.0.56", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] @@ -4408,7 +4348,7 @@ checksum = "606c4ba35817e2922a308af55ad51bab3645b59eae5c570d4a6cf07e36bd493b" dependencies = [ "proc-macro2 1.0.56", "quote 1.0.26", - "syn 2.0.13", + "syn 2.0.15", "version_check", "yansi", ] @@ -4563,7 +4503,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.9", ] [[package]] @@ -4639,17 +4579,11 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.9", "redox_syscall 0.2.16", "thiserror", ] -[[package]] -name = "reduce" -version = "0.1.5+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feff7c275fbc4a96ccdc240a5a180487a61a31baffaff6cdd4fb2c8e9e0a2ecd" - [[package]] name = "reference-trie" version = "0.25.0" @@ -4679,13 +4613,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.3" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" dependencies = [ - "aho-corasick 0.7.20", + "aho-corasick 1.0.1", "memchr", - "regex-syntax 0.6.29", + "regex-syntax 0.7.1", ] [[package]] @@ -4712,11 +4646,17 @@ version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +[[package]] +name = "regex-syntax" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" + [[package]] name = "reqwest" -version = "0.11.16" +version = "0.11.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" +checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91" dependencies = [ "base64 0.21.0", "bytes", @@ -4753,50 +4693,66 @@ dependencies = [ [[package]] name = "revm" -version = "2.3.1" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73d84c8f9836efb0f5f5f8de4700a953c4e1f3119e5cfcb0aad8e5be73daf991" +checksum = "f293f351c4c203d321744e54ed7eed3d2b6eef4c140228910dde3ac9a5ea8031" dependencies = [ - "arrayref", "auto_impl", - "bytes", - "hashbrown 0.13.2", - "hex", - "num_enum", - "primitive-types 0.12.1", - "revm_precompiles", - "rlp", + "revm-interpreter", + "revm-precompile", "serde", - "sha3 0.10.6", + "serde_json", ] [[package]] -name = "revm_precompiles" +name = "revm-interpreter" version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0353d456ef3e989dc9190f42c6020f09bc2025930c37895826029304413204b5" +checksum = "a53980a26f9b5a66d13511c35074d4b53631e157850a1d7cf1af4efc2c2b72c9" dependencies = [ - "bytes", - "hashbrown 0.13.2", - "k256 0.11.6", + "derive_more", + "enumn", + "revm-primitives", + "serde", + "sha3 0.10.8", +] + +[[package]] +name = "revm-precompile" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41320af3bd6a65153d38eb1d3638ba89104cc9513c7feedb2d8510e8307dab29" +dependencies = [ + "k256", "num 0.4.0", "once_cell", - "primitive-types 0.12.1", + "revm-primitives", "ripemd", "sha2 0.10.6", - "sha3 0.10.6", + "sha3 0.10.8", "substrate-bn", ] [[package]] -name = "rfc6979" -version = "0.3.1" +name = "revm-primitives" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" +checksum = "304d998f466ffef72d76c7f20b05bf08a96801736a6fb1fdef47d49a292618df" dependencies = [ - "crypto-bigint 0.4.9", - "hmac", - "zeroize", + "auto_impl", + "bitvec 1.0.1", + "bytes", + "derive_more", + "enumn", + "fixed-hash 0.8.0", + "hashbrown 0.13.2", + "hex", + "hex-literal", + "primitive-types 0.12.1", + "rlp", + "ruint", + "serde", + "sha3 0.10.8", ] [[package]] @@ -4855,11 +4811,32 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "ruint" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d470e29e933dac4101180fd6574971892315c414cf2961a192729089687cc9b" +dependencies = [ + "derive_more", + "primitive-types 0.12.1", + "rlp", + "ruint-macro", + "rustc_version 0.4.0", + "serde", + "thiserror", +] + +[[package]] +name = "ruint-macro" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62cc5760263ea229d367e7dff3c0cbf09e4797a125bd87059a6c095804f3b2d1" + [[package]] name = "rustc-demangle" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc-hex" @@ -4887,16 +4864,16 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.6" +version = "0.37.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d097081ed288dfe45699b72f5b5d648e5f15d64d900c7080273baa20c16a6849" +checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" dependencies = [ "bitflags", "errno", "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -4981,9 +4958,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cfdffd972d76b22f3d7f81c8be34b2296afd3a25e0a547bd9abe340a4dbbe97" +checksum = "dfdef77228a4c05dc94211441595746732131ad7f6530c6c18f045da7b7ab937" dependencies = [ "cfg-if 1.0.0", "derive_more", @@ -4993,9 +4970,9 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61fa974aea2d63dd18a4ec3a49d59af9f34178c73a4f56d2f18205628d00681e" +checksum = "53012eae69e5aa5c14671942a5dd47de59d4cdcff8532a6dd0e081faf1119482" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.56", @@ -5039,25 +5016,12 @@ dependencies = [ [[package]] name = "sec1" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" -dependencies = [ - "base16ct 0.1.1", - "der 0.6.1", - "generic-array 0.14.7", - "subtle 2.4.1", - "zeroize", -] - -[[package]] -name = "sec1" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e" +checksum = "f0aec48e813d6b90b15f0b8948af3c63483992dee44c03e9930b3eebdabe046e" dependencies = [ - "base16ct 0.2.0", - "der 0.7.1", + "base16ct", + "der", "generic-array 0.14.7", "pkcs8", "subtle 2.4.1", @@ -5105,9 +5069,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.159" +version = "1.0.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "71b2f6e1ab5c2b98c05f0f35b236b22e8df7ead6ffbf51d7808da7f8817e7ab6" dependencies = [ "serde_derive", ] @@ -5124,20 +5088,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.159" +version = "1.0.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" +checksum = "a2a0814352fd64b58489904a44ea8d90cb1a91dcb6b4f5ebabc32c8318e93cb6" dependencies = [ "proc-macro2 1.0.56", "quote 1.0.26", - "syn 2.0.13", + "syn 2.0.15", ] [[package]] name = "serde_json" -version = "1.0.95" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "indexmap", "itoa", @@ -5151,7 +5115,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf" dependencies = [ - "regex 1.7.3", + "regex 1.8.1", "serde", ] @@ -5269,9 +5233,9 @@ dependencies = [ [[package]] name = "sha3" -version = "0.10.6" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ "digest 0.10.6", "keccak", @@ -5318,19 +5282,9 @@ dependencies = [ [[package]] name = "signature" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" -dependencies = [ - "digest 0.10.6", - "rand_core 0.6.4", -] - -[[package]] -name = "signature" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fe458c98333f9c8152221191a77e2a44e8325d0193484af2e9421a53019e57d" +checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" dependencies = [ "digest 0.10.6", "rand_core 0.6.4", @@ -5378,14 +5332,15 @@ dependencies = [ [[package]] name = "solang-parser" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff87dae6cdccacdbf3b19e99b271083556e808de0f59c74a01482f64fdbc61fc" +checksum = "8c5ead679f39243782be98c2689e592fc0fc9489ca2e47c9e027bd30f948df31" dependencies = [ "itertools 0.10.5", "lalrpop", "lalrpop-util", "phf", + "thiserror", "unicode-xid 0.2.4", ] @@ -5397,12 +5352,12 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spki" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0445c905640145c7ea8c1993555957f65e7c46d0535b91ba501bc9bfc85522f" +checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" dependencies = [ "base64ct", - "der 0.7.1", + "der", ] [[package]] @@ -5485,7 +5440,7 @@ checksum = "01afefe60c02f4a2271fb15d1965c37856712cebb338330b06649d12afec42df" dependencies = [ "anyhow", "cfg-if 1.0.0", - "clap 3.2.23", + "clap 3.2.25", "console 0.14.1", "dialoguer", "fs2", @@ -5545,9 +5500,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.13" +version = "2.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" dependencies = [ "proc-macro2 1.0.56", "quote 1.0.26", @@ -5689,7 +5644,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2 1.0.56", "quote 1.0.26", - "syn 2.0.13", + "syn 2.0.15", ] [[package]] @@ -5775,9 +5730,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.27.0" +version = "1.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f" dependencies = [ "autocfg", "bytes", @@ -5789,18 +5744,18 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2 1.0.56", "quote 1.0.26", - "syn 2.0.13", + "syn 2.0.15", ] [[package]] @@ -5860,9 +5815,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", @@ -5998,13 +5953,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ "proc-macro2 1.0.56", "quote 1.0.26", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] @@ -6053,14 +6008,14 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" dependencies = [ "matchers", "nu-ansi-term", "once_cell", - "regex 1.7.3", + "regex 1.8.1", "sharded-slab", "smallvec", "thread_local 1.1.7", @@ -6147,12 +6102,6 @@ dependencies = [ "webpki", ] -[[package]] -name = "typed-arena" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9b2228007eba4120145f785df0f6c92ea538f5a3635a612ecf4e334c8c1446d" - [[package]] name = "typenum" version = "1.16.0" @@ -6228,12 +6177,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - [[package]] name = "unicode-width" version = "0.1.10" @@ -6293,7 +6236,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.9", "serde", ] @@ -6311,9 +6254,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "vergen" -version = "8.1.1" +version = "8.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b86a8af1dedf089b1c78338678e4c7492b6045649042d94faf19690499d236" +checksum = "6e03272e388fb78fc79481a493424f78d77be1d55f21bcd314b5a6716e195afe" dependencies = [ "anyhow", "git2", @@ -6508,11 +6451,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.46.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.42.2", + "windows-targets 0.48.0", ] [[package]] @@ -6664,9 +6607,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.1" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" dependencies = [ "memchr", ] @@ -6731,7 +6674,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2 1.0.56", "quote 1.0.26", - "syn 2.0.13", + "syn 2.0.15", ] [[package]] @@ -6756,8 +6699,8 @@ dependencies = [ [[package]] name = "zokrates_abi" -version = "0.1.7" -source = "git+https://github.com/ZoKrates/ZoKrates?tag=0.8.5#5d67cdb1d9f65f757e8774a3bf094218d0dd0267" +version = "0.1.9" +source = "git+https://github.com/ZoKrates/ZoKrates?tag=0.8.7#c537a80930480fbc8c18af1c5d1b9194787d409c" dependencies = [ "serde", "serde_derive", @@ -6768,19 +6711,16 @@ dependencies = [ [[package]] name = "zokrates_analysis" -version = "0.1.1" -source = "git+https://github.com/ZoKrates/ZoKrates?tag=0.8.5#5d67cdb1d9f65f757e8774a3bf094218d0dd0267" +version = "0.1.3" +source = "git+https://github.com/ZoKrates/ZoKrates?tag=0.8.7#c537a80930480fbc8c18af1c5d1b9194787d409c" dependencies = [ "cfg-if 0.1.10", - "csv", "lazy_static", "log", "num 0.1.42", "num-bigint 0.2.6", - "reduce", "serde", "serde_json", - "typed-arena", "zokrates_ast", "zokrates_common", "zokrates_embed", @@ -6790,8 +6730,8 @@ dependencies = [ [[package]] name = "zokrates_ark" -version = "0.1.2" -source = "git+https://github.com/ZoKrates/ZoKrates?tag=0.8.5#5d67cdb1d9f65f757e8774a3bf094218d0dd0267" +version = "0.1.4" +source = "git+https://github.com/ZoKrates/ZoKrates?tag=0.8.7#c537a80930480fbc8c18af1c5d1b9194787d409c" dependencies = [ "ark-bls12-377", "ark-bn254", @@ -6817,12 +6757,12 @@ dependencies = [ [[package]] name = "zokrates_ast" -version = "0.1.5" -source = "git+https://github.com/ZoKrates/ZoKrates?tag=0.8.5#5d67cdb1d9f65f757e8774a3bf094218d0dd0267" +version = "0.1.7" +source = "git+https://github.com/ZoKrates/ZoKrates?tag=0.8.7#c537a80930480fbc8c18af1c5d1b9194787d409c" dependencies = [ "ark-bls12-377", + "byteorder", "cfg-if 0.1.10", - "csv", "derivative", "num-bigint 0.2.6", "pairing_ce", @@ -6836,16 +6776,16 @@ dependencies = [ [[package]] name = "zokrates_common" -version = "0.1.2" -source = "git+https://github.com/ZoKrates/ZoKrates?tag=0.8.5#5d67cdb1d9f65f757e8774a3bf094218d0dd0267" +version = "0.1.3" +source = "git+https://github.com/ZoKrates/ZoKrates?tag=0.8.7#c537a80930480fbc8c18af1c5d1b9194787d409c" dependencies = [ "serde", ] [[package]] name = "zokrates_embed" -version = "0.1.9" -source = "git+https://github.com/ZoKrates/ZoKrates?tag=0.8.5#5d67cdb1d9f65f757e8774a3bf094218d0dd0267" +version = "0.1.10" +source = "git+https://github.com/ZoKrates/ZoKrates?tag=0.8.7#c537a80930480fbc8c18af1c5d1b9194787d409c" dependencies = [ "ark-bls12-377", "ark-bw6-761", @@ -6863,8 +6803,8 @@ dependencies = [ [[package]] name = "zokrates_field" -version = "0.5.3" -source = "git+https://github.com/ZoKrates/ZoKrates?tag=0.8.5#5d67cdb1d9f65f757e8774a3bf094218d0dd0267" +version = "0.5.5" +source = "git+https://github.com/ZoKrates/ZoKrates?tag=0.8.7#c537a80930480fbc8c18af1c5d1b9194787d409c" dependencies = [ "ark-bls12-377", "ark-bls12-381", @@ -6872,7 +6812,9 @@ dependencies = [ "ark-bw6-761", "ark-ec", "ark-ff", + "ark-pallas", "ark-serialize", + "ark-vesta", "bellman_ce", "bincode 0.8.0", "lazy_static", @@ -6887,8 +6829,8 @@ dependencies = [ [[package]] name = "zokrates_interpreter" -version = "0.1.3" -source = "git+https://github.com/ZoKrates/ZoKrates?tag=0.8.5#5d67cdb1d9f65f757e8774a3bf094218d0dd0267" +version = "0.1.5" +source = "git+https://github.com/ZoKrates/ZoKrates?tag=0.8.7#c537a80930480fbc8c18af1c5d1b9194787d409c" dependencies = [ "ark-bls12-377", "num 0.1.42", @@ -6904,8 +6846,8 @@ dependencies = [ [[package]] name = "zokrates_parser" -version = "0.3.3" -source = "git+https://github.com/ZoKrates/ZoKrates?tag=0.8.5#5d67cdb1d9f65f757e8774a3bf094218d0dd0267" +version = "0.3.5" +source = "git+https://github.com/ZoKrates/ZoKrates?tag=0.8.7#c537a80930480fbc8c18af1c5d1b9194787d409c" dependencies = [ "pest", "pest_derive", @@ -6913,8 +6855,8 @@ dependencies = [ [[package]] name = "zokrates_pest_ast" -version = "0.3.1" -source = "git+https://github.com/ZoKrates/ZoKrates?tag=0.8.5#5d67cdb1d9f65f757e8774a3bf094218d0dd0267" +version = "0.3.3" +source = "git+https://github.com/ZoKrates/ZoKrates?tag=0.8.7#c537a80930480fbc8c18af1c5d1b9194787d409c" dependencies = [ "from-pest", "lazy_static", @@ -6925,8 +6867,8 @@ dependencies = [ [[package]] name = "zokrates_proof_systems" -version = "0.1.1" -source = "git+https://github.com/ZoKrates/ZoKrates?tag=0.8.5#5d67cdb1d9f65f757e8774a3bf094218d0dd0267" +version = "0.1.3" +source = "git+https://github.com/ZoKrates/ZoKrates?tag=0.8.7#c537a80930480fbc8c18af1c5d1b9194787d409c" dependencies = [ "blake2 0.8.1", "byteorder", @@ -6962,9 +6904,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.7+zstd.1.5.4" +version = "2.0.8+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5" +checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" dependencies = [ "cc", "libc", diff --git a/fusion-prover/Cargo.toml b/fusion-prover/Cargo.toml index d7ac3b2..25e8723 100644 --- a/fusion-prover/Cargo.toml +++ b/fusion-prover/Cargo.toml @@ -14,12 +14,12 @@ serde = "1.0.152" serde_json = "1.0.61" serde_tuple = "0.5.0" rand_0_8 = { version = "0.8", package = "rand" } -zokrates_abi = { git = "https://github.com/ZoKrates/ZoKrates", tag = "0.8.5" } -zokrates_ark = { git = "https://github.com/ZoKrates/ZoKrates", tag = "0.8.5" } -zokrates_ast = { git = "https://github.com/ZoKrates/ZoKrates", tag = "0.8.5" } -zokrates_field = { git = "https://github.com/ZoKrates/ZoKrates", tag = "0.8.5" } -zokrates_interpreter = { git = "https://github.com/ZoKrates/ZoKrates", tag = "0.8.5" } -zokrates_proof_systems = { git = "https://github.com/ZoKrates/ZoKrates", tag = "0.8.5" } +zokrates_abi = { git = "https://github.com/ZoKrates/ZoKrates", tag = "0.8.7" } +zokrates_ark = { git = "https://github.com/ZoKrates/ZoKrates", tag = "0.8.7" } +zokrates_ast = { git = "https://github.com/ZoKrates/ZoKrates", tag = "0.8.7" } +zokrates_field = { git = "https://github.com/ZoKrates/ZoKrates", tag = "0.8.7" } +zokrates_interpreter = { git = "https://github.com/ZoKrates/ZoKrates", tag = "0.8.7" } +zokrates_proof_systems = { git = "https://github.com/ZoKrates/ZoKrates", tag = "0.8.7" } fusion-l1 = { path = "../l1-verifier/out/bindings" } fusion-api = { path = "../fusion-api" } fusion-config = { path = "../fusion-config" } diff --git a/fusion-prover/src/lib.rs b/fusion-prover/src/lib.rs index 4f3b36a..14fc545 100644 --- a/fusion-prover/src/lib.rs +++ b/fusion-prover/src/lib.rs @@ -23,13 +23,14 @@ use rand_0_8::SeedableRng; use zokrates_abi::{parse_strict, Encode, Inputs}; use zokrates_ark::Ark; -use zokrates_ast::ir::{self, ProgEnum, Witness}; +use zokrates_ast::ir::{self, Parameter, ProgEnum, Solver, Witness}; use zokrates_ast::typed::abi::Abi; use zokrates_field::Bn128Field; use zokrates_proof_systems::*; +use std::borrow::Borrow; use std::fs::File; -use std::io::{BufReader, Read}; +use std::io::BufReader; use std::path::Path; #[derive(Serialize_tuple, Deserialize_tuple, Debug)] @@ -155,20 +156,24 @@ impl Prover { }; let prog = prog.collect(); - let witness = Self::compute_witness(config, prog.clone(), tx, pre_state, post_state)?; + let witness = Self::compute_witness( + config, + prog.statements.iter(), + &prog.arguments, + &prog.solvers, + tx, + pre_state, + post_state, + )?; let pk_path = Path::new(&config.proving_key_path); let pk_file = File::open(pk_path) .map_err(|why| format!("Could not open {}: {}", pk_path.display(), why))?; - let mut pk: Vec = Vec::new(); - let mut pk_reader = BufReader::new(pk_file); - pk_reader - .read_to_end(&mut pk) - .map_err(|why| format!("Could not read {}: {}", pk_path.display(), why))?; + let pk_reader = BufReader::new(pk_file); let mut rng = StdRng::from_entropy(); - let proof: Proof = Ark::generate_proof(prog, witness, pk, &mut rng); + let proof: Proof = Ark::generate_proof(prog, witness, pk_reader, &mut rng); let ret = proof.to_fusion_l1_tx(); /* @@ -183,9 +188,11 @@ impl Prover { Ok(ret) } - fn compute_witness<'a, I: IntoIterator>>( + fn compute_witness<'a, S: Borrow>>( config: &Config, - prog: ir::ProgIterator<'a, Bn128Field, I>, + statements: impl Iterator, + arguments: &[Parameter], + solvers: &[Solver<'a, Bn128Field>], tx: &SignedTx, pre_state: &State, post_state: &State, @@ -204,7 +211,7 @@ impl Prover { let inputs = CircuitInput::new(tx, pre_state, post_state); //println!("\n\n{}\n\n", serde_json::to_string(&inputs).unwrap()); - let arguments = parse_strict( + let witness = parse_strict( serde_json::to_string(&inputs).unwrap().as_str(), signature.inputs, ) @@ -214,11 +221,15 @@ impl Prover { let interpreter = zokrates_interpreter::Interpreter::default(); - let _public_inputs = prog.public_inputs(); - - let encoded = arguments.encode(); + let encoded = witness.encode(); let witness = interpreter - .execute_with_log_stream(prog, &encoded, &mut std::io::stdout()) + .execute_with_log_stream( + &encoded, + statements, + arguments, + solvers, + &mut std::io::stdout(), + ) .map_err(|e| format!("Execution failed: {e}"))?; // Uncomment to see the witness verification result values