diff --git a/Cargo.lock b/Cargo.lock index 26bcfbaa65..51e3057ca3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -335,7 +335,7 @@ dependencies = [ "alloy-rlp", "alloy-serde", "alloy-sol-types", - "itertools 0.14.0", + "itertools 0.13.0", "serde", "serde_json", "serde_with", @@ -526,7 +526,7 @@ checksum = "5f0e0fee31ef5ed1ba1316088939cea399010ed7731dba877ed44aeb407a75ea" [[package]] name = "ark-bn254" version = "0.5.0" -source = "git+https://github.com/a16z/arkworks-algebra?branch=dev%2Ftwist-shout#76bb3a4518928f1ff7f15875f940d614bb9845e6" +source = "git+https://github.com/a16z/arkworks-algebra?branch=jolt#74c2edb413ee7b35681f4b5d911ff8bf77305d4d" dependencies = [ "ark-ec", "ark-ff 0.5.0", @@ -537,7 +537,7 @@ dependencies = [ [[package]] name = "ark-ec" version = "0.5.0" -source = "git+https://github.com/a16z/arkworks-algebra?branch=dev%2Ftwist-shout#76bb3a4518928f1ff7f15875f940d614bb9845e6" +source = "git+https://github.com/a16z/arkworks-algebra?branch=jolt#74c2edb413ee7b35681f4b5d911ff8bf77305d4d" dependencies = [ "ahash", "ark-ff 0.5.0", @@ -546,8 +546,8 @@ dependencies = [ "ark-std 0.5.0", "educe", "fnv", - "hashbrown 0.15.5", - "itertools 0.13.0", + "hashbrown 0.16.1", + "itertools 0.14.0", "num-bigint", "num-integer", "num-traits", @@ -596,20 +596,18 @@ dependencies = [ [[package]] name = "ark-ff" version = "0.5.0" -source = "git+https://github.com/a16z/arkworks-algebra?branch=dev%2Ftwist-shout#76bb3a4518928f1ff7f15875f940d614bb9845e6" +source = "git+https://github.com/a16z/arkworks-algebra?branch=jolt#74c2edb413ee7b35681f4b5d911ff8bf77305d4d" dependencies = [ "allocative", "ark-ff-asm 0.5.0", "ark-ff-macros 0.5.0", "ark-serialize 0.5.0", "ark-std 0.5.0", - "arrayvec", "digest 0.10.7", "educe", - "itertools 0.13.0", + "itertools 0.14.0", "num-bigint", "num-traits", - "paste", "rayon", "zeroize", ] @@ -637,7 +635,7 @@ dependencies = [ [[package]] name = "ark-ff-asm" version = "0.5.0" -source = "git+https://github.com/a16z/arkworks-algebra?branch=dev%2Ftwist-shout#76bb3a4518928f1ff7f15875f940d614bb9845e6" +source = "git+https://github.com/a16z/arkworks-algebra?branch=jolt#74c2edb413ee7b35681f4b5d911ff8bf77305d4d" dependencies = [ "quote", "syn 2.0.114", @@ -671,7 +669,7 @@ dependencies = [ [[package]] name = "ark-ff-macros" version = "0.5.0" -source = "git+https://github.com/a16z/arkworks-algebra?branch=dev%2Ftwist-shout#76bb3a4518928f1ff7f15875f940d614bb9845e6" +source = "git+https://github.com/a16z/arkworks-algebra?branch=jolt#74c2edb413ee7b35681f4b5d911ff8bf77305d4d" dependencies = [ "num-bigint", "num-traits", @@ -683,7 +681,7 @@ dependencies = [ [[package]] name = "ark-grumpkin" version = "0.5.0" -source = "git+https://github.com/a16z/arkworks-algebra?branch=dev%2Ftwist-shout#76bb3a4518928f1ff7f15875f940d614bb9845e6" +source = "git+https://github.com/a16z/arkworks-algebra?branch=jolt#74c2edb413ee7b35681f4b5d911ff8bf77305d4d" dependencies = [ "ark-bn254", "ark-ec", @@ -694,7 +692,7 @@ dependencies = [ [[package]] name = "ark-poly" version = "0.5.0" -source = "git+https://github.com/a16z/arkworks-algebra?branch=dev%2Ftwist-shout#76bb3a4518928f1ff7f15875f940d614bb9845e6" +source = "git+https://github.com/a16z/arkworks-algebra?branch=jolt#74c2edb413ee7b35681f4b5d911ff8bf77305d4d" dependencies = [ "ahash", "ark-ff 0.5.0", @@ -702,13 +700,13 @@ dependencies = [ "ark-std 0.5.0", "educe", "fnv", - "hashbrown 0.15.5", + "hashbrown 0.16.1", ] [[package]] name = "ark-secp256k1" version = "0.5.0" -source = "git+https://github.com/a16z/arkworks-algebra?branch=dev%2Ftwist-shout#76bb3a4518928f1ff7f15875f940d614bb9845e6" +source = "git+https://github.com/a16z/arkworks-algebra?branch=jolt#74c2edb413ee7b35681f4b5d911ff8bf77305d4d" dependencies = [ "ark-ec", "ark-ff 0.5.0", @@ -739,14 +737,14 @@ dependencies = [ [[package]] name = "ark-serialize" version = "0.5.0" -source = "git+https://github.com/a16z/arkworks-algebra?branch=dev%2Ftwist-shout#76bb3a4518928f1ff7f15875f940d614bb9845e6" +source = "git+https://github.com/a16z/arkworks-algebra?branch=jolt#74c2edb413ee7b35681f4b5d911ff8bf77305d4d" dependencies = [ - "ark-serialize-derive 0.5.0 (git+https://github.com/a16z/arkworks-algebra?branch=dev%2Ftwist-shout)", + "ark-serialize-derive 0.5.0 (git+https://github.com/a16z/arkworks-algebra?branch=jolt)", "ark-std 0.5.0", - "arrayvec", "digest 0.10.7", "num-bigint", "rayon", + "serde_with", ] [[package]] @@ -763,7 +761,7 @@ dependencies = [ [[package]] name = "ark-serialize-derive" version = "0.5.0" -source = "git+https://github.com/a16z/arkworks-algebra?branch=dev%2Ftwist-shout#76bb3a4518928f1ff7f15875f940d614bb9845e6" +source = "git+https://github.com/a16z/arkworks-algebra?branch=jolt#74c2edb413ee7b35681f4b5d911ff8bf77305d4d" dependencies = [ "proc-macro2", "quote", @@ -2277,7 +2275,6 @@ version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" dependencies = [ - "allocator-api2", "foldhash 0.1.5", ] @@ -2287,6 +2284,7 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" dependencies = [ + "allocator-api2", "foldhash 0.2.0", "serde", "serde_core", @@ -2496,7 +2494,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core 0.62.2", + "windows-core 0.61.2", ] [[package]] @@ -2992,7 +2990,7 @@ dependencies = [ [[package]] name = "jolt-optimizations" version = "0.5.0" -source = "git+https://github.com/a16z/arkworks-algebra?branch=dev%2Ftwist-shout#76bb3a4518928f1ff7f15875f940d614bb9845e6" +source = "git+https://github.com/a16z/arkworks-algebra?branch=jolt#74c2edb413ee7b35681f4b5d911ff8bf77305d4d" dependencies = [ "ark-bn254", "ark-ec", @@ -4153,7 +4151,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b" dependencies = [ "anyhow", - "itertools 0.14.0", + "itertools 0.10.5", "proc-macro2", "quote", "syn 2.0.114", @@ -6357,21 +6355,8 @@ dependencies = [ "windows-implement", "windows-interface", "windows-link 0.1.3", - "windows-result 0.3.4", - "windows-strings 0.4.2", -] - -[[package]] -name = "windows-core" -version = "0.62.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-link 0.2.1", - "windows-result 0.4.1", - "windows-strings 0.5.1", + "windows-result", + "windows-strings", ] [[package]] @@ -6438,15 +6423,6 @@ dependencies = [ "windows-link 0.1.3", ] -[[package]] -name = "windows-result" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" -dependencies = [ - "windows-link 0.2.1", -] - [[package]] name = "windows-strings" version = "0.4.2" @@ -6456,15 +6432,6 @@ dependencies = [ "windows-link 0.1.3", ] -[[package]] -name = "windows-strings" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" -dependencies = [ - "windows-link 0.2.1", -] - [[package]] name = "windows-sys" version = "0.48.0" diff --git a/Cargo.toml b/Cargo.toml index 7da28ecad0..fbedc7b479 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -136,10 +136,10 @@ inherits = "release" debug = false [patch.crates-io] -ark-bn254 = { git = "https://github.com/a16z/arkworks-algebra", branch = "dev/twist-shout" } -ark-ff = { git = "https://github.com/a16z/arkworks-algebra", branch = "dev/twist-shout" } -ark-ec = { git = "https://github.com/a16z/arkworks-algebra", branch = "dev/twist-shout" } -ark-serialize = { git = "https://github.com/a16z/arkworks-algebra", branch = "dev/twist-shout" } +ark-bn254 = { git = "https://github.com/a16z/arkworks-algebra", branch = "jolt" } +ark-ff = { git = "https://github.com/a16z/arkworks-algebra", branch = "jolt" } +ark-ec = { git = "https://github.com/a16z/arkworks-algebra", branch = "jolt" } +ark-serialize = { git = "https://github.com/a16z/arkworks-algebra", branch = "jolt" } allocative = { git = "https://github.com/facebookexperimental/allocative", rev = "85b773d85d526d068ce94724ff7a7b81203fc95e" } [workspace.metadata.cargo-machete] @@ -147,21 +147,21 @@ ignored = ["jolt-sdk"] [workspace.dependencies] # Cryptography and Math -ark-bn254 = { git = "https://github.com/a16z/arkworks-algebra", branch = "dev/twist-shout", default-features = false } -ark-grumpkin = { git = "https://github.com/a16z/arkworks-algebra", branch = "dev/twist-shout", default-features = false } -ark-ec = { git = "https://github.com/a16z/arkworks-algebra", branch = "dev/twist-shout", default-features = false } -ark-ff = { git = "https://github.com/a16z/arkworks-algebra", branch = "dev/twist-shout", default-features = false } -ark-serialize = { git = "https://github.com/a16z/arkworks-algebra", branch = "dev/twist-shout", default-features = false, features = [ +ark-bn254 = { git = "https://github.com/a16z/arkworks-algebra", branch = "jolt", default-features = false } +ark-grumpkin = { git = "https://github.com/a16z/arkworks-algebra", branch = "jolt", default-features = false } +ark-ec = { git = "https://github.com/a16z/arkworks-algebra", branch = "jolt", default-features = false } +ark-ff = { git = "https://github.com/a16z/arkworks-algebra", branch = "jolt", default-features = false } +ark-serialize = { git = "https://github.com/a16z/arkworks-algebra", branch = "jolt", default-features = false, features = [ "derive", ] } -ark-secp256k1 = { git = "https://github.com/a16z/arkworks-algebra", branch = "dev/twist-shout", default-features = false } +ark-secp256k1 = { git = "https://github.com/a16z/arkworks-algebra", branch = "jolt", default-features = false } ark-serialize-derive = { version = "0.5.0", default-features = false } ark-std = { version = "0.5.0", default-features = false } sha2 = "0.10" sha3 = "0.10.8" blake2 = "0.10" blake3 = { version = "1.5.0" } -jolt-optimizations = { git = "https://github.com/a16z/arkworks-algebra", branch = "dev/twist-shout" } +jolt-optimizations = { git = "https://github.com/a16z/arkworks-algebra", branch = "jolt" } dory = { package = "dory-pcs", version = "0.2.0", features = ["backends", "cache", "disk-persistence"] } # Core Utilities diff --git a/src/main.rs b/src/main.rs index 77f1a4a1ea..f8452c1463 100644 --- a/src/main.rs +++ b/src/main.rs @@ -519,11 +519,11 @@ tracing = "0.1" tracing-subscriber = "0.3" [patch.crates-io] -ark-ff = { git = "https://github.com/a16z/arkworks-algebra", branch = "dev/twist-shout" } -ark-ec = { git = "https://github.com/a16z/arkworks-algebra", branch = "dev/twist-shout" } -jolt-optimizations = { git = "https://github.com/a16z/arkworks-algebra", branch = "dev/twist-shout" } -ark-serialize = { git = "https://github.com/a16z/arkworks-algebra", branch = "dev/twist-shout" } -ark-bn254 = { git = "https://github.com/a16z/arkworks-algebra", branch = "dev/twist-shout" } +ark-ff = { git = "https://github.com/a16z/arkworks-algebra", branch = "jolt" } +ark-ec = { git = "https://github.com/a16z/arkworks-algebra", branch = "jolt" } +jolt-optimizations = { git = "https://github.com/a16z/arkworks-algebra", branch = "jolt" } +ark-serialize = { git = "https://github.com/a16z/arkworks-algebra", branch = "jolt" } +ark-bn254 = { git = "https://github.com/a16z/arkworks-algebra", branch = "jolt" } allocative = { git = "https://github.com/facebookexperimental/allocative", rev = "85b773d85d526d068ce94724ff7a7b81203fc95e" } "#;