parazyd 1 год назад
Родитель
Сommit
fda2a84034

Разница между файлами не показана из-за своего большого размера
+ 193 - 211
Cargo.lock


+ 20 - 22
Cargo.toml

@@ -52,7 +52,7 @@ members = [
 
 [dependencies]
 # Hard dependencies
-libc = "0.2.172"
+libc = "0.2.174"
 log = "0.4.27"
 thiserror = "2.0.12"
 
@@ -67,14 +67,14 @@ pin-project-lite = {version = "0.2.16", optional = true}
 futures-rustls = {version = "0.26.0", default-features = false, features = ["logging", "tls12", "ring"], optional = true}
 
 # Pluggable Transports
-socket2 = {version = "0.5.9", features = ["all"], optional = true}
-arti-client = {version = "0.30.0", default-features = false, features = ["async-std", "compression", "error_detail", "rustls", "onion-service-client", "onion-service-service"], optional = true}
-tor-error = {version = "0.30.0", optional = true}
-tor-rtcompat = {version = "0.30.0", features = ["async-std", "rustls"], optional = true}
-tor-hscrypto = {version = "0.30.0", optional = true}
-tor-hsservice = {version = "0.30.0", optional = true}
-tor-proto = {version = "0.30.0", optional = true}
-tor-cell = {version = "0.30.0", optional = true}
+socket2 = {version = "0.6.0", features = ["all"], optional = true}
+arti-client = {version = "0.32.0", default-features = false, features = ["async-std", "compression", "error_detail", "rustls", "onion-service-client", "onion-service-service"], optional = true}
+tor-error = {version = "0.32.0", optional = true}
+tor-rtcompat = {version = "0.32.0", features = ["async-std", "rustls"], optional = true}
+tor-hscrypto = {version = "0.32.0", optional = true}
+tor-hsservice = {version = "0.32.0", optional = true}
+tor-proto = {version = "0.32.0", optional = true}
+tor-cell = {version = "0.32.0", optional = true}
 
 # TLS cert utilities
 ed25519-compact = {version = "2.1.1", optional = true}
@@ -90,13 +90,13 @@ httparse = {version = "1.10.1", optional = true}
 semver = {version = "1.0.26", optional = true}
 structopt = {version= "0.3.26", optional = true}
 structopt-toml = {version= "0.5.1", optional = true}
-toml = {version = "0.8.22", optional = true}
+toml = {version = "0.9.5", optional = true}
 
 # Utilities
 #darkfi-serial = {path = "src/serial", optional = true}
 #darkfi-derive = {path = "src/serial/derive", optional = true}
-darkfi-serial = {version = "0.5.0", optional = true}
-darkfi-derive = {version = "0.5.0", optional = true}
+darkfi-serial = {version = "0.5.1", optional = true}
+darkfi-derive = {version = "0.5.1", optional = true}
 
 # TODO: check chrono usage and impl our own
 chrono = {version = "0.4.41", optional = true}
@@ -112,14 +112,14 @@ regex = {version = "1.11.1", optional = true}
 rand = {version = "0.8.5", optional = true}
 blake3 = {version = "1.8.2", features = ["rayon"], optional = true}
 crypto_api_chachapoly = {version = "0.5.0", optional = true}
-halo2_proofs = {version = "0.3.0", features = ["circuit-params"], optional = true}
+halo2_proofs = {version = "0.3.1", features = ["circuit-params"], optional = true}
 halo2_gadgets = {version = "0.3.1", features = ["circuit-params"], optional = true}
 
 # Smart contract runtime
 darkfi-sdk = {path = "src/sdk", optional = true}
-wasmer = {version = "6.0.1", features = ["singlepass"], optional = true}
-wasmer-compiler-singlepass = {version = "6.0.1", optional = true}
-wasmer-middlewares = {version = "6.0.1", optional = true}
+wasmer = {version = "6.1.0-rc.2", features = ["singlepass"], optional = true}
+wasmer-compiler-singlepass = {version = "6.1.0-rc.2", optional = true}
+wasmer-middlewares = {version = "6.1.0-rc.2", optional = true}
 
 # Blockchain store
 sled-overlay = {version = "0.1.9", optional = true}
@@ -131,13 +131,13 @@ tiny-keccak = { version = "2.0.2", features = ["keccak"], optional = true }
 
 [dev-dependencies]
 clap = {version = "4.4.11", features = ["derive"]}
-halo2_proofs = {version = "0.3.0", features = ["dev-graph", "sanity-checks"]}
+halo2_proofs = {version = "0.3.1", features = ["dev-graph", "sanity-checks"]}
 halo2_gadgets = "0.3.1"
 plotters = "0.3.7"
 easy-parallel = "3.3.1"
 prettytable-rs = "0.10.0"
 # Used for benchmarks
-criterion = { version = "0.5.1", features = ["html_reports"] }
+criterion = { version = "0.7.0", features = ["html_reports"] }
 
 # -----BEGIN LIBRARY FEATURES-----
 [features]
@@ -321,10 +321,8 @@ dht = [
 # -----END LIBRARY FEATURES-----
 
 [patch.crates-io]
-halo2_proofs = {git="https://github.com/parazyd/halo2", branch="v4"}
-halo2_gadgets = {git="https://github.com/parazyd/halo2", branch="v4"}
-# Temp smol-2.0 fix
-async-lock = {git="https://github.com/smol-rs/async-lock", rev="542831132f2c707aae1c380edd43452053433814"}
+halo2_proofs = {git="https://github.com/parazyd/halo2", branch="v031"}
+halo2_gadgets = {git="https://github.com/parazyd/halo2", branch="v031"}
 # Forked "url" crate with added P2P schemas
 url = {git="https://github.com/darkrenaissance/rust-url", branch="main"}
 

+ 8 - 8
bin/app/Cargo.toml

@@ -29,10 +29,10 @@ darkfi-serial = {version = "0.5.0", features = ["async"]}
 thiserror = "2.0.12"
 smol = "2.0.2"
 atomic_float = "1.1.0"
-async-channel = "2.3.1"
+async-channel = "2.5.0"
 easy-parallel = "3.3.1"
 rand = "0.8.5"
-async-lock = "3.4.0"
+async-lock = "3.4.1"
 futures = "0.3.31"
 async-recursion = "1.1.1"
 colored = "3.0.0"
@@ -47,7 +47,7 @@ blake3 = "1.8.2"
 simplelog = "0.12.2"
 # For log files
 file-rotate = "0.7.6"
-parking_lot = { version = "0.12.3", features = ["nightly"] }
+parking_lot = { version = "0.12.4", features = ["nightly"] }
 regex = "1.11"
 parley = { git = "https://github.com/linebender/parley.git" }
 swash = { git = "https://github.com/valadaptive/swash", branch = "tight-bounds" }
@@ -77,8 +77,8 @@ halo2_gadgets = { git="https://github.com/parazyd/halo2", branch="v4" }
 # Once merged, we can remove this
 swash = { git = "https://github.com/valadaptive/swash", branch = "tight-bounds" }
 
-tor-rtcompat = { git = "https://github.com/narodnik/arti" }
-tor-rtmock = { git = "https://github.com/narodnik/arti" }
+tor-rtcompat = "0.32.0"
+tor-rtmock = "0.32.0"
 
 [target.'cfg(not(target_os = "android"))'.dependencies]
 dirs = "5.0.1"
@@ -86,12 +86,12 @@ dirs = "5.0.1"
 [target.'cfg(target_os = "android")'.dependencies]
 android_logger = "0.13.3"
 # Required by Arti: tor-dirmgr
-tor-dirmgr = { version="0.29.0", features=["static"] }
+tor-dirmgr = { version="0.32.0", features=["static"] }
 
 [target.'cfg(target_os = "windows")'.dependencies]
 # Used by tor-dirmgr
-#rusqlite = {version = "0.32.1", features = ["bundled"]}
-tor-dirmgr = { version="0.29.0", features=["static"] }
+#rusqlite = {version = "0.37.0", features = ["bundled"]}
+tor-dirmgr = { version="0.32.0", features=["static"] }
 
 [package.metadata.android.activity_attributes]
 "android:exported" = "true"

+ 1 - 1
bin/darkfid/Cargo.toml

@@ -23,7 +23,7 @@ log = "0.4.27"
 num-bigint = "0.4.6"
 rand = "0.8.5"
 sled-overlay = "0.1.9"
-toml = "0.8.22"
+toml = "0.9.5"
 
 # JSON-RPC
 async-trait = "0.1.88"

+ 3 - 3
bin/darkirc/Cargo.toml

@@ -21,7 +21,7 @@ path = "src/main.rs"
 darkfi = {path = "../../", features = ["async-daemonize", "event-graph", "rpc", "zk"]}
 darkfi-sdk = {path = "../../src/sdk", features = ["async"]}
 darkfi-serial = {version = "0.5.0", features = ["async"]}
-libc = "0.2.172"
+libc = "0.2.174"
 
 # Event Graph DB
 sled-overlay = "0.1.9"
@@ -44,7 +44,7 @@ url = "2.5.4"
 
 # Encoding and parsing
 bs58 = "0.5.1"
-toml = "0.8.22"
+toml = "0.9.5"
 semver = "1.0.26"
 
 # Daemon
@@ -62,7 +62,7 @@ structopt-toml = "0.5.1"
 # See https://github.com/rust-mobile/android-rs-glue/issues/193
 [target.aarch64-linux-android.dependencies]
 openssl = { version = "*", features = ["vendored"] }
-rusqlite = {version = "0.32.1", features = ["bundled"]}
+rusqlite = {version = "0.36.0", features = ["bundled"]}
 
 [lints]
 workspace = true

+ 2 - 2
bin/drk/Cargo.toml

@@ -26,8 +26,8 @@ num-bigint = "0.4.6"
 prettytable-rs = "0.10.0"
 rand = "0.8.5"
 rodio = {version = "0.20.1", default-features = false, features = ["minimp3"]}
-rusqlite = {version = "0.32.1", features = ["sqlcipher"]}
-toml = "0.8.22"
+rusqlite = {version = "0.36.0", features = ["sqlcipher"]}
+toml = "0.9.5"
 url = "2.5.4"
 
 # Daemon

+ 1 - 1
bin/explorer/explorerd/Cargo.toml

@@ -38,7 +38,7 @@ blake3 = "1.8.2"
 log = "0.4.27"
 lazy_static = "1.5.0"
 tar = "0.4.44"
-toml = "0.8.22"
+toml = "0.9.5"
 thiserror = "2.0.12"
 
 # Testing

+ 1 - 1
bin/lilith/Cargo.toml

@@ -17,7 +17,7 @@ futures = "0.3.31"
 log = "0.4.27"
 semver = "1.0.26"
 tinyjson = "2.5.1"
-toml = "0.8.22"
+toml = "0.9.5"
 url = "2.5.4"
 
 # Daemon

+ 2 - 2
bin/tau/taud/Cargo.toml

@@ -37,13 +37,13 @@ rand = "0.8.5"
 
 # Encoding and parsing
 bs58 = "0.5.1"
-toml = "0.8.22"
+toml = "0.9.5"
 
 # Misc
 async-trait = "0.1.88"
 chrono = "0.4.41"
 futures = "0.3.31"
-libc = "0.2.172"
+libc = "0.2.174"
 log = "0.4.27"
 thiserror = "2.0.12"
 tinyjson = "2.5.1"

+ 2 - 2
example/p2pdebug/Cargo.toml

@@ -16,7 +16,7 @@ smol = "2.0.2"
 futures = "0.3.31"
 async-std = "1.13.1"
 async-trait = "0.1.88"
-async-channel = "2.3.1"
+async-channel = "2.5.0"
 async-executor = "1.13.2"
 easy-parallel = "3.3.1"
 
@@ -31,7 +31,7 @@ fxhash = "0.2.1"
 url = "2.5.4"
 
 # Encoding and parsing
-serde_json = "1.0.140"
+serde_json = "1.0.142"
 
 [lints]
 workspace = true

+ 1 - 1
fuzz/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 cargo-fuzz = true
 
 [dependencies]
-libfuzzer-sys = "0.4.9"
+libfuzzer-sys = "0.4.10"
 
 [dependencies.darkfi]
 path = ".."

+ 1 - 1
fuzz/honggfuzz/Cargo.toml

@@ -9,7 +9,7 @@ cargo-fuzz = true
 
 [dependencies]
 honggfuzz = "0.5.57"
-bitcoin = "0.32.5"
+bitcoin = "0.32.7"
 
 [dependencies.darkfi]
 path = "../.."

+ 3 - 3
script/research/dhtd/Cargo.toml

@@ -10,16 +10,16 @@ path = "../../../"
 features = ["dht"]
 
 [dependencies]
-async-channel = "2.3.1"
+async-channel = "2.5.0"
 async-executor = "1.13.2"
 async-std = "1.13.1"
 async-trait = "0.1.88"
 blake3 = "1.8.2"
 ctrlc = { version = "3.4.7", features = ["termination"] }
 easy-parallel = "3.3.1"
-futures-lite = "2.6.0"
+futures-lite = "2.6.1"
 log = "0.4.27"
-serde_json = "1.0.140"
+serde_json = "1.0.142"
 simplelog = "0.12.2"
 url = "2.5.4"
 

+ 1 - 1
script/research/zk/ecip-bench/Cargo.toml

@@ -10,7 +10,7 @@ edition = "2021"
 [dependencies]
 darkfi = {path = "../../../../", features = ["zk"]}
 darkfi-sdk = {path = "../../../../src/sdk"}
-halo2_proofs = "0.3.0"
+halo2_proofs = "0.3.1"
 halo2_gadgets = "0.3.1"
 rand = "0.8.5"
 hex = "0.4.3"

+ 1 - 1
src/contract/dao/Cargo.toml

@@ -20,7 +20,7 @@ thiserror = "2.0.12"
 # probably shouldn't be in WASM
 chacha20poly1305 = { version = "0.10.1", optional = true }
 darkfi = { path = "../../../", features = ["zk", "rpc", "blockchain"], optional = true }
-halo2_proofs = { version = "0.3.0", optional = true }
+halo2_proofs = { version = "0.3.1", optional = true }
 log = { version = "0.4.27", optional = true }
 rand = { version = "0.8.5", optional = true }
 

+ 1 - 1
src/contract/deployooor/Cargo.toml

@@ -12,7 +12,7 @@ crate-type = ["cdylib", "rlib"]
 darkfi-sdk = { path = "../../sdk", features = ["wasm"] }
 darkfi-serial = { version = "0.5.0", features = ["derive", "crypto"] }
 thiserror = "2.0.12"
-wasmparser = "0.230.0"
+wasmparser = "0.236.0"
 
 # The following dependencies are used for the client API and
 # probably shouldn't be in WASM

+ 1 - 1
src/contract/money/Cargo.toml

@@ -19,7 +19,7 @@ thiserror = "2.0.12"
 # probably shouldn't be in WASM
 darkfi = { path = "../../../", features = ["zk"], optional = true }
 chacha20poly1305 = { version = "0.10.1", optional = true }
-halo2_proofs = { version = "0.3.0", optional = true }
+halo2_proofs = { version = "0.3.1", optional = true }
 log = { version = "0.4.27", optional = true }
 rand = { version = "0.8.5", optional = true }
 

+ 3 - 3
src/net/transport/tcp.rs

@@ -75,10 +75,10 @@ impl TcpDialer {
         }
 
         if let Some(ttl) = self.ttl {
-            socket.set_ttl(ttl)?;
+            socket.set_ttl_v4(ttl)?;
         }
 
-        socket.set_nodelay(true)?;
+        socket.set_tcp_nodelay(true)?;
         let keepalive = TcpKeepalive::new().with_time(Duration::from_secs(20));
         socket.set_tcp_keepalive(&keepalive)?;
         socket.enable_reuse_port()?;
@@ -165,7 +165,7 @@ impl TcpListener {
             socket.set_only_v6(true)?;
         }
 
-        socket.set_nodelay(true)?;
+        socket.set_tcp_nodelay(true)?;
         let keepalive = TcpKeepalive::new().with_time(Duration::from_secs(20));
         socket.set_tcp_keepalive(&keepalive)?;
         socket.enable_reuse_port()?;

+ 4 - 4
src/sdk/Cargo.toml

@@ -21,7 +21,7 @@ wasm = []
 thiserror = "2.0.12"
 
 # Serialization
-darkfi-serial = {version = "0.5.0", features = ["crypto"]}
+darkfi-serial = {version = "0.5.1", features = ["crypto"]}
 
 # Encoding
 bs58 = "0.5.1"
@@ -33,7 +33,7 @@ blake2b_simd = "1.0.3"
 blake3 = "1.8.2"
 chacha20poly1305 = "0.10.1"
 halo2_gadgets = "0.3.1"
-bridgetree = "0.6.0"
+bridgetree = "0.7.0"
 num-bigint = "0.4.6"
 num-traits = "0.2.19"
 pasta_curves = "0.5.1"
@@ -43,10 +43,10 @@ rand = "0.8.5"
 # Misc
 lazy_static = "1.5.0"
 subtle = "2.6.1"
-hashbrown = "0.15.3"
+hashbrown = "0.15.4"
 
 [dev-dependencies]
-halo2_proofs = {version = "0.3.0", features = ["dev-graph", "sanity-checks"]}
+halo2_proofs = {version = "0.3.1", features = ["dev-graph", "sanity-checks"]}
 halo2_gadgets = {version = "0.3.1", features = ["test-dependencies"]}
 
 [lints]

+ 2 - 2
src/sdk/python/Cargo.toml

@@ -16,8 +16,8 @@ doc = false
 [dependencies]
 darkfi = {path = "../../../", features = ["zk", "zkas"]}
 darkfi-sdk = {path = "../"}
-halo2_proofs = {version = "0.3.0", features = ["dev-graph", "sanity-checks"]}
-halo2_gadgets = "0.3.1"
+halo2_proofs = {version = "0.3.1", features = ["circuit-params", "dev-graph", "sanity-checks"]}
+halo2_gadgets = {version = "0.3.1", features = ["circuit-params"]}
 plotters = "0.3.7"
 pyo3 = {version = "0.22.6", features = ["gil-refs"]}
 rand = "0.8.5"

+ 1 - 1
src/zk/vm.rs

@@ -44,7 +44,7 @@ use halo2_gadgets::{
             MerklePath,
         },
     },
-    utilities::lookup_range_check::LookupRangeCheckConfig,
+    utilities::lookup_range_check::{LookupRangeCheck, LookupRangeCheckConfig},
 };
 use halo2_proofs::{
     arithmetic::Field,

Некоторые файлы не были показаны из-за большого количества измененных файлов