diff --git a/Cargo.lock b/Cargo.lock index 40c3d1cd..8b689d93 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -76,12 +76,6 @@ dependencies = [ "libc", ] -[[package]] -name = "anes" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" - [[package]] name = "anstream" version = "0.6.15" @@ -187,7 +181,7 @@ dependencies = [ "byteorder", "cfg-if", "color-eyre", - "criterion 0.3.6", + "criterion", "ethers-core 2.0.7", "fnv", "hex", @@ -388,6 +382,7 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "ashlang" version = "0.1.3" +source = "git+https://github.com/chancehudson/ashlang.git#95fdb8d313e4b25a5bcffb8c328c9321a8810407" dependencies = [ "anyhow", "camino", @@ -403,7 +398,6 @@ dependencies = [ "scalarff", "serde", "spartan", - "triton-vm", ] [[package]] @@ -481,7 +475,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi 0.1.19", + "hermit-abi", "libc", "winapi", ] @@ -820,33 +814,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "ciborium" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" -dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", -] - -[[package]] -name = "ciborium-io" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" - -[[package]] -name = "ciborium-ll" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" -dependencies = [ - "ciborium-io", - "half 2.4.1", -] - [[package]] name = "clap" version = "2.34.0" @@ -1029,7 +996,7 @@ dependencies = [ "atty", "cast", "clap 2.34.0", - "criterion-plot 0.4.5", + "criterion-plot", "csv", "itertools 0.10.5", "lazy_static", @@ -1046,32 +1013,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "criterion" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" -dependencies = [ - "anes", - "cast", - "ciborium", - "clap 4.5.20", - "criterion-plot 0.5.0", - "is-terminal", - "itertools 0.10.5", - "num-traits", - "once_cell", - "oorandom", - "plotters", - "rayon", - "regex", - "serde", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", -] - [[package]] name = "criterion-plot" version = "0.4.5" @@ -1082,16 +1023,6 @@ dependencies = [ "itertools 0.10.5", ] -[[package]] -name = "criterion-plot" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" -dependencies = [ - "cast", - "itertools 0.10.5", -] - [[package]] name = "crossbeam-deque" version = "0.8.5" @@ -1518,7 +1449,7 @@ dependencies = [ "rust_decimal", "serde", "serde_json", - "strum 0.24.1", + "strum", "thiserror", "tiny-keccak", "unicode-xid", @@ -1544,7 +1475,7 @@ dependencies = [ "rlp", "serde", "serde_json", - "strum 0.24.1", + "strum", "tempfile", "thiserror", "tiny-keccak", @@ -1818,16 +1749,6 @@ version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" -[[package]] -name = "half" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" -dependencies = [ - "cfg-if", - "crunchy", -] - [[package]] name = "halo2-fibonacci" version = "0.1.0" @@ -1987,12 +1908,6 @@ dependencies = [ "libc", ] -[[package]] -name = "hermit-abi" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" - [[package]] name = "hex" version = "0.4.3" @@ -2153,17 +2068,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71dd52191aae121e8611f1e8dc3e324dd0dd1dee1e6dd91d10ee07a3cfb4d9d8" -[[package]] -name = "is-terminal" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" -dependencies = [ - "hermit-abi 0.4.0", - "libc", - "windows-sys 0.52.0", -] - [[package]] name = "is_terminal_polyfill" version = "1.70.1" @@ -2280,16 +2184,6 @@ version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" -[[package]] -name = "matrixmultiply" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a" -dependencies = [ - "autocfg", - "rawpointer", -] - [[package]] name = "memchr" version = "2.7.4" @@ -2391,20 +2285,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "ndarray" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32" -dependencies = [ - "matrixmultiply", - "num-complex", - "num-integer", - "num-traits", - "rawpointer", - "rayon", -] - [[package]] name = "nom" version = "7.1.3" @@ -3011,12 +2891,6 @@ dependencies = [ "rand", ] -[[package]] -name = "rawpointer" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" - [[package]] name = "rayon" version = "1.10.0" @@ -3258,7 +3132,7 @@ dependencies = [ "num-bigint", "num-integer", "rand", - "twenty-first 0.41.0", + "twenty-first", ] [[package]] @@ -3372,7 +3246,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" dependencies = [ - "half 1.8.3", + "half", "serde", ] @@ -3579,16 +3453,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" dependencies = [ - "strum_macros 0.24.3", -] - -[[package]] -name = "strum" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" -dependencies = [ - "strum_macros 0.26.4", + "strum_macros", ] [[package]] @@ -3604,19 +3469,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "strum_macros" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.79", -] - [[package]] name = "subtle" version = "2.6.1" @@ -3880,61 +3732,6 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "triton-vm" -version = "0.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "811e935891f9f6a2cee1d884d599324427552c0dc7cb4033e66374e602386aba" -dependencies = [ - "arbitrary", - "colored", - "criterion 0.5.1", - "get-size", - "itertools 0.12.1", - "lazy_static", - "ndarray", - "nom", - "num-traits", - "proc-macro2", - "quote", - "rand", - "rand_core", - "rayon", - "serde", - "serde_derive", - "strum 0.26.3", - "thiserror", - "twenty-first 0.40.0", - "unicode-width", -] - -[[package]] -name = "twenty-first" -version = "0.40.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c23d90a342ccf515da09a83b1f85288c79d4ef973dc86ee700590d555d03e20" -dependencies = [ - "arbitrary", - "bfieldcodec_derive", - "blake3", - "get-size", - "hashbrown 0.14.5", - "itertools 0.12.1", - "lazy_static", - "num-bigint", - "num-traits", - "phf", - "rand", - "rand_distr", - "rayon", - "serde", - "serde-big-array", - "serde_derive", - "serde_json", - "sha3 0.10.8", - "thiserror", -] - [[package]] name = "twenty-first" version = "0.41.0" diff --git a/mopro-ffi/Cargo.toml b/mopro-ffi/Cargo.toml index 24e701e7..82b7ee54 100644 --- a/mopro-ffi/Cargo.toml +++ b/mopro-ffi/Cargo.toml @@ -46,7 +46,8 @@ thiserror = "=1.0.39" color-eyre = "=0.6.2" # ashlang deps -ashlang = { path = "../../ashlang/ashlang", optional = true } +#ashlang = { path = "../../ashlang/ashlang", optional = true } +ashlang = { git = "https://github.com/chancehudson/ashlang.git", optional = true, default-features = false, features = ["spartan-prover", "serde"] } #ashlang = { version = "0.1.0", optional = true, default-features = false, features = ["spartan-prover"] } #scalarff = { path = "../../scalarff", optional = true }