From c21e656700afede61bd5aba6703ad3d6c43808dd Mon Sep 17 00:00:00 2001 From: Hansie Odendaal Date: Thu, 28 Nov 2024 08:35:15 +0200 Subject: [PATCH] Merge development PRs: #6673, #6672, #6688, #6694 --- .github/workflows/build_binaries.yml | 2 +- .github/workflows/publish_test_results_ci.yml | 2 +- Cargo.lock | 78 +++++++++---------- Cargo.toml | 2 +- README.md | 4 +- applications/minotari_app_grpc/Cargo.toml | 4 +- .../minotari_app_utilities/Cargo.toml | 4 +- .../minotari_console_wallet/Cargo.toml | 6 +- .../minotari_ledger_wallet/common/Cargo.toml | 2 +- .../minotari_ledger_wallet/comms/Cargo.toml | 2 +- .../minotari_ledger_wallet/wallet/Cargo.lock | 4 +- .../minotari_ledger_wallet/wallet/Cargo.toml | 4 +- .../minotari_ledger_wallet/wallet/README.md | 7 +- .../minotari_ledger_wallet/wallet/src/main.rs | 5 +- .../minotari_merge_mining_proxy/Cargo.toml | 4 +- applications/minotari_miner/Cargo.toml | 2 +- applications/minotari_node/Cargo.toml | 6 +- base_layer/chat_ffi/Cargo.toml | 2 +- base_layer/common_types/Cargo.toml | 4 +- base_layer/contacts/Cargo.toml | 18 +++-- .../contacts/src/chat_client/Cargo.toml | 2 +- base_layer/core/Cargo.toml | 30 +++---- base_layer/core/src/blocks/genesis_block.rs | 9 +++ .../core/src/transactions/aggregated_body.rs | 32 ++++++++ base_layer/key_manager/Cargo.toml | 8 +- base_layer/mmr/Cargo.toml | 2 +- base_layer/p2p/Cargo.toml | 14 ++-- base_layer/service_framework/Cargo.toml | 4 +- base_layer/tari_mining_helper_ffi/Cargo.toml | 6 +- base_layer/wallet/Cargo.toml | 24 +++--- base_layer/wallet_ffi/Cargo.toml | 4 +- changelog-development.md | 18 +++++ changelog-nextnet.md | 19 +++++ common/Cargo.toml | 6 +- common/tari_features/Cargo.toml | 2 +- common_sqlite/Cargo.toml | 2 +- comms/core/Cargo.toml | 10 +-- comms/dht/Cargo.toml | 16 ++-- comms/rpc_macros/Cargo.toml | 2 +- hashing/Cargo.toml | 2 +- infrastructure/derive/Cargo.toml | 2 +- infrastructure/libtor/Cargo.toml | 2 +- infrastructure/max_size/Cargo.toml | 2 +- infrastructure/metrics/Cargo.toml | 2 +- infrastructure/shutdown/Cargo.toml | 2 +- infrastructure/storage/Cargo.toml | 2 +- infrastructure/tari_script/Cargo.toml | 2 +- infrastructure/test_utils/Cargo.toml | 5 +- package-lock.json | 2 +- 49 files changed, 244 insertions(+), 151 deletions(-) diff --git a/.github/workflows/build_binaries.yml b/.github/workflows/build_binaries.yml index e479f559bc..e4d0ceff21 100644 --- a/.github/workflows/build_binaries.yml +++ b/.github/workflows/build_binaries.yml @@ -122,7 +122,7 @@ jobs: run: | BRANCH_NAME=$(echo "${GITHUB_REF}" | sed 's|refs/heads/||') if [[ "${BRANCH_NAME}" == "build-bins-nextnet"* ]]; then - source buildtools/multinet_envs.sh "v1.8.0-rc.0" + source buildtools/multinet_envs.sh "v1.9.0-rc.0" else source buildtools/multinet_envs.sh ${{ env.GHA_NETWORK }} fi diff --git a/.github/workflows/publish_test_results_ci.yml b/.github/workflows/publish_test_results_ci.yml index 0ab37a69d5..9eb60d8cef 100644 --- a/.github/workflows/publish_test_results_ci.yml +++ b/.github/workflows/publish_test_results_ci.yml @@ -48,7 +48,7 @@ jobs: files: "artifacts/**/*.xml" - name: Publish Test Report 2 - uses: mikepenz/action-junit-report@v4 + uses: mikepenz/action-junit-report@v5 if: always() with: report_paths: "artifacts/**/*.xml" diff --git a/Cargo.lock b/Cargo.lock index 2e2a6318a1..a09ded8bf7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3903,7 +3903,7 @@ dependencies = [ [[package]] name = "libp2p-messaging" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "async-trait", "futures-bounded", @@ -4060,7 +4060,7 @@ dependencies = [ [[package]] name = "libp2p-substream" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "libp2p", "smallvec 1.13.2", @@ -4469,7 +4469,7 @@ dependencies = [ [[package]] name = "minotari_app_grpc" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "argon2", "base64 0.13.1", @@ -4498,7 +4498,7 @@ dependencies = [ [[package]] name = "minotari_app_utilities" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "clap 3.2.25", "dialoguer 0.10.4", @@ -4518,7 +4518,7 @@ dependencies = [ [[package]] name = "minotari_console_wallet" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "blake2", "chrono", @@ -4572,14 +4572,14 @@ dependencies = [ [[package]] name = "minotari_ledger_wallet_common" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "bs58 0.5.1", ] [[package]] name = "minotari_ledger_wallet_comms" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "borsh", "dialoguer 0.11.0", @@ -4601,7 +4601,7 @@ dependencies = [ [[package]] name = "minotari_merge_mining_proxy" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "anyhow", "bincode", @@ -4643,7 +4643,7 @@ dependencies = [ [[package]] name = "minotari_miner" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "base64 0.13.1", "borsh", @@ -4680,7 +4680,7 @@ dependencies = [ [[package]] name = "minotari_mining_helper_ffi" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "borsh", "cbindgen", @@ -4698,7 +4698,7 @@ dependencies = [ [[package]] name = "minotari_node" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "anyhow", "async-trait", @@ -4754,7 +4754,7 @@ dependencies = [ [[package]] name = "minotari_wallet" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "argon2", "async-trait", @@ -4806,7 +4806,7 @@ dependencies = [ [[package]] name = "minotari_wallet_ffi" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "borsh", "cbindgen", @@ -6221,7 +6221,7 @@ dependencies = [ [[package]] name = "proto_builder" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "prost-build 0.13.3", "sha2 0.10.8", @@ -7686,7 +7686,7 @@ dependencies = [ [[package]] name = "tari_common" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "anyhow", "config", @@ -7712,7 +7712,7 @@ dependencies = [ [[package]] name = "tari_common_sqlite" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "diesel", "diesel_migrations", @@ -7726,7 +7726,7 @@ dependencies = [ [[package]] name = "tari_common_types" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "base64 0.21.5", "bitflags 2.6.0", @@ -7751,7 +7751,7 @@ dependencies = [ [[package]] name = "tari_comms" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "anyhow", "async-trait", @@ -7801,7 +7801,7 @@ dependencies = [ [[package]] name = "tari_comms_dht" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "anyhow", "bitflags 2.6.0", @@ -7845,7 +7845,7 @@ dependencies = [ [[package]] name = "tari_comms_rpc_macros" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "futures 0.3.30", "proc-macro2", @@ -7860,7 +7860,7 @@ dependencies = [ [[package]] name = "tari_contacts" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "chrono", "diesel", @@ -7895,7 +7895,7 @@ dependencies = [ [[package]] name = "tari_core" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "async-trait", "bincode", @@ -7997,11 +7997,11 @@ dependencies = [ [[package]] name = "tari_features" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" [[package]] name = "tari_hashing" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "blake2", "borsh", @@ -8057,7 +8057,7 @@ dependencies = [ [[package]] name = "tari_key_manager" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "argon2", "async-trait", @@ -8092,7 +8092,7 @@ dependencies = [ [[package]] name = "tari_libtor" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "derivative", "libtor", @@ -8105,7 +8105,7 @@ dependencies = [ [[package]] name = "tari_max_size" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "borsh", "serde", @@ -8115,7 +8115,7 @@ dependencies = [ [[package]] name = "tari_metrics" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "anyhow", "futures 0.3.30", @@ -8130,7 +8130,7 @@ dependencies = [ [[package]] name = "tari_mmr" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "bincode", "blake2", @@ -8148,7 +8148,7 @@ dependencies = [ [[package]] name = "tari_network" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "anyhow", "humantime 2.1.0", @@ -8165,7 +8165,7 @@ dependencies = [ [[package]] name = "tari_p2p" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "anyhow", "clap 3.2.25", @@ -8202,7 +8202,7 @@ dependencies = [ [[package]] name = "tari_rpc_framework" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "async-trait", "bitflags 2.6.0", @@ -8227,7 +8227,7 @@ dependencies = [ [[package]] name = "tari_rpc_macros" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "proc-macro2", "quote", @@ -8236,7 +8236,7 @@ dependencies = [ [[package]] name = "tari_script" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "blake2", "borsh", @@ -8254,7 +8254,7 @@ dependencies = [ [[package]] name = "tari_service_framework" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "anyhow", "async-trait", @@ -8271,7 +8271,7 @@ dependencies = [ [[package]] name = "tari_shutdown" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "futures 0.3.30", "tokio", @@ -8279,7 +8279,7 @@ dependencies = [ [[package]] name = "tari_storage" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "bincode", "lmdb-zero", @@ -8292,7 +8292,7 @@ dependencies = [ [[package]] name = "tari_swarm" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "libp2p", "libp2p-messaging", @@ -8303,7 +8303,7 @@ dependencies = [ [[package]] name = "tari_test_utils" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "futures 0.3.30", "futures-test", diff --git a/Cargo.toml b/Cargo.toml index 986ce712b2..27696686c9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ authors = ["The Tari Development Community"] repository = "https://github.com/tari-project/tari" license = "BSD-3-Clause" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" edition = "2021" [workspace] diff --git a/README.md b/README.md index 6c4f93c83b..df55d32d82 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.8.0-rc.0 | -| Esmeralda | 1.8.0-pre.0 | +| Nextnet | 1.9.0-rc.0 | +| Esmeralda | 1.9.0-pre.0 | 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 61783c52f6..70b784f60d 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.8.0-pre.0" +version = "1.9.0-pre.0" 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.8.0-pre.0" } +tari_features = { path = "../../common/tari_features", version = "1.9.0-pre.0" } 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 300a8150a4..b1bc43ad6d 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.8.0-pre.0" +version = "1.9.0-pre.0" 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.8.0-pre.0" } +tari_features = { path = "../../common/tari_features", version = "1.9.0-pre.0" } [features] miner_input = ["minotari_app_grpc"] diff --git a/applications/minotari_console_wallet/Cargo.toml b/applications/minotari_console_wallet/Cargo.toml index 2535a971d0..fa64928743 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.8.0-pre.0" +version = "1.9.0-pre.0" 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.8.0-pre.0", optional = true } +minotari_ledger_wallet_comms = { path = "../../applications/minotari_ledger_wallet/comms", version = "1.9.0-pre.0", optional = true } tari_common = { path = "../../common" } tari_common_types = { path = "../../base_layer/common_types" } tari_contacts = { path = "../../base_layer/contacts" } @@ -82,7 +82,7 @@ default-features = false features = ["crossterm"] [build-dependencies] -tari_features = { path = "../../common/tari_features", version = "1.8.0-pre.0" } +tari_features = { path = "../../common/tari_features", version = "1.9.0-pre.0" } [features] default = ["ledger"] diff --git a/applications/minotari_ledger_wallet/common/Cargo.toml b/applications/minotari_ledger_wallet/common/Cargo.toml index f56716b331..fb3a371c7d 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.8.0-pre.0" +version = "1.9.0-pre.0" 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 5da4718c90..3b710a1011 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.8.0-pre.0" +version = "1.9.0-pre.0" 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 90dbf6694a..b46bcd7b55 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.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "blake2", "borsh", @@ -735,7 +735,7 @@ dependencies = [ [[package]] name = "tari_hashing" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" dependencies = [ "borsh", "digest", diff --git a/applications/minotari_ledger_wallet/wallet/Cargo.toml b/applications/minotari_ledger_wallet/wallet/Cargo.toml index 3853bca4fa..f1374485cc 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.8.0-pre.0" +version = "1.9.0-pre.0" 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.8.0-pre.0" } +tari_hashing = { path = "../../../hashing", version = "1.9.0-pre.0" } minotari_ledger_wallet_common = { path = "../common" } diff --git a/applications/minotari_ledger_wallet/wallet/README.md b/applications/minotari_ledger_wallet/wallet/README.md index aa28371822..8df303142a 100644 --- a/applications/minotari_ledger_wallet/wallet/README.md +++ b/applications/minotari_ledger_wallet/wallet/README.md @@ -72,13 +72,18 @@ For more information see [LedgerCTL](https://github.com/LedgerHQ/ledgerctl). It is recommended to build the Ledger application via the official `ledger-app-builder` Docker image, as the Docker image is properly setup, supported and always kept up to date. +**Note:** Before proceeding, manually delete any ledger docker images from Docker Desktop as those will not be updated +automatically: +- Select he _Images_ tab/menu item +- Select the checkbox next to _ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder_ and then press _Delete_. + ### Option 1: Using Docker Ensure Docker Desktop is installed and running on your machine. The following command has to be run from the root of the Tari repository. -Replace ```{TARGET}``` with the appropriate value (e.g., `nanosplus`, `nanos`, etc.). +Replace ```{TARGET}``` with the appropriate value (e.g., `nanosplus`, `stax`, etc.). Compiled resources will be found in `applications/minotari_ledger_wallet/wallet/target/{TARGET}/release` diff --git a/applications/minotari_ledger_wallet/wallet/src/main.rs b/applications/minotari_ledger_wallet/wallet/src/main.rs index fece1eccd1..d58d130126 100644 --- a/applications/minotari_ledger_wallet/wallet/src/main.rs +++ b/applications/minotari_ledger_wallet/wallet/src/main.rs @@ -229,7 +229,7 @@ extern "C" fn sample_main() { continue; }; - let status = match handle_apdu(&mut comm, ins, &mut offset_ctx) { + let _status = match handle_apdu(&mut comm, ins, &mut offset_ctx) { Ok(()) => { comm.reply_ok(); AppSW::Ok @@ -239,8 +239,9 @@ extern "C" fn sample_main() { sw }, }; + #[cfg(any(target_os = "stax", target_os = "flex"))] - show_status_and_home_if_needed(&ins, &status, &mut offset_ctx, &mut home); + show_status_and_home_if_needed(&ins, &_status, &mut offset_ctx, &mut home); } } diff --git a/applications/minotari_merge_mining_proxy/Cargo.toml b/applications/minotari_merge_mining_proxy/Cargo.toml index 8a8fad2943..792c774ec4 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.8.0-pre.0" +version = "1.9.0-pre.0" edition = "2018" [features] @@ -55,7 +55,7 @@ url = "2.1.1" scraper = "0.19.0" [build-dependencies] -tari_features = { path = "../../common/tari_features", version = "1.8.0-pre.0" } +tari_features = { path = "../../common/tari_features", version = "1.9.0-pre.0" } [dev-dependencies] hyper = { version ="0.14.12", features = ["full"] } diff --git a/applications/minotari_miner/Cargo.toml b/applications/minotari_miner/Cargo.toml index 3a06d95961..17a41b8cb9 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.8.0-pre.0" +version = "1.9.0-pre.0" edition = "2018" [dependencies] diff --git a/applications/minotari_node/Cargo.toml b/applications/minotari_node/Cargo.toml index 6db1c37c68..d7cd535c3d 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.8.0-pre.0" +version = "1.9.0-pre.0" 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.8.0-pre.0" } +], version = "1.9.0-pre.0" } anyhow = "1.0.53" async-trait = "0.1.52" @@ -75,7 +75,7 @@ metrics = ["tari_metrics"] safe = [] [build-dependencies] -tari_features = { path = "../../common/tari_features", version = "1.8.0-pre.0" } +tari_features = { path = "../../common/tari_features", version = "1.9.0-pre.0" } [package.metadata.cargo-machete] ignored = [ diff --git a/base_layer/chat_ffi/Cargo.toml b/base_layer/chat_ffi/Cargo.toml index 14c14dea2e..3ba31ca33b 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.8.0-pre.0" +version = "1.9.0-pre.0" edition = "2018" [dependencies] diff --git a/base_layer/common_types/Cargo.toml b/base_layer/common_types/Cargo.toml index 081e797312..b72b988011 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.8.0-pre.0" +version = "1.9.0-pre.0" edition = "2018" [dependencies] tari_crypto = { version = "0.21.0" } tari_utilities = { version = "0.8" } -tari_common = { path = "../../common", version = "1.8.0-pre.0" } +tari_common = { path = "../../common", version = "1.9.0-pre.0" } 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 b2d0743027..680b484817 100644 --- a/base_layer/contacts/Cargo.toml +++ b/base_layer/contacts/Cargo.toml @@ -3,21 +3,22 @@ name = "tari_contacts" authors = ["The Tari Development Community"] description = "Tari contacts library" license = "BSD-3-Clause" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" edition = "2018" [dependencies] +tari_common = { path = "../../common", version = "1.9.0-pre.0" } +tari_common_sqlite = { path = "../../common_sqlite", version = "1.9.0-pre.0" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.9.0-pre.0" } tari_network = { workspace = true } -tari_common = { path = "../../common", version = "1.8.0-pre.0" } -tari_common_sqlite = { path = "../../common_sqlite", version = "1.8.0-pre.0" } -tari_common_types = { path = "../../base_layer/common_types", version = "1.8.0-pre.0" } + tari_crypto = { version = "0.21.0" } tari_max_size = { path = "../../infrastructure/max_size" } tari_p2p = { path = "../p2p", features = [ "auto-update", -], version = "1.8.0-pre.0" } -tari_service_framework = { path = "../service_framework", version = "1.8.0-pre.0" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.8.0-pre.0" } +], version = "1.9.0-pre.0" } +tari_service_framework = { path = "../service_framework", version = "1.9.0-pre.0" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.9.0-pre.0" } tari_utilities = { version = "0.8" } chrono = { version = "0.4.19", default-features = false, features = ["serde"] } @@ -47,6 +48,9 @@ tari_comms_dht = { path = "../../comms/dht", features = ["test-mocks"] } tari_test_utils = { path = "../../infrastructure/test_utils" } tempfile = "3.1.0" +[build-dependencies] +tari_common = { path = "../../common", version = "1.9.0-pre.0" } + [package.metadata.cargo-machete] ignored = [ "prost", diff --git a/base_layer/contacts/src/chat_client/Cargo.toml b/base_layer/contacts/src/chat_client/Cargo.toml index aa29467f23..643bbad9f7 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.8.0-pre.0" +version = "1.9.0-pre.0" edition = "2018" diff --git a/base_layer/core/Cargo.toml b/base_layer/core/Cargo.toml index 79c37dd0ff..b6fde6b493 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.8.0-pre.0" +version = "1.9.0-pre.0" edition = "2021" [features] @@ -27,27 +27,28 @@ ledger = ["minotari_ledger_wallet_comms"] metrics = ["tari_metrics"] [dependencies] -minotari_ledger_wallet_comms = { path = "../../applications/minotari_ledger_wallet/comms", version = "1.8.0-pre.0", optional = true } -tari_common = { path = "../../common", version = "1.8.0-pre.0" } -tari_common_types = { path = "../../base_layer/common_types", version = "1.8.0-pre.0" } +minotari_ledger_wallet_comms = { path = "../../applications/minotari_ledger_wallet/comms", version = "1.9.0-pre.0", optional = true } +tari_common = { path = "../../common", version = "1.9.0-pre.0" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.9.0-pre.0" } + 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.8.0-pre.0" } -tari_mmr = { path = "../../base_layer/mmr", optional = true, version = "1.8.0-pre.0" } -tari_p2p = { path = "../../base_layer/p2p", version = "1.8.0-pre.0" } -tari_script = { path = "../../infrastructure/tari_script", version = "1.8.0-pre.0" } -tari_service_framework = { path = "../service_framework", version = "1.8.0-pre.0" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.8.0-pre.0" } -tari_storage = { path = "../../infrastructure/storage", version = "1.8.0-pre.0" } -tari_test_utils = { path = "../../infrastructure/test_utils", version = "1.8.0-pre.0" } +tari_metrics = { path = "../../infrastructure/metrics", optional = true, version = "1.9.0-pre.0" } +tari_mmr = { path = "../../base_layer/mmr", optional = true, version = "1.9.0-pre.0" } +tari_p2p = { path = "../../base_layer/p2p", version = "1.9.0-pre.0" } +tari_script = { path = "../../infrastructure/tari_script", version = "1.9.0-pre.0" } +tari_service_framework = { path = "../service_framework", version = "1.9.0-pre.0" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.9.0-pre.0" } +tari_storage = { path = "../../infrastructure/storage", version = "1.9.0-pre.0" } +tari_test_utils = { path = "../../infrastructure/test_utils", version = "1.9.0-pre.0" } tari_utilities = { version = "0.8", features = ["borsh"] } tari_key_manager = { path = "../key_manager", features = [ "key_manager_service", -], version = "1.8.0-pre.0" } +], version = "1.9.0-pre.0" } tari_common_sqlite = { path = "../../common_sqlite" } tari_hashing = { path = "../../hashing" } @@ -110,7 +111,8 @@ quickcheck = "1.0" serial_test = "0.5" [build-dependencies] -tari_features = { path = "../../common/tari_features", version = "1.8.0-pre.0" } +tari_features = { path = "../../common/tari_features", version = "1.9.0-pre.0" } + [[bench]] name = "mempool" diff --git a/base_layer/core/src/blocks/genesis_block.rs b/base_layer/core/src/blocks/genesis_block.rs index 8818206ca2..a75767e192 100644 --- a/base_layer/core/src/blocks/genesis_block.rs +++ b/base_layer/core/src/blocks/genesis_block.rs @@ -751,6 +751,15 @@ mod test { block.header().block_output_mr.to_vec().to_hex(), ); } else { + let coinbases = block.block().body.get_coinbase_outputs().into_iter().cloned().collect(); + let normal_output_mr = block.block().body.calculate_header_normal_output_mr().unwrap(); + assert_eq!( + AggregateBody::calculate_header_block_output_mr(normal_output_mr, &coinbases) + .unwrap() + .to_vec() + .to_hex(), + block.header().block_output_mr.to_vec().to_hex(), + ); assert_eq!( block_output_mr_hash_from_pruned_mmr(&block_output_mmr) .unwrap() diff --git a/base_layer/core/src/transactions/aggregated_body.rs b/base_layer/core/src/transactions/aggregated_body.rs index ecdafcde2c..9e092063ea 100644 --- a/base_layer/core/src/transactions/aggregated_body.rs +++ b/base_layer/core/src/transactions/aggregated_body.rs @@ -23,12 +23,18 @@ use std::{ cmp::max, fmt::{Display, Error, Formatter}, }; +#[cfg(feature = "base_node")] +use std::convert::TryFrom; use borsh::{BorshDeserialize, BorshSerialize}; use log::*; use serde::{Deserialize, Serialize}; use tari_common_types::types::{ComAndPubSignature, Commitment, PrivateKey}; +#[cfg(feature = "base_node")] +use tari_common_types::types::FixedHash; use tari_crypto::commitment::HomomorphicCommitmentFactory; +#[cfg(feature = "base_node")] +use tari_mmr::pruned_hashset::PrunedHashSet; use tari_utilities::hex::Hex; use crate::transactions::{ @@ -45,6 +51,8 @@ use crate::transactions::{ }, weight::TransactionWeight, }; +#[cfg(feature = "base_node")] +use crate::{block_output_mr_hash_from_pruned_mmr, MrHashError, PrunedOutputMmr}; pub const LOG_TARGET: &str = "c::tx::aggregated_body"; @@ -446,6 +454,30 @@ impl AggregateBody { .iter() .any(|k| k.features.output_type == OutputType::Coinbase) } + + #[cfg(feature = "base_node")] + pub fn calculate_header_block_output_mr( + normal_output_mr: FixedHash, + coinbases: &Vec, + ) -> Result { + let mut block_output_mmr = PrunedOutputMmr::new(PrunedHashSet::default()); + for o in coinbases { + block_output_mmr.push(o.hash().to_vec())?; + } + block_output_mmr.push(normal_output_mr.to_vec())?; + block_output_mr_hash_from_pruned_mmr(&block_output_mmr) + } + + #[cfg(feature = "base_node")] + pub fn calculate_header_normal_output_mr(&self) -> Result { + let mut normal_output_mmr = PrunedOutputMmr::new(PrunedHashSet::default()); + for o in self.outputs() { + if !o.features.is_coinbase() { + normal_output_mmr.push(o.hash().to_vec())?; + } + } + Ok(FixedHash::try_from(normal_output_mmr.get_merkle_root()?)?) + } } impl PartialEq for AggregateBody { diff --git a/base_layer/key_manager/Cargo.toml b/base_layer/key_manager/Cargo.toml index 99c6298579..b8bef7c8b3 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.8.0-pre.0" +version = "1.9.0-pre.0" 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.8.0-pre.0" } -tari_common_types = { path = "../../base_layer/common_types", version = "1.8.0-pre.0" } -tari_service_framework = { path = "../service_framework", version = "1.8.0-pre.0" } +tari_common_sqlite = { path = "../../common_sqlite", version = "1.9.0-pre.0" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.9.0-pre.0" } +tari_service_framework = { path = "../service_framework", version = "1.9.0-pre.0" } 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 6159052eab..27c32cb817 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.8.0-pre.0" +version = "1.9.0-pre.0" edition = "2018" [features] diff --git a/base_layer/p2p/Cargo.toml b/base_layer/p2p/Cargo.toml index 1cfd4c53b7..fcc8e868a7 100644 --- a/base_layer/p2p/Cargo.toml +++ b/base_layer/p2p/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_p2p" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" authors = ["The Tari Development community"] description = "Tari base layer-specific peer-to-peer communication features" repository = "https://github.com/tari-project/tari" @@ -10,12 +10,14 @@ license = "BSD-3-Clause" edition = "2021" [dependencies] +tari_common = { path = "../../common", version = "1.9.0-pre.0" } tari_network = { workspace = true } -tari_common = { path = "../../common", version = "1.8.0-pre.0" } -tari_common_types = { path = "../common_types", version = "1.8.0-pre.0" } + +tari_common_types = { path = "../common_types", version = "1.9.0-pre.0" } tari_crypto = { version = "0.21.0" } -tari_service_framework = { path = "../service_framework", version = "1.8.0-pre.0" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.8.0-pre.0" } +tari_service_framework = { path = "../service_framework", version = "1.9.0-pre.0" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.9.0-pre.0" } + tari_utilities = { version = "0.8" } anyhow = "1.0.53" @@ -49,7 +51,7 @@ tempfile = "3.1.0" [build-dependencies] tari_common = { path = "../../common", features = [ "build", -], version = "1.8.0-pre.0" } +], version = "1.9.0-pre.0" } [features] test-mocks = [] diff --git a/base_layer/service_framework/Cargo.toml b/base_layer/service_framework/Cargo.toml index 21a8a95409..25a364c2d9 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.8.0-pre.0" +version = "1.9.0-pre.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 = { path = "../../infrastructure/shutdown", version = "1.8.0-pre.0" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.9.0-pre.0" } 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 87dc9a5077..ccf8a5ea8f 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.8.0-pre.0" +version = "1.9.0-pre.0" 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.8.0-pre.0" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.9.0-pre.0" } 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.8.0-pre.0" } +tari_features = { path = "../../common/tari_features", version = "1.9.0-pre.0" } 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 413f16556f..95625e36b4 100644 --- a/base_layer/wallet/Cargo.toml +++ b/base_layer/wallet/Cargo.toml @@ -3,32 +3,32 @@ name = "minotari_wallet" authors = ["The Tari Development Community"] description = "Tari cryptocurrency wallet library" license = "BSD-3-Clause" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" edition = "2018" [dependencies] +tari_common = { path = "../../common", version = "1.9.0-pre.0" } +tari_common_sqlite = { path = "../../common_sqlite", version = "1.9.0-pre.0" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.9.0-pre.0" } +tari_contacts = { path = "../../base_layer/contacts", version = "1.9.0-pre.0" } tari_network = { workspace = true } tari_rpc_framework = { workspace = true } -tari_common = { path = "../../common", version = "1.8.0-pre.0" } -tari_common_sqlite = { path = "../../common_sqlite", version = "1.8.0-pre.0" } -tari_common_types = { path = "../../base_layer/common_types", version = "1.8.0-pre.0" } -tari_contacts = { path = "../../base_layer/contacts", version = "1.8.0-pre.0" } tari_core = { path = "../../base_layer/core", default-features = false, features = [ "transactions", "mempool_proto", "base_node_proto", -], version = "1.8.0-pre.0" } +], version = "1.9.0-pre.0" } 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.8.0-pre.0" } +], version = "1.9.0-pre.0" } tari_p2p = { path = "../p2p", features = [ "auto-update", -], version = "1.8.0-pre.0" } -tari_script = { path = "../../infrastructure/tari_script", version = "1.8.0-pre.0" } -tari_service_framework = { path = "../service_framework", version = "1.8.0-pre.0" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.8.0-pre.0" } +], version = "1.9.0-pre.0" } +tari_script = { path = "../../infrastructure/tari_script", version = "1.9.0-pre.0" } +tari_service_framework = { path = "../service_framework", version = "1.9.0-pre.0" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.9.0-pre.0" } tari_utilities = { version = "0.8" } # Uncomment for tokio tracing via tokio-console (needs "tracing" features) @@ -74,7 +74,7 @@ zeroize = "1" tari_common = { path = "../../common", features = [ "build", "static-application-info", -], version = "1.8.0-pre.0" } +], version = "1.9.0-pre.0" } [dev-dependencies] tari_p2p = { path = "../p2p", features = ["test-mocks"] } diff --git a/base_layer/wallet_ffi/Cargo.toml b/base_layer/wallet_ffi/Cargo.toml index c742ea3770..ad02920f9d 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.8.0-pre.0" +version = "1.9.0-pre.0" edition = "2021" [dependencies] @@ -64,7 +64,7 @@ tari_common = { path = "../../common", features = [ "build", "static-application-info", ] } -tari_features = { path = "../../common/tari_features", version = "1.8.0-pre.0" } +tari_features = { path = "../../common/tari_features", version = "1.9.0-pre.0" } [lints.rust] unexpected_cfgs = { level = "warn", check-cfg = [ diff --git a/changelog-development.md b/changelog-development.md index 204b451d90..8714dfafe9 100644 --- a/changelog-development.md +++ b/changelog-development.md @@ -2,6 +2,24 @@ 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.9.0-pre.0](https://github.com/tari-project/tari/compare/v1.8.0-pre.0...v1.9.0-pre.0) (2024-11-14) + + +### ⚠ BREAKING CHANGES + +* add new header field (#6686) + +### Features + +* add new header field ([#6686](https://github.com/tari-project/tari/issues/6686)) ([69a5872](https://github.com/tari-project/tari/commit/69a5872e52d8332e0b46e50614b2105bed0d22c9)) +* update ledger instructions ([#6673](https://github.com/tari-project/tari/issues/6673)) ([06f7a68](https://github.com/tari-project/tari/commit/06f7a6830661ffdc88cd0b90cf4e139123786225)) +* verify active base node peer connections and disconnect if stale ([#6655](https://github.com/tari-project/tari/issues/6655)) ([e61b5e2](https://github.com/tari-project/tari/commit/e61b5e2d172f782e953f351a81723713b150c57d)) + + +### Bug Fixes + +* **comms:** ensure that inbound messaging terminates on disconnect ([#6653](https://github.com/tari-project/tari/issues/6653)) ([47b4877](https://github.com/tari-project/tari/commit/47b48770f84e05c3dce1926d0a8d21eee4ccfe21)) + ## [1.8.0-pre.0](https://github.com/tari-project/tari/compare/v1.7.0-pre.4...v1.8.0-pre.0) (2024-10-28) diff --git a/changelog-nextnet.md b/changelog-nextnet.md index 7080c61cd2..0265a5aca2 100644 --- a/changelog-nextnet.md +++ b/changelog-nextnet.md @@ -2,6 +2,25 @@ 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.9.0-rc.0](https://github.com/tari-project/tari/compare/v1.8.0-rc.0...v1.9.0-rc.0) (2024-11-14) + + +### ⚠ BREAKING CHANGES + +* add new header field (#6686) + +### Features + +* add new header field ([#6686](https://github.com/tari-project/tari/issues/6686)) ([69a5872](https://github.com/tari-project/tari/commit/69a5872e52d8332e0b46e50614b2105bed0d22c9)) +* update ledger instructions ([#6673](https://github.com/tari-project/tari/issues/6673)) ([06f7a68](https://github.com/tari-project/tari/commit/06f7a6830661ffdc88cd0b90cf4e139123786225)) +* verify active base node peer connections and disconnect if stale ([#6655](https://github.com/tari-project/tari/issues/6655)) ([e61b5e2](https://github.com/tari-project/tari/commit/e61b5e2d172f782e953f351a81723713b150c57d)) + + +### Bug Fixes + +* **comms:** ensure that inbound messaging terminates on disconnect ([#6653](https://github.com/tari-project/tari/issues/6653)) ([47b4877](https://github.com/tari-project/tari/commit/47b48770f84e05c3dce1926d0a8d21eee4ccfe21)) + + ## [1.8.0-rc.0](https://github.com/tari-project/tari/compare/v1.7.0-rc.4...v1.8.0-rc.0) (2024-10-28) diff --git a/common/Cargo.toml b/common/Cargo.toml index 5f5a1c52b8..91e99c0290 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.8.0-pre.0" +version = "1.9.0-pre.0" edition = "2018" [features] @@ -14,7 +14,7 @@ build = ["toml", "prost-build"] static-application-info = ["git2"] [dependencies] -tari_features = { path = "./tari_features", version = "1.8.0-pre.0" } +tari_features = { path = "./tari_features", version = "1.9.0-pre.0" } 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.8.0-pre.0" } +tari_features = { path = "./tari_features", version = "1.9.0-pre.0" } [lints.rust] unexpected_cfgs = { level = "warn", check-cfg = [ diff --git a/common/tari_features/Cargo.toml b/common/tari_features/Cargo.toml index 6f5a9067aa..85348bff94 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.8.0-pre.0" +version = "1.9.0-pre.0" 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 07d56792fe..674e35b7f5 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.8.0-pre.0" +version = "1.9.0-pre.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 d6acc263df..1ffd46f5fa 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.8.0-pre.0" +version = "1.9.0-pre.0" edition = "2021" [dependencies] tari_crypto = { version = "0.21.0" } -tari_metrics = { path = "../../infrastructure/metrics", optional = true, version = "1.8.0-pre.0" } -tari_storage = { path = "../../infrastructure/storage", version = "1.8.0-pre.0" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.8.0-pre.0" } +tari_metrics = { path = "../../infrastructure/metrics", optional = true, version = "1.9.0-pre.0" } +tari_storage = { path = "../../infrastructure/storage", version = "1.9.0-pre.0" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.9.0-pre.0" } 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.8.0-pre.0" } +], version = "1.9.0-pre.0" } [features] c_integration = [] diff --git a/comms/dht/Cargo.toml b/comms/dht/Cargo.toml index 39afe03046..00652fe569 100644 --- a/comms/dht/Cargo.toml +++ b/comms/dht/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_comms_dht" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" 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.8.0-pre.0" } -tari_common = { path = "../../common", version = "1.8.0-pre.0" } -tari_comms_rpc_macros = { path = "../rpc_macros", version = "1.8.0-pre.0" } +tari_comms = { path = "../core", features = ["rpc"], version = "1.9.0-pre.0" } +tari_common = { path = "../../common", version = "1.9.0-pre.0" } +tari_comms_rpc_macros = { path = "../rpc_macros", version = "1.9.0-pre.0" } tari_crypto = { version = "0.21.0" } tari_utilities = { version = "0.8" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.8.0-pre.0" } -tari_storage = { path = "../../infrastructure/storage", version = "1.8.0-pre.0" } -tari_common_sqlite = { path = "../../common_sqlite", version = "1.8.0-pre.0" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.9.0-pre.0" } +tari_storage = { path = "../../infrastructure/storage", version = "1.9.0-pre.0" } +tari_common_sqlite = { path = "../../common_sqlite", version = "1.9.0-pre.0" } 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.8.0-pre.0" } +tari_common = { path = "../../common", version = "1.9.0-pre.0" } [features] test-mocks = [] diff --git a/comms/rpc_macros/Cargo.toml b/comms/rpc_macros/Cargo.toml index 4f76705cef..01ef8c59f5 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.8.0-pre.0" +version = "1.9.0-pre.0" edition = "2018" [lib] diff --git a/hashing/Cargo.toml b/hashing/Cargo.toml index bf0a983902..bc9d7a870d 100644 --- a/hashing/Cargo.toml +++ b/hashing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_hashing" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" edition = "2021" description = "Tari hash domains" authors = ["The Tari Development Community"] diff --git a/infrastructure/derive/Cargo.toml b/infrastructure/derive/Cargo.toml index 5b81e08ca6..750558581c 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.8.0-pre.0" +version = "1.9.0-pre.0" edition = "2018" [lib] diff --git a/infrastructure/libtor/Cargo.toml b/infrastructure/libtor/Cargo.toml index 1eda1897a8..88ec9867dc 100644 --- a/infrastructure/libtor/Cargo.toml +++ b/infrastructure/libtor/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_libtor" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" edition = "2021" license = "BSD-3-Clause" diff --git a/infrastructure/max_size/Cargo.toml b/infrastructure/max_size/Cargo.toml index d93e32e569..f7283bbb4a 100644 --- a/infrastructure/max_size/Cargo.toml +++ b/infrastructure/max_size/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_max_size" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" 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 c863312103..224cdd43cb 100644 --- a/infrastructure/metrics/Cargo.toml +++ b/infrastructure/metrics/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tari_metrics" description = "Tari metrics" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" 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 eafee3ffe2..a276842240 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.8.0-pre.0" +version = "1.9.0-pre.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 4d827f9dc3..ebe0d50a62 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.8.0-pre.0" +version = "1.9.0-pre.0" edition = "2018" [dependencies] diff --git a/infrastructure/tari_script/Cargo.toml b/infrastructure/tari_script/Cargo.toml index ccbf4c6d43..a1e1830397 100644 --- a/infrastructure/tari_script/Cargo.toml +++ b/infrastructure/tari_script/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_script" -version = "1.8.0-pre.0" +version = "1.9.0-pre.0" 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 c14ae50057..32a25f0a1e 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.8.0-pre.0" +version = "1.9.0-pre.0" authors = ["The Tari Development Community"] edition = "2018" license = "BSD-3-Clause" @@ -9,7 +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.8.0-pre.0" } +tari_shutdown = { path = "../shutdown", version = "1.9.0-pre.0" } + futures = { version = "^0.3.1" } rand = "0.8" diff --git a/package-lock.json b/package-lock.json index 3223905177..2b54c97572 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "tari", - "version": "1.8.0-pre.0", + "version": "1.9.0-pre.0", "lockfileVersion": 2, "requires": true, "packages": {}