Merge branch 'params-new-regtest' into params-genesis-hash
This commit is contained in:
commit
c91f60d5be
|
@ -78,8 +78,7 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
# TODO: Windows was removed for now, see https://github.com/ZcashFoundation/zebra/issues/3801
|
os: [ubuntu-latest, macos-latest, windows-latest]
|
||||||
os: [ubuntu-latest, macos-latest]
|
|
||||||
rust: [stable, beta]
|
rust: [stable, beta]
|
||||||
# TODO: When vars.EXPERIMENTAL_FEATURES has features in it, add it here.
|
# 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.
|
# Or work out a way to trim the space from the variable: GitHub doesn't allow empty variables.
|
||||||
|
|
40
Cargo.lock
40
Cargo.lock
|
@ -705,9 +705,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "chrono"
|
name = "chrono"
|
||||||
version = "0.4.34"
|
version = "0.4.38"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b"
|
checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"android-tzdata",
|
"android-tzdata",
|
||||||
"iana-time-zone",
|
"iana-time-zone",
|
||||||
|
@ -1077,9 +1077,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cxx"
|
name = "cxx"
|
||||||
version = "1.0.107"
|
version = "1.0.113"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "bbe98ba1789d56fb3db3bee5e032774d4f421b685de7ba703643584ba24effbe"
|
checksum = "048948e14bc2c2652ec606c8e3bb913407f0187288fb351a0b2d972beaf12070"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cc",
|
"cc",
|
||||||
"cxxbridge-flags",
|
"cxxbridge-flags",
|
||||||
|
@ -1089,9 +1089,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cxx-gen"
|
name = "cxx-gen"
|
||||||
version = "0.7.117"
|
version = "0.7.121"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "54b629c0d006c7e44c1444dd17d18a458c9390d32276b758ac7abd21a75c99b0"
|
checksum = "383ecb9f96a536a1c7a2a61c5786f583da84f9240da149d78d005a4413c9a71e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"codespan-reporting",
|
"codespan-reporting",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
|
@ -1101,15 +1101,15 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cxxbridge-flags"
|
name = "cxxbridge-flags"
|
||||||
version = "1.0.107"
|
version = "1.0.113"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "20888d9e1d2298e2ff473cee30efe7d5036e437857ab68bbfea84c74dba91da2"
|
checksum = "af40b0467c68d3d9fb7550ef984edc8ad47252f703ef0f1f2d1052e0e4af8793"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cxxbridge-macro"
|
name = "cxxbridge-macro"
|
||||||
version = "1.0.107"
|
version = "1.0.113"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "2fa16a70dd58129e4dfffdff535fb1bce66673f7bbeec4a5a1765a504e1ccd84"
|
checksum = "7743446286141c9f6d4497c493c01234eb848e14d2e20866ae9811eae0630cb9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
|
@ -3809,9 +3809,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rustls"
|
name = "rustls"
|
||||||
version = "0.21.10"
|
version = "0.21.11"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba"
|
checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"log",
|
"log",
|
||||||
"ring 0.17.8",
|
"ring 0.17.8",
|
||||||
|
@ -5670,9 +5670,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zcash_client_backend"
|
name = "zcash_client_backend"
|
||||||
version = "0.10.0-rc.4"
|
version = "0.10.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ecc33f71747a93d509f7e1c047961e359a271bdf4869cc07f7f65ee1ba7df8c2"
|
checksum = "d6a382af39be9ee5a3788157145c404b7cd19acc440903f6c34b09fb44f0e991"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64 0.21.7",
|
"base64 0.21.7",
|
||||||
"bech32",
|
"bech32",
|
||||||
|
@ -5737,9 +5737,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zcash_primitives"
|
name = "zcash_primitives"
|
||||||
version = "0.13.0-rc.1"
|
version = "0.13.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0cc4391d9325e0a51a7cbff02b5c4b5472d66087bd9c903ddb12dea7ec22f3e0"
|
checksum = "d17e4c94ca8d69d2fcf2be97522da5732a580eb2125cda3b150761952f8df8e6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aes",
|
"aes",
|
||||||
"bip0039",
|
"bip0039",
|
||||||
|
@ -5773,9 +5773,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zcash_proofs"
|
name = "zcash_proofs"
|
||||||
version = "0.13.0-rc.1"
|
version = "0.13.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "48f22eff3bdc382327ef28f809024ddc89ec6d903ba71be629b2cbea34afdda2"
|
checksum = "df0c99f65a840ff256c106b28d67d702d9759d206112473d4982c92003262406"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bellman",
|
"bellman",
|
||||||
"blake2b_simd",
|
"blake2b_simd",
|
||||||
|
@ -5804,9 +5804,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zcash_script"
|
name = "zcash_script"
|
||||||
version = "0.1.14"
|
version = "0.1.15"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8deff8ea47cbe2a008abefedc1a2d9c0e48a87844379759ace270a0b53353c71"
|
checksum = "9e3de6aece21108f502f724183955d244e02338613eaa4f9010386c63618a3a8"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bellman",
|
"bellman",
|
||||||
"bindgen",
|
"bindgen",
|
||||||
|
|
|
@ -97,10 +97,10 @@ orchard = "0.6.0"
|
||||||
zcash_encoding = "0.2.0"
|
zcash_encoding = "0.2.0"
|
||||||
zcash_history = "0.4.0"
|
zcash_history = "0.4.0"
|
||||||
zcash_note_encryption = "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
|
# Time
|
||||||
chrono = { version = "0.4.34", default-features = false, features = ["clock", "std", "serde"] }
|
chrono = { version = "0.4.38", default-features = false, features = ["clock", "std", "serde"] }
|
||||||
humantime = "2.1.0"
|
humantime = "2.1.0"
|
||||||
|
|
||||||
# Error Handling & Formatting
|
# Error Handling & Formatting
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
//! Generate large transparent blocks and transactions for testing.
|
//! Generate large transparent blocks and transactions for testing.
|
||||||
|
|
||||||
use chrono::{DateTime, NaiveDateTime, Utc};
|
use chrono::DateTime;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
|
@ -42,18 +42,6 @@ pub fn transaction() -> (Transaction, Vec<u8>) {
|
||||||
(transaction, transaction_bytes)
|
(transaction, transaction_bytes)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Returns a generated transparent lock time, and its canonical serialized bytes.
|
|
||||||
pub fn lock_time() -> (LockTime, Vec<u8>) {
|
|
||||||
let lock_time = LockTime::Time(DateTime::<Utc>::from_naive_utc_and_offset(
|
|
||||||
NaiveDateTime::from_timestamp_opt(61, 0)
|
|
||||||
.expect("in-range number of seconds and valid nanosecond"),
|
|
||||||
Utc,
|
|
||||||
));
|
|
||||||
let lock_time_bytes = lock_time.zcash_serialize_to_vec().unwrap();
|
|
||||||
|
|
||||||
(lock_time, lock_time_bytes)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Returns a generated transparent input, and its canonical serialized bytes.
|
/// Returns a generated transparent input, and its canonical serialized bytes.
|
||||||
pub fn input() -> (transparent::Input, Vec<u8>) {
|
pub fn input() -> (transparent::Input, Vec<u8>) {
|
||||||
// Some of the test vectors are in a non-canonical format,
|
// Some of the test vectors are in a non-canonical format,
|
||||||
|
@ -182,8 +170,8 @@ fn single_transaction_block_many_inputs(oversized: bool) -> Block {
|
||||||
// A block header
|
// A block header
|
||||||
let (block_header, block_header_bytes) = block_header();
|
let (block_header, block_header_bytes) = block_header();
|
||||||
|
|
||||||
// A LockTime
|
let lock_time = LockTime::Time(DateTime::from_timestamp(61, 0).unwrap());
|
||||||
let (lock_time, lock_time_bytes) = lock_time();
|
let lock_time_bytes = lock_time.zcash_serialize_to_vec().unwrap();
|
||||||
|
|
||||||
// Calculate the number of inputs we need,
|
// Calculate the number of inputs we need,
|
||||||
// subtracting the bytes used to serialize the expected input count,
|
// subtracting the bytes used to serialize the expected input count,
|
||||||
|
@ -256,8 +244,8 @@ fn single_transaction_block_many_outputs(oversized: bool) -> Block {
|
||||||
// A block header
|
// A block header
|
||||||
let (block_header, block_header_bytes) = block_header();
|
let (block_header, block_header_bytes) = block_header();
|
||||||
|
|
||||||
// A LockTime
|
let lock_time = LockTime::Time(DateTime::from_timestamp(61, 0).unwrap());
|
||||||
let (lock_time, lock_time_bytes) = lock_time();
|
let lock_time_bytes = lock_time.zcash_serialize_to_vec().unwrap();
|
||||||
|
|
||||||
// Calculate the number of outputs we need,
|
// Calculate the number of outputs we need,
|
||||||
// subtracting the bytes used to serialize the expected output count,
|
// subtracting the bytes used to serialize the expected output count,
|
||||||
|
|
|
@ -98,8 +98,9 @@ fn check_parameters_impl() {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Checks that `NetworkUpgrade::activation_height()` returns the activation height of the next
|
/// Checks that `NetworkUpgrade::activation_height()` returns the activation height of the next
|
||||||
/// network upgrade if it doesn't find an activation height for a prior network upgrade, and that the
|
/// network upgrade if it doesn't find an activation height for a prior network upgrade, that the
|
||||||
/// `Genesis` upgrade is always at `Height(0)`.
|
/// `Genesis` upgrade is always at `Height(0)`, and that the default Mainnet/Testnet/Regtest activation
|
||||||
|
/// heights are what's expected.
|
||||||
#[test]
|
#[test]
|
||||||
fn activates_network_upgrades_correctly() {
|
fn activates_network_upgrades_correctly() {
|
||||||
let expected_activation_height = 1;
|
let expected_activation_height = 1;
|
||||||
|
@ -178,6 +179,8 @@ fn check_configured_network_name() {
|
||||||
.expect_err("should panic when setting network name that's too long or contains non-alphanumeric characters (except '_')");
|
.expect_err("should panic when setting network name that's too long or contains non-alphanumeric characters (except '_')");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
drop(std::panic::take_hook());
|
||||||
|
|
||||||
// Checks that network names are displayed correctly
|
// Checks that network names are displayed correctly
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
Network::new_default_testnet().to_string(),
|
Network::new_default_testnet().to_string(),
|
||||||
|
@ -235,6 +238,8 @@ fn check_configured_sapling_hrps() {
|
||||||
.expect_err("should panic when setting Sapling HRPs that are too long or contain non-alphanumeric characters (except '-')");
|
.expect_err("should panic when setting Sapling HRPs that are too long or contain non-alphanumeric characters (except '-')");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
drop(std::panic::take_hook());
|
||||||
|
|
||||||
// Check that Sapling HRPs can contain lowercase ascii characters and dashes.
|
// Check that Sapling HRPs can contain lowercase ascii characters and dashes.
|
||||||
let expected_hrp_sapling_extended_spending_key = "sapling-hrp-a";
|
let expected_hrp_sapling_extended_spending_key = "sapling-hrp-a";
|
||||||
let expected_hrp_sapling_extended_full_viewing_key = "sapling-hrp-b";
|
let expected_hrp_sapling_extended_full_viewing_key = "sapling-hrp-b";
|
||||||
|
@ -286,3 +291,60 @@ fn check_configured_sapling_hrps() {
|
||||||
zp_constants::regtest::HRP_SAPLING_PAYMENT_ADDRESS,
|
zp_constants::regtest::HRP_SAPLING_PAYMENT_ADDRESS,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Checks that configured testnet names are validated and used correctly.
|
||||||
|
#[test]
|
||||||
|
fn check_network_name() {
|
||||||
|
// Sets a no-op panic hook to avoid long output.
|
||||||
|
std::panic::set_hook(Box::new(|_| {}));
|
||||||
|
|
||||||
|
// Checks that reserved network names cannot be used for configured testnets.
|
||||||
|
for reserved_network_name in RESERVED_NETWORK_NAMES {
|
||||||
|
std::panic::catch_unwind(|| {
|
||||||
|
testnet::Parameters::build().with_network_name(reserved_network_name)
|
||||||
|
})
|
||||||
|
.expect_err("should panic when attempting to set network name as a reserved name");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check that max length is enforced, and that network names may only contain alphanumeric characters and '_'.
|
||||||
|
for invalid_network_name in [
|
||||||
|
"a".repeat(MAX_NETWORK_NAME_LENGTH + 1),
|
||||||
|
"!!!!non-alphanumeric-name".to_string(),
|
||||||
|
] {
|
||||||
|
std::panic::catch_unwind(|| {
|
||||||
|
testnet::Parameters::build().with_network_name(invalid_network_name)
|
||||||
|
})
|
||||||
|
.expect_err("should panic when setting network name that's too long or contains non-alphanumeric characters (except '_')");
|
||||||
|
}
|
||||||
|
|
||||||
|
drop(std::panic::take_hook());
|
||||||
|
|
||||||
|
// Checks that network names are displayed correctly
|
||||||
|
assert_eq!(
|
||||||
|
Network::new_default_testnet().to_string(),
|
||||||
|
"Testnet",
|
||||||
|
"default testnet should be displayed as 'Testnet'"
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
Network::Mainnet.to_string(),
|
||||||
|
"Mainnet",
|
||||||
|
"Mainnet should be displayed as 'Mainnet'"
|
||||||
|
);
|
||||||
|
|
||||||
|
// TODO: Check Regtest
|
||||||
|
|
||||||
|
// Check that network name can contain alphanumeric characters and '_'.
|
||||||
|
let expected_name = "ConfiguredTestnet_1";
|
||||||
|
let network = testnet::Parameters::build()
|
||||||
|
// Check that network name can contain `MAX_NETWORK_NAME_LENGTH` characters
|
||||||
|
.with_network_name("a".repeat(MAX_NETWORK_NAME_LENGTH))
|
||||||
|
.with_network_name(expected_name)
|
||||||
|
.to_network();
|
||||||
|
|
||||||
|
// Check that configured network name is displayed
|
||||||
|
assert_eq!(
|
||||||
|
network.to_string(),
|
||||||
|
expected_name,
|
||||||
|
"network must be displayed as configured network name"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
//! Fixed test vectors for transactions.
|
//! Fixed test vectors for transactions.
|
||||||
|
|
||||||
use chrono::{DateTime, NaiveDateTime, Utc};
|
use chrono::DateTime;
|
||||||
use color_eyre::eyre::Result;
|
use color_eyre::eyre::Result;
|
||||||
use lazy_static::lazy_static;
|
use lazy_static::lazy_static;
|
||||||
|
|
||||||
|
@ -220,13 +220,6 @@ fn deserialize_large_transaction() {
|
||||||
let output =
|
let output =
|
||||||
transparent::Output::zcash_deserialize(&zebra_test::vectors::DUMMY_OUTPUT1[..]).unwrap();
|
transparent::Output::zcash_deserialize(&zebra_test::vectors::DUMMY_OUTPUT1[..]).unwrap();
|
||||||
|
|
||||||
// Create a lock time.
|
|
||||||
let lock_time = LockTime::Time(DateTime::<Utc>::from_naive_utc_and_offset(
|
|
||||||
NaiveDateTime::from_timestamp_opt(61, 0)
|
|
||||||
.expect("in-range number of seconds and valid nanosecond"),
|
|
||||||
Utc,
|
|
||||||
));
|
|
||||||
|
|
||||||
// Serialize the input so that we can determine its serialized size.
|
// Serialize the input so that we can determine its serialized size.
|
||||||
let mut input_data = Vec::new();
|
let mut input_data = Vec::new();
|
||||||
input
|
input
|
||||||
|
@ -241,14 +234,12 @@ fn deserialize_large_transaction() {
|
||||||
.take(tx_inputs_num)
|
.take(tx_inputs_num)
|
||||||
.collect::<Vec<_>>();
|
.collect::<Vec<_>>();
|
||||||
|
|
||||||
let outputs = vec![output];
|
|
||||||
|
|
||||||
// Create an oversized transaction. Adding the output and lock time causes
|
// Create an oversized transaction. Adding the output and lock time causes
|
||||||
// the transaction to overflow the threshold.
|
// the transaction to overflow the threshold.
|
||||||
let oversized_tx = Transaction::V1 {
|
let oversized_tx = Transaction::V1 {
|
||||||
inputs,
|
inputs,
|
||||||
outputs,
|
outputs: vec![output],
|
||||||
lock_time,
|
lock_time: LockTime::Time(DateTime::from_timestamp(61, 0).unwrap()),
|
||||||
};
|
};
|
||||||
|
|
||||||
// Serialize the transaction.
|
// Serialize the transaction.
|
||||||
|
|
|
@ -43,7 +43,7 @@ jubjub = "0.10.0"
|
||||||
rand = "0.8.5"
|
rand = "0.8.5"
|
||||||
rayon = "1.10.0"
|
rayon = "1.10.0"
|
||||||
|
|
||||||
chrono = { version = "0.4.34", default-features = false, features = ["clock", "std"] }
|
chrono = { version = "0.4.38", default-features = false, features = ["clock", "std"] }
|
||||||
displaydoc = "0.2.4"
|
displaydoc = "0.2.4"
|
||||||
lazy_static = "1.4.0"
|
lazy_static = "1.4.0"
|
||||||
once_cell = "1.18.0"
|
once_cell = "1.18.0"
|
||||||
|
|
|
@ -26,7 +26,7 @@ tokio-stream = "0.1.15"
|
||||||
tower = { version = "0.4.13", features = ["util", "buffer"] }
|
tower = { version = "0.4.13", features = ["util", "buffer"] }
|
||||||
color-eyre = "0.6.3"
|
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-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" }
|
zebra-chain = { path = "../zebra-chain" , version = "1.0.0-beta.36" }
|
||||||
|
|
|
@ -43,7 +43,7 @@ proptest-impl = ["proptest", "proptest-derive", "zebra-chain/proptest-impl"]
|
||||||
bitflags = "2.5.0"
|
bitflags = "2.5.0"
|
||||||
byteorder = "1.5.0"
|
byteorder = "1.5.0"
|
||||||
bytes = "1.6.0"
|
bytes = "1.6.0"
|
||||||
chrono = { version = "0.4.34", default-features = false, features = ["clock", "std"] }
|
chrono = { version = "0.4.38", default-features = false, features = ["clock", "std"] }
|
||||||
dirs = "5.0.1"
|
dirs = "5.0.1"
|
||||||
hex = "0.4.3"
|
hex = "0.4.3"
|
||||||
humantime-serde = "1.1.1"
|
humantime-serde = "1.1.1"
|
||||||
|
|
|
@ -42,7 +42,7 @@ proptest-impl = [
|
||||||
]
|
]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
chrono = { version = "0.4.34", default-features = false, features = ["clock", "std"] }
|
chrono = { version = "0.4.38", default-features = false, features = ["clock", "std"] }
|
||||||
futures = "0.3.30"
|
futures = "0.3.30"
|
||||||
|
|
||||||
# lightwalletd sends JSON-RPC requests over HTTP 1.1
|
# lightwalletd sends JSON-RPC requests over HTTP 1.1
|
||||||
|
|
|
@ -23,13 +23,14 @@ use super::super::*;
|
||||||
|
|
||||||
/// Test that the JSON-RPC server spawns when configured with a single thread.
|
/// Test that the JSON-RPC server spawns when configured with a single thread.
|
||||||
#[test]
|
#[test]
|
||||||
|
#[cfg(not(target_os = "windows"))]
|
||||||
fn rpc_server_spawn_single_thread() {
|
fn rpc_server_spawn_single_thread() {
|
||||||
rpc_server_spawn(false)
|
rpc_server_spawn(false)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Test that the JSON-RPC server spawns when configured with multiple threads.
|
/// Test that the JSON-RPC server spawns when configured with multiple threads.
|
||||||
#[test]
|
#[test]
|
||||||
fn rpc_sever_spawn_parallel_threads() {
|
fn rpc_server_spawn_parallel_threads() {
|
||||||
rpc_server_spawn(true)
|
rpc_server_spawn(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -52,14 +52,14 @@ tracing = "0.1.39"
|
||||||
futures = "0.3.30"
|
futures = "0.3.30"
|
||||||
|
|
||||||
zcash_client_backend = "0.10.0-rc.1"
|
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-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"] }
|
zebra-state = { path = "../zebra-state", version = "1.0.0-beta.36", features = ["shielded-scan"] }
|
||||||
zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.36", features = ["shielded-scan"] }
|
zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.36", features = ["shielded-scan"] }
|
||||||
zebra-grpc = { path = "../zebra-grpc", version = "0.1.0-alpha.3" }
|
zebra-grpc = { path = "../zebra-grpc", version = "0.1.0-alpha.3" }
|
||||||
|
|
||||||
chrono = { version = "0.4.34", default-features = false, features = ["clock", "std", "serde"] }
|
chrono = { version = "0.4.38", default-features = false, features = ["clock", "std", "serde"] }
|
||||||
|
|
||||||
# test feature proptest-impl
|
# test feature proptest-impl
|
||||||
proptest = { version = "1.4.0", optional = true }
|
proptest = { version = "1.4.0", optional = true }
|
||||||
|
|
|
@ -15,7 +15,7 @@ keywords = ["zebra", "zcash"]
|
||||||
categories = ["api-bindings", "cryptography::cryptocurrencies"]
|
categories = ["api-bindings", "cryptography::cryptocurrencies"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
zcash_script = "0.1.14"
|
zcash_script = "0.1.15"
|
||||||
|
|
||||||
zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.36" }
|
zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.36" }
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,7 @@ elasticsearch = [
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
bincode = "1.3.3"
|
bincode = "1.3.3"
|
||||||
chrono = { version = "0.4.34", default-features = false, features = ["clock", "std"] }
|
chrono = { version = "0.4.38", default-features = false, features = ["clock", "std"] }
|
||||||
dirs = "5.0.1"
|
dirs = "5.0.1"
|
||||||
futures = "0.3.30"
|
futures = "0.3.30"
|
||||||
hex = "0.4.3"
|
hex = "0.4.3"
|
||||||
|
|
|
@ -120,7 +120,7 @@ tokio = { version = "1.37.0", features = ["full"], optional = true }
|
||||||
|
|
||||||
jsonrpc = { version = "0.18.0", 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}
|
zcash_client_backend = {version = "0.10.0-rc.1", optional = true}
|
||||||
|
|
||||||
# For the openapi generator
|
# For the openapi generator
|
||||||
|
|
|
@ -173,7 +173,7 @@ zebra-utils = { path = "../zebra-utils", version = "1.0.0-beta.36", optional = t
|
||||||
|
|
||||||
abscissa_core = "0.7.0"
|
abscissa_core = "0.7.0"
|
||||||
clap = { version = "4.5.4", features = ["cargo"] }
|
clap = { version = "4.5.4", features = ["cargo"] }
|
||||||
chrono = { version = "0.4.34", default-features = false, features = ["clock", "std"] }
|
chrono = { version = "0.4.38", default-features = false, features = ["clock", "std"] }
|
||||||
humantime-serde = "1.1.1"
|
humantime-serde = "1.1.1"
|
||||||
indexmap = "2.2.6"
|
indexmap = "2.2.6"
|
||||||
lazy_static = "1.4.0"
|
lazy_static = "1.4.0"
|
||||||
|
|
|
@ -624,6 +624,7 @@ fn config_tests() -> Result<()> {
|
||||||
invalid_generated_config()?;
|
invalid_generated_config()?;
|
||||||
|
|
||||||
// Check that we have a current version of the config stored
|
// Check that we have a current version of the config stored
|
||||||
|
#[cfg(not(target_os = "windows"))]
|
||||||
last_config_is_stored()?;
|
last_config_is_stored()?;
|
||||||
|
|
||||||
// Check that Zebra's previous configurations still work
|
// Check that Zebra's previous configurations still work
|
||||||
|
|
Loading…
Reference in New Issue