diff --git a/.github/workflows/ci-unit-tests-os.yml b/.github/workflows/ci-unit-tests-os.yml index c75c7e3e4..1d332e4d1 100644 --- a/.github/workflows/ci-unit-tests-os.yml +++ b/.github/workflows/ci-unit-tests-os.yml @@ -78,8 +78,7 @@ jobs: strategy: fail-fast: false matrix: - # TODO: Windows was removed for now, see https://github.com/ZcashFoundation/zebra/issues/3801 - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-latest, windows-latest] rust: [stable, beta] # TODO: When vars.EXPERIMENTAL_FEATURES has features in it, add it here. # Or work out a way to trim the space from the variable: GitHub doesn't allow empty variables. diff --git a/Cargo.lock b/Cargo.lock index a4a1730f1..baab5fced 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1077,9 +1077,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.107" +version = "1.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe98ba1789d56fb3db3bee5e032774d4f421b685de7ba703643584ba24effbe" +checksum = "048948e14bc2c2652ec606c8e3bb913407f0187288fb351a0b2d972beaf12070" dependencies = [ "cc", "cxxbridge-flags", @@ -1089,9 +1089,9 @@ dependencies = [ [[package]] name = "cxx-gen" -version = "0.7.117" +version = "0.7.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54b629c0d006c7e44c1444dd17d18a458c9390d32276b758ac7abd21a75c99b0" +checksum = "383ecb9f96a536a1c7a2a61c5786f583da84f9240da149d78d005a4413c9a71e" dependencies = [ "codespan-reporting", "proc-macro2", @@ -1101,15 +1101,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.107" +version = "1.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20888d9e1d2298e2ff473cee30efe7d5036e437857ab68bbfea84c74dba91da2" +checksum = "af40b0467c68d3d9fb7550ef984edc8ad47252f703ef0f1f2d1052e0e4af8793" [[package]] name = "cxxbridge-macro" -version = "1.0.107" +version = "1.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fa16a70dd58129e4dfffdff535fb1bce66673f7bbeec4a5a1765a504e1ccd84" +checksum = "7743446286141c9f6d4497c493c01234eb848e14d2e20866ae9811eae0630cb9" dependencies = [ "proc-macro2", "quote", @@ -5670,9 +5670,9 @@ dependencies = [ [[package]] name = "zcash_client_backend" -version = "0.10.0-rc.4" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc33f71747a93d509f7e1c047961e359a271bdf4869cc07f7f65ee1ba7df8c2" +checksum = "d6a382af39be9ee5a3788157145c404b7cd19acc440903f6c34b09fb44f0e991" dependencies = [ "base64 0.21.7", "bech32", @@ -5737,9 +5737,9 @@ dependencies = [ [[package]] name = "zcash_primitives" -version = "0.13.0-rc.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc4391d9325e0a51a7cbff02b5c4b5472d66087bd9c903ddb12dea7ec22f3e0" +checksum = "d17e4c94ca8d69d2fcf2be97522da5732a580eb2125cda3b150761952f8df8e6" dependencies = [ "aes", "bip0039", @@ -5773,9 +5773,9 @@ dependencies = [ [[package]] name = "zcash_proofs" -version = "0.13.0-rc.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48f22eff3bdc382327ef28f809024ddc89ec6d903ba71be629b2cbea34afdda2" +checksum = "df0c99f65a840ff256c106b28d67d702d9759d206112473d4982c92003262406" dependencies = [ "bellman", "blake2b_simd", @@ -5804,9 +5804,9 @@ dependencies = [ [[package]] name = "zcash_script" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8deff8ea47cbe2a008abefedc1a2d9c0e48a87844379759ace270a0b53353c71" +checksum = "9e3de6aece21108f502f724183955d244e02338613eaa4f9010386c63618a3a8" dependencies = [ "bellman", "bindgen", diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml index 2abde7524..bcc7430e8 100644 --- a/zebra-chain/Cargo.toml +++ b/zebra-chain/Cargo.toml @@ -97,7 +97,7 @@ orchard = "0.6.0" zcash_encoding = "0.2.0" zcash_history = "0.4.0" zcash_note_encryption = "0.4.0" -zcash_primitives = { version = "0.13.0-rc.1", features = ["transparent-inputs"] } +zcash_primitives = { version = "0.13.0", features = ["transparent-inputs"] } # Time chrono = { version = "0.4.38", default-features = false, features = ["clock", "std", "serde"] } diff --git a/zebra-grpc/Cargo.toml b/zebra-grpc/Cargo.toml index 1d3203b7c..44a0fbc46 100644 --- a/zebra-grpc/Cargo.toml +++ b/zebra-grpc/Cargo.toml @@ -26,7 +26,7 @@ tokio-stream = "0.1.15" tower = { version = "0.4.13", features = ["util", "buffer"] } color-eyre = "0.6.3" -zcash_primitives = { version = "0.13.0-rc.1" } +zcash_primitives = { version = "0.13.0" } zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.36", features = ["shielded-scan"] } zebra-chain = { path = "../zebra-chain" , version = "1.0.0-beta.36" } diff --git a/zebra-rpc/src/server/tests/vectors.rs b/zebra-rpc/src/server/tests/vectors.rs index 2622b84ba..0f4aca010 100644 --- a/zebra-rpc/src/server/tests/vectors.rs +++ b/zebra-rpc/src/server/tests/vectors.rs @@ -23,13 +23,14 @@ use super::super::*; /// Test that the JSON-RPC server spawns when configured with a single thread. #[test] +#[cfg(not(target_os = "windows"))] fn rpc_server_spawn_single_thread() { rpc_server_spawn(false) } /// Test that the JSON-RPC server spawns when configured with multiple threads. #[test] -fn rpc_sever_spawn_parallel_threads() { +fn rpc_server_spawn_parallel_threads() { rpc_server_spawn(true) } diff --git a/zebra-scan/Cargo.toml b/zebra-scan/Cargo.toml index 2cd00ac59..5d05c0f0c 100644 --- a/zebra-scan/Cargo.toml +++ b/zebra-scan/Cargo.toml @@ -52,7 +52,7 @@ tracing = "0.1.39" futures = "0.3.30" zcash_client_backend = "0.10.0-rc.1" -zcash_primitives = "0.13.0-rc.1" +zcash_primitives = "0.13.0" zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.36", features = ["shielded-scan"] } zebra-state = { path = "../zebra-state", version = "1.0.0-beta.36", features = ["shielded-scan"] } diff --git a/zebra-script/Cargo.toml b/zebra-script/Cargo.toml index 9e95e1797..da6932cdc 100644 --- a/zebra-script/Cargo.toml +++ b/zebra-script/Cargo.toml @@ -15,7 +15,7 @@ keywords = ["zebra", "zcash"] categories = ["api-bindings", "cryptography::cryptocurrencies"] [dependencies] -zcash_script = "0.1.14" +zcash_script = "0.1.15" zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.36" } diff --git a/zebra-utils/Cargo.toml b/zebra-utils/Cargo.toml index 88a99c2dc..658e6789d 100644 --- a/zebra-utils/Cargo.toml +++ b/zebra-utils/Cargo.toml @@ -120,7 +120,7 @@ tokio = { version = "1.37.0", features = ["full"], optional = true } jsonrpc = { version = "0.18.0", optional = true } -zcash_primitives = { version = "0.13.0-rc.1", optional = true } +zcash_primitives = { version = "0.13.0", optional = true } zcash_client_backend = {version = "0.10.0-rc.1", optional = true} # For the openapi generator diff --git a/zebrad/tests/acceptance.rs b/zebrad/tests/acceptance.rs index eb6a27917..6c9115d9e 100644 --- a/zebrad/tests/acceptance.rs +++ b/zebrad/tests/acceptance.rs @@ -622,6 +622,7 @@ fn config_tests() -> Result<()> { invalid_generated_config()?; // Check that we have a current version of the config stored + #[cfg(not(target_os = "windows"))] last_config_is_stored()?; // Check that Zebra's previous configurations still work