diff --git a/.config/hakari.toml b/.config/hakari.toml new file mode 100644 index 000000000..5ca7c147c --- /dev/null +++ b/.config/hakari.toml @@ -0,0 +1,25 @@ +# This file contains settings for `cargo hakari`. +# See https://docs.rs/cargo-hakari/latest/cargo_hakari/config for a full list of options. + +hakari-package = "workspace-hack" + +# Format version for hakari's output. Version 4 requires cargo-hakari 0.9.22 or above. +dep-format-version = "4" + +# Setting workspace.resolver = "2" in the root Cargo.toml is HIGHLY recommended. +# Hakari works much better with the new feature resolver. +# For more about the new feature resolver, see: +# https://blog.rust-lang.org/2021/03/25/Rust-1.51.0.html#cargos-new-feature-resolver +resolver = "2" + +# Add triples corresponding to platforms commonly used by developers here. +# https://doc.rust-lang.org/rustc/platform-support.html +platforms = [ + "x86_64-unknown-linux-gnu", + # "x86_64-apple-darwin", + "aarch64-apple-darwin", + # "x86_64-pc-windows-msvc", +] + +# Write out exact versions rather than a semver range. (Defaults to false.) +# exact-versions = true diff --git a/Cargo.lock b/Cargo.lock index e8e35d4aa..aeb04d238 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1819,6 +1819,9 @@ dependencies = [ [[package]] name = "common" version = "0.0.0" +dependencies = [ + "workspace-hack 0.1.0", +] [[package]] name = "compact_str" @@ -3556,6 +3559,7 @@ dependencies = [ "safetensors", "safetensors-ndarray", "tokio", + "workspace-hack 0.1.0", ] [[package]] @@ -3571,6 +3575,7 @@ dependencies = [ "serde_json", "tokenizers", "tokio", + "workspace-hack 0.1.0", ] [[package]] @@ -3835,6 +3840,7 @@ dependencies = [ "tracing", "tracing-subscriber", "url", + "workspace-hack 0.1.0", ] [[package]] @@ -3852,6 +3858,7 @@ dependencies = [ "tracing", "tracing-subscriber", "url", + "workspace-hack 0.1.0", ] [[package]] @@ -3883,6 +3890,7 @@ dependencies = [ "tracing", "tracing-subscriber", "triomphe", + "workspace-hack 0.1.0", ] [[package]] @@ -5072,6 +5080,7 @@ dependencies = [ "proc-macro2 1.0.74", "quote 1.0.35", "syn 2.0.46", + "workspace-hack 0.1.0", ] [[package]] @@ -5626,6 +5635,7 @@ dependencies = [ "tokio", "toml 0.7.8", "tracing", + "workspace-hack 0.1.0", ] [[package]] @@ -5648,6 +5658,7 @@ dependencies = [ "serde", "tokio", "tracing", + "workspace-hack 0.1.0", ] [[package]] @@ -5670,6 +5681,7 @@ dependencies = [ "tokio", "tracing", "trait-variant", + "workspace-hack 0.1.0", ] [[package]] @@ -5697,6 +5709,7 @@ dependencies = [ "tokio", "tokio-stream", "tracing", + "workspace-hack 0.1.0", ] [[package]] @@ -5737,6 +5750,7 @@ dependencies = [ "tokio", "tokio-util 0.7.10", "tracing", + "workspace-hack 0.1.0", ] [[package]] @@ -5781,6 +5795,7 @@ dependencies = [ "tokio", "tracing", "tracing-subscriber", + "workspace-hack 0.1.0", ] [[package]] @@ -5824,6 +5839,7 @@ dependencies = [ "tonic 0.8.3", "tracing", "typed-store", + "workspace-hack 0.1.0", ] [[package]] @@ -5846,6 +5862,7 @@ dependencies = [ "serde", "tokio", "tracing", + "workspace-hack 0.1.0", ] [[package]] @@ -5891,6 +5908,7 @@ dependencies = [ "tokio", "toml 0.7.8", "tracing", + "workspace-hack 0.1.0", ] [[package]] @@ -5925,6 +5943,7 @@ dependencies = [ "tokio", "tokio-stream", "tracing", + "workspace-hack 0.1.0", ] [[package]] @@ -5960,6 +5979,7 @@ dependencies = [ "resolved-pathbuf", "toml 0.7.8", "tracing", + "workspace-hack 0.1.0", ] [[package]] @@ -5980,6 +6000,7 @@ dependencies = [ "tokio", "tonic 0.8.3", "tracing", + "workspace-hack 0.1.0", ] [[package]] @@ -6032,6 +6053,7 @@ dependencies = [ "tracing", "triomphe", "url", + "workspace-hack 0.1.0", "wtransport", ] @@ -6050,6 +6072,7 @@ dependencies = [ "serde", "tokio", "tracing", + "workspace-hack 0.1.0", ] [[package]] @@ -6084,6 +6107,7 @@ dependencies = [ "tracing", "trait-variant", "triomphe", + "workspace-hack 0.1.0", "zeroize", ] @@ -6101,6 +6125,7 @@ dependencies = [ "tokio", "tracing", "triomphe", + "workspace-hack 0.1.0", ] [[package]] @@ -6116,6 +6141,7 @@ dependencies = [ "stdext", "tokio", "tracing", + "workspace-hack 0.1.0", ] [[package]] @@ -6125,6 +6151,7 @@ dependencies = [ "lightning-interfaces", "tokio", "tracing", + "workspace-hack 0.1.0", ] [[package]] @@ -6136,6 +6163,7 @@ dependencies = [ "lightning-interfaces", "lightning-utils", "tokio", + "workspace-hack 0.1.0", ] [[package]] @@ -6146,6 +6174,7 @@ dependencies = [ "serde", "serde_json", "versions", + "workspace-hack 0.1.0", ] [[package]] @@ -6159,6 +6188,7 @@ dependencies = [ "quote 1.0.35", "syn 1.0.109", "unescape", + "workspace-hack 0.1.0", ] [[package]] @@ -6168,6 +6198,7 @@ dependencies = [ "anyhow", "lightning-interfaces", "serde", + "workspace-hack 0.1.0", ] [[package]] @@ -6189,6 +6220,7 @@ dependencies = [ "lightning-test-utils", "serde", "tokio", + "workspace-hack 0.1.0", ] [[package]] @@ -6198,6 +6230,7 @@ dependencies = [ "anyhow", "lightning-interfaces", "serde", + "workspace-hack 0.1.0", ] [[package]] @@ -6218,6 +6251,7 @@ dependencies = [ "serde", "tokio", "url", + "workspace-hack 0.1.0", ] [[package]] @@ -6249,6 +6283,7 @@ dependencies = [ "tokio-util 0.7.10", "tracing", "unsigned-varint 0.8.0", + "workspace-hack 0.1.0", ] [[package]] @@ -6269,6 +6304,7 @@ dependencies = [ "serde", "tokio", "tracing", + "workspace-hack 0.1.0", ] [[package]] @@ -6307,6 +6343,7 @@ dependencies = [ "tracing", "trait-variant", "webpki", + "workspace-hack 0.1.0", "x509-parser 0.15.1", ] @@ -6330,6 +6367,7 @@ dependencies = [ "serde", "tokio", "tracing", + "workspace-hack 0.1.0", ] [[package]] @@ -6341,6 +6379,7 @@ dependencies = [ "lightning-interfaces", "lightning-test-utils", "rand 0.8.5", + "workspace-hack 0.1.0", ] [[package]] @@ -6366,6 +6405,7 @@ dependencies = [ "tokio", "tracing", "tracing-test", + "workspace-hack 0.1.0", ] [[package]] @@ -6409,6 +6449,7 @@ dependencies = [ "tokio", "tower", "tracing", + "workspace-hack 0.1.0", ] [[package]] @@ -6423,6 +6464,7 @@ dependencies = [ "ink-quill", "lightning-types", "serde", + "workspace-hack 0.1.0", ] [[package]] @@ -6457,6 +6499,7 @@ dependencies = [ "tracing", "triomphe", "which 5.0.0", + "workspace-hack 0.1.0", ] [[package]] @@ -6477,6 +6520,7 @@ dependencies = [ "serde", "tokio", "tracing", + "workspace-hack 0.1.0", ] [[package]] @@ -6496,6 +6540,7 @@ dependencies = [ "serde_json", "tokio", "tracing", + "workspace-hack 0.1.0", ] [[package]] @@ -6522,6 +6567,7 @@ dependencies = [ "simplelog", "tokio", "tracing", + "workspace-hack 0.1.0", ] [[package]] @@ -6555,6 +6601,7 @@ dependencies = [ "simulon", "tokio", "tracing", + "workspace-hack 0.1.0", ] [[package]] @@ -6578,6 +6625,7 @@ dependencies = [ "serde", "thiserror", "url", + "workspace-hack 0.1.0", ] [[package]] @@ -6596,6 +6644,7 @@ dependencies = [ "tokio", "toml 0.7.8", "tracing", + "workspace-hack 0.1.0", ] [[package]] @@ -7124,7 +7173,7 @@ dependencies = [ "futures", "parking_lot", "tokio", - "workspace-hack", + "workspace-hack 0.1.0 (git+https://github.com/fleek-network/empty-workspace-hack.git?rev=c07eb1e343a455d57a5481b50eada03c62b4f2c6)", ] [[package]] @@ -7144,7 +7193,7 @@ dependencies = [ "tokio", "tracing", "uuid 1.6.1", - "workspace-hack", + "workspace-hack 0.1.0 (git+https://github.com/fleek-network/empty-workspace-hack.git?rev=c07eb1e343a455d57a5481b50eada03c62b4f2c6)", ] [[package]] @@ -7168,7 +7217,7 @@ dependencies = [ "tower", "tower-http 0.3.5", "tracing", - "workspace-hack", + "workspace-hack 0.1.0 (git+https://github.com/fleek-network/empty-workspace-hack.git?rev=c07eb1e343a455d57a5481b50eada03c62b4f2c6)", ] [[package]] @@ -7187,7 +7236,7 @@ dependencies = [ "parking_lot", "roaring", "smallvec", - "workspace-hack", + "workspace-hack 0.1.0 (git+https://github.com/fleek-network/empty-workspace-hack.git?rev=c07eb1e343a455d57a5481b50eada03c62b4f2c6)", ] [[package]] @@ -7198,7 +7247,7 @@ dependencies = [ "proc-macro2 1.0.74", "syn 1.0.109", "synstructure", - "workspace-hack", + "workspace-hack 0.1.0 (git+https://github.com/fleek-network/empty-workspace-hack.git?rev=c07eb1e343a455d57a5481b50eada03c62b4f2c6)", ] [[package]] @@ -7273,7 +7322,7 @@ dependencies = [ "sui-protocol-config", "thiserror", "tracing", - "workspace-hack", + "workspace-hack 0.1.0 (git+https://github.com/fleek-network/empty-workspace-hack.git?rev=c07eb1e343a455d57a5481b50eada03c62b4f2c6)", ] [[package]] @@ -7299,7 +7348,7 @@ dependencies = [ "tokio", "tracing", "typed-store", - "workspace-hack", + "workspace-hack 0.1.0 (git+https://github.com/fleek-network/empty-workspace-hack.git?rev=c07eb1e343a455d57a5481b50eada03c62b4f2c6)", ] [[package]] @@ -7311,7 +7360,7 @@ dependencies = [ "fastcrypto", "serde", "shared-crypto", - "workspace-hack", + "workspace-hack 0.1.0 (git+https://github.com/fleek-network/empty-workspace-hack.git?rev=c07eb1e343a455d57a5481b50eada03c62b4f2c6)", ] [[package]] @@ -7328,7 +7377,7 @@ dependencies = [ "once_cell", "rayon", "thiserror", - "workspace-hack", + "workspace-hack 0.1.0 (git+https://github.com/fleek-network/empty-workspace-hack.git?rev=c07eb1e343a455d57a5481b50eada03c62b4f2c6)", ] [[package]] @@ -7363,7 +7412,7 @@ dependencies = [ "tonic 0.8.3", "tracing", "typed-store", - "workspace-hack", + "workspace-hack 0.1.0 (git+https://github.com/fleek-network/empty-workspace-hack.git?rev=c07eb1e343a455d57a5481b50eada03c62b4f2c6)", ] [[package]] @@ -7393,7 +7442,7 @@ dependencies = [ "tokio", "tower", "tracing", - "workspace-hack", + "workspace-hack 0.1.0 (git+https://github.com/fleek-network/empty-workspace-hack.git?rev=c07eb1e343a455d57a5481b50eada03c62b4f2c6)", ] [[package]] @@ -7435,7 +7484,7 @@ dependencies = [ "tracing", "tracing-subscriber", "url", - "workspace-hack", + "workspace-hack 0.1.0 (git+https://github.com/fleek-network/empty-workspace-hack.git?rev=c07eb1e343a455d57a5481b50eada03c62b4f2c6)", ] [[package]] @@ -7479,7 +7528,7 @@ dependencies = [ "tower", "tracing", "typed-store", - "workspace-hack", + "workspace-hack 0.1.0 (git+https://github.com/fleek-network/empty-workspace-hack.git?rev=c07eb1e343a455d57a5481b50eada03c62b4f2c6)", ] [[package]] @@ -7503,7 +7552,7 @@ dependencies = [ "tokio", "tracing", "typed-store", - "workspace-hack", + "workspace-hack 0.1.0 (git+https://github.com/fleek-network/empty-workspace-hack.git?rev=c07eb1e343a455d57a5481b50eada03c62b4f2c6)", ] [[package]] @@ -7550,7 +7599,7 @@ dependencies = [ "tonic-build", "tracing", "typed-store", - "workspace-hack", + "workspace-hack 0.1.0 (git+https://github.com/fleek-network/empty-workspace-hack.git?rev=c07eb1e343a455d57a5481b50eada03c62b4f2c6)", ] [[package]] @@ -7586,7 +7635,7 @@ dependencies = [ "tower", "tracing", "typed-store", - "workspace-hack", + "workspace-hack 0.1.0 (git+https://github.com/fleek-network/empty-workspace-hack.git?rev=c07eb1e343a455d57a5481b50eada03c62b4f2c6)", ] [[package]] @@ -8871,7 +8920,7 @@ dependencies = [ "anyhow", "prometheus", "protobuf", - "workspace-hack", + "workspace-hack 0.1.0 (git+https://github.com/fleek-network/empty-workspace-hack.git?rev=c07eb1e343a455d57a5481b50eada03c62b4f2c6)", ] [[package]] @@ -10643,7 +10692,7 @@ dependencies = [ "fastcrypto", "serde", "serde_repr", - "workspace-hack", + "workspace-hack 0.1.0 (git+https://github.com/fleek-network/empty-workspace-hack.git?rev=c07eb1e343a455d57a5481b50eada03c62b4f2c6)", ] [[package]] @@ -11167,7 +11216,7 @@ version = "0.1.0" source = "git+https://github.com/MystenLabs/sui.git?rev=b06ada015694890d7c46347b13fbc3e9a763513c#b06ada015694890d7c46347b13fbc3e9a763513c" dependencies = [ "serde_yaml", - "workspace-hack", + "workspace-hack 0.1.0 (git+https://github.com/fleek-network/empty-workspace-hack.git?rev=c07eb1e343a455d57a5481b50eada03c62b4f2c6)", ] [[package]] @@ -11184,7 +11233,7 @@ dependencies = [ "once_cell", "sui-proc-macros", "tracing", - "workspace-hack", + "workspace-hack 0.1.0 (git+https://github.com/fleek-network/empty-workspace-hack.git?rev=c07eb1e343a455d57a5481b50eada03c62b4f2c6)", ] [[package]] @@ -11197,7 +11246,7 @@ dependencies = [ "quote 1.0.35", "sui-enum-compat-util", "syn 2.0.46", - "workspace-hack", + "workspace-hack 0.1.0 (git+https://github.com/fleek-network/empty-workspace-hack.git?rev=c07eb1e343a455d57a5481b50eada03c62b4f2c6)", ] [[package]] @@ -11210,7 +11259,7 @@ dependencies = [ "serde_with", "sui-protocol-config-macros", "tracing", - "workspace-hack", + "workspace-hack 0.1.0 (git+https://github.com/fleek-network/empty-workspace-hack.git?rev=c07eb1e343a455d57a5481b50eada03c62b4f2c6)", ] [[package]] @@ -11221,7 +11270,7 @@ dependencies = [ "proc-macro2 1.0.74", "quote 1.0.35", "syn 1.0.109", - "workspace-hack", + "workspace-hack 0.1.0 (git+https://github.com/fleek-network/empty-workspace-hack.git?rev=c07eb1e343a455d57a5481b50eada03c62b4f2c6)", ] [[package]] @@ -11340,7 +11389,7 @@ dependencies = [ "tracing", "tracing-appender", "tracing-subscriber", - "workspace-hack", + "workspace-hack 0.1.0 (git+https://github.com/fleek-network/empty-workspace-hack.git?rev=c07eb1e343a455d57a5481b50eada03c62b4f2c6)", ] [[package]] @@ -12223,7 +12272,7 @@ dependencies = [ "thiserror", "tokio", "tracing", - "workspace-hack", + "workspace-hack 0.1.0 (git+https://github.com/fleek-network/empty-workspace-hack.git?rev=c07eb1e343a455d57a5481b50eada03c62b4f2c6)", ] [[package]] @@ -13184,6 +13233,149 @@ dependencies = [ "web-sys", ] +[[package]] +name = "workspace-hack" +version = "0.1.0" +dependencies = [ + "ahash 0.8.7", + "arc-swap", + "arrayvec", + "autometrics", + "axum 0.6.20", + "axum 0.7.4", + "base64 0.13.1", + "base64 0.21.5", + "bitflags 2.4.1", + "block-padding 0.3.3", + "bytemuck", + "byteorder", + "bytes", + "cbc", + "cc", + "chrono", + "cipher", + "clap 4.4.12", + "clap_builder", + "concurrent-queue", + "core-foundation", + "core-foundation-sys", + "core2", + "criterion", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "crunchy", + "crypto-common", + "data-encoding", + "der 0.7.8", + "ecdsa", + "either", + "elliptic-curve", + "ethers-contract-abigen", + "fastcrypto", + "futures", + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", + "generic-array", + "getrandom", + "hashbrown 0.12.3", + "hashbrown 0.13.2", + "hashbrown 0.14.3", + "hdrhistogram", + "hex", + "hkdf", + "hmac", + "hyper 0.14.28", + "hyper-rustls", + "image", + "indexmap 1.9.3", + "indexmap 2.1.0", + "inout", + "itertools 0.10.5", + "jpeg-decoder", + "k256", + "lazy_static", + "libc", + "linux-raw-sys", + "log", + "matrixmultiply", + "memchr", + "miniz_oxide", + "mio", + "multihash 0.19.1", + "nom", + "num-bigint", + "num-bigint-dig", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", + "openssl", + "openssl-sys", + "p256", + "phf_shared 0.11.2", + "plotters", + "prettyplease 0.2.16", + "primitive-types", + "proc-macro2 1.0.74", + "prost 0.11.9", + "quinn", + "quinn-proto", + "quinn-udp", + "quote 1.0.35", + "rand 0.8.5", + "rand_chacha", + "regex", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", + "reqwest", + "ring 0.16.20", + "ring 0.17.7", + "rocksdb", + "ruint", + "rustix", + "rustls 0.21.10", + "rustls-pki-types", + "schemars", + "scopeguard", + "sec1", + "security-framework-sys", + "semver 1.0.21", + "serde", + "serde_json", + "sha1 0.10.6", + "sha2 0.10.8", + "sha3 0.10.8", + "smallvec", + "socket2 0.5.5", + "spin 0.9.8", + "spki 0.7.3", + "syn 1.0.109", + "syn 2.0.46", + "time", + "tokio", + "tokio-rustls 0.24.1", + "tokio-stream", + "tokio-util 0.7.10", + "toml_datetime", + "tower", + "tracing", + "tracing-core", + "tracing-subscriber", + "unicode-bidi", + "unicode-normalization", + "url", + "uuid 1.6.1", + "web-sys", + "zeroize", +] + [[package]] name = "workspace-hack" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index 1f494a23a..bcbf4919f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,6 +3,7 @@ resolver = "2" members = [ "core/*", "core/interfaces/proc", + "etc/workspace-hack", "lib/*", "services/*", "services/ai/examples/rust/*", diff --git a/core/application/Cargo.toml b/core/application/Cargo.toml index 1d890240b..e65c4be65 100644 --- a/core/application/Cargo.toml +++ b/core/application/Cargo.toml @@ -31,6 +31,7 @@ fleek-crypto.workspace = true hp-fixed.workspace = true atomo-rocks.workspace = true resolved-pathbuf.workspace = true +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } [dev-dependencies] diff --git a/core/archive/Cargo.toml b/core/archive/Cargo.toml index b4ba541e5..1b940882f 100644 --- a/core/archive/Cargo.toml +++ b/core/archive/Cargo.toml @@ -19,6 +19,7 @@ ethers.workspace = true rocksdb = "0.21" atomo-rocks.workspace = true atomo.workspace = true +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } [dev-dependencies] diff --git a/core/blockstore-server/Cargo.toml b/core/blockstore-server/Cargo.toml index 8e256050e..c561a08cf 100644 --- a/core/blockstore-server/Cargo.toml +++ b/core/blockstore-server/Cargo.toml @@ -17,6 +17,7 @@ tokio-stream.workspace = true anyhow.workspace = true tracing.workspace = true thiserror = "1.0" +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } [dev-dependencies] lightning-test-utils = { path = "../test-utils" } diff --git a/core/blockstore/Cargo.toml b/core/blockstore/Cargo.toml index cb841e890..ab3b6f101 100644 --- a/core/blockstore/Cargo.toml +++ b/core/blockstore/Cargo.toml @@ -22,3 +22,4 @@ tempdir.workspace = true tokio.workspace = true derive_more = "0.99" arrayref = "0.3" +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } diff --git a/core/broadcast/Cargo.toml b/core/broadcast/Cargo.toml index 8df9e9a16..b66b4c744 100644 --- a/core/broadcast/Cargo.toml +++ b/core/broadcast/Cargo.toml @@ -27,6 +27,7 @@ smallvec = "1.11.0" ta = "0.5.0" tracing.workspace = true rand.workspace = true +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } [dev-dependencies] lightning-test-utils = { path = "../test-utils" } diff --git a/core/cli/Cargo.toml b/core/cli/Cargo.toml index 09b314389..e91e34872 100644 --- a/core/cli/Cargo.toml +++ b/core/cli/Cargo.toml @@ -32,6 +32,7 @@ rand.workspace = true panic-report.workspace = true os_info = "3.7.0" compile-time-run = "0.2.12" +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } [dev-dependencies] serial_test = "3.0.0" diff --git a/core/consensus/Cargo.toml b/core/consensus/Cargo.toml index 399172199..6943dbbf3 100644 --- a/core/consensus/Cargo.toml +++ b/core/consensus/Cargo.toml @@ -47,3 +47,4 @@ tonic = { version = "0.8.2", features = ["transport", "tls"] } prometheus = "0.13.3" multiaddr = "0.17.1" fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "c961a01596a87e76f590c7e43aca9d57106dbbb1" } +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } diff --git a/core/dack-aggregator/Cargo.toml b/core/dack-aggregator/Cargo.toml index f9d91b7e1..7c321d208 100644 --- a/core/dack-aggregator/Cargo.toml +++ b/core/dack-aggregator/Cargo.toml @@ -17,6 +17,7 @@ affair.workspace = true tracing.workspace = true resolved-pathbuf.workspace = true queue-file = "1.4.10" +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } [dev-dependencies] lightning-test-utils = { path = "../test-utils" } diff --git a/core/e2e/Cargo.toml b/core/e2e/Cargo.toml old mode 100755 new mode 100644 index be4ab3902..f336e3f1d --- a/core/e2e/Cargo.toml +++ b/core/e2e/Cargo.toml @@ -46,3 +46,4 @@ fleek-blake3 = "1.5" toml = "0.7" resolve-path = "0.1.0" clap = { version = "4.2", features = ["derive"] } +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } diff --git a/core/fetcher/Cargo.toml b/core/fetcher/Cargo.toml index 1c8f8be4c..bc2268980 100644 --- a/core/fetcher/Cargo.toml +++ b/core/fetcher/Cargo.toml @@ -18,6 +18,7 @@ tracing.workspace = true tokio-stream.workspace = true bytes.workspace = true thiserror = "1.0" +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } [dev-dependencies] lightning-blockstore = { path = "../blockstore" } diff --git a/core/final-bindings/Cargo.toml b/core/final-bindings/Cargo.toml index ed1009e14..f3bed2296 100644 --- a/core/final-bindings/Cargo.toml +++ b/core/final-bindings/Cargo.toml @@ -33,6 +33,7 @@ toml = "0.7" anyhow.workspace = true resolved-pathbuf.workspace = true tracing.workspace = true +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } [features] default = [] diff --git a/core/forwarder/Cargo.toml b/core/forwarder/Cargo.toml index 621170b35..7f0fd6ab9 100644 --- a/core/forwarder/Cargo.toml +++ b/core/forwarder/Cargo.toml @@ -19,6 +19,7 @@ rand = "0.8.5" # These dependencies MUST be pinned to the same versions used by `lightning-consensus` narwhal-types = { git = "https://github.com/MystenLabs/sui.git", rev = "b06ada015694890d7c46347b13fbc3e9a763513c", package = "narwhal-types" } tonic = { version = "0.8.3", features = ["transport", "tls"] } +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } [dev-dependencies] lightning-test-utils = { path = "../test-utils" } diff --git a/core/handshake/Cargo.toml b/core/handshake/Cargo.toml index a56e236e4..64e861289 100644 --- a/core/handshake/Cargo.toml +++ b/core/handshake/Cargo.toml @@ -44,6 +44,7 @@ serde_json.workspace = true cid.workspace = true hex = "0.4" url = { version = "2.5.0", features = ["serde"] } +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } [dev-dependencies] criterion = { version = "0.5.0", features = ["html_reports", "async_tokio"] } diff --git a/core/indexer/Cargo.toml b/core/indexer/Cargo.toml index d175505be..79bbf3bbd 100644 --- a/core/indexer/Cargo.toml +++ b/core/indexer/Cargo.toml @@ -13,6 +13,7 @@ tokio.workspace = true tracing.workspace = true lightning-interfaces = { path = "../interfaces" } +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } [dev-dependencies] lightning-test-utils = { path = "../test-utils" } diff --git a/core/interfaces/Cargo.toml b/core/interfaces/Cargo.toml index d233a7976..78d24f42b 100644 --- a/core/interfaces/Cargo.toml +++ b/core/interfaces/Cargo.toml @@ -36,6 +36,7 @@ better-shutdown.workspace = true # Currently we need the SDK because of the FFI types. fn-sdk = { path = "../../lib/sdk" } +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } [dev-dependencies] criterion = { version = "0.5.0", features = ["html_reports"] } diff --git a/core/interfaces/proc/Cargo.toml b/core/interfaces/proc/Cargo.toml index ff6c54638..6d03f5b88 100644 --- a/core/interfaces/proc/Cargo.toml +++ b/core/interfaces/proc/Cargo.toml @@ -10,6 +10,7 @@ proc-macro = true quote = "1.0" proc-macro2 = "1.0" darling = "0.20.3" +workspace-hack = { version = "0.1", path = "../../../etc/workspace-hack" } [dependencies.syn] version = "2.0" diff --git a/core/keystore/Cargo.toml b/core/keystore/Cargo.toml index 2c6ba0e23..40840f823 100644 --- a/core/keystore/Cargo.toml +++ b/core/keystore/Cargo.toml @@ -13,6 +13,7 @@ serde.workspace = true tracing.workspace = true resolved-pathbuf.workspace = true triomphe = "0.1" +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } [dev-dependencies] lightning-test-utils = { path = "../test-utils" } diff --git a/core/metrics/Cargo.toml b/core/metrics/Cargo.toml index 59150aa5e..f8df7d8d0 100644 --- a/core/metrics/Cargo.toml +++ b/core/metrics/Cargo.toml @@ -14,3 +14,4 @@ once_cell = "1.18.0" prometheus = "0.13.3" stdext = "0.3.1" tokio.workspace = true +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } diff --git a/core/node/Cargo.toml b/core/node/Cargo.toml index b52d6e029..4ec89a38c 100644 --- a/core/node/Cargo.toml +++ b/core/node/Cargo.toml @@ -7,3 +7,4 @@ edition = "2021" lightning-interfaces = { path = "../interfaces" } tokio.worspace = true tracing.workspace = true +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } diff --git a/core/notifier/Cargo.toml b/core/notifier/Cargo.toml index 543e0259c..e469616fa 100644 --- a/core/notifier/Cargo.toml +++ b/core/notifier/Cargo.toml @@ -10,6 +10,7 @@ lightning-interfaces = { path = "../interfaces" } lightning-utils = { path = "../utils" } tokio.workspace = true anyhow.workspace = true +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } [dev-dependencies] lightning-application = { path = "../application", features = ["test"] } diff --git a/core/origin-arweave/Cargo.toml b/core/origin-arweave/Cargo.toml index c9e5a070c..85a28e07f 100644 --- a/core/origin-arweave/Cargo.toml +++ b/core/origin-arweave/Cargo.toml @@ -9,3 +9,4 @@ edition = "2021" lightning-interfaces = {path="../interfaces"} anyhow.workspace = true serde.workspace = true +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } diff --git a/core/origin-demuxer/Cargo.toml b/core/origin-demuxer/Cargo.toml index a65e9549f..476c38a4a 100644 --- a/core/origin-demuxer/Cargo.toml +++ b/core/origin-demuxer/Cargo.toml @@ -12,6 +12,7 @@ lightning-origin-ipfs = { path = "../origin-ipfs" } lightning-origin-http = { path = "../origin-http" } serde.workspace = true tokio.workspace = true +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } [dev-dependencies] fleek-crypto.workspace = true diff --git a/core/origin-filecoin/Cargo.toml b/core/origin-filecoin/Cargo.toml index 55be8e505..31264afad 100644 --- a/core/origin-filecoin/Cargo.toml +++ b/core/origin-filecoin/Cargo.toml @@ -9,3 +9,4 @@ edition = "2021" lightning-interfaces = {path="../interfaces"} anyhow.workspace = true serde.workspace = true +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } diff --git a/core/origin-http/Cargo.toml b/core/origin-http/Cargo.toml index 927dafa7a..e93673f32 100644 --- a/core/origin-http/Cargo.toml +++ b/core/origin-http/Cargo.toml @@ -11,6 +11,7 @@ lightning-interfaces = { path = "../interfaces" } reqwest = "0.11" serde.workspace = true url = "2.5.0" +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } [dev-dependencies] fleek-crypto.workspace = true diff --git a/core/origin-ipfs/Cargo.toml b/core/origin-ipfs/Cargo.toml index b1c339b83..198e4e1e1 100644 --- a/core/origin-ipfs/Cargo.toml +++ b/core/origin-ipfs/Cargo.toml @@ -23,6 +23,7 @@ tracing.workspace = true unsigned-varint = { version = "0.8", features = ["std"] } libipld = { version = "0.16", features = ["dag-cbor", "derive"] } thiserror = "1" +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } [dev-dependencies] fleek-crypto.workspace = true diff --git a/core/pinger/Cargo.toml b/core/pinger/Cargo.toml index c330966dd..36957eca4 100644 --- a/core/pinger/Cargo.toml +++ b/core/pinger/Cargo.toml @@ -15,6 +15,7 @@ serde.workspace = true rand.workspace = true tracing.workspace = true fleek-crypto.workspace = true +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } [dev-dependencies] lightning-test-utils = { path = "../test-utils" } diff --git a/core/pool/Cargo.toml b/core/pool/Cargo.toml index c84e49be8..bc7a593e7 100644 --- a/core/pool/Cargo.toml +++ b/core/pool/Cargo.toml @@ -35,6 +35,7 @@ thiserror = "1.0" webpki = { version = "0.22", features = ["std"] } x509-parser = "0.15.1" serde_json = "1.0" +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } [dev-dependencies] lightning-test-utils = { path = "../test-utils" } diff --git a/core/rep-collector/Cargo.toml b/core/rep-collector/Cargo.toml index 7a184845a..fd91ca9db 100644 --- a/core/rep-collector/Cargo.toml +++ b/core/rep-collector/Cargo.toml @@ -16,6 +16,7 @@ tokio.workspace = true lru.workspace = true scc.workspace = true tracing.workspace = true +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } [dev-dependencies] lightning-test-utils = { path = "../test-utils" } diff --git a/core/reputation/Cargo.toml b/core/reputation/Cargo.toml index 020f005b9..b58874f31 100644 --- a/core/reputation/Cargo.toml +++ b/core/reputation/Cargo.toml @@ -9,6 +9,7 @@ edition = "2021" lightning-interfaces = {path="../interfaces"} fleek-crypto.workspace = true hp-fixed.workspace = true +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } [dev-dependencies] lightning-test-utils = {path="../test-utils"} diff --git a/core/resolver/Cargo.toml b/core/resolver/Cargo.toml index 518e71987..c0fe8273a 100644 --- a/core/resolver/Cargo.toml +++ b/core/resolver/Cargo.toml @@ -16,6 +16,7 @@ resolved-pathbuf.workspace = true serde.workspace = true tokio.workspace = true rocksdb = "0.21" +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } [dev-dependencies] lightning-test-utils = { path = "../test-utils" } diff --git a/core/rpc-openrpc-macros/Cargo.toml b/core/rpc-openrpc-macros/Cargo.toml index 4d1ea2221..a5342e0eb 100644 --- a/core/rpc-openrpc-macros/Cargo.toml +++ b/core/rpc-openrpc-macros/Cargo.toml @@ -16,3 +16,4 @@ quote = "1.0.33" syn = { version = "1.0.104", features = ["full", "derive", "extra-traits"] } unescape = "0.1.0" lightning-openrpc = { path = "../rpc-openrpc" } +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } diff --git a/core/rpc-openrpc/Cargo.toml b/core/rpc-openrpc/Cargo.toml index 422e1cb42..fdd9e4cef 100644 --- a/core/rpc-openrpc/Cargo.toml +++ b/core/rpc-openrpc/Cargo.toml @@ -9,4 +9,5 @@ edition.workspace = true schemars = "0.8.16" serde.workspace = true serde_json.workspace = true -versions = "5.0.1" \ No newline at end of file +versions = "5.0.1" +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } diff --git a/core/rpc/Cargo.toml b/core/rpc/Cargo.toml index 868793afe..c5f5d78a0 100644 --- a/core/rpc/Cargo.toml +++ b/core/rpc/Cargo.toml @@ -38,6 +38,7 @@ lightning-utils = { path = "../utils" } alloy-primitives = "0.5.2" hyper = { version = "0.14.27", features = ["server", "full"] } futures.workspace = true +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } [dev-dependencies] diff --git a/core/schema/Cargo.toml b/core/schema/Cargo.toml index 74cced3e9..e1ca92a3c 100644 --- a/core/schema/Cargo.toml +++ b/core/schema/Cargo.toml @@ -14,3 +14,4 @@ lightning-types.workspace = true bytes = "1.5" arrayref = "0.3" flexbuffers = "2.0" +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } diff --git a/core/service-executor/Cargo.toml b/core/service-executor/Cargo.toml index e8db0f87b..e58ffba0a 100644 --- a/core/service-executor/Cargo.toml +++ b/core/service-executor/Cargo.toml @@ -31,6 +31,7 @@ bincode = "1.3.3" fleek-service-fetcher = { path = "../../services/fetcher", optional = true } fleek-service-js-poc = { path = "../../services/js-poc", optional = true } fleek-service-ai = { path = "../../services/ai", optional = true } +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } [features] default = [] diff --git a/core/signer/Cargo.toml b/core/signer/Cargo.toml index 7d040cf10..cdbf06bba 100644 --- a/core/signer/Cargo.toml +++ b/core/signer/Cargo.toml @@ -15,6 +15,7 @@ tokio.workspace = true fleek-crypto.workspace = true affair.workspace = true resolved-pathbuf.workspace = true +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } [dev-dependencies] lightning-test-utils = { path = "../test-utils" } diff --git a/core/syncronizer/Cargo.toml b/core/syncronizer/Cargo.toml index 36e3319f7..6940c1946 100644 --- a/core/syncronizer/Cargo.toml +++ b/core/syncronizer/Cargo.toml @@ -19,3 +19,4 @@ tokio.workspace = true rand.workspace = true fleek-crypto.workspace = true async-channel = "2.2" +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } diff --git a/core/test-utils/Cargo.toml b/core/test-utils/Cargo.toml index f99d06fdd..dea017e90 100644 --- a/core/test-utils/Cargo.toml +++ b/core/test-utils/Cargo.toml @@ -26,3 +26,4 @@ simplelog = "0.12.1" plotters = "0.3" rand_distr = "0.4" rand_chacha = "0.3" +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } diff --git a/core/topology/Cargo.toml b/core/topology/Cargo.toml index 733ea846f..1ea0cb806 100644 --- a/core/topology/Cargo.toml +++ b/core/topology/Cargo.toml @@ -16,6 +16,7 @@ serde = { version = "1.0", features = ["derive"] } fleek-crypto.workspace = true tracing.workspace = true tokio.workspace = true +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } [dev-dependencies] lightning-application = { path = "../application" } diff --git a/core/types/Cargo.toml b/core/types/Cargo.toml index adb4771d9..3a1452429 100644 --- a/core/types/Cargo.toml +++ b/core/types/Cargo.toml @@ -23,3 +23,4 @@ schemars.workspace = true ethers.workspace = true ruint = "1.11.1" url = "2.5.0" +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } diff --git a/core/utils/Cargo.toml b/core/utils/Cargo.toml index 600757e9e..b07a4d277 100644 --- a/core/utils/Cargo.toml +++ b/core/utils/Cargo.toml @@ -18,3 +18,4 @@ serde_json.workspace = true reqwest.workspace = true resolved-pathbuf.workspace = true toml = "0.7" +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } diff --git a/etc/workspace-hack/.gitattributes b/etc/workspace-hack/.gitattributes new file mode 100644 index 000000000..3e9dba4b6 --- /dev/null +++ b/etc/workspace-hack/.gitattributes @@ -0,0 +1,4 @@ +# Avoid putting conflict markers in the generated Cargo.toml file, since their presence breaks +# Cargo. +# Also do not check out the file as CRLF on Windows, as that's what hakari needs. +Cargo.toml merge=binary -crlf diff --git a/etc/workspace-hack/Cargo.toml b/etc/workspace-hack/Cargo.toml new file mode 100644 index 000000000..6bfc5e5ef --- /dev/null +++ b/etc/workspace-hack/Cargo.toml @@ -0,0 +1,330 @@ +# This file is generated by `cargo hakari`. +# To regenerate, run: +# cargo hakari generate + +[package] +name = "workspace-hack" +version = "0.1.0" +description = "workspace-hack package, managed by hakari" +# You can choose to publish this crate: see https://docs.rs/cargo-hakari/latest/cargo_hakari/publishing. +publish = false + +# The parts of the file between the BEGIN HAKARI SECTION and END HAKARI SECTION comments +# are managed by hakari. + +### BEGIN HAKARI SECTION +[dependencies] +ahash = { version = "0.8" } +arc-swap = { version = "1", default-features = false, features = ["serde"] } +arrayvec = { version = "0.7" } +autometrics = { version = "0.6", default-features = false, features = ["prometheus", "prometheus-exporter"] } +axum-3b31131e45eafb45 = { package = "axum", version = "0.6", features = ["headers", "http2"] } +axum-ca01ad9e24f5d932 = { package = "axum", version = "0.7", features = ["macros"] } +base64-594e8ee84c453af0 = { package = "base64", version = "0.13", features = ["alloc"] } +base64-647d43efb71741da = { package = "base64", version = "0.21" } +bitflags = { version = "2", default-features = false, features = ["std"] } +block-padding = { version = "0.3", default-features = false, features = ["std"] } +bytemuck = { version = "1", default-features = false, features = ["extern_crate_alloc"] } +byteorder = { version = "1", features = ["i128"] } +bytes = { version = "1", features = ["serde"] } +cbc = { version = "0.1", features = ["std"] } +chrono = { version = "0.4" } +cipher = { version = "0.4", default-features = false, features = ["block-padding", "std"] } +clap = { version = "4", features = ["derive"] } +clap_builder = { version = "4", default-features = false, features = ["color", "help", "std", "suggestions", "usage"] } +concurrent-queue = { version = "2" } +core2 = { version = "0.4", default-features = false, features = ["alloc"] } +criterion = { version = "0.5", features = ["async_tokio", "html_reports"] } +crossbeam-channel = { version = "0.5" } +crossbeam-deque = { version = "0.8" } +crossbeam-utils = { version = "0.8" } +crunchy = { version = "0.2", features = ["limit_256", "std"] } +crypto-common = { version = "0.1", default-features = false, features = ["getrandom", "std"] } +data-encoding = { version = "2" } +der = { version = "0.7", default-features = false, features = ["derive", "oid", "pem", "std"] } +ecdsa = { version = "0.16", features = ["pem", "signing", "std", "verifying"] } +either = { version = "1" } +elliptic-curve = { version = "0.13", features = ["ecdh", "hash2curve", "hazmat", "pem", "std"] } +ethers-contract-abigen = { version = "2", default-features = false, features = ["providers", "rustls"] } +fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "c961a01596a87e76f590c7e43aca9d57106dbbb1", features = ["copy_key"] } +futures = { version = "0.3", features = ["bilock", "unstable"] } +futures-channel = { version = "0.3", features = ["sink", "unstable"] } +futures-core = { version = "0.3", features = ["unstable"] } +futures-executor = { version = "0.3" } +futures-io = { version = "0.3", features = ["unstable"] } +futures-sink = { version = "0.3" } +futures-task = { version = "0.3", features = ["unstable"] } +futures-util = { version = "0.3", features = ["bilock", "channel", "io", "sink", "unstable"] } +generic-array = { version = "0.14", default-features = false, features = ["more_lengths", "serde", "zeroize"] } +getrandom = { version = "0.2", default-features = false, features = ["std"] } +hashbrown-582f2526e08bb6a0 = { package = "hashbrown", version = "0.14", default-features = false, features = ["inline-more", "raw"] } +hashbrown-594e8ee84c453af0 = { package = "hashbrown", version = "0.13" } +hashbrown-5ef9efb8ec2df382 = { package = "hashbrown", version = "0.12", features = ["raw"] } +hdrhistogram = { version = "7" } +hex = { version = "0.4" } +hkdf = { version = "0.12", default-features = false, features = ["std"] } +hmac = { version = "0.12", default-features = false, features = ["reset", "std"] } +hyper = { version = "0.14", features = ["full"] } +hyper-rustls = { version = "0.24", features = ["http2"] } +image = { version = "0.24" } +indexmap-dff4ba8e3ae991db = { package = "indexmap", version = "1", default-features = false, features = ["serde", "std"] } +inout = { version = "0.1", default-features = false, features = ["std"] } +itertools = { version = "0.10" } +k256 = { version = "0.13" } +lazy_static = { version = "1", default-features = false, features = ["spin_no_std"] } +libc = { version = "0.2" } +log = { version = "0.4", default-features = false, features = ["std"] } +matrixmultiply = { version = "0.3", features = ["cgemm"] } +memchr = { version = "2" } +miniz_oxide = { version = "0.7", features = ["simd"] } +multihash = { version = "0.19" } +nom = { version = "7" } +num-bigint = { version = "0.4", features = ["rand", "serde"] } +num-bigint-dig = { version = "0.8", default-features = false, features = ["i128", "prime", "u64_digit", "zeroize"] } +num-complex = { version = "0.4", default-features = false, features = ["std"] } +num-integer = { version = "0.1", features = ["i128"] } +num-iter = { version = "0.1", features = ["i128"] } +num-rational = { version = "0.4", default-features = false, features = ["num-bigint-std", "std"] } +num-traits = { version = "0.2", features = ["i128", "libm"] } +p256 = { version = "0.13", features = ["ecdh"] } +phf_shared = { version = "0.11" } +plotters = { version = "0.3" } +prettyplease = { version = "0.2", default-features = false, features = ["verbatim"] } +primitive-types = { version = "0.12", features = ["byteorder", "rlp", "rustc-hex", "scale-info", "serde_no_std"] } +proc-macro2 = { version = "1", features = ["span-locations"] } +prost = { version = "0.11" } +quinn = { version = "0.10", features = ["futures-io"] } +quinn-proto = { version = "0.10", features = ["native-certs"] } +quinn-udp = { version = "0.4", default-features = false, features = ["log"] } +quote = { version = "1" } +rand = { version = "0.8", features = ["small_rng"] } +rand_chacha = { version = "0.3" } +regex = { version = "1" } +regex-automata = { version = "0.4", default-features = false, features = ["dfa-onepass", "hybrid", "meta", "nfa-backtrack", "perf-inline", "perf-literal", "unicode"] } +regex-syntax = { version = "0.8" } +reqwest = { version = "0.11", features = ["brotli", "gzip", "json", "rustls-tls", "socks", "stream"] } +ring-9067fe90e8c1f593 = { package = "ring", version = "0.17", features = ["std"] } +ring-986da7b5efc2b80e = { package = "ring", version = "0.16", features = ["std"] } +rocksdb = { version = "0.21", features = ["multi-threaded-cf"] } +ruint = { version = "1", features = ["num-bigint", "primitive-types", "serde"] } +rustls = { version = "0.21", features = ["dangerous_configuration", "quic"] } +rustls-pki-types = { version = "1", features = ["std"] } +schemars = { version = "0.8", features = ["either"] } +scopeguard = { version = "1" } +sec1 = { version = "0.7", features = ["pem", "std", "subtle"] } +serde = { version = "1", features = ["alloc", "derive", "rc"] } +serde_json = { version = "1", features = ["alloc", "float_roundtrip", "preserve_order", "raw_value", "unbounded_depth"] } +sha1 = { version = "0.10", features = ["oid"] } +sha2 = { version = "0.10", features = ["oid"] } +sha3 = { version = "0.10" } +smallvec = { version = "1", default-features = false, features = ["union"] } +socket2 = { version = "0.5", default-features = false, features = ["all"] } +spki = { version = "0.7", default-features = false, features = ["pem", "std"] } +syn-f595c2ba2a3f28df = { package = "syn", version = "2", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] } +time = { version = "0.3", features = ["formatting", "local-offset", "macros", "parsing"] } +tokio = { version = "1", features = ["full", "test-util", "tracing"] } +tokio-rustls = { version = "0.24" } +tokio-stream = { version = "0.1", features = ["net"] } +tokio-util = { version = "0.7", features = ["codec", "compat", "io", "time"] } +toml_datetime = { version = "0.6", default-features = false, features = ["serde"] } +tower = { version = "0.4", features = ["full"] } +tracing = { version = "0.1", features = ["log"] } +tracing-core = { version = "0.1" } +tracing-subscriber = { version = "0.3", features = ["env-filter", "json", "time"] } +unicode-bidi = { version = "0.3" } +unicode-normalization = { version = "0.1" } +url = { version = "2", features = ["expose_internals", "serde"] } +uuid = { version = "1", features = ["fast-rng", "serde", "v4"] } +web-sys = { version = "0.3", default-features = false, features = ["AbortController", "AbortSignal", "AddEventListenerOptions", "BinaryType", "Cache", "CacheQueryOptions", "CacheStorage", "CloseEvent", "CloseEventInit", "Document", "ErrorEvent", "File", "FileReader", "FormData", "Headers", "History", "HtmlHeadElement", "Location", "MessageEvent", "ProgressEvent", "ReadableStream", "ReadableStreamDefaultReader", "Request", "RequestInit", "RequestRedirect", "Response", "ResponseInit", "TransformStream", "WebSocket", "Window", "WorkerGlobalScope", "WritableStream", "WritableStreamDefaultWriter", "console"] } +zeroize = { version = "1", features = ["zeroize_derive"] } + +[build-dependencies] +ahash = { version = "0.8" } +arc-swap = { version = "1", default-features = false, features = ["serde"] } +arrayvec = { version = "0.7" } +autometrics = { version = "0.6", default-features = false, features = ["prometheus", "prometheus-exporter"] } +axum-3b31131e45eafb45 = { package = "axum", version = "0.6", features = ["headers", "http2"] } +axum-ca01ad9e24f5d932 = { package = "axum", version = "0.7", features = ["macros"] } +base64-594e8ee84c453af0 = { package = "base64", version = "0.13", features = ["alloc"] } +base64-647d43efb71741da = { package = "base64", version = "0.21" } +bitflags = { version = "2", default-features = false, features = ["std"] } +block-padding = { version = "0.3", default-features = false, features = ["std"] } +bytemuck = { version = "1", default-features = false, features = ["extern_crate_alloc"] } +byteorder = { version = "1", features = ["i128"] } +bytes = { version = "1", features = ["serde"] } +cbc = { version = "0.1", features = ["std"] } +cc = { version = "1", default-features = false, features = ["parallel"] } +chrono = { version = "0.4" } +cipher = { version = "0.4", default-features = false, features = ["block-padding", "std"] } +clap = { version = "4", features = ["derive"] } +clap_builder = { version = "4", default-features = false, features = ["color", "help", "std", "suggestions", "usage"] } +concurrent-queue = { version = "2" } +core2 = { version = "0.4", default-features = false, features = ["alloc"] } +criterion = { version = "0.5", features = ["async_tokio", "html_reports"] } +crossbeam-channel = { version = "0.5" } +crossbeam-deque = { version = "0.8" } +crossbeam-utils = { version = "0.8" } +crunchy = { version = "0.2", features = ["limit_256", "std"] } +crypto-common = { version = "0.1", default-features = false, features = ["getrandom", "std"] } +data-encoding = { version = "2" } +der = { version = "0.7", default-features = false, features = ["derive", "oid", "pem", "std"] } +ecdsa = { version = "0.16", features = ["pem", "signing", "std", "verifying"] } +either = { version = "1" } +elliptic-curve = { version = "0.13", features = ["ecdh", "hash2curve", "hazmat", "pem", "std"] } +ethers-contract-abigen = { version = "2", default-features = false, features = ["providers", "rustls"] } +fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "c961a01596a87e76f590c7e43aca9d57106dbbb1", features = ["copy_key"] } +futures = { version = "0.3", features = ["bilock", "unstable"] } +futures-channel = { version = "0.3", features = ["sink", "unstable"] } +futures-core = { version = "0.3", features = ["unstable"] } +futures-executor = { version = "0.3" } +futures-io = { version = "0.3", features = ["unstable"] } +futures-sink = { version = "0.3" } +futures-task = { version = "0.3", features = ["unstable"] } +futures-util = { version = "0.3", features = ["bilock", "channel", "io", "sink", "unstable"] } +generic-array = { version = "0.14", default-features = false, features = ["more_lengths", "serde", "zeroize"] } +getrandom = { version = "0.2", default-features = false, features = ["std"] } +hashbrown-582f2526e08bb6a0 = { package = "hashbrown", version = "0.14", default-features = false, features = ["inline-more", "raw"] } +hashbrown-594e8ee84c453af0 = { package = "hashbrown", version = "0.13" } +hashbrown-5ef9efb8ec2df382 = { package = "hashbrown", version = "0.12", features = ["raw"] } +hdrhistogram = { version = "7" } +hex = { version = "0.4" } +hkdf = { version = "0.12", default-features = false, features = ["std"] } +hmac = { version = "0.12", default-features = false, features = ["reset", "std"] } +hyper = { version = "0.14", features = ["full"] } +hyper-rustls = { version = "0.24", features = ["http2"] } +image = { version = "0.24" } +indexmap-dff4ba8e3ae991db = { package = "indexmap", version = "1", default-features = false, features = ["serde", "std"] } +inout = { version = "0.1", default-features = false, features = ["std"] } +itertools = { version = "0.10" } +k256 = { version = "0.13" } +lazy_static = { version = "1", default-features = false, features = ["spin_no_std"] } +libc = { version = "0.2" } +log = { version = "0.4", default-features = false, features = ["std"] } +matrixmultiply = { version = "0.3", features = ["cgemm"] } +memchr = { version = "2" } +miniz_oxide = { version = "0.7", features = ["simd"] } +multihash = { version = "0.19" } +nom = { version = "7" } +num-bigint = { version = "0.4", features = ["rand", "serde"] } +num-bigint-dig = { version = "0.8", default-features = false, features = ["i128", "prime", "u64_digit", "zeroize"] } +num-complex = { version = "0.4", default-features = false, features = ["std"] } +num-integer = { version = "0.1", features = ["i128"] } +num-iter = { version = "0.1", features = ["i128"] } +num-rational = { version = "0.4", default-features = false, features = ["num-bigint-std", "std"] } +num-traits = { version = "0.2", features = ["i128", "libm"] } +p256 = { version = "0.13", features = ["ecdh"] } +phf_shared = { version = "0.11" } +plotters = { version = "0.3" } +prettyplease = { version = "0.2", default-features = false, features = ["verbatim"] } +primitive-types = { version = "0.12", features = ["byteorder", "rlp", "rustc-hex", "scale-info", "serde_no_std"] } +proc-macro2 = { version = "1", features = ["span-locations"] } +prost = { version = "0.11" } +quinn = { version = "0.10", features = ["futures-io"] } +quinn-proto = { version = "0.10", features = ["native-certs"] } +quinn-udp = { version = "0.4", default-features = false, features = ["log"] } +quote = { version = "1" } +rand = { version = "0.8", features = ["small_rng"] } +rand_chacha = { version = "0.3" } +regex = { version = "1" } +regex-automata = { version = "0.4", default-features = false, features = ["dfa-onepass", "hybrid", "meta", "nfa-backtrack", "perf-inline", "perf-literal", "unicode"] } +regex-syntax = { version = "0.8" } +reqwest = { version = "0.11", features = ["brotli", "gzip", "json", "rustls-tls", "socks", "stream"] } +ring-9067fe90e8c1f593 = { package = "ring", version = "0.17", features = ["std"] } +ring-986da7b5efc2b80e = { package = "ring", version = "0.16", features = ["std"] } +rocksdb = { version = "0.21", features = ["multi-threaded-cf"] } +ruint = { version = "1", features = ["num-bigint", "primitive-types", "serde"] } +rustls = { version = "0.21", features = ["dangerous_configuration", "quic"] } +rustls-pki-types = { version = "1", features = ["std"] } +schemars = { version = "0.8", features = ["either"] } +scopeguard = { version = "1" } +sec1 = { version = "0.7", features = ["pem", "std", "subtle"] } +serde = { version = "1", features = ["alloc", "derive", "rc"] } +serde_json = { version = "1", features = ["alloc", "float_roundtrip", "preserve_order", "raw_value", "unbounded_depth"] } +sha1 = { version = "0.10", features = ["oid"] } +sha2 = { version = "0.10", features = ["oid"] } +sha3 = { version = "0.10" } +smallvec = { version = "1", default-features = false, features = ["union"] } +socket2 = { version = "0.5", default-features = false, features = ["all"] } +spki = { version = "0.7", default-features = false, features = ["pem", "std"] } +syn-dff4ba8e3ae991db = { package = "syn", version = "1", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] } +syn-f595c2ba2a3f28df = { package = "syn", version = "2", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] } +time = { version = "0.3", features = ["formatting", "local-offset", "macros", "parsing"] } +tokio = { version = "1", features = ["full", "test-util", "tracing"] } +tokio-rustls = { version = "0.24" } +tokio-stream = { version = "0.1", features = ["net"] } +tokio-util = { version = "0.7", features = ["codec", "compat", "io", "time"] } +toml_datetime = { version = "0.6", default-features = false, features = ["serde"] } +tower = { version = "0.4", features = ["full"] } +tracing = { version = "0.1", features = ["log"] } +tracing-core = { version = "0.1" } +tracing-subscriber = { version = "0.3", features = ["env-filter", "json", "time"] } +unicode-bidi = { version = "0.3" } +unicode-normalization = { version = "0.1" } +url = { version = "2", features = ["expose_internals", "serde"] } +uuid = { version = "1", features = ["fast-rng", "serde", "v4"] } +web-sys = { version = "0.3", default-features = false, features = ["AbortController", "AbortSignal", "AddEventListenerOptions", "BinaryType", "Cache", "CacheQueryOptions", "CacheStorage", "CloseEvent", "CloseEventInit", "Document", "ErrorEvent", "File", "FileReader", "FormData", "Headers", "History", "HtmlHeadElement", "Location", "MessageEvent", "ProgressEvent", "ReadableStream", "ReadableStreamDefaultReader", "Request", "RequestInit", "RequestRedirect", "Response", "ResponseInit", "TransformStream", "WebSocket", "Window", "WorkerGlobalScope", "WritableStream", "WritableStreamDefaultWriter", "console"] } +zeroize = { version = "1", features = ["zeroize_derive"] } + +[target.x86_64-unknown-linux-gnu.dependencies] +arrayvec = { version = "0.7", default-features = false, features = ["serde"] } +bitflags = { version = "2", default-features = false, features = ["serde"] } +hashbrown-582f2526e08bb6a0 = { package = "hashbrown", version = "0.14" } +indexmap-f595c2ba2a3f28df = { package = "indexmap", version = "2", features = ["serde"] } +jpeg-decoder = { version = "0.3", default-features = false, features = ["rayon"] } +linux-raw-sys = { version = "0.4", default-features = false, features = ["elf", "errno", "general", "ioctl", "no_std", "std"] } +mio = { version = "0.8", features = ["net", "os-ext"] } +openssl = { version = "0.10", features = ["vendored"] } +openssl-sys = { version = "0.9", default-features = false, features = ["vendored"] } +rustix = { version = "0.38", features = ["fs", "termios"] } +semver = { version = "1", features = ["serde"] } +spin = { version = "0.9" } +web-sys = { version = "0.3", default-features = false, features = ["Worker"] } + +[target.x86_64-unknown-linux-gnu.build-dependencies] +arrayvec = { version = "0.7", default-features = false, features = ["serde"] } +bitflags = { version = "2", default-features = false, features = ["serde"] } +hashbrown-582f2526e08bb6a0 = { package = "hashbrown", version = "0.14" } +indexmap-f595c2ba2a3f28df = { package = "indexmap", version = "2", features = ["serde"] } +jpeg-decoder = { version = "0.3", default-features = false, features = ["rayon"] } +linux-raw-sys = { version = "0.4", default-features = false, features = ["elf", "errno", "general", "ioctl", "no_std", "std"] } +mio = { version = "0.8", features = ["net", "os-ext"] } +openssl = { version = "0.10", features = ["vendored"] } +openssl-sys = { version = "0.9", default-features = false, features = ["vendored"] } +rustix = { version = "0.38", features = ["fs", "termios"] } +semver = { version = "1", features = ["serde"] } +spin = { version = "0.9" } +web-sys = { version = "0.3", default-features = false, features = ["Worker"] } + +[target.aarch64-apple-darwin.dependencies] +arrayvec = { version = "0.7", default-features = false, features = ["serde"] } +bitflags = { version = "2", default-features = false, features = ["serde"] } +core-foundation = { version = "0.9" } +core-foundation-sys = { version = "0.8" } +hashbrown-582f2526e08bb6a0 = { package = "hashbrown", version = "0.14" } +indexmap-f595c2ba2a3f28df = { package = "indexmap", version = "2", features = ["serde"] } +jpeg-decoder = { version = "0.3", default-features = false, features = ["rayon"] } +libc = { version = "0.2", default-features = false, features = ["extra_traits"] } +mio = { version = "0.8", features = ["net", "os-ext"] } +rustix = { version = "0.38", features = ["fs", "termios"] } +security-framework-sys = { version = "2" } +semver = { version = "1", features = ["serde"] } +spin = { version = "0.9" } +web-sys = { version = "0.3", default-features = false, features = ["Worker"] } + +[target.aarch64-apple-darwin.build-dependencies] +arrayvec = { version = "0.7", default-features = false, features = ["serde"] } +bitflags = { version = "2", default-features = false, features = ["serde"] } +core-foundation = { version = "0.9" } +core-foundation-sys = { version = "0.8" } +hashbrown-582f2526e08bb6a0 = { package = "hashbrown", version = "0.14" } +indexmap-f595c2ba2a3f28df = { package = "indexmap", version = "2", features = ["serde"] } +jpeg-decoder = { version = "0.3", default-features = false, features = ["rayon"] } +libc = { version = "0.2", default-features = false, features = ["extra_traits"] } +mio = { version = "0.8", features = ["net", "os-ext"] } +rustix = { version = "0.38", features = ["fs", "termios"] } +security-framework-sys = { version = "2" } +semver = { version = "1", features = ["serde"] } +spin = { version = "0.9" } +web-sys = { version = "0.3", default-features = false, features = ["Worker"] } + +### END HAKARI SECTION diff --git a/etc/workspace-hack/build.rs b/etc/workspace-hack/build.rs new file mode 100644 index 000000000..92518ef04 --- /dev/null +++ b/etc/workspace-hack/build.rs @@ -0,0 +1,2 @@ +// A build script is required for cargo to consider build dependencies. +fn main() {} diff --git a/etc/workspace-hack/src/lib.rs b/etc/workspace-hack/src/lib.rs new file mode 100644 index 000000000..22489f632 --- /dev/null +++ b/etc/workspace-hack/src/lib.rs @@ -0,0 +1 @@ +// This is a stub lib.rs. diff --git a/services/ai/Cargo.toml b/services/ai/Cargo.toml index d30116721..ffdb2ffb7 100644 --- a/services/ai/Cargo.toml +++ b/services/ai/Cargo.toml @@ -21,6 +21,7 @@ tracing.workspace = true tracing-subscriber = { version = "0.3", features = [ "env-filter" ] } tokio.workspace = true url ="2.5.0" +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } [[bin]] name = "fn-service-2" diff --git a/services/ai/examples/rust/common/Cargo.toml b/services/ai/examples/rust/common/Cargo.toml index 6163895b2..fc12d7167 100644 --- a/services/ai/examples/rust/common/Cargo.toml +++ b/services/ai/examples/rust/common/Cargo.toml @@ -5,3 +5,4 @@ edition = "2021" publish = false [dependencies] +workspace-hack = { version = "0.1", path = "../../../../../etc/workspace-hack" } diff --git a/services/ai/examples/rust/nlp/Cargo.toml b/services/ai/examples/rust/nlp/Cargo.toml index ada528cac..0259b4344 100644 --- a/services/ai/examples/rust/nlp/Cargo.toml +++ b/services/ai/examples/rust/nlp/Cargo.toml @@ -14,3 +14,4 @@ safetensors = "0.4" safetensors-ndarray = { path = "../../../../../lib/safetensors-ndarray" } tokenizers = { version = "0.15", default-features = false, features = [ "onig", "http" ] } tokio.workspace = true +workspace-hack = { version = "0.1", path = "../../../../../etc/workspace-hack" } diff --git a/services/ai/examples/rust/vision/Cargo.toml b/services/ai/examples/rust/vision/Cargo.toml index 9ab75f8b7..1429e6a1c 100644 --- a/services/ai/examples/rust/vision/Cargo.toml +++ b/services/ai/examples/rust/vision/Cargo.toml @@ -12,3 +12,4 @@ safetensors = "0.4" safetensors-ndarray = { path = "../../../../../lib/safetensors-ndarray" } tokio.workspace = true common = { path = "../common" } +workspace-hack = { version = "0.1", path = "../../../../../etc/workspace-hack" } diff --git a/services/fetcher/Cargo.toml b/services/fetcher/Cargo.toml index a51ef256d..c13302277 100644 --- a/services/fetcher/Cargo.toml +++ b/services/fetcher/Cargo.toml @@ -14,6 +14,7 @@ tracing-subscriber = { version = "0.3", features = [ "env-filter" ] } url ="2.5.0" cid = "0.11" hex = "0.4" +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } [dev-dependencies] lightning-schema = { path = "../../core/schema" } diff --git a/services/js-poc/Cargo.toml b/services/js-poc/Cargo.toml index 3dce21123..a0634aab1 100644 --- a/services/js-poc/Cargo.toml +++ b/services/js-poc/Cargo.toml @@ -30,6 +30,7 @@ deno_fetch = "0.170" deno_crypto = "0.160" deno_canvas = "0.15.0" deno_webgpu = "0.113" +workspace-hack = { version = "0.1", path = "../../etc/workspace-hack" } [dev-dependencies] lightning-schema = { path = "../../core/schema" }