Skip to content

Commit 65448a6

Browse files
mrainimabdulbasitsveitser
authored
chore: update jellyfish & arkworks deps (#3601)
* upgrade alloy from 0.13 to 1.0 * bindings * add migration * remove rand_v0.9 * clippy * remove commented test * clippy * clippy * update alloy version for just gen-bindings * layout test: only exit with non-zero on error Newer versions of forge will fail a test if vm.ffi returns with non-zero exit code. * add migration test for postgres * filesystem migration test * add more events in fs test * clippy * clippy * update ark deps * fix advz compatibility * pin serde to 1.0.219 for alloy compatibility * start/stop vm broadcast in same fn * Workaround foundry CreatCollision issue As long as we start/stop broadcasts in the same function we can work around the issue. See: foundry-rs/foundry#11633 Also, Revert "start/stop vm broadcast in same fn" This reverts commit 5f4a580. * don't use startBroadcast for single tx * cargo hakari * fixing rand & hakari * fix compilation error * upgrade bn254 submodule * update vk * fmt * fix serde version for alloy compilation * update bindings for bn254 update * contract test fix * Delete hotshot-state-prover/src/bin/state-relay-watcher.rs * fk alloy * remove todo comment * address comments * fix decode_raw_log() * fmt * cdn deps * manually remove the unwanted `print-trace` feature * update vk for v1/v2 * fix bindings for V1/V2 * audit * plastic surgery * address comments * alloy features * use dummy [email protected] * revert ark-relations patch --------- Co-authored-by: imabdulbasit <[email protected]> Co-authored-by: Abdul Basit <[email protected]> Co-authored-by: sveitser <[email protected]>
1 parent 2c166fe commit 65448a6

File tree

163 files changed

+41119
-14517
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+41119
-14517
lines changed

.cargo/audit.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ ignore = [
1313
# To upgrade async-tungstenite we need a new release of tide-websockets, which seems unlikely
1414
# https://github.com/http-rs/tide-websockets
1515
"RUSTSEC-2025-0009",
16-
# Requires jf to upgrade ark from 0.4 to 0.5, so we can use tracing-subscriber 0.3 exclusively
16+
# Still here because of `ark-relations` crate.
1717
"RUSTSEC-2025-0055",
1818
]

.config/hakari.toml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# This file contains settings for `cargo hakari`.
2+
# See https://docs.rs/cargo-hakari/latest/cargo_hakari/config for a full list of options.
3+
4+
hakari-package = "workspace-hack"
5+
6+
# Format version for hakari's output. Version 4 requires cargo-hakari 0.9.22 or above.
7+
dep-format-version = "4"
8+
9+
# Setting workspace.resolver = "2" or higher in the root Cargo.toml is HIGHLY recommended.
10+
# Hakari works much better with the v2 resolver. (The v2 and v3 resolvers are identical from
11+
# hakari's perspective, so you're welcome to set either.)
12+
#
13+
# For more about the new feature resolver, see:
14+
# https://blog.rust-lang.org/2021/03/25/Rust-1.51.0.html#cargos-new-feature-resolver
15+
resolver = "2"
16+
17+
# Add triples corresponding to platforms commonly used by developers here.
18+
# https://doc.rust-lang.org/rustc/platform-support.html
19+
platforms = [
20+
# "x86_64-unknown-linux-gnu",
21+
# "x86_64-apple-darwin",
22+
# "aarch64-apple-darwin",
23+
# "x86_64-pc-windows-msvc",
24+
]
25+
26+
# Write out exact versions rather than a semver range. (Defaults to false.)
27+
# exact-versions = true
28+
29+
[traversal-excludes]
30+
third-party = [
31+
# `jf-vid` has features that need to be explicitly enabled via HotShot features --
32+
# namely "gpu-vid" and "test-srs". Hence, we exclude it from `workspace-hack` so that
33+
# these features are not enabled for all crates by default.
34+
{ name = "jf-advz", git = "https://github.com/EspressoSystems/jellyfish-compat", tag = "jf-advz-v0.2.1" },
35+
# `sqlx` has internal packages that can have different features depending on the host/target platform.
36+
# This only gets pulled in indirectly via the CDN, so it's safe to just exclude.
37+
{ name = "sqlx" }
38+
]

0 commit comments

Comments
 (0)