diff --git a/Cargo.lock b/Cargo.lock index 6d1de5f..48943a9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -937,7 +937,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -1046,7 +1046,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -2032,7 +2032,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d463f34ca3c400fde3a054da0e0b8c6ffa21e4590922f3e18281bb5eeef4cbdc" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -2252,18 +2252,6 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084" -[[package]] -name = "nix" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" -dependencies = [ - "bitflags", - "cfg-if", - "cfg_aliases", - "libc", -] - [[package]] name = "nix" version = "0.30.1" @@ -2298,7 +2286,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -2754,7 +2742,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "343d3bd7056eda839b03204e68deff7d1b13aba7af2b2fd16890697274262ee7" dependencies = [ "heck", - "itertools 0.14.0", + "itertools 0.12.1", "log", "multimap", "petgraph", @@ -2775,7 +2763,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b" dependencies = [ "anyhow", - "itertools 0.14.0", + "itertools 0.12.1", "proc-macro2", "quote", "syn 2.0.114", @@ -2885,7 +2873,7 @@ dependencies = [ "once_cell", "socket2", "tracing", - "windows-sys 0.60.2", + "windows-sys 0.52.0", ] [[package]] @@ -3139,7 +3127,7 @@ dependencies = [ "clap", "hex", "insta", - "nix 0.30.1", + "nix", "owo-colors", "regex", "ripemd 0.1.3", @@ -3293,7 +3281,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -3755,7 +3743,7 @@ dependencies = [ "getrandom 0.3.4", "once_cell", "rustix", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -5069,9 +5057,9 @@ dependencies = [ [[package]] name = "zebra-chain" -version = "3.1.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4aa7e85afd7bdf159e8c9a973d32bfc410be42ce82c2396690ae1208933bb8" +checksum = "3b41d733382b3ecbf892f816ab9c1e448c9ae868d2bbb9f12a55b80c4e21fee2" dependencies = [ "bech32", "bitflags", @@ -5130,9 +5118,9 @@ dependencies = [ [[package]] name = "zebra-consensus" -version = "3.1.1" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770efa97a22262ee80290b0ffa251cddb34d7c50351c4e5255ed80f644d035e0" +checksum = "11221f1e778bda63ec3e412dc29322a5293e517a24710ec0bc65aea26f1e55c8" dependencies = [ "bellman", "blake2b_simd", @@ -5169,9 +5157,9 @@ dependencies = [ [[package]] name = "zebra-network" -version = "2.0.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3edeb353c33962fb5f9012745ddb44d33ee90acb8c9410669bf54d72488b8cf" +checksum = "d3a34b04cb134997950b1ad0138aef9a6320f7aec16cab082419652ae3fcac8e" dependencies = [ "bitflags", "byteorder", @@ -5206,9 +5194,9 @@ dependencies = [ [[package]] name = "zebra-node-services" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "863ddd987ed6373872b20629a471c535ae2ba114a193415227635840ec570ccd" +checksum = "30236040805a4ae868e0f3f810ee92db08925307e21ee7d1b6d480cb4b8b5efc" dependencies = [ "color-eyre", "jsonrpsee-types", @@ -5222,9 +5210,9 @@ dependencies = [ [[package]] name = "zebra-rpc" -version = "3.1.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c81f52b33b83f5a7f9b0377981843242c2657027053a406f01b06862dddbf747" +checksum = "8afcfc310a775b123a9f27e32e50b25f2b02b80051bce5e4be3ced786d83e808" dependencies = [ "base64", "chrono", @@ -5239,7 +5227,7 @@ dependencies = [ "jsonrpsee", "jsonrpsee-proc-macros", "jsonrpsee-types", - "nix 0.29.0", + "nix", "prost", "rand 0.8.5", "sapling-crypto", @@ -5272,9 +5260,9 @@ dependencies = [ [[package]] name = "zebra-script" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11acd2a4f9077e3698bbc51a3f04c247381f7bf7f77aacc408e5760d3246993b" +checksum = "e3a0327411bde3e0ecd8212ddecfc003d214d3be966229ae675258a402e4ca04" dependencies = [ "libzcash_script", "thiserror 2.0.17", @@ -5285,9 +5273,9 @@ dependencies = [ [[package]] name = "zebra-state" -version = "3.1.1" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b47250eaaa047bebde853a54184ab00ab19f47ed451f35b7c1ae8fe17004d87a" +checksum = "8a110993e61b6057f20cb4abef92abe811f7d8a8957ee40688a1c30f23e2009a" dependencies = [ "bincode", "chrono", @@ -5418,7 +5406,7 @@ dependencies = [ [[package]] name = "zingo_common_components" version = "0.1.0" -source = "git+https://github.com/zingolabs/zingo-common.git?branch=dev#bec229a0bcc47b1d1430649f316be79dcc51a956" +source = "git+https://github.com/zingolabs/zingo-common.git?branch=dev#7de9f9e8a261f95a632df2c57d2c9cbe68fc0ae8" dependencies = [ "zebra-chain", ] diff --git a/Cargo.toml b/Cargo.toml index 948e640..4ac8361 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,9 +8,9 @@ resolver = "2" zingo_test_vectors = { path = "zingo_test_vectors" } # zebra -zebra-chain = "3.0" +zebra-chain = "4.0" zebra-node-services = "2.0" -zebra-rpc = "3.0" +zebra-rpc = "4.0" # other http = "1.1.0" diff --git a/regtest-launcher/src/main.rs b/regtest-launcher/src/main.rs index 11b9611..3c8b48d 100644 --- a/regtest-launcher/src/main.rs +++ b/regtest-launcher/src/main.rs @@ -92,13 +92,16 @@ async fn main() { ); let client = RpcRequestClient::new(SocketAddr::from_str(&rpc_addr.to_string()).unwrap()); - let regtest_network = Network::Testnet(Arc::new(Parameters::new_regtest(RegtestParameters { - activation_heights: heights, - funding_streams: None, - lockbox_disbursements: None, - checkpoints: None, - extend_funding_stream_addresses_as_required: None, - }))); + let regtest_network = Network::Testnet(Arc::new( + Parameters::new_regtest(RegtestParameters { + activation_heights: heights, + funding_streams: None, + lockbox_disbursements: None, + checkpoints: None, + extend_funding_stream_addresses_as_required: None, + }) + .unwrap(), + )); let running = Arc::new(AtomicBool::new(true)); let running_miner = running.clone();