diff --git a/Cargo.lock b/Cargo.lock index fdc3225d..9c6ff69a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -122,14 +122,10 @@ dependencies = [ "num-bigint 0.3.3", "num-traits", "pairing", - "rand 0.4.6", - "rand 0.6.5", + "rand 0.8.5", "serde", "serde_json", "thiserror", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test", "wasmer", ] @@ -913,15 +909,6 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" -[[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "code_producers" version = "2.1.9" @@ -1003,16 +990,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "console_error_panic_hook" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" -dependencies = [ - "cfg-if 1.0.0", - "wasm-bindgen", -] - [[package]] name = "const-oid" version = "0.9.6" @@ -2008,7 +1985,7 @@ dependencies = [ [[package]] name = "fields" version = "0.1.0" -source = "git+https://github.com/0xEigenLabs/eigen-zkvm.git?branch=feat/no-plonby#439c29eeb358377cb4033af2119d3e3423266b5f" +source = "git+https://github.com/0xEigenLabs/eigen-zkvm.git?branch=feat/no-plonby#578c824969997d8b47e613545c32861f42874b1a" dependencies = [ "byteorder", "franklin-crypto", @@ -2353,7 +2330,7 @@ dependencies = [ "ff", "rand 0.8.5", "rand_core 0.6.4", - "rand_xorshift 0.3.0", + "rand_xorshift", "subtle", ] @@ -3843,7 +3820,7 @@ dependencies = [ "num-traits", "rand 0.8.5", "rand_chacha 0.3.1", - "rand_xorshift 0.3.0", + "rand_xorshift", "regex-syntax 0.8.4", "rusty-fork", "tempfile", @@ -3928,25 +3905,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "rand" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -dependencies = [ - "autocfg 0.1.8", - "libc", - "rand_chacha 0.1.1", - "rand_core 0.4.2", - "rand_hc 0.1.0", - "rand_isaac", - "rand_jitter", - "rand_os", - "rand_pcg", - "rand_xorshift 0.1.1", - "winapi", -] - [[package]] name = "rand" version = "0.7.3" @@ -3957,7 +3915,7 @@ dependencies = [ "libc", "rand_chacha 0.2.2", "rand_core 0.5.1", - "rand_hc 0.2.0", + "rand_hc", ] [[package]] @@ -3971,16 +3929,6 @@ dependencies = [ "rand_core 0.6.4", ] -[[package]] -name = "rand_chacha" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" -dependencies = [ - "autocfg 0.1.8", - "rand_core 0.3.1", -] - [[package]] name = "rand_chacha" version = "0.2.2" @@ -4034,15 +3982,6 @@ dependencies = [ "getrandom 0.2.15", ] -[[package]] -name = "rand_hc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" -dependencies = [ - "rand_core 0.3.1", -] - [[package]] name = "rand_hc" version = "0.2.0" @@ -4052,60 +3991,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_isaac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_jitter" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -dependencies = [ - "libc", - "rand_core 0.4.2", - "winapi", -] - -[[package]] -name = "rand_os" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -dependencies = [ - "cloudabi", - "fuchsia-cprng", - "libc", - "rand_core 0.4.2", - "rdrand", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "rand_pcg" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" -dependencies = [ - "autocfg 0.1.8", - "rand_core 0.4.2", -] - -[[package]] -name = "rand_xorshift" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -dependencies = [ - "rand_core 0.3.1", -] - [[package]] name = "rand_xorshift" version = "0.3.0" @@ -4168,15 +4053,10 @@ dependencies = [ "powdr-parser-util", "powdr-pil-analyzer", "proptest", - "rand 0.4.6", - "rand 0.6.5", "serde", "serde_json", "starky 0.0.1", "thiserror", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test", "wasmer", ] @@ -4472,12 +4352,6 @@ dependencies = [ "syn 2.0.72", ] -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - [[package]] name = "scopeguard" version = "1.2.0" @@ -4796,7 +4670,7 @@ dependencies = [ [[package]] name = "starky" version = "0.0.1" -source = "git+https://github.com/0xEigenLabs/eigen-zkvm.git?branch=feat/no-plonby#439c29eeb358377cb4033af2119d3e3423266b5f" +source = "git+https://github.com/0xEigenLabs/eigen-zkvm.git?branch=feat/no-plonby#578c824969997d8b47e613545c32861f42874b1a" dependencies = [ "anyhow", "byteorder", @@ -5353,8 +5227,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if 1.0.0", - "serde", - "serde_json", "wasm-bindgen-macro", ] @@ -5373,18 +5245,6 @@ dependencies = [ "wasm-bindgen-shared", ] -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "wasm-bindgen-macro" version = "0.2.92" @@ -5414,31 +5274,6 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" -[[package]] -name = "wasm-bindgen-test" -version = "0.3.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9bf62a58e0780af3e852044583deee40983e5886da43a271dd772379987667b" -dependencies = [ - "console_error_panic_hook", - "js-sys", - "scoped-tls", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test-macro", -] - -[[package]] -name = "wasm-bindgen-test-macro" -version = "0.3.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - [[package]] name = "wasmer" version = "4.3.5" @@ -5464,7 +5299,6 @@ dependencies = [ "wasmer-derive", "wasmer-types", "wasmer-vm", - "wasmparser", "winapi", ] diff --git a/algebraic-gpu/Cargo.toml b/algebraic-gpu/Cargo.toml index 6e66017a..fc83a757 100644 --- a/algebraic-gpu/Cargo.toml +++ b/algebraic-gpu/Cargo.toml @@ -32,22 +32,12 @@ ff = { version = "0.13.0", features = ["derive"] } pairing = "0.23.0" bellperson = { version = "0.26", default-features = false, features = ["groth16"] } +rand = "0.8.5" + [dev-dependencies] env_logger = "0.10" -[target.'cfg(not(target_arch = "wasm32"))'.dependencies] -rand = "0.4" - -[target.'cfg(target_arch = "wasm32")'.dependencies] -wasm-bindgen = { version = "0.2.51", features = ["serde-serialize"] } -wasm-bindgen-futures = "0.4.1" -rand = { version="0.6.5", features = ["wasm-bindgen"] } - -[target.'cfg(target_arch = "wasm32")'.dev-dependencies] -wasm-bindgen-test = "0.3" - [features] default = ["bellperson/default", "wasmer/singlepass"] -wasm = ["wasmer/js-default"] cuda = ["bellperson/cuda", "wasmer/singlepass"] -opencl = ["bellperson/opencl", "wasmer/singlepass"] \ No newline at end of file +opencl = ["bellperson/opencl", "wasmer/singlepass"] diff --git a/algebraic/Cargo.toml b/algebraic/Cargo.toml index 31fa432f..17a2a8ff 100644 --- a/algebraic/Cargo.toml +++ b/algebraic/Cargo.toml @@ -21,7 +21,7 @@ num-traits = "0.2.8" serde = { version = "1.0", features = [ "derive" ] } serde_json = { version = "1.0", features = [ "arbitrary_precision" ] } hex = "*" -wasmer = { version = "4.2.5", default-features = false } +wasmer = { version = "4.3.2", default-features = false } thiserror="1.0" anyhow = "1.0.79" fnv = { version = "1.0.3", default-features = false } diff --git a/recursion/Cargo.toml b/recursion/Cargo.toml index 68769bab..46366087 100644 --- a/recursion/Cargo.toml +++ b/recursion/Cargo.toml @@ -19,7 +19,7 @@ num-traits = "0.2.8" serde = { version = "1.0", features = [ "derive" ] } serde_json = { version = "1.0", features = [ "arbitrary_precision" ] } hex = "*" -wasmer = { version = "4.2.5", default-features = false } +wasmer = { version = "4.3.2", default-features = false } thiserror="1.0" anyhow = "1.0.79" fnv = { version = "1.0.3", default-features = false } @@ -38,18 +38,6 @@ powdr-parser-util = { git = "https://github.com/0xEigenLabs/powdr", branch = "ei [dev-dependencies] env_logger = "0.10" -[target.'cfg(not(target_arch = "wasm32"))'.dependencies] -rand = "0.4" - -[target.'cfg(target_arch = "wasm32")'.dependencies] -wasm-bindgen = { version = "0.2.51", features = ["serde-serialize"] } -wasm-bindgen-futures = "0.4.1" -rand = { version="0.6.5", features = ["wasm-bindgen"] } - -[target.'cfg(target_arch = "wasm32")'.dev-dependencies] -wasm-bindgen-test = "0.3" - [features] default = ["wasmer/singlepass", "starky/default"] -wasm = ["wasmer/js-default"] avx512 = ["fields/avx512", "starky/avx512", "powdr/starky-avx512"]