diff --git a/Cargo.lock b/Cargo.lock index 12dc146ce51..aa1bcdb443b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4467,7 +4467,7 @@ dependencies = [ [[package]] name = "minotari_app_grpc" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "argon2", "base64 0.13.1", @@ -4496,7 +4496,7 @@ dependencies = [ [[package]] name = "minotari_app_utilities" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "clap 3.2.25", "dialoguer 0.10.4", @@ -4516,7 +4516,7 @@ dependencies = [ [[package]] name = "minotari_console_wallet" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "blake2", "chrono", @@ -4570,14 +4570,14 @@ dependencies = [ [[package]] name = "minotari_ledger_wallet_common" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "bs58 0.5.1", ] [[package]] name = "minotari_ledger_wallet_comms" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "borsh", "dialoguer 0.11.0", @@ -4599,7 +4599,7 @@ dependencies = [ [[package]] name = "minotari_merge_mining_proxy" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "anyhow", "bincode", @@ -4641,7 +4641,7 @@ dependencies = [ [[package]] name = "minotari_miner" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "base64 0.13.1", "borsh", @@ -4678,7 +4678,7 @@ dependencies = [ [[package]] name = "minotari_mining_helper_ffi" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "borsh", "cbindgen", @@ -4696,7 +4696,7 @@ dependencies = [ [[package]] name = "minotari_node" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "anyhow", "async-trait", @@ -4751,7 +4751,7 @@ dependencies = [ [[package]] name = "minotari_wallet" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "argon2", "async-trait", @@ -4803,7 +4803,7 @@ dependencies = [ [[package]] name = "minotari_wallet_ffi" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "borsh", "cbindgen", @@ -7683,7 +7683,7 @@ dependencies = [ [[package]] name = "tari_common" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "anyhow", "config", @@ -7709,7 +7709,7 @@ dependencies = [ [[package]] name = "tari_common_sqlite" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "diesel", "diesel_migrations", @@ -7723,7 +7723,7 @@ dependencies = [ [[package]] name = "tari_common_types" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "base64 0.21.5", "bitflags 2.6.0", @@ -7748,7 +7748,7 @@ dependencies = [ [[package]] name = "tari_comms" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "anyhow", "async-trait", @@ -7798,7 +7798,7 @@ dependencies = [ [[package]] name = "tari_comms_dht" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "anyhow", "bitflags 2.6.0", @@ -7842,7 +7842,7 @@ dependencies = [ [[package]] name = "tari_comms_rpc_macros" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "futures 0.3.30", "proc-macro2", @@ -7857,7 +7857,7 @@ dependencies = [ [[package]] name = "tari_contacts" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "chrono", "diesel", @@ -7892,7 +7892,7 @@ dependencies = [ [[package]] name = "tari_core" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "async-trait", "bincode", @@ -7993,11 +7993,11 @@ dependencies = [ [[package]] name = "tari_features" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" [[package]] name = "tari_hashing" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "blake2", "borsh", @@ -8052,7 +8052,7 @@ dependencies = [ [[package]] name = "tari_key_manager" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "argon2", "async-trait", @@ -8087,7 +8087,7 @@ dependencies = [ [[package]] name = "tari_libtor" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "derivative", "libtor", @@ -8100,7 +8100,7 @@ dependencies = [ [[package]] name = "tari_max_size" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "borsh", "serde", @@ -8110,7 +8110,7 @@ dependencies = [ [[package]] name = "tari_metrics" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "anyhow", "futures 0.3.30", @@ -8125,7 +8125,7 @@ dependencies = [ [[package]] name = "tari_mmr" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "bincode", "blake2", @@ -8161,7 +8161,7 @@ dependencies = [ [[package]] name = "tari_p2p" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "anyhow", "clap 3.2.25", @@ -8232,7 +8232,7 @@ dependencies = [ [[package]] name = "tari_script" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "blake2", "borsh", @@ -8250,7 +8250,7 @@ dependencies = [ [[package]] name = "tari_service_framework" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "anyhow", "async-trait", @@ -8267,7 +8267,7 @@ dependencies = [ [[package]] name = "tari_shutdown" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "futures 0.3.30", "tokio", @@ -8275,7 +8275,7 @@ dependencies = [ [[package]] name = "tari_storage" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "bincode", "lmdb-zero", @@ -8299,7 +8299,7 @@ dependencies = [ [[package]] name = "tari_test_utils" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "futures 0.3.30", "futures-test", diff --git a/README.md b/README.md index 3fdf82c5fcc..e39f0b2142c 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,8 @@ The recommended running versions of each network are: | Network | Version | |-----------|----------------| | Stagenet | 1.0.0-alpha.0a | -| Nextnet | 1.7.0-rc.0 | -| Esmeralda | 1.7.0-pre.0 | +| Nextnet | 1.7.0-rc.2 | +| Esmeralda | 1.7.0-pre.2 | For more detail about versioning, see [Release Ideology](https://github.com/tari-project/tari/blob/development/docs/src/branching_releases.md). diff --git a/applications/minotari_app_grpc/Cargo.toml b/applications/minotari_app_grpc/Cargo.toml index 12346b6450a..89ec1adb8ca 100644 --- a/applications/minotari_app_grpc/Cargo.toml +++ b/applications/minotari_app_grpc/Cargo.toml @@ -4,7 +4,7 @@ authors = ["The Tari Development Community"] description = "This crate is to provide a single source for all cross application grpc files and conversions to and from tari::core" repository = "https://github.com/tari-project/tari" license = "BSD-3-Clause" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" edition = "2021" [dependencies] @@ -32,7 +32,7 @@ tonic = { version = "0.12.3", features = ["tls"] } zeroize = "1" [build-dependencies] -tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.0" } +tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.2" } tonic-build = "0.12.3" [package.metadata.cargo-machete] diff --git a/applications/minotari_app_utilities/Cargo.toml b/applications/minotari_app_utilities/Cargo.toml index eb5876f1585..a951097bdc0 100644 --- a/applications/minotari_app_utilities/Cargo.toml +++ b/applications/minotari_app_utilities/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "minotari_app_utilities" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" authors = ["The Tari Development Community"] edition = "2018" license = "BSD-3-Clause" @@ -26,7 +26,7 @@ tari_common = { path = "../../common", features = [ "build", "static-application-info", ] } -tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.0" } +tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.2" } [features] miner_input = ["minotari_app_grpc"] diff --git a/applications/minotari_console_wallet/Cargo.toml b/applications/minotari_console_wallet/Cargo.toml index cb9b770e09b..febcbf90a8e 100644 --- a/applications/minotari_console_wallet/Cargo.toml +++ b/applications/minotari_console_wallet/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "minotari_console_wallet" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" authors = ["The Tari Development Community"] edition = "2018" license = "BSD-3-Clause" @@ -9,7 +9,7 @@ license = "BSD-3-Clause" tari_network = { workspace = true } minotari_app_grpc = { path = "../minotari_app_grpc" } minotari_app_utilities = { path = "../minotari_app_utilities" } -minotari_ledger_wallet_comms = { path = "../../applications/minotari_ledger_wallet/comms", version = "1.7.0-pre.0", optional = true } +minotari_ledger_wallet_comms = { path = "../../applications/minotari_ledger_wallet/comms", version = "1.7.0-pre.2", optional = true } tari_common = { path = "../../common" } tari_common_types = { path = "../../base_layer/common_types" } tari_contacts = { path = "../../base_layer/contacts" } @@ -83,7 +83,7 @@ default-features = false features = ["crossterm"] [build-dependencies] -tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.0" } +tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.2" } [features] default = ["ledger"] diff --git a/applications/minotari_ledger_wallet/common/Cargo.toml b/applications/minotari_ledger_wallet/common/Cargo.toml index fa605783808..1422c0cdbe6 100644 --- a/applications/minotari_ledger_wallet/common/Cargo.toml +++ b/applications/minotari_ledger_wallet/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "minotari_ledger_wallet_common" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" authors = ["The Tari Development Community"] license = "BSD-3-Clause" edition = "2021" diff --git a/applications/minotari_ledger_wallet/comms/Cargo.toml b/applications/minotari_ledger_wallet/comms/Cargo.toml index 5e6af02e7e0..020869ece1d 100644 --- a/applications/minotari_ledger_wallet/comms/Cargo.toml +++ b/applications/minotari_ledger_wallet/comms/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "minotari_ledger_wallet_comms" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" authors = ["The Tari Development Community"] license = "BSD-3-Clause" edition = "2021" diff --git a/applications/minotari_ledger_wallet/wallet/Cargo.lock b/applications/minotari_ledger_wallet/wallet/Cargo.lock index f8ab0c332dd..82cf55cdef6 100644 --- a/applications/minotari_ledger_wallet/wallet/Cargo.lock +++ b/applications/minotari_ledger_wallet/wallet/Cargo.lock @@ -432,7 +432,7 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "minotari_ledger_wallet" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "blake2", "borsh", @@ -735,7 +735,7 @@ dependencies = [ [[package]] name = "tari_hashing" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" dependencies = [ "borsh", "digest", diff --git a/applications/minotari_ledger_wallet/wallet/Cargo.toml b/applications/minotari_ledger_wallet/wallet/Cargo.toml index 2d1a325f561..b28b2cae042 100644 --- a/applications/minotari_ledger_wallet/wallet/Cargo.toml +++ b/applications/minotari_ledger_wallet/wallet/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "minotari_ledger_wallet" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" authors = ["The Tari Development Community"] license = "BSD-3-Clause" edition = "2021" @@ -9,7 +9,7 @@ edition = "2021" tari_crypto = { version = "0.21.0", default-features = false, features = [ "borsh", ] } -tari_hashing = { path = "../../../hashing", version = "1.7.0-pre.0" } +tari_hashing = { path = "../../../hashing", version = "1.7.0-pre.2" } minotari_ledger_wallet_common = { path = "../common" } diff --git a/applications/minotari_merge_mining_proxy/Cargo.toml b/applications/minotari_merge_mining_proxy/Cargo.toml index a8d767a5911..2deb3049f47 100644 --- a/applications/minotari_merge_mining_proxy/Cargo.toml +++ b/applications/minotari_merge_mining_proxy/Cargo.toml @@ -4,7 +4,7 @@ authors = ["The Tari Development Community"] description = "The Tari merge mining proxy for xmrig" repository = "https://github.com/tari-project/tari" license = "BSD-3-Clause" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" edition = "2018" [features] @@ -54,7 +54,8 @@ url = "2.1.1" scraper = "0.19.0" [build-dependencies] -tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.0" } +tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.2" } [dev-dependencies] markup5ever = "0.11.0" +hyper = { version ="0.14.12", features = ["full"] } diff --git a/applications/minotari_merge_mining_proxy/src/monero_fail.rs b/applications/minotari_merge_mining_proxy/src/monero_fail.rs index fb385b003ab..8e6c2242436 100644 --- a/applications/minotari_merge_mining_proxy/src/monero_fail.rs +++ b/applications/minotari_merge_mining_proxy/src/monero_fail.rs @@ -265,6 +265,7 @@ mod test { use crate::{ config::MergeMiningProxyConfig, + error::MmProxyError::HtmlParseError, monero_fail::{get_monerod_html, get_monerod_info}, }; @@ -272,9 +273,21 @@ mod test { async fn test_get_monerod_info() { // Monero mainnet let config = MergeMiningProxyConfig::default(); - let entries = get_monerod_info(5, Duration::from_secs(2), &config.monero_fail_url) - .await - .unwrap(); + let entries = match get_monerod_info(5, Duration::from_secs(2), &config.monero_fail_url).await { + Ok(val) => val, + Err(HtmlParseError(val)) => { + if val.contains("No public monero servers available") { + return; + } + vec![] + }, + Err(err) => { + if err.to_string().contains("Failed to send request to monerod") { + return; + } + panic!("Unexpected error: {}", err); + }, + }; for (i, entry) in entries.iter().enumerate() { assert!(entry.up && entry.up_history.iter().all(|&v| v)); if i > 0 { @@ -322,7 +335,15 @@ mod test { #[tokio::test] async fn test_table_structure() { let config = MergeMiningProxyConfig::default(); - let html_content = get_monerod_html(&config.monero_fail_url).await.unwrap(); + let html_content = match get_monerod_html(&config.monero_fail_url).await { + Ok(val) => val, + Err(err) => { + if err.to_string().contains("Failed to send request to monerod") { + return; + } + panic!("Unexpected error: {}", err); + }, + }; let table_structure = extract_table_structure(&html_content); diff --git a/applications/minotari_miner/Cargo.toml b/applications/minotari_miner/Cargo.toml index 8f0087ac17a..68a15ae607e 100644 --- a/applications/minotari_miner/Cargo.toml +++ b/applications/minotari_miner/Cargo.toml @@ -4,7 +4,7 @@ authors = ["The Tari Development Community"] description = "The tari miner implementation" repository = "https://github.com/tari-project/tari" license = "BSD-3-Clause" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" edition = "2018" [dependencies] diff --git a/applications/minotari_node/Cargo.toml b/applications/minotari_node/Cargo.toml index 3ffb2cdf8ed..30e87bd422a 100644 --- a/applications/minotari_node/Cargo.toml +++ b/applications/minotari_node/Cargo.toml @@ -4,7 +4,7 @@ authors = ["The Tari Development Community"] description = "The tari full base node implementation" repository = "https://github.com/tari-project/tari" license = "BSD-3-Clause" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" edition = "2018" [dependencies] @@ -25,7 +25,7 @@ tari_shutdown = { path = "../../infrastructure/shutdown" } tari_utilities = { version = "0.8" } tari_key_manager = { path = "../../base_layer/key_manager", features = [ "key_manager_service", -], version = "1.7.0-pre.0" } +], version = "1.7.0-pre.2" } anyhow = "1.0.53" async-trait = "0.1.52" @@ -74,7 +74,7 @@ metrics = ["tari_metrics"] safe = [] [build-dependencies] -tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.0" } +tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.2" } [package.metadata.cargo-machete] ignored = [ diff --git a/base_layer/chat_ffi/Cargo.toml b/base_layer/chat_ffi/Cargo.toml index e9b4bf8247c..c2cdb31fc72 100644 --- a/base_layer/chat_ffi/Cargo.toml +++ b/base_layer/chat_ffi/Cargo.toml @@ -3,7 +3,7 @@ name = "minotari_chat_ffi" authors = ["The Tari Development Community"] description = "Tari cryptocurrency chat C FFI bindings" license = "BSD-3-Clause" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" edition = "2018" [dependencies] diff --git a/base_layer/common_types/Cargo.toml b/base_layer/common_types/Cargo.toml index c03a0f551f9..6a45822c0bf 100644 --- a/base_layer/common_types/Cargo.toml +++ b/base_layer/common_types/Cargo.toml @@ -3,13 +3,13 @@ name = "tari_common_types" authors = ["The Tari Development Community"] description = "Tari cryptocurrency common types" license = "BSD-3-Clause" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" edition = "2018" [dependencies] tari_crypto = { version = "0.21.0" } tari_utilities = { version = "0.8" } -tari_common = { path = "../../common", version = "1.7.0-pre.0" } +tari_common = { path = "../../common", version = "1.7.0-pre.2" } minotari_ledger_wallet_common = { path = "../../applications/minotari_ledger_wallet/common" } chacha20poly1305 = "0.10.1" bitflags = { version = "2.4", features = ["serde"] } diff --git a/base_layer/contacts/Cargo.toml b/base_layer/contacts/Cargo.toml index a4dadc41fba..577496d2566 100644 --- a/base_layer/contacts/Cargo.toml +++ b/base_layer/contacts/Cargo.toml @@ -3,21 +3,21 @@ name = "tari_contacts" authors = ["The Tari Development Community"] description = "Tari contacts library" license = "BSD-3-Clause" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" edition = "2018" [dependencies] tari_network = { workspace = true } -tari_common = { path = "../../common", version = "1.7.0-pre.0" } -tari_common_sqlite = { path = "../../common_sqlite", version = "1.7.0-pre.0" } -tari_common_types = { path = "../../base_layer/common_types", version = "1.7.0-pre.0" } +tari_common = { path = "../../common", version = "1.7.0-pre.2" } +tari_common_sqlite = { path = "../../common_sqlite", version = "1.7.0-pre.2" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.7.0-pre.2" } tari_crypto = { version = "0.21.0" } tari_max_size = { path = "../../infrastructure/max_size" } tari_p2p = { path = "../p2p", features = [ "auto-update", -], version = "1.7.0-pre.0" } -tari_service_framework = { path = "../service_framework", version = "1.7.0-pre.0" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.7.0-pre.0" } +], version = "1.7.0-pre.2" } +tari_service_framework = { path = "../service_framework", version = "1.7.0-pre.2" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.7.0-pre.2" } tari_utilities = { version = "0.8" } chrono = { version = "0.4.19", default-features = false, features = ["serde"] } diff --git a/base_layer/contacts/src/chat_client/Cargo.toml b/base_layer/contacts/src/chat_client/Cargo.toml index 6d629e5af6e..bfc1ae2e162 100644 --- a/base_layer/contacts/src/chat_client/Cargo.toml +++ b/base_layer/contacts/src/chat_client/Cargo.toml @@ -3,7 +3,7 @@ name = "tari_chat_client" authors = ["The Tari Development Community"] description = "Tari cucumber chat client" license = "BSD-3-Clause" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" edition = "2018" diff --git a/base_layer/core/Cargo.toml b/base_layer/core/Cargo.toml index daa4ca61904..6bc3db88613 100644 --- a/base_layer/core/Cargo.toml +++ b/base_layer/core/Cargo.toml @@ -6,7 +6,7 @@ repository = "https://github.com/tari-project/tari" homepage = "https://tari.com" readme = "README.md" license = "BSD-3-Clause" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" edition = "2021" [features] @@ -27,27 +27,27 @@ ledger = ["minotari_ledger_wallet_comms"] metrics = ["tari_metrics"] [dependencies] -minotari_ledger_wallet_comms = { path = "../../applications/minotari_ledger_wallet/comms", version = "1.7.0-pre.0", optional = true } -tari_common = { path = "../../common", version = "1.7.0-pre.0" } -tari_common_types = { path = "../../base_layer/common_types", version = "1.7.0-pre.0" } +minotari_ledger_wallet_comms = { path = "../../applications/minotari_ledger_wallet/comms", version = "1.7.0-pre.2", optional = true } +tari_common = { path = "../../common", version = "1.7.0-pre.2" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.7.0-pre.2" } libp2p-substream = { workspace = true } tari_network = { workspace = true } tari_rpc_framework = { workspace = true } tari_rpc_macros = { workspace = true } tari_crypto = { version = "0.21.0", features = ["borsh"] } tari_max_size = { path = "../../infrastructure/max_size" } -tari_metrics = { path = "../../infrastructure/metrics", optional = true, version = "1.7.0-pre.0" } -tari_mmr = { path = "../../base_layer/mmr", optional = true, version = "1.7.0-pre.0" } -tari_p2p = { path = "../../base_layer/p2p", version = "1.7.0-pre.0" } -tari_script = { path = "../../infrastructure/tari_script", version = "1.7.0-pre.0" } -tari_service_framework = { path = "../service_framework", version = "1.7.0-pre.0" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.7.0-pre.0" } -tari_storage = { path = "../../infrastructure/storage", version = "1.7.0-pre.0" } -tari_test_utils = { path = "../../infrastructure/test_utils", version = "1.7.0-pre.0" } +tari_metrics = { path = "../../infrastructure/metrics", optional = true, version = "1.7.0-pre.2" } +tari_mmr = { path = "../../base_layer/mmr", optional = true, version = "1.7.0-pre.2" } +tari_p2p = { path = "../../base_layer/p2p", version = "1.7.0-pre.2" } +tari_script = { path = "../../infrastructure/tari_script", version = "1.7.0-pre.2" } +tari_service_framework = { path = "../service_framework", version = "1.7.0-pre.2" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.7.0-pre.2" } +tari_storage = { path = "../../infrastructure/storage", version = "1.7.0-pre.2" } +tari_test_utils = { path = "../../infrastructure/test_utils", version = "1.7.0-pre.2" } tari_utilities = { version = "0.8", features = ["borsh"] } tari_key_manager = { path = "../key_manager", features = [ "key_manager_service", -], version = "1.7.0-pre.0" } +], version = "1.7.0-pre.2" } tari_common_sqlite = { path = "../../common_sqlite" } tari_hashing = { path = "../../hashing" } @@ -109,7 +109,7 @@ quickcheck = "1.0" serial_test = "0.5" [build-dependencies] -tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.0" } +tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.2" } [[bench]] name = "mempool" diff --git a/base_layer/key_manager/Cargo.toml b/base_layer/key_manager/Cargo.toml index f4797efa6cf..071169708aa 100644 --- a/base_layer/key_manager/Cargo.toml +++ b/base_layer/key_manager/Cargo.toml @@ -4,7 +4,7 @@ authors = ["The Tari Development Community"] description = "Tari cryptocurrency wallet key management" repository = "https://github.com/tari-project/tari" license = "BSD-3-Clause" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" edition = "2021" [lib] @@ -13,9 +13,9 @@ crate-type = ["lib", "cdylib"] [dependencies] tari_crypto = { version = "0.21.0" } tari_utilities = { version = "0.8" } -tari_common_sqlite = { path = "../../common_sqlite", version = "1.7.0-pre.0" } -tari_common_types = { path = "../../base_layer/common_types", version = "1.7.0-pre.0" } -tari_service_framework = { path = "../service_framework", version = "1.7.0-pre.0" } +tari_common_sqlite = { path = "../../common_sqlite", version = "1.7.0-pre.2" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.7.0-pre.2" } +tari_service_framework = { path = "../service_framework", version = "1.7.0-pre.2" } async-trait = { version = "0.1.50" } chrono = { version = "0.4.19", default-features = false, features = ["serde"] } diff --git a/base_layer/mmr/Cargo.toml b/base_layer/mmr/Cargo.toml index 1733955081c..f8af73d99b0 100644 --- a/base_layer/mmr/Cargo.toml +++ b/base_layer/mmr/Cargo.toml @@ -4,7 +4,7 @@ authors = ["The Tari Development Community"] description = "A Merkle Mountain Range implementation" repository = "https://github.com/tari-project/tari" license = "BSD-3-Clause" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" edition = "2018" [features] diff --git a/base_layer/p2p/Cargo.toml b/base_layer/p2p/Cargo.toml index c90f510b05d..45b83871fd5 100644 --- a/base_layer/p2p/Cargo.toml +++ b/base_layer/p2p/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_p2p" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" authors = ["The Tari Development community"] description = "Tari base layer-specific peer-to-peer communication features" repository = "https://github.com/tari-project/tari" @@ -11,11 +11,11 @@ edition = "2021" [dependencies] tari_network = { workspace = true } -tari_common = { path = "../../common", version = "1.7.0-pre.0" } -tari_common_types = { path = "../common_types", version = "1.7.0-pre.0" } +tari_common = { path = "../../common", version = "1.7.0-pre.2" } +tari_common_types = { path = "../common_types", version = "1.7.0-pre.2" } tari_crypto = { version = "0.21.0" } -tari_service_framework = { path = "../service_framework", version = "1.7.0-pre.0" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.7.0-pre.0" } +tari_service_framework = { path = "../service_framework", version = "1.7.0-pre.2" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.7.0-pre.2" } tari_utilities = { version = "0.8" } anyhow = "1.0.53" @@ -49,7 +49,7 @@ tempfile = "3.1.0" [build-dependencies] tari_common = { path = "../../common", features = [ "build", -], version = "1.7.0-pre.0" } +], version = "1.7.0-pre.2" } [features] test-mocks = [] diff --git a/base_layer/service_framework/Cargo.toml b/base_layer/service_framework/Cargo.toml index c8d8e1e5cb2..9e0029a50fb 100644 --- a/base_layer/service_framework/Cargo.toml +++ b/base_layer/service_framework/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_service_framework" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" authors = ["The Tari Development Community"] description = "The Tari communication stack service framework" repository = "https://github.com/tari-project/tari" @@ -10,7 +10,7 @@ license = "BSD-3-Clause" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.7.0-pre.0" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.7.0-pre.2" } anyhow = "1.0.53" async-trait = "0.1.50" diff --git a/base_layer/tari_mining_helper_ffi/Cargo.toml b/base_layer/tari_mining_helper_ffi/Cargo.toml index 87febdfd1ad..bab5f8f6ef2 100644 --- a/base_layer/tari_mining_helper_ffi/Cargo.toml +++ b/base_layer/tari_mining_helper_ffi/Cargo.toml @@ -3,7 +3,7 @@ name = "minotari_mining_helper_ffi" authors = ["The Tari Development Community"] description = "Tari cryptocurrency miningcore C FFI bindings" license = "BSD-3-Clause" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" edition = "2018" [dependencies] @@ -14,7 +14,7 @@ tari_core = { path = "../core", default-features = false, features = [ "base_node_proto", "base_node", ] } -tari_common_types = { path = "../../base_layer/common_types", version = "1.7.0-pre.0" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.7.0-pre.2" } tari_utilities = { version = "0.8" } libc = "0.2.65" thiserror = "1.0.26" @@ -26,7 +26,7 @@ tari_core = { path = "../core", features = ["transactions", "base_node"] } rand = "0.8" [build-dependencies] -tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.0" } +tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.2" } cbindgen = "0.24.3" tari_common = { path = "../../common", features = [ "build", diff --git a/base_layer/wallet/Cargo.toml b/base_layer/wallet/Cargo.toml index 0247678021e..6323c180cae 100644 --- a/base_layer/wallet/Cargo.toml +++ b/base_layer/wallet/Cargo.toml @@ -3,24 +3,32 @@ name = "minotari_wallet" authors = ["The Tari Development Community"] description = "Tari cryptocurrency wallet library" license = "BSD-3-Clause" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" edition = "2018" [dependencies] tari_network = { workspace = true } tari_rpc_framework = { workspace = true } -tari_common = { path = "../../common", version = "1.7.0-pre.0" } -tari_common_sqlite = { path = "../../common_sqlite", version = "1.7.0-pre.0" } -tari_common_types = { path = "../../base_layer/common_types", version = "1.7.0-pre.0" } -tari_contacts = { path = "../../base_layer/contacts", version = "1.7.0-pre.0" } -tari_core = { path = "../../base_layer/core", default-features = false, features = ["transactions", "mempool_proto", "base_node_proto"], version = "1.7.0-pre.0" } +tari_common = { path = "../../common", version = "1.7.0-pre.2" } +tari_common_sqlite = { path = "../../common_sqlite", version = "1.7.0-pre.2" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.7.0-pre.2" } +tari_contacts = { path = "../../base_layer/contacts", version = "1.7.0-pre.2" } +tari_core = { path = "../../base_layer/core", default-features = false, features = [ + "transactions", + "mempool_proto", + "base_node_proto", +], version = "1.7.0-pre.2" } tari_crypto = { version = "0.21.0" } tari_max_size = { path = "../../infrastructure/max_size" } -tari_key_manager = { path = "../key_manager", features = ["key_manager_service", ], version = "1.7.0-pre.0" } -tari_p2p = { path = "../p2p", features = ["auto-update"], version = "1.7.0-pre.0" } -tari_script = { path = "../../infrastructure/tari_script", version = "1.7.0-pre.0" } -tari_service_framework = { path = "../service_framework", version = "1.7.0-pre.0" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.7.0-pre.0" } +tari_key_manager = { path = "../key_manager", features = [ + "key_manager_service", +], version = "1.7.0-pre.2" } +tari_p2p = { path = "../p2p", features = [ + "auto-update", +], version = "1.7.0-pre.2" } +tari_script = { path = "../../infrastructure/tari_script", version = "1.7.0-pre.2" } +tari_service_framework = { path = "../service_framework", version = "1.7.0-pre.2" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.7.0-pre.2" } tari_utilities = { version = "0.8" } # Uncomment for tokio tracing via tokio-console (needs "tracing" features) @@ -66,7 +74,7 @@ zeroize = "1" tari_common = { path = "../../common", features = [ "build", "static-application-info", -], version = "1.7.0-pre.0" } +], version = "1.7.0-pre.2" } [dev-dependencies] tari_p2p = { path = "../p2p", features = ["test-mocks"] } diff --git a/base_layer/wallet/src/utxo_scanner_service/utxo_scanner_task.rs b/base_layer/wallet/src/utxo_scanner_service/utxo_scanner_task.rs index 9a7d99f3586..369939c37bd 100644 --- a/base_layer/wallet/src/utxo_scanner_service/utxo_scanner_task.rs +++ b/base_layer/wallet/src/utxo_scanner_service/utxo_scanner_task.rs @@ -32,6 +32,7 @@ use tari_common_types::{ tari_address::TariAddress, transaction::{ImportStatus, TxId}, types::HashOutput, + wallet_types::WalletType, }; use tari_core::{ base_node::rpc::BaseNodeWalletRpcClient, @@ -229,7 +230,17 @@ where // The node does not know of any of our cached headers so we will start the scan anew from the // wallet birthday self.resources.db.clear_scanned_blocks()?; - let birthday_height_hash = self.get_birthday_header_height_hash(&mut client).await?; + let birthday_height_hash = match self.resources.db.get_wallet_type()? { + Some(WalletType::ProvidedKeys(_)) => { + let header_proto = client.get_header_by_height(0).await?; + let header = BlockHeader::try_from(header_proto).map_err(UtxoScannerError::ConversionError)?; + HeightHash { + height: 0, + header_hash: header.hash(), + } + }, + _ => self.get_birthday_header_height_hash(&mut client).await?, + }; ScannedBlock { height: birthday_height_hash.height, diff --git a/base_layer/wallet/tests/utxo_scanner/mod.rs b/base_layer/wallet/tests/utxo_scanner/mod.rs index e985560f596..6ce3a1bf0a2 100644 --- a/base_layer/wallet/tests/utxo_scanner/mod.rs +++ b/base_layer/wallet/tests/utxo_scanner/mod.rs @@ -297,6 +297,7 @@ async fn generate_block_headers_and_utxos( #[tokio::test] async fn test_utxo_scanner_recovery() { + // env_logger::init(); // Set `$env:RUST_LOG = "trace"` let key_manager = create_memory_db_key_manager().unwrap(); let mut test_interface = setup(key_manager.clone(), UtxoScannerMode::Recovery, None, None, None).await; diff --git a/base_layer/wallet_ffi/Cargo.toml b/base_layer/wallet_ffi/Cargo.toml index 3495f4cd4b0..3f9e9c24d34 100644 --- a/base_layer/wallet_ffi/Cargo.toml +++ b/base_layer/wallet_ffi/Cargo.toml @@ -3,7 +3,7 @@ name = "minotari_wallet_ffi" authors = ["The Tari Development Community"] description = "Tari cryptocurrency wallet C FFI bindings" license = "BSD-3-Clause" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" edition = "2021" [dependencies] @@ -64,7 +64,7 @@ tari_common = { path = "../../common", features = [ "build", "static-application-info", ] } -tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.0" } +tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.2" } [lints.rust] unexpected_cfgs = { level = "warn", check-cfg = [ diff --git a/base_layer/wallet_ffi/wallet.h b/base_layer/wallet_ffi/wallet.h index ec00806363a..236d326201e 100644 --- a/base_layer/wallet_ffi/wallet.h +++ b/base_layer/wallet_ffi/wallet.h @@ -417,7 +417,6 @@ void destroy_tari_vector(struct TariVector *v); void destroy_tari_coin_preview(struct TariCoinPreview *p); /** - * -------------------------------- Strings ------------------------------------------------ /// * Frees memory for a char array * * ## Arguments @@ -1333,8 +1332,6 @@ struct ByteVector *range_proof_get_bytes(TariRangeProof *proof_ptr, void range_proof_destroy(TariRangeProof *proof_ptr); /** - * -------------------------------------------------------------------------------------------- /// - * --------------------------------------- Covenant --------------------------------------------/// * Creates a TariCovenant from a ByteVector containing the covenant bytes * * ## Arguments @@ -1844,8 +1841,6 @@ const char *liveness_data_get_online_status(TariContactsLivenessData *liveness_d void liveness_data_destroy(TariContactsLivenessData *liveness_data); /** - * -------------------------------------------------------------------------------------------- /// - * ----------------------------------- CompletedTransactions ----------------------------------- /// * Gets the length of a TariCompletedTransactions * * ## Arguments diff --git a/changelog-development.md b/changelog-development.md index d30fb22d3ba..201e76eddfc 100644 --- a/changelog-development.md +++ b/changelog-development.md @@ -2,6 +2,21 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [1.7.0-pre.2](https://github.com/tari-project/tari/compare/v1.7.0-pre.1...v1.7.0-pre.2) (2024-10-15) + + +### Bug Fixes + +* view-only wallet scan ([#6633](https://github.com/tari-project/tari/issues/6633)) ([351fdb3](https://github.com/tari-project/tari/commit/351fdb30d243692bb48e2789eafc66a8790c576e)) + +## [1.7.0-pre.1](https://github.com/tari-project/tari/compare/v1.7.0-pre.0...v1.7.0-pre.1) (2024-10-15) + + +### Features + +* add checked_sub ([#6628](https://github.com/tari-project/tari/issues/6628)) ([2d0ccb1](https://github.com/tari-project/tari/commit/2d0ccb121bb13990cac422fe72945cced06c1f74)) +* add dns resiliency ([#6629](https://github.com/tari-project/tari/issues/6629)) ([8dd919f](https://github.com/tari-project/tari/commit/8dd919f4188c4936d5c8ab9f7e328ec79179bdfb)) + ## [1.7.0-pre.0](https://github.com/tari-project/tari/compare/v1.6.0-pre.0...v1.7.0-pre.0) (2024-10-11) diff --git a/changelog-nextnet.md b/changelog-nextnet.md index 377afadae28..4afdf791c1d 100644 --- a/changelog-nextnet.md +++ b/changelog-nextnet.md @@ -2,6 +2,22 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. # Changelog +## [1.7.0-rc.2](https://github.com/tari-project/tari/compare/v1.7.0-rc.1...v1.7.0-rc.2) (2024-10-15) + + +### Bug Fixes + +* view-only wallet scan ([#6633](https://github.com/tari-project/tari/issues/6633)) ([351fdb3](https://github.com/tari-project/tari/commit/351fdb30d243692bb48e2789eafc66a8790c576e)) + + +## [1.7.0-rc.1](https://github.com/tari-project/tari/compare/v1.7.0-rc.0...v1.7.0-rc.1) (2024-10-15) + + +### Features + +* add checked_sub ([#6628](https://github.com/tari-project/tari/issues/6628)) ([2d0ccb1](https://github.com/tari-project/tari/commit/2d0ccb121bb13990cac422fe72945cced06c1f74)) +* add dns resiliency ([#6629](https://github.com/tari-project/tari/issues/6629)) ([8dd919f](https://github.com/tari-project/tari/commit/8dd919f4188c4936d5c8ab9f7e328ec79179bdfb)) + ## [1.7.0-rc.0](https://github.com/tari-project/tari/compare/v1.5.1-rc.0...v1.7.0-rc.0) (2024-10-08) diff --git a/common/Cargo.toml b/common/Cargo.toml index 5d69c71bc85..a299d4ddb5b 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -6,7 +6,7 @@ repository = "https://github.com/tari-project/tari" homepage = "https://tari.com" readme = "README.md" license = "BSD-3-Clause" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" edition = "2018" [features] @@ -14,7 +14,7 @@ build = ["toml", "prost-build"] static-application-info = ["git2"] [dependencies] -tari_features = { path = "./tari_features", version = "1.7.0-pre.0" } +tari_features = { path = "./tari_features", version = "1.7.0-pre.2" } anyhow = "1.0.53" config = { version = "0.14.0", default-features = false, features = ["toml"] } @@ -44,7 +44,7 @@ multiaddr = { workspace = true } toml = "0.5.8" [build-dependencies] -tari_features = { path = "./tari_features", version = "1.7.0-pre.0" } +tari_features = { path = "./tari_features", version = "1.7.0-pre.2" } [lints.rust] unexpected_cfgs = { level = "warn", check-cfg = [ diff --git a/common/tari_features/Cargo.toml b/common/tari_features/Cargo.toml index 0e8533e9893..d366176a025 100644 --- a/common/tari_features/Cargo.toml +++ b/common/tari_features/Cargo.toml @@ -6,7 +6,7 @@ repository = "https://github.com/tari-project/tari" homepage = "https://tari.com" readme = "README.md" license = "BSD-3-Clause" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common_sqlite/Cargo.toml b/common_sqlite/Cargo.toml index af103ed2f4e..7bccef47294 100644 --- a/common_sqlite/Cargo.toml +++ b/common_sqlite/Cargo.toml @@ -3,7 +3,7 @@ name = "tari_common_sqlite" authors = ["The Tari Development Community"] description = "Tari cryptocurrency wallet library" license = "BSD-3-Clause" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/comms/core/Cargo.toml b/comms/core/Cargo.toml index 5bb86294317..25d1c1c96de 100644 --- a/comms/core/Cargo.toml +++ b/comms/core/Cargo.toml @@ -6,14 +6,14 @@ repository = "https://github.com/tari-project/tari" homepage = "https://tari.com" readme = "README.md" license = "BSD-3-Clause" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" edition = "2021" [dependencies] tari_crypto = { version = "0.21.0" } -tari_metrics = { path = "../../infrastructure/metrics", optional = true, version = "1.7.0-pre.0" } -tari_storage = { path = "../../infrastructure/storage", version = "1.7.0-pre.0" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.7.0-pre.0" } +tari_metrics = { path = "../../infrastructure/metrics", optional = true, version = "1.7.0-pre.2" } +tari_storage = { path = "../../infrastructure/storage", version = "1.7.0-pre.2" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.7.0-pre.2" } tari_utilities = { version = "0.8" } anyhow = "1.0.53" @@ -72,7 +72,7 @@ tempfile = "3.1.0" [build-dependencies] tari_common = { path = "../../common", features = [ "build", -], version = "1.7.0-pre.0" } +], version = "1.7.0-pre.2" } [features] c_integration = [] diff --git a/comms/dht/Cargo.toml b/comms/dht/Cargo.toml index c3c23c443f4..9258230602f 100644 --- a/comms/dht/Cargo.toml +++ b/comms/dht/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_comms_dht" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" authors = ["The Tari Development Community"] description = "Tari comms DHT module" repository = "https://github.com/tari-project/tari" @@ -10,14 +10,14 @@ license = "BSD-3-Clause" edition = "2021" [dependencies] -tari_comms = { path = "../core", features = ["rpc"], version = "1.7.0-pre.0" } -tari_common = { path = "../../common", version = "1.7.0-pre.0" } -tari_comms_rpc_macros = { path = "../rpc_macros", version = "1.7.0-pre.0" } +tari_comms = { path = "../core", features = ["rpc"], version = "1.7.0-pre.2" } +tari_common = { path = "../../common", version = "1.7.0-pre.2" } +tari_comms_rpc_macros = { path = "../rpc_macros", version = "1.7.0-pre.2" } tari_crypto = { version = "0.21.0" } tari_utilities = { version = "0.8" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.7.0-pre.0" } -tari_storage = { path = "../../infrastructure/storage", version = "1.7.0-pre.0" } -tari_common_sqlite = { path = "../../common_sqlite", version = "1.7.0-pre.0" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.7.0-pre.2" } +tari_storage = { path = "../../infrastructure/storage", version = "1.7.0-pre.2" } +tari_common_sqlite = { path = "../../common_sqlite", version = "1.7.0-pre.2" } anyhow = "1.0.53" bitflags = { version = "2.4", features = ["serde"] } @@ -67,7 +67,7 @@ clap = "3.2" [build-dependencies] -tari_common = { path = "../../common", version = "1.7.0-pre.0" } +tari_common = { path = "../../common", version = "1.7.0-pre.2" } [features] test-mocks = [] diff --git a/comms/rpc_macros/Cargo.toml b/comms/rpc_macros/Cargo.toml index f8afbd3193e..98eba9e21d3 100644 --- a/comms/rpc_macros/Cargo.toml +++ b/comms/rpc_macros/Cargo.toml @@ -6,7 +6,7 @@ repository = "https://github.com/tari-project/tari" homepage = "https://tari.com" readme = "README.md" license = "BSD-3-Clause" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" edition = "2018" [lib] diff --git a/hashing/Cargo.toml b/hashing/Cargo.toml index 4906c33317f..f21554f738c 100644 --- a/hashing/Cargo.toml +++ b/hashing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_hashing" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" edition = "2021" description = "Tari hash domains" authors = ["The Tari Development Community"] diff --git a/infrastructure/derive/Cargo.toml b/infrastructure/derive/Cargo.toml index d60bf3957a6..9c78f732b26 100644 --- a/infrastructure/derive/Cargo.toml +++ b/infrastructure/derive/Cargo.toml @@ -6,7 +6,7 @@ repository = "https://github.com/tari-project/tari" homepage = "https://tari.com" readme = "README.md" license = "BSD-3-Clause" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" edition = "2018" [lib] diff --git a/infrastructure/libtor/Cargo.toml b/infrastructure/libtor/Cargo.toml index 7628c5902c6..bbbdcf68565 100644 --- a/infrastructure/libtor/Cargo.toml +++ b/infrastructure/libtor/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_libtor" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" edition = "2021" license = "BSD-3-Clause" diff --git a/infrastructure/max_size/Cargo.toml b/infrastructure/max_size/Cargo.toml index 83d271f9c9d..8555adaeb7b 100644 --- a/infrastructure/max_size/Cargo.toml +++ b/infrastructure/max_size/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_max_size" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" edition = "2021" description = "Tari max size library" authors = ["The Tari Development Community"] diff --git a/infrastructure/metrics/Cargo.toml b/infrastructure/metrics/Cargo.toml index 5b2b66811fd..1604cfc394b 100644 --- a/infrastructure/metrics/Cargo.toml +++ b/infrastructure/metrics/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tari_metrics" description = "Tari metrics" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" edition = "2021" authors = ["The Tari Development Community"] repository = "https://github.com/tari-project/tari" diff --git a/infrastructure/shutdown/Cargo.toml b/infrastructure/shutdown/Cargo.toml index 5ae6a49d739..1923556a419 100644 --- a/infrastructure/shutdown/Cargo.toml +++ b/infrastructure/shutdown/Cargo.toml @@ -6,7 +6,7 @@ repository = "https://github.com/tari-project/tari" homepage = "https://tari.com" readme = "README.md" license = "BSD-3-Clause" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/infrastructure/storage/Cargo.toml b/infrastructure/storage/Cargo.toml index af8b87aa519..a4b638ff1f2 100644 --- a/infrastructure/storage/Cargo.toml +++ b/infrastructure/storage/Cargo.toml @@ -6,7 +6,7 @@ repository = "https://github.com/tari-project/tari" homepage = "https://tari.com" readme = "README.md" license = "BSD-3-Clause" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" edition = "2018" [dependencies] diff --git a/infrastructure/tari_script/Cargo.toml b/infrastructure/tari_script/Cargo.toml index d00a7238452..abfdcefabca 100644 --- a/infrastructure/tari_script/Cargo.toml +++ b/infrastructure/tari_script/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_script" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" edition = "2021" description = "Tari script library" authors = ["The Tari Development Community"] diff --git a/infrastructure/test_utils/Cargo.toml b/infrastructure/test_utils/Cargo.toml index e9581c095f3..224081f722f 100644 --- a/infrastructure/test_utils/Cargo.toml +++ b/infrastructure/test_utils/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tari_test_utils" description = "Utility functions used in Tari test functions" -version = "1.7.0-pre.0" +version = "1.7.0-pre.2" authors = ["The Tari Development Community"] edition = "2018" license = "BSD-3-Clause" @@ -9,8 +9,8 @@ license = "BSD-3-Clause" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tari_shutdown = { path = "../shutdown", version = "1.7.0-pre.0" } -tari_comms = { path = "../../comms/core", version = "1.7.0-pre.0" } +tari_shutdown = { path = "../shutdown", version = "1.7.0-pre.2" } +tari_comms = { path = "../../comms/core", version = "1.7.0-pre.2" } futures = { version = "^0.3.1" } rand = "0.8" diff --git a/package-lock.json b/package-lock.json index 75feea86cf2..307eb82a0d6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "tari", - "version": "1.7.0-pre.0", + "version": "1.7.0-pre.2", "lockfileVersion": 2, "requires": true, "packages": {}