diff --git a/Cargo.lock b/Cargo.lock index ff2e00b207..66d84b4982 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6498,7 +6498,7 @@ dependencies = [ [[package]] name = "tari_app_grpc" -version = "0.32.5" +version = "0.33.0" dependencies = [ "chrono", "num-traits", @@ -6516,7 +6516,7 @@ dependencies = [ [[package]] name = "tari_app_utilities" -version = "0.32.5" +version = "0.33.0" dependencies = [ "clap 3.2.6", "config", @@ -6539,7 +6539,7 @@ dependencies = [ [[package]] name = "tari_base_node" -version = "0.32.5" +version = "0.33.0" dependencies = [ "anyhow", "async-trait", @@ -6666,7 +6666,7 @@ dependencies = [ [[package]] name = "tari_common" -version = "0.32.5" +version = "0.33.0" dependencies = [ "anyhow", "config", @@ -6683,7 +6683,7 @@ dependencies = [ "serde_json", "sha2 0.9.9", "structopt", - "tari_test_utils 0.32.5", + "tari_test_utils 0.33.0", "tempfile", "thiserror", "toml", @@ -6691,7 +6691,7 @@ dependencies = [ [[package]] name = "tari_common_sqlite" -version = "0.32.5" +version = "0.33.0" dependencies = [ "diesel", "log", @@ -6700,7 +6700,7 @@ dependencies = [ [[package]] name = "tari_common_types" -version = "0.32.5" +version = "0.33.0" dependencies = [ "digest 0.9.0", "lazy_static", @@ -6714,7 +6714,7 @@ dependencies = [ [[package]] name = "tari_comms" -version = "0.32.5" +version = "0.33.0" dependencies = [ "anyhow", "async-trait", @@ -6750,7 +6750,7 @@ dependencies = [ "tari_metrics", "tari_shutdown", "tari_storage", - "tari_test_utils 0.32.5", + "tari_test_utils 0.33.0", "tari_utilities", "tempfile", "thiserror", @@ -6764,7 +6764,7 @@ dependencies = [ [[package]] name = "tari_comms_dht" -version = "0.32.5" +version = "0.33.0" dependencies = [ "anyhow", "bitflags 1.3.2", @@ -6798,7 +6798,7 @@ dependencies = [ "tari_crypto", "tari_shutdown", "tari_storage", - "tari_test_utils 0.32.5", + "tari_test_utils 0.33.0", "tari_utilities", "tempfile", "thiserror", @@ -6810,7 +6810,7 @@ dependencies = [ [[package]] name = "tari_comms_rpc_macros" -version = "0.32.5" +version = "0.33.0" dependencies = [ "futures 0.3.21", "proc-macro2", @@ -6818,14 +6818,14 @@ dependencies = [ "quote", "syn", "tari_comms", - "tari_test_utils 0.32.5", + "tari_test_utils 0.33.0", "tokio 1.17.0", "tower-service", ] [[package]] name = "tari_console_wallet" -version = "0.32.5" +version = "0.33.0" dependencies = [ "bitflags 1.3.2", "chrono", @@ -6874,7 +6874,7 @@ dependencies = [ [[package]] name = "tari_core" -version = "0.32.5" +version = "0.33.0" dependencies = [ "async-trait", "bincode", @@ -6924,7 +6924,7 @@ dependencies = [ "tari_service_framework", "tari_shutdown", "tari_storage", - "tari_test_utils 0.32.5", + "tari_test_utils 0.33.0", "tari_utilities", "tempfile", "thiserror", @@ -7031,7 +7031,7 @@ dependencies = [ [[package]] name = "tari_key_manager" -version = "0.32.5" +version = "0.33.0" dependencies = [ "argon2", "arrayvec 0.7.2", @@ -7062,7 +7062,7 @@ dependencies = [ [[package]] name = "tari_launchpad" -version = "0.32.5" +version = "0.33.0" dependencies = [ "bollard", "config", @@ -7105,7 +7105,7 @@ dependencies = [ [[package]] name = "tari_merge_mining_proxy" -version = "0.32.5" +version = "0.33.0" dependencies = [ "anyhow", "bincode", @@ -7157,7 +7157,7 @@ dependencies = [ [[package]] name = "tari_miner" -version = "0.32.5" +version = "0.33.0" dependencies = [ "base64 0.13.0", "bufstream", @@ -7192,7 +7192,7 @@ dependencies = [ [[package]] name = "tari_mining_helper_ffi" -version = "0.30.2" +version = "0.33.0" dependencies = [ "hex", "libc", @@ -7209,7 +7209,7 @@ dependencies = [ [[package]] name = "tari_mmr" -version = "0.32.5" +version = "0.33.0" dependencies = [ "bincode", "blake2 0.9.2", @@ -7227,7 +7227,7 @@ dependencies = [ [[package]] name = "tari_p2p" -version = "0.32.5" +version = "0.33.0" dependencies = [ "anyhow", "bytes 0.5.6", @@ -7255,7 +7255,7 @@ dependencies = [ "tari_service_framework", "tari_shutdown", "tari_storage", - "tari_test_utils 0.32.5", + "tari_test_utils 0.33.0", "tari_utilities", "tempfile", "thiserror", @@ -7285,7 +7285,7 @@ dependencies = [ [[package]] name = "tari_service_framework" -version = "0.32.5" +version = "0.33.0" dependencies = [ "anyhow", "async-trait", @@ -7293,7 +7293,7 @@ dependencies = [ "futures-test", "log", "tari_shutdown", - "tari_test_utils 0.32.5", + "tari_test_utils 0.33.0", "thiserror", "tokio 1.17.0", "tower", @@ -7302,7 +7302,7 @@ dependencies = [ [[package]] name = "tari_shutdown" -version = "0.32.5" +version = "0.33.0" dependencies = [ "futures 0.3.21", "tokio 1.17.0", @@ -7310,7 +7310,7 @@ dependencies = [ [[package]] name = "tari_storage" -version = "0.32.5" +version = "0.33.0" dependencies = [ "bincode", "lmdb-zero", @@ -7338,7 +7338,7 @@ dependencies = [ [[package]] name = "tari_test_utils" -version = "0.32.5" +version = "0.33.0" dependencies = [ "futures 0.3.21", "futures-test", @@ -7364,7 +7364,7 @@ dependencies = [ [[package]] name = "tari_validator_node" -version = "0.32.5" +version = "0.33.0" dependencies = [ "anyhow", "async-trait", @@ -7399,7 +7399,7 @@ dependencies = [ "tari_service_framework", "tari_shutdown", "tari_storage", - "tari_test_utils 0.32.5", + "tari_test_utils 0.33.0", "thiserror", "tokio 1.17.0", "tokio-stream", @@ -7408,7 +7408,7 @@ dependencies = [ [[package]] name = "tari_wallet" -version = "0.32.5" +version = "0.33.0" dependencies = [ "aes-gcm 0.8.0", "argon2", @@ -7449,7 +7449,7 @@ dependencies = [ "tari_service_framework", "tari_shutdown", "tari_storage", - "tari_test_utils 0.32.5", + "tari_test_utils 0.33.0", "tari_utilities", "tempfile", "thiserror", @@ -7459,7 +7459,7 @@ dependencies = [ [[package]] name = "tari_wallet_ffi" -version = "0.32.5" +version = "0.33.0" dependencies = [ "cbindgen 0.24.3", "chrono", @@ -7484,7 +7484,7 @@ dependencies = [ "tari_script", "tari_service_framework", "tari_shutdown", - "tari_test_utils 0.32.5", + "tari_test_utils 0.33.0", "tari_utilities", "tari_wallet", "tempfile", @@ -7690,7 +7690,7 @@ dependencies = [ [[package]] name = "test_faucet" -version = "0.32.5" +version = "0.33.0" dependencies = [ "rand 0.8.5", "serde", diff --git a/applications/launchpad/backend/Cargo.toml b/applications/launchpad/backend/Cargo.toml index 9388eee09d..bcb55001c2 100644 --- a/applications/launchpad/backend/Cargo.toml +++ b/applications/launchpad/backend/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_launchpad" -version = "0.32.5" +version = "0.33.0" description = "The Tari Launcher" authors = ["The Tari Development Community"] license = "BSD-3-Clause" @@ -14,8 +14,8 @@ build = "src/build.rs" tauri-build = { version = "1.0.0-rc.5", features = [] } [dependencies] -tari_app_utilities = { version = "^0.32", path = "../../tari_app_utilities" } -tari_comms = { version = "^0.32", path = "../../../comms/core" } +tari_app_utilities = { version = "^0.33", path = "../../tari_app_utilities" } +tari_comms = { version = "^0.33", path = "../../../comms/core" } tari_common = { path="../../../common"} bollard = "0.11.1" diff --git a/applications/tari_app_grpc/Cargo.toml b/applications/tari_app_grpc/Cargo.toml index 3f06265ca0..5407ad8229 100644 --- a/applications/tari_app_grpc/Cargo.toml +++ b/applications/tari_app_grpc/Cargo.toml @@ -4,11 +4,11 @@ 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 = "0.32.5" +version = "0.33.0" edition = "2018" [dependencies] -tari_common_types = { version = "^0.32", path = "../../base_layer/common_types"} +tari_common_types = { version = "^0.33", path = "../../base_layer/common_types"} tari_comms = { path = "../../comms/core"} tari_core = { path = "../../base_layer/core"} tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.14.0" } diff --git a/applications/tari_app_utilities/Cargo.toml b/applications/tari_app_utilities/Cargo.toml index 118d4c45eb..33bfd51dcb 100644 --- a/applications/tari_app_utilities/Cargo.toml +++ b/applications/tari_app_utilities/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_app_utilities" -version = "0.32.5" +version = "0.33.0" authors = ["The Tari Development Community"] edition = "2018" license = "BSD-3-Clause" diff --git a/applications/tari_base_node/Cargo.toml b/applications/tari_base_node/Cargo.toml index 519f70d969..67e0684a33 100644 --- a/applications/tari_base_node/Cargo.toml +++ b/applications/tari_base_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 = "0.32.5" +version = "0.33.0" edition = "2018" [dependencies] diff --git a/applications/tari_console_wallet/Cargo.toml b/applications/tari_console_wallet/Cargo.toml index 6d684d0f8a..afeb9b42ee 100644 --- a/applications/tari_console_wallet/Cargo.toml +++ b/applications/tari_console_wallet/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_console_wallet" -version = "0.32.5" +version = "0.33.0" authors = ["The Tari Development Community"] edition = "2018" license = "BSD-3-Clause" diff --git a/applications/tari_merge_mining_proxy/Cargo.toml b/applications/tari_merge_mining_proxy/Cargo.toml index 9838890680..13c6869fca 100644 --- a/applications/tari_merge_mining_proxy/Cargo.toml +++ b/applications/tari_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 = "0.32.5" +version = "0.33.0" edition = "2018" [features] diff --git a/applications/tari_miner/Cargo.toml b/applications/tari_miner/Cargo.toml index 619b613ca9..57c305a054 100644 --- a/applications/tari_miner/Cargo.toml +++ b/applications/tari_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 = "0.32.5" +version = "0.33.0" edition = "2018" [dependencies] diff --git a/applications/tari_stratum_transcoder/README.md b/applications/tari_stratum_transcoder/README.md deleted file mode 100644 index 3ba0deebfa..0000000000 --- a/applications/tari_stratum_transcoder/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# DEPRECATED - -This application has been been deprecated as of 07/03/2022 - -## Tari Stratum Transcoder - -## Description - -This application is used to translate and pipe request from mining_core to the Tari BaseNode and Tari Wallet. diff --git a/applications/tari_stratum_transcoder/src/main.rs b/applications/tari_stratum_transcoder/src/main.rs deleted file mode 100644 index abed20c289..0000000000 --- a/applications/tari_stratum_transcoder/src/main.rs +++ /dev/null @@ -1,95 +0,0 @@ -// Copyright 2020. The Tari Project -// -// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the -// following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following -// disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the -// following disclaimer in the documentation and/or other materials provided with the distribution. -// -// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote -// products derived from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -// USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -mod common; -mod error; -mod proxy; - -use std::convert::{Infallible, TryFrom}; - -use futures::future; -use hyper::{service::make_service_fn, Server}; -use proxy::{StratumTranscoderProxyConfig, StratumTranscoderProxyService}; -use structopt::StructOpt; -use tari_app_grpc::tari_rpc as grpc; -use tari_common::{configuration::bootstrap::ApplicationType, ConfigBootstrap, GlobalConfig}; -use tokio::time::Duration; - -use crate::error::StratumTranscoderProxyError; - -#[tokio::main] -async fn main() -> Result<(), StratumTranscoderProxyError> { - let config = initialize()?; - - let config = StratumTranscoderProxyConfig::try_from(config)?; - let addr = config.transcoder_host_address; - let client = reqwest::Client::builder() - .connect_timeout(Duration::from_secs(5)) - .timeout(Duration::from_secs(10)) - .pool_max_idle_per_host(25) - .build() - .map_err(StratumTranscoderProxyError::ReqwestError)?; - let base_node_client = - grpc::base_node_client::BaseNodeClient::connect(format!("http://{}", config.grpc_base_node_address)).await?; - let wallet_client = - grpc::wallet_client::WalletClient::connect(format!("http://{}", config.grpc_console_wallet_address)).await?; - let miningcore_service = StratumTranscoderProxyService::new(config, client, base_node_client, wallet_client); - let service = make_service_fn(|_conn| future::ready(Result::<_, Infallible>::Ok(miningcore_service.clone()))); - - match Server::try_bind(&addr) { - Ok(builder) => { - println!("Listening on {}...", addr); - builder.serve(service).await?; - Ok(()) - }, - Err(err) => { - println!("Fatal: Cannot bind to '{}'.", addr); - println!("It may be part of a Port Exclusion Range. Please try to use another port for the"); - println!("'proxy_host_address' in 'config/config.toml' and for the applicable XMRig '[pools][url]' or"); - println!("[pools][self-select]' config setting that can be found in 'config/xmrig_config_***.json' or"); - println!("'/config.json'."); - println!(); - Err(err.into()) - }, - } -} - -/// Loads the configuration and sets up logging -fn initialize() -> Result { - // Parse and validate command-line arguments - let mut bootstrap = ConfigBootstrap::from_args(); - // Check and initialize configuration files - let application_type = ApplicationType::StratumTranscoder; - bootstrap.init_dirs(application_type)?; - - // Load and apply configuration file - let cfg = bootstrap.load_configuration()?; - - #[cfg(feature = "envlog")] - let _ = env_logger::try_init(); - // Initialise the logger - #[cfg(not(feature = "envlog"))] - bootstrap.initialize_logging()?; - - let cfg = GlobalConfig::convert_from(application_type, cfg, bootstrap.network)?; - Ok(cfg) -} diff --git a/applications/tari_validator_node/Cargo.toml b/applications/tari_validator_node/Cargo.toml index b235d72bc1..85d177fb25 100644 --- a/applications/tari_validator_node/Cargo.toml +++ b/applications/tari_validator_node/Cargo.toml @@ -4,7 +4,7 @@ authors = ["The Tari Development Community"] description = "The Tari validator node implementation" repository = "https://github.com/tari-project/tari" license = "BSD-3-Clause" -version = "0.32.5" +version = "0.33.0" edition = "2018" [dependencies] diff --git a/applications/test_faucet/Cargo.toml b/applications/test_faucet/Cargo.toml index 4e118a74ff..2ac55618d6 100644 --- a/applications/test_faucet/Cargo.toml +++ b/applications/test_faucet/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "test_faucet" -version = "0.32.5" +version = "0.33.0" authors = ["The Tari Development Community"] edition = "2018" license = "BSD-3-Clause" diff --git a/base_layer/common_types/Cargo.toml b/base_layer/common_types/Cargo.toml index 7a7e4fd366..fc2f6a064c 100644 --- a/base_layer/common_types/Cargo.toml +++ b/base_layer/common_types/Cargo.toml @@ -3,7 +3,7 @@ name = "tari_common_types" authors = ["The Tari Development Community"] description = "Tari cryptocurrency common types" license = "BSD-3-Clause" -version = "0.32.5" +version = "0.33.0" edition = "2018" [dependencies] diff --git a/base_layer/core/Cargo.toml b/base_layer/core/Cargo.toml index 3e7071239b..b86e517b7b 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 = "0.32.5" +version = "0.33.0" edition = "2018" [features] @@ -19,20 +19,20 @@ avx2 = ["tari_crypto/avx2"] benches = ["base_node", "criterion"] [dependencies] -tari_common = { version = "^0.32", path = "../../common" } -tari_common_types = { version = "^0.32", path = "../../base_layer/common_types" } -tari_comms = { version = "^0.32", path = "../../comms/core" } -tari_comms_dht = { version = "^0.32", path = "../../comms/dht" } -tari_comms_rpc_macros = { version = "^0.32", path = "../../comms/rpc_macros" } +tari_common = { version = "^0.33", path = "../../common" } +tari_common_types = { version = "^0.33", path = "../../base_layer/common_types" } +tari_comms = { version = "^0.33", path = "../../comms/core" } +tari_comms_dht = { version = "^0.33", path = "../../comms/dht" } +tari_comms_rpc_macros = { version = "^0.33", path = "../../comms/rpc_macros" } tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.14.0" } tari_metrics = { path = "../../infrastructure/metrics" } -tari_mmr = { version = "^0.32", path = "../../base_layer/mmr", optional = true, features = ["native_bitmap"] } -tari_p2p = { version = "^0.32", path = "../../base_layer/p2p" } +tari_mmr = { version = "^0.33", path = "../../base_layer/mmr", optional = true, features = ["native_bitmap"] } +tari_p2p = { version = "^0.33", path = "../../base_layer/p2p" } tari_script = { path = "../../infrastructure/tari_script" } -tari_service_framework = { version = "^0.32", path = "../service_framework" } -tari_shutdown = { version = "^0.32", path = "../../infrastructure/shutdown" } -tari_storage = { version = "^0.32", path = "../../infrastructure/storage" } -tari_test_utils = { version = "^0.32", path = "../../infrastructure/test_utils" } +tari_service_framework = { version = "^0.33", path = "../service_framework" } +tari_shutdown = { version = "^0.33", path = "../../infrastructure/shutdown" } +tari_storage = { version = "^0.33", path = "../../infrastructure/storage" } +tari_test_utils = { version = "^0.33", path = "../../infrastructure/test_utils" } tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.4.4" } async-trait = "0.1.50" @@ -75,15 +75,15 @@ tracing-attributes = "*" uint = { version = "0.9", default-features = false } [dev-dependencies] -tari_p2p = { version = "^0.32", path = "../../base_layer/p2p", features = ["test-mocks"] } -tari_test_utils = { version = "^0.32", path = "../../infrastructure/test_utils" } +tari_p2p = { version = "^0.33", path = "../../base_layer/p2p", features = ["test-mocks"] } +tari_test_utils = { version = "^0.33", path = "../../infrastructure/test_utils" } config = { version = "0.13.0" } env_logger = "0.7.0" tempfile = "3.1.0" [build-dependencies] -tari_common = { version = "^0.32", path = "../../common", features = ["build"] } +tari_common = { version = "^0.33", path = "../../common", features = ["build"] } [[bench]] name = "mempool" diff --git a/base_layer/key_manager/Cargo.toml b/base_layer/key_manager/Cargo.toml index 9cfdc3add9..ef8234a5bf 100644 --- a/base_layer/key_manager/Cargo.toml +++ b/base_layer/key_manager/Cargo.toml @@ -4,14 +4,14 @@ authors = ["The Tari Development Community"] description = "Tari cryptocurrency wallet key management" repository = "https://github.com/tari-project/tari" license = "BSD-3-Clause" -version = "0.32.5" +version = "0.33.0" edition = "2021" [lib] crate-type = ["lib", "cdylib"] [dependencies] -tari_common_types = { version = "^0.32", path = "../../base_layer/common_types" } +tari_common_types = { version = "^0.33", path = "../../base_layer/common_types" } tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.14.0" } tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.4.4" } diff --git a/base_layer/mmr/Cargo.toml b/base_layer/mmr/Cargo.toml index 911cf0208d..a038614be3 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 = "0.32.5" +version = "0.33.0" edition = "2018" [features] diff --git a/base_layer/p2p/Cargo.toml b/base_layer/p2p/Cargo.toml index afdaa3d4b8..5ecc2b29e0 100644 --- a/base_layer/p2p/Cargo.toml +++ b/base_layer/p2p/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_p2p" -version = "0.32.5" +version = "0.33.0" authors = ["The Tari Development community"] description = "Tari base layer-specific peer-to-peer communication features" repository = "https://github.com/tari-project/tari" @@ -10,13 +10,13 @@ license = "BSD-3-Clause" edition = "2018" [dependencies] -tari_comms = { version = "^0.32", path = "../../comms/core" } -tari_comms_dht = { version = "^0.32", path = "../../comms/dht" } -tari_common = { version = "^0.32", path = "../../common" } +tari_comms = { version = "^0.33", path = "../../comms/core" } +tari_comms_dht = { version = "^0.33", path = "../../comms/dht" } +tari_common = { version = "^0.33", path = "../../common" } tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.14.0" } -tari_service_framework = { version = "^0.32", path = "../service_framework" } -tari_shutdown = { version = "^0.32", path = "../../infrastructure/shutdown" } -tari_storage = { version = "^0.32", path = "../../infrastructure/storage" } +tari_service_framework = { version = "^0.33", path = "../service_framework" } +tari_shutdown = { version = "^0.33", path = "../../infrastructure/shutdown" } +tari_storage = { version = "^0.33", path = "../../infrastructure/storage" } tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.4.4" } anyhow = "1.0.53" @@ -44,7 +44,7 @@ rustls = "0.20.2" webpki = "0.21" [dev-dependencies] -tari_test_utils = { version = "^0.32", path = "../../infrastructure/test_utils" } +tari_test_utils = { version = "^0.33", path = "../../infrastructure/test_utils" } config = "0.13.0" clap = "2.33.0" @@ -52,7 +52,7 @@ lazy_static = "1.3.0" tempfile = "3.1.0" [build-dependencies] -tari_common = { version = "^0.32", path = "../../common", features = ["build"] } +tari_common = { version = "^0.33", path = "../../common", features = ["build"] } [features] test-mocks = [] diff --git a/base_layer/service_framework/Cargo.toml b/base_layer/service_framework/Cargo.toml index 602d869b70..fed952dad6 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 = "0.32.5" +version = "0.33.0" 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 = { version = "^0.32", path = "../../infrastructure/shutdown" } +tari_shutdown = { version = "^0.33", path = "../../infrastructure/shutdown" } anyhow = "1.0.53" async-trait = "0.1.50" @@ -21,7 +21,7 @@ tokio = { version = "1.14", features = ["rt"] } tower-service = { version = "0.3" } [dev-dependencies] -tari_test_utils = { version = "^0.32", path = "../../infrastructure/test_utils" } +tari_test_utils = { version = "^0.33", path = "../../infrastructure/test_utils" } tokio = { version = "1.14", features = ["rt-multi-thread", "macros", "time"] } futures-test = { version = "0.3.3" } diff --git a/base_layer/tari_mining_helper_ffi/Cargo.toml b/base_layer/tari_mining_helper_ffi/Cargo.toml index 1279245689..6c72e08268 100644 --- a/base_layer/tari_mining_helper_ffi/Cargo.toml +++ b/base_layer/tari_mining_helper_ffi/Cargo.toml @@ -3,11 +3,11 @@ name = "tari_mining_helper_ffi" authors = ["The Tari Development Community"] description = "Tari cryptocurrency miningcore C FFI bindings" license = "BSD-3-Clause" -version = "0.30.2" +version = "0.33.0" edition = "2018" [dependencies] -tari_comms = { version = "^0.32", path = "../../comms/core" } +tari_comms = { version = "^0.33", path = "../../comms/core" } tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.14.0" } tari_common = { path = "../../common" } tari_core = { path = "../core", default-features = false, features = ["transactions"]} diff --git a/base_layer/wallet/Cargo.toml b/base_layer/wallet/Cargo.toml index d6f0d9e422..0e19d03abb 100644 --- a/base_layer/wallet/Cargo.toml +++ b/base_layer/wallet/Cargo.toml @@ -3,21 +3,21 @@ name = "tari_wallet" authors = ["The Tari Development Community"] description = "Tari cryptocurrency wallet library" license = "BSD-3-Clause" -version = "0.32.5" +version = "0.33.0" edition = "2018" [dependencies] tari_common = { path = "../../common" } -tari_common_types = { version = "^0.32", path = "../../base_layer/common_types" } -tari_comms = { version = "^0.32", path = "../../comms/core" } -tari_comms_dht = { version = "^0.32", path = "../../comms/dht" } +tari_common_types = { version = "^0.33", path = "../../base_layer/common_types" } +tari_comms = { version = "^0.33", path = "../../comms/core" } +tari_comms_dht = { version = "^0.33", path = "../../comms/dht" } tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.14.0" } -tari_key_manager = { version = "^0.32", path = "../key_manager" } -tari_p2p = { version = "^0.32", path = "../p2p", features = ["auto-update"] } +tari_key_manager = { version = "^0.33", path = "../key_manager" } +tari_p2p = { version = "^0.33", path = "../p2p", features = ["auto-update"] } tari_script = { path = "../../infrastructure/tari_script" } -tari_service_framework = { version = "^0.32", path = "../service_framework" } -tari_shutdown = { version = "^0.32", path = "../../infrastructure/shutdown" } -tari_storage = { version = "^0.32", path = "../../infrastructure/storage" } +tari_service_framework = { version = "^0.33", path = "../service_framework" } +tari_shutdown = { version = "^0.33", path = "../../infrastructure/shutdown" } +tari_storage = { version = "^0.33", path = "../../infrastructure/storage" } tari_common_sqlite = { path = "../../common_sqlite" } tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.4.4" } @@ -58,14 +58,14 @@ prost = "0.9" [dependencies.tari_core] path = "../../base_layer/core" -version = "^0.32" +version = "^0.33" default-features = false features = ["transactions", "mempool_proto", "base_node_proto", ] [dev-dependencies] -tari_p2p = { version = "^0.32", path = "../p2p", features = ["test-mocks"] } -tari_comms_dht = { version = "^0.32", path = "../../comms/dht", features = ["test-mocks"] } -tari_test_utils = { version = "^0.32", path = "../../infrastructure/test_utils" } +tari_p2p = { version = "^0.33", path = "../p2p", features = ["test-mocks"] } +tari_comms_dht = { version = "^0.33", path = "../../comms/dht", features = ["test-mocks"] } +tari_test_utils = { version = "^0.33", path = "../../infrastructure/test_utils" } env_logger = "0.7.1" prost = "0.9.0" diff --git a/base_layer/wallet_ffi/Cargo.toml b/base_layer/wallet_ffi/Cargo.toml index be85789c8f..dc78e137b9 100644 --- a/base_layer/wallet_ffi/Cargo.toml +++ b/base_layer/wallet_ffi/Cargo.toml @@ -3,22 +3,22 @@ name = "tari_wallet_ffi" authors = ["The Tari Development Community"] description = "Tari cryptocurrency wallet C FFI bindings" license = "BSD-3-Clause" -version = "0.32.5" +version = "0.33.0" edition = "2018" [dependencies] -tari_core = { version = "^0.32", path = "../../base_layer/core", default-features = false, features = ["transactions"]} +tari_core = { version = "^0.33", path = "../../base_layer/core", default-features = false, features = ["transactions"]} tari_common = {path="../../common"} tari_common_types = {path="../common_types"} -tari_comms = { version = "^0.32", path = "../../comms/core", features = ["c_integration"]} -tari_comms_dht = { version = "^0.32", path = "../../comms/dht", default-features = false } +tari_comms = { version = "^0.33", path = "../../comms/core", features = ["c_integration"]} +tari_comms_dht = { version = "^0.33", path = "../../comms/dht", default-features = false } tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.14.0" } -tari_key_manager = { version = "^0.32", path = "../key_manager" } -tari_p2p = { version = "^0.32", path = "../p2p" } +tari_key_manager = { version = "^0.33", path = "../key_manager" } +tari_p2p = { version = "^0.33", path = "../p2p" } tari_script = { path = "../../infrastructure/tari_script" } -tari_shutdown = { version = "^0.32", path = "../../infrastructure/shutdown" } +tari_shutdown = { version = "^0.33", path = "../../infrastructure/shutdown" } tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.4.4" } -tari_wallet = { version = "^0.32", path = "../wallet", features = ["c_integration"]} +tari_wallet = { version = "^0.33", path = "../wallet", features = ["c_integration"]} chrono = { version = "0.4.19", default-features = false, features = ["serde"] } futures = { version = "^0.3.1", features =["compat", "std"]} @@ -48,10 +48,10 @@ crate-type = ["staticlib","cdylib"] [dev-dependencies] tempfile = "3.1.0" lazy_static = "1.3.0" -tari_key_manager = { version = "^0.32", path = "../key_manager" } -tari_common_types = { version = "^0.32", path = "../../base_layer/common_types"} -tari_test_utils = { version = "^0.32", path = "../../infrastructure/test_utils"} +tari_key_manager = { version = "^0.33", path = "../key_manager" } +tari_common_types = { version = "^0.33", path = "../../base_layer/common_types"} +tari_test_utils = { version = "^0.33", path = "../../infrastructure/test_utils"} tari_service_framework = { path = "../../base_layer/service_framework" } [build-dependencies] -cbindgen = "0.24.3" \ No newline at end of file +cbindgen = "0.24.3" diff --git a/changelog.md b/changelog.md index 0b4e0e62c8..2d676391a4 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,91 @@ 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. +## [0.33.0](https://github.com/tari-project/tari/compare/v0.32.5...v0.33.0) (2022-06-30) + + +### ⚠ BREAKING CHANGES + +* **core:** add contract index to blockchain database (#4184) +* **core:** replace OutputFlags with OutputType (#4174) +* **core:** add side-chain features and constitution to UTXOs (#4134) +* **comms:** commit to public key and nonce in identity sig (#3928) +* **dht:** fixes MAC related key vuln for propagated cleartext msgs (#3907) +* **core:** define OutputFlags for side-chain contracts (#4088) + +### Features + +* add an encrypted value to the TransactionOutput ([#4148](https://github.com/tari-project/tari/issues/4148)) ([01b600a](https://github.com/tari-project/tari/commit/01b600ae3756b02ad99ffad8c4d16e09e31ffa77)) +* add encrypted_value to the UnblindedOutput ([#4142](https://github.com/tari-project/tari/issues/4142)) ([f79d383](https://github.com/tari-project/tari/commit/f79d383533c2e9c4db95d4a13973992c9a8739ef)) +* add FeePerGramStats to ffi library ([#4114](https://github.com/tari-project/tari/issues/4114)) ([234d32f](https://github.com/tari-project/tari/commit/234d32f446d5f75c2af78b8e30bc818a628b1dfb)) +* add sender to instructions ([#4234](https://github.com/tari-project/tari/issues/4234)) ([6c116ac](https://github.com/tari-project/tari/commit/6c116acae93eff0869cc82fa18b9342624da6914)) +* add validator node checkpointing ([#4217](https://github.com/tari-project/tari/issues/4217)) ([8b0add0](https://github.com/tari-project/tari/commit/8b0add0b53011de30253337a6830f3b9c66251b8)) +* **base_layer:** basic contract constitution validation ([#4232](https://github.com/tari-project/tari/issues/4232)) ([c2efd5e](https://github.com/tari-project/tari/commit/c2efd5e161176d7c66a6669fef2625bf77d2eb82)) +* **base_layer:** basic validations for proposals, proposal acceptances and amendments ([#4238](https://github.com/tari-project/tari/issues/4238)) ([64f8972](https://github.com/tari-project/tari/commit/64f89724896c6ddd7b21efc8c8ff605cbc373f70)) +* **base_layer:** validate acceptance window expiration on dan layer ([#4251](https://github.com/tari-project/tari/issues/4251)) ([25e316b](https://github.com/tari-project/tari/commit/25e316b68d270abf917cad660d031a9feb168ae4)) +* **base_layer:** validate duplicated acceptances ([#4233](https://github.com/tari-project/tari/issues/4233)) ([3d8a3b2](https://github.com/tari-project/tari/commit/3d8a3b2c09b375b7af59d52f1462a93801beff07)) +* **base_layer:** validate that contract definitions are not duplicated ([#4230](https://github.com/tari-project/tari/issues/4230)) ([0a2812c](https://github.com/tari-project/tari/commit/0a2812c165be76fd177f0563c802c3afb43d0215)) +* **base_layer:** validation of committee membership in contract acceptances ([#4221](https://github.com/tari-project/tari/issues/4221)) ([641844a](https://github.com/tari-project/tari/commit/641844a749e043ad708debeaebc25b8c4c8adaa6)) +* **base-node:** improve contract utxo scanning ([#4208](https://github.com/tari-project/tari/issues/4208)) ([0fcde31](https://github.com/tari-project/tari/commit/0fcde31bdf81e27b92bf3d44dc563c4cf23fd38f)) +* change tari explorer block view ([#4226](https://github.com/tari-project/tari/issues/4226)) ([652cba3](https://github.com/tari-project/tari/commit/652cba36a584f208b1782c95057d3839a6317d04)) +* **ci:** build both x86/arm64 docker images from GHA ([#4204](https://github.com/tari-project/tari/issues/4204)) ([28a8f8b](https://github.com/tari-project/tari/commit/28a8f8b541f96d2bee4bd7f46cc1625dfeb0d323)) +* **console-wallet:** add contract-definition init command ([#4164](https://github.com/tari-project/tari/issues/4164)) ([8685e2f](https://github.com/tari-project/tari/commit/8685e2fe3b174a00047d049acca998df3c85975c)) +* **console-wallet:** generate issuer key for contract init-definition ([#4202](https://github.com/tari-project/tari/issues/4202)) ([7317d6b](https://github.com/tari-project/tari/commit/7317d6ba858dd0b54fb0a39cf5c0c1999042cb7b)) +* constitution publishing ([#4150](https://github.com/tari-project/tari/issues/4150)) ([ba83b8f](https://github.com/tari-project/tari/commit/ba83b8f0aaa833dafe2e89c82ab802e35eb190a2)) +* contract acceptance publication ([#4151](https://github.com/tari-project/tari/issues/4151)) ([d3d3e91](https://github.com/tari-project/tari/commit/d3d3e91c80b0bc2a6adeb796c2500aa88f1f49cb)) +* contract auto acceptance ([#4177](https://github.com/tari-project/tari/issues/4177)) ([87f9969](https://github.com/tari-project/tari/commit/87f996923f138f953198a2f16c11a180cca5134d)) +* **core:** add contract acceptance utxo features ([#4145](https://github.com/tari-project/tari/issues/4145)) ([2636cb5](https://github.com/tari-project/tari/commit/2636cb56ddf1b67ed7bf4c4aea8c05f9369b11d0)) +* **core:** add contract index to blockchain database ([#4184](https://github.com/tari-project/tari/issues/4184)) ([b7e97f4](https://github.com/tari-project/tari/commit/b7e97f45d3b3b7407058d6bb8da89f6f14f98984)) +* **core:** add side-chain features and constitution to UTXOs ([#4134](https://github.com/tari-project/tari/issues/4134)) ([ada3143](https://github.com/tari-project/tari/commit/ada31432ea2e0ac1591153580b0e2b86475b30e7)) +* **core:** adds constitution UTXO features ([#4121](https://github.com/tari-project/tari/issues/4121)) ([da5696a](https://github.com/tari-project/tari/commit/da5696a69a7568e744681d5139dbc4fe81031644)) +* **core:** define OutputFlags for side-chain contracts ([#4088](https://github.com/tari-project/tari/issues/4088)) ([50993a3](https://github.com/tari-project/tari/commit/50993a3dc0aaf8506ef21a90c45a2a56d801716a)) +* **core:** impl consensus encoding for bool ([#4120](https://github.com/tari-project/tari/issues/4120)) ([682aa5d](https://github.com/tari-project/tari/commit/682aa5d0ec108074ffed68aead83a757ee5c9490)) +* **core:** new output features for changes in contracts ([#4169](https://github.com/tari-project/tari/issues/4169)) ([41570f6](https://github.com/tari-project/tari/commit/41570f6f159776aaf99a504715ee4af31919f1b7)) +* **miner:** friendlier miner output ([#4219](https://github.com/tari-project/tari/issues/4219)) ([4245838](https://github.com/tari-project/tari/commit/42458381105df4ca2b54b3e6510423dc775bde9e)) +* publication of contract update proposal acceptances ([#4199](https://github.com/tari-project/tari/issues/4199)) ([e3b2b9b](https://github.com/tari-project/tari/commit/e3b2b9b5bbbc8bced1228832202f4932012f6a6e)) +* scan base node for constitutions ([#4144](https://github.com/tari-project/tari/issues/4144)) ([310a2d2](https://github.com/tari-project/tari/commit/310a2d20267f0c0226a76c9ba0b56864569621cb)) +* swap dalek bulletproofs for bulletproofs-plus ([#4213](https://github.com/tari-project/tari/issues/4213)) ([46f9bb8](https://github.com/tari-project/tari/commit/46f9bb8359295a2c0432c304ec20c2a4498fa31d)) +* use tari_crypto's updated "extended pedersen commitment factory" ([#4206](https://github.com/tari-project/tari/issues/4206)) ([50ce20a](https://github.com/tari-project/tari/commit/50ce20a3b13647a841e4cbfac44837a78a623dcd)) +* **validator_node:** add global db ([#4210](https://github.com/tari-project/tari/issues/4210)) ([3965267](https://github.com/tari-project/tari/commit/3965267c53b60e26d8f8effc852107fec4ab3111)) +* **validator-node:** add logging ([#4189](https://github.com/tari-project/tari/issues/4189)) ([2ed859f](https://github.com/tari-project/tari/commit/2ed859f22e0436a4e27d6508560c9122746c0e85)) +* **validator-node:** allow network to be configured via cli ([#4190](https://github.com/tari-project/tari/issues/4190)) ([6a4c1a4](https://github.com/tari-project/tari/commit/6a4c1a4a3b3014f988d8a1cb31e926bc4d743a68)) +* **vn:** record contract states ([#4241](https://github.com/tari-project/tari/issues/4241)) ([92ae4ab](https://github.com/tari-project/tari/commit/92ae4abf2d59e675f2f6c48df053e3273076fbd8)) +* wallet selects previous checkpoint for spending ([#4236](https://github.com/tari-project/tari/issues/4236)) ([90a5ec3](https://github.com/tari-project/tari/commit/90a5ec32bd4f746b29f06d70bc9737a9cacf4538)) +* **wallet_ffi:** new ffi method to create covenant ([#4115](https://github.com/tari-project/tari/issues/4115)) ([dd65b4b](https://github.com/tari-project/tari/commit/dd65b4bd8b168b9423cd953f5e089b5723dbb747)) +* **wallet_ffi:** new ffi method to create output features ([#4109](https://github.com/tari-project/tari/issues/4109)) ([f8fa3ec](https://github.com/tari-project/tari/commit/f8fa3ecb5700e80adf63cc3e61f0b8367217f1bc)) +* **wallet:** add help for wallet cli commands ([#4162](https://github.com/tari-project/tari/issues/4162)) ([859b7d3](https://github.com/tari-project/tari/commit/859b7d3022dab60732f5e638b52f8c1237a2a8f4)) +* **wallet:** adds contract_id to outputs db ([#4222](https://github.com/tari-project/tari/issues/4222)) ([6f331f8](https://github.com/tari-project/tari/commit/6f331f877b0c41336f73c42440facb32953fa59b)) +* **wallet:** allow UTXO selection by specific outputs and by token ([#4227](https://github.com/tari-project/tari/issues/4227)) ([f2a7e18](https://github.com/tari-project/tari/commit/f2a7e1846341a69ddea6eb3541467e82e1bf2e47)) +* **wallet:** new cli commands to initialise proposals and amendments ([#4205](https://github.com/tari-project/tari/issues/4205)) ([40cbd50](https://github.com/tari-project/tari/commit/40cbd50e319e77b037931b8cc33f6b87cf174488)) +* **wallet:** new command to publish a contract definition transaction ([#4133](https://github.com/tari-project/tari/issues/4133)) ([b4991a4](https://github.com/tari-project/tari/commit/b4991a471cb3a6db2a54b623c0afc09f71ae3dc4)) +* **wallet:** new command to publish a contract update proposal ([#4188](https://github.com/tari-project/tari/issues/4188)) ([0e3bee0](https://github.com/tari-project/tari/commit/0e3bee06a08760b3fb61c2896a52b53a86d7e4a9)) +* **wallet:** publish contract amendment ([#4200](https://github.com/tari-project/tari/issues/4200)) ([edcce4a](https://github.com/tari-project/tari/commit/edcce4a816102929284285d0f8cdb04fe7006c76)) + + +### Bug Fixes + +* add prettierignore for partials ([#4229](https://github.com/tari-project/tari/issues/4229)) ([923cf07](https://github.com/tari-project/tari/commit/923cf0765581c9e0c471cfff00886015a2e827bb)) +* **ci:** sort .license.ignore locally before diff ([#4106](https://github.com/tari-project/tari/issues/4106)) ([8594754](https://github.com/tari-project/tari/commit/859475438219b6ace16e6b2437522788d0c7d737)) +* **comms:** commit to public key and nonce in identity sig ([#3928](https://github.com/tari-project/tari/issues/3928)) ([5ac6133](https://github.com/tari-project/tari/commit/5ac6133a8ab0707dfd97cf1647d709256bb9c05b)) +* **contract-index:** adds support for ContractAmendment to contract index ([#4214](https://github.com/tari-project/tari/issues/4214)) ([a41d0c9](https://github.com/tari-project/tari/commit/a41d0c92cffa734406dad50820ef1367f24ae133)) +* **core:** cleanup duplicate maturity check ([#4181](https://github.com/tari-project/tari/issues/4181)) ([5e55bf2](https://github.com/tari-project/tari/commit/5e55bf22110ac40ffc0dea88d88ba836982591eb)) +* **core:** don't allow coinbase transactions in mempool ([#4103](https://github.com/tari-project/tari/issues/4103)) ([46450d5](https://github.com/tari-project/tari/commit/46450d5a475fa8b57107f6806962a4c9a1338ac5)) +* **dht:** fixes MAC related key vuln for propagated cleartext msgs ([#3907](https://github.com/tari-project/tari/issues/3907)) ([1e96d45](https://github.com/tari-project/tari/commit/1e96d45535f4af967a761fd71521eb68bbb1b371)) +* hash in cucumber ([#4124](https://github.com/tari-project/tari/issues/4124)) ([5d7d55d](https://github.com/tari-project/tari/commit/5d7d55d97f1251619911e4555a925cc03b50c7ed)) +* **hotstuff:** fix bug where decide state was listening for wrong message ([#4160](https://github.com/tari-project/tari/issues/4160)) ([fe7b304](https://github.com/tari-project/tari/commit/fe7b304e936dc567ca106c86dfeb7ed403807b04)) +* **integration_test:** fix wallet-cli integration tests ([#4132](https://github.com/tari-project/tari/issues/4132)) ([4464064](https://github.com/tari-project/tari/commit/446406491698e97983143036c2ea9dd0ac10b365)) +* move peer dbs into sub folders ([#4147](https://github.com/tari-project/tari/issues/4147)) ([2b1a69a](https://github.com/tari-project/tari/commit/2b1a69a9219f29472d6fa26b1b2350be7880b11a)) +* **test:** integration test for validator node is broken ([#4192](https://github.com/tari-project/tari/issues/4192)) ([16d6ba5](https://github.com/tari-project/tari/commit/16d6ba5403e4a0e62e676e56c8ab755a69e6e1f0)) +* **test:** unifying dan layer integration tests ([#4175](https://github.com/tari-project/tari/issues/4175)) ([f3495ee](https://github.com/tari-project/tari/commit/f3495ee71fbb83edef9b295b42a34b6dfae87acf)) +* **validator-node:** return error if contract_id empty for publish_contract_acceptance grpc ([#4191](https://github.com/tari-project/tari/issues/4191)) ([8874114](https://github.com/tari-project/tari/commit/8874114bb25232e62e539e600fe082443a476fec)) +* **validator:** set tor_identity base path ([#4187](https://github.com/tari-project/tari/issues/4187)) ([e324b80](https://github.com/tari-project/tari/commit/e324b803f748e862796210226ca31906613bde28)) +* **vn scanning:** only scan since last scan and restart accepted contracts ([#4252](https://github.com/tari-project/tari/issues/4252)) ([43b4a53](https://github.com/tari-project/tari/commit/43b4a534609059e4a717ec7d1c69650b7fe2a5d3)) +* **wallet:** select only basic utxos when building a transaction ([#4178](https://github.com/tari-project/tari/issues/4178)) ([42269ae](https://github.com/tari-project/tari/commit/42269ae48e9a8eb1ebc479a22813bf2f8cf0c22b)) +* **wallet:** use correct type for contract_id in the contract constitution file format ([#4179](https://github.com/tari-project/tari/issues/4179)) ([669a1bd](https://github.com/tari-project/tari/commit/669a1bd45fd68615da037886379e96b89b9f4f76)) + + +* **core:** replace OutputFlags with OutputType ([#4174](https://github.com/tari-project/tari/issues/4174)) ([d779f43](https://github.com/tari-project/tari/commit/d779f4311a0415b3ecd98e806bfbf27fc2486412)) + ### [0.32.5](https://github.com/tari-project/tari/compare/v0.32.4...v0.32.5) (2022-06-20) diff --git a/common/Cargo.toml b/common/Cargo.toml index 8fec6c953d..be54317126 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 = "0.32.5" +version = "0.33.0" edition = "2018" [features] @@ -34,5 +34,5 @@ thiserror = "1.0.29" toml = { version = "0.5", optional = true } [dev-dependencies] -tari_test_utils = { version = "^0.32", path = "../infrastructure/test_utils"} +tari_test_utils = { version = "^0.33", path = "../infrastructure/test_utils"} toml = "0.5.8" diff --git a/common_sqlite/Cargo.toml b/common_sqlite/Cargo.toml index 918935fc48..72de53959c 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 = "0.32.5" +version = "0.33.0" 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 70aa376b83..113bb7e592 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 = "0.32.5" +version = "0.33.0" edition = "2018" [dependencies] tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.14.0" } tari_metrics = { path = "../../infrastructure/metrics" } -tari_storage = { version = "^0.32", path = "../../infrastructure/storage" } -tari_shutdown = { version = "^0.32", path = "../../infrastructure/shutdown" } +tari_storage = { version = "^0.33", path = "../../infrastructure/storage" } +tari_shutdown = { version = "^0.33", path = "../../infrastructure/shutdown" } tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.4.4" } anyhow = "1.0.53" @@ -51,7 +51,7 @@ tracing = "0.1.26" yamux = "=0.9.0" [dev-dependencies] -tari_test_utils = { version = "^0.32", path = "../../infrastructure/test_utils" } +tari_test_utils = { version = "^0.33", path = "../../infrastructure/test_utils" } tari_comms_rpc_macros = { version = "*", path = "../rpc_macros" } env_logger = "0.7.0" @@ -59,7 +59,7 @@ serde_json = "1.0.39" tempfile = "3.1.0" [build-dependencies] -tari_common = { version = "^0.32", path = "../../common", features = ["build"] } +tari_common = { version = "^0.33", path = "../../common", features = ["build"] } [features] c_integration = [] diff --git a/comms/dht/Cargo.toml b/comms/dht/Cargo.toml index 7edccc0a09..42114eff35 100644 --- a/comms/dht/Cargo.toml +++ b/comms/dht/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_comms_dht" -version = "0.32.5" +version = "0.33.0" authors = ["The Tari Development Community"] description = "Tari comms DHT module" repository = "https://github.com/tari-project/tari" @@ -10,12 +10,12 @@ license = "BSD-3-Clause" edition = "2018" [dependencies] -tari_comms = { version = "^0.32", path = "../core", features = ["rpc"] } -tari_comms_rpc_macros = { version = "^0.32", path = "../rpc_macros" } +tari_comms = { version = "^0.33", path = "../core", features = ["rpc"] } +tari_comms_rpc_macros = { version = "^0.33", path = "../rpc_macros" } tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.14.0" } tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.4.4" } -tari_shutdown = { version = "^0.32", path = "../../infrastructure/shutdown" } -tari_storage = { version = "^0.32", path = "../../infrastructure/storage" } +tari_shutdown = { version = "^0.33", path = "../../infrastructure/shutdown" } +tari_storage = { version = "^0.33", path = "../../infrastructure/storage" } tari_common_sqlite = { path = "../../common_sqlite" } anyhow = "1.0.53" @@ -49,7 +49,7 @@ tokio = { version = "1.14", features = ["rt", "macros"] } pin-project = "0.4" [dev-dependencies] -tari_test_utils = { version = "^0.32", path = "../../infrastructure/test_utils" } +tari_test_utils = { version = "^0.33", path = "../../infrastructure/test_utils" } env_logger = "0.7.0" futures-test = { version = "0.3.5" } @@ -63,7 +63,7 @@ clap = "2.33.0" [build-dependencies] -tari_common = { version = "^0.32", path = "../../common" } +tari_common = { version = "^0.33", path = "../../common" } [features] test-mocks = [] diff --git a/comms/rpc_macros/Cargo.toml b/comms/rpc_macros/Cargo.toml index ceb532c2a9..8b2338d177 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 = "0.32.5" +version = "0.33.0" edition = "2018" [lib] @@ -19,8 +19,8 @@ quote = "1.0.7" syn = { version = "1.0.38", features = ["fold"] } [dev-dependencies] -tari_comms = { version = "^0.32", path = "../core", features = ["rpc"] } -tari_test_utils = { version = "^0.32", path = "../../infrastructure/test_utils" } +tari_comms = { version = "^0.33", path = "../core", features = ["rpc"] } +tari_test_utils = { version = "^0.33", path = "../../infrastructure/test_utils" } futures = "0.3.5" prost = "0.9.0" diff --git a/infrastructure/derive/Cargo.toml b/infrastructure/derive/Cargo.toml index 66ce3251a7..d7b3a02b30 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 = "0.32.5" +version = "0.33.0" edition = "2018" [lib] diff --git a/infrastructure/libtor/Cargo.toml b/infrastructure/libtor/Cargo.toml index 733d40c488..6143b826b8 100644 --- a/infrastructure/libtor/Cargo.toml +++ b/infrastructure/libtor/Cargo.toml @@ -15,7 +15,7 @@ multiaddr = { version = "0.14.0" } # NB: make sure this crate is not included in any other crate used by wallet_ffi [target.'cfg(unix)'.dependencies] -tari_shutdown = { version = "^0.32", path = "../shutdown"} +tari_shutdown = { version = "^0.33", path = "../shutdown"} libtor = { version = "46.9.0", optional = true } rand = "0.8" tempfile = "3.1.0" diff --git a/infrastructure/shutdown/Cargo.toml b/infrastructure/shutdown/Cargo.toml index d01eaeccde..b11ebe93b1 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 = "0.32.5" +version = "0.33.0" 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 80efcf32f1..582a34a179 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 = "0.32.5" +version = "0.33.0" edition = "2018" [dependencies] diff --git a/infrastructure/test_utils/Cargo.toml b/infrastructure/test_utils/Cargo.toml index b119a808ae..40da07cb5d 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 = "0.32.5" +version = "0.33.0" authors = ["The Tari Development Community"] edition = "2018" license = "BSD-3-Clause" diff --git a/package-lock.json b/package-lock.json index f17e27bdc8..6b9d0760d7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "tari", - "version": "0.32.5", + "version": "0.33.0", "lockfileVersion": 2, "requires": true, "packages": {} diff --git a/scripts/update_crate_metadata.sh b/scripts/update_crate_metadata.sh index 9cb7fe5ee7..43437b082a 100755 --- a/scripts/update_crate_metadata.sh +++ b/scripts/update_crate_metadata.sh @@ -41,7 +41,7 @@ function update_versions { base_layer/service_framework base_layer/wallet base_layer/wallet_ffi - base_layer/tari_mining_helpers_ffi + base_layer/tari_mining_helper_ffi common common_sqlite comms/core