From 36ff43680ac9eacada86621aee873149d86175ad Mon Sep 17 00:00:00 2001 From: SW van Heerden Date: Tue, 28 Jan 2025 10:47:34 +0200 Subject: [PATCH] chore: new release v1.11.0-pre.0 (#6768) Description --- new release esme --- Cargo.lock | 68 ++++++------- 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.toml | 4 +- .../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 | 20 ++-- .../contacts/src/chat_client/Cargo.toml | 2 +- base_layer/core/Cargo.toml | 36 +++---- base_layer/core/src/blocks/block_header.rs | 12 +-- base_layer/core/src/blocks/genesis_block.rs | 4 +- .../core/src/consensus/consensus_constants.rs | 97 +------------------ .../core/src/proof_of_work/sha3x_pow.rs | 4 +- .../core/tests/tests/block_validation.rs | 2 +- base_layer/key_manager/Cargo.toml | 8 +- base_layer/mmr/Cargo.toml | 2 +- base_layer/p2p/Cargo.toml | 16 +-- base_layer/service_framework/Cargo.toml | 4 +- base_layer/tari_mining_helper_ffi/Cargo.toml | 6 +- base_layer/tari_mining_helper_ffi/src/lib.rs | 38 -------- base_layer/wallet/Cargo.toml | 28 +++--- base_layer/wallet_ffi/Cargo.toml | 4 +- changelog-development.md | 18 ++++ changelog-nextnet.md | 18 ++++ 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 | 6 +- package-lock.json | 2 +- 47 files changed, 201 insertions(+), 292 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0a997ca4f1..39f36c5ae7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3906,7 +3906,7 @@ dependencies = [ [[package]] name = "minotari_app_grpc" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "argon2 0.4.1", "base64 0.13.1", @@ -3935,7 +3935,7 @@ dependencies = [ [[package]] name = "minotari_app_utilities" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "clap 3.2.25", "dialoguer 0.10.4", @@ -3957,7 +3957,7 @@ dependencies = [ [[package]] name = "minotari_chat_ffi" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "cbindgen", "chrono", @@ -3982,7 +3982,7 @@ dependencies = [ [[package]] name = "minotari_console_wallet" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "blake2", "chrono", @@ -4038,14 +4038,14 @@ dependencies = [ [[package]] name = "minotari_ledger_wallet_common" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "bs58 0.5.1", ] [[package]] name = "minotari_ledger_wallet_comms" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "borsh", "dialoguer 0.11.0", @@ -4067,7 +4067,7 @@ dependencies = [ [[package]] name = "minotari_merge_mining_proxy" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "anyhow", "bincode", @@ -4109,7 +4109,7 @@ dependencies = [ [[package]] name = "minotari_miner" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "base64 0.13.1", "borsh", @@ -4146,7 +4146,7 @@ dependencies = [ [[package]] name = "minotari_mining_helper_ffi" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "borsh", "cbindgen", @@ -4165,7 +4165,7 @@ dependencies = [ [[package]] name = "minotari_node" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "anyhow", "async-trait", @@ -4222,7 +4222,7 @@ dependencies = [ [[package]] name = "minotari_wallet" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "argon2 0.4.1", "async-trait", @@ -4273,7 +4273,7 @@ dependencies = [ [[package]] name = "minotari_wallet_ffi" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "borsh", "cbindgen", @@ -6857,7 +6857,7 @@ dependencies = [ [[package]] name = "tari_chat_client" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "anyhow", "async-trait", @@ -6884,7 +6884,7 @@ dependencies = [ [[package]] name = "tari_common" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "anyhow", "config", @@ -6909,7 +6909,7 @@ dependencies = [ [[package]] name = "tari_common_sqlite" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "diesel", "diesel_migrations", @@ -6923,7 +6923,7 @@ dependencies = [ [[package]] name = "tari_common_types" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "base64 0.21.7", "bitflags 2.6.0", @@ -6948,7 +6948,7 @@ dependencies = [ [[package]] name = "tari_comms" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "anyhow", "async-trait", @@ -6998,7 +6998,7 @@ dependencies = [ [[package]] name = "tari_comms_dht" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "anyhow", "bitflags 2.6.0", @@ -7042,7 +7042,7 @@ dependencies = [ [[package]] name = "tari_comms_rpc_macros" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "futures 0.3.31", "proc-macro2", @@ -7057,7 +7057,7 @@ dependencies = [ [[package]] name = "tari_contacts" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "chrono", "diesel", @@ -7091,7 +7091,7 @@ dependencies = [ [[package]] name = "tari_core" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "anyhow", "async-trait", @@ -7194,11 +7194,11 @@ dependencies = [ [[package]] name = "tari_features" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" [[package]] name = "tari_hashing" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "blake2", "borsh", @@ -7256,7 +7256,7 @@ dependencies = [ [[package]] name = "tari_key_manager" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "argon2 0.4.1", "async-trait", @@ -7291,7 +7291,7 @@ dependencies = [ [[package]] name = "tari_libtor" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "derivative", "libtor", @@ -7305,7 +7305,7 @@ dependencies = [ [[package]] name = "tari_max_size" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "borsh", "serde", @@ -7315,7 +7315,7 @@ dependencies = [ [[package]] name = "tari_metrics" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "anyhow", "futures 0.3.31", @@ -7330,7 +7330,7 @@ dependencies = [ [[package]] name = "tari_mmr" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "bincode", "blake2", @@ -7348,7 +7348,7 @@ dependencies = [ [[package]] name = "tari_p2p" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "anyhow", "clap 3.2.25", @@ -7387,7 +7387,7 @@ dependencies = [ [[package]] name = "tari_script" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "blake2", "borsh", @@ -7405,7 +7405,7 @@ dependencies = [ [[package]] name = "tari_service_framework" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "anyhow", "async-trait", @@ -7422,7 +7422,7 @@ dependencies = [ [[package]] name = "tari_shutdown" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "futures 0.3.31", "tokio", @@ -7430,7 +7430,7 @@ dependencies = [ [[package]] name = "tari_storage" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "bincode", "lmdb-zero", @@ -7443,7 +7443,7 @@ dependencies = [ [[package]] name = "tari_test_utils" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" dependencies = [ "futures 0.3.31", "futures-test", diff --git a/README.md b/README.md index 9388b47619..74c899fdf4 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.10.1-rc.0 | -| Esmeralda | 1.10.1-pre.0 | +| Nextnet | 1.11.0-rc.0 | +| Esmeralda | 1.11.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 3ae83ea5a4..7116ee6104 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.10.1-pre.0" +version = "1.11.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.10.1-pre.0" } +tari_features = { path = "../../common/tari_features", version = "1.11.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 7ebeb49917..53eec979fd 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.10.1-pre.0" +version = "1.11.0-pre.0" authors = ["The Tari Development Community"] edition = "2018" license = "BSD-3-Clause" @@ -30,7 +30,7 @@ tari_common = { path = "../../common", features = [ "build", "static-application-info", ] } -tari_features = { path = "../../common/tari_features", version = "1.10.1-pre.0" } +tari_features = { path = "../../common/tari_features", version = "1.11.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 6342e08aef..d5f132ca08 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.10.1-pre.0" +version = "1.11.0-pre.0" authors = ["The Tari Development Community"] edition = "2018" license = "BSD-3-Clause" @@ -8,7 +8,7 @@ license = "BSD-3-Clause" [dependencies] 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.10.1-pre.0", optional = true } +minotari_ledger_wallet_comms = { path = "../../applications/minotari_ledger_wallet/comms", version = "1.11.0-pre.0", optional = true } tari_common = { path = "../../common" } tari_common_types = { path = "../../base_layer/common_types" } tari_comms = { path = "../../comms/core" } @@ -84,7 +84,7 @@ default-features = false features = ["crossterm"] [build-dependencies] -tari_features = { path = "../../common/tari_features", version = "1.10.1-pre.0" } +tari_features = { path = "../../common/tari_features", version = "1.11.0-pre.0" } [features] default = ["libtor", "ledger"] diff --git a/applications/minotari_ledger_wallet/common/Cargo.toml b/applications/minotari_ledger_wallet/common/Cargo.toml index f064f2c1fc..578755e87f 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.10.1-pre.0" +version = "1.11.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 416a6849ed..bc1394ff98 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.10.1-pre.0" +version = "1.11.0-pre.0" authors = ["The Tari Development Community"] license = "BSD-3-Clause" edition = "2021" diff --git a/applications/minotari_ledger_wallet/wallet/Cargo.toml b/applications/minotari_ledger_wallet/wallet/Cargo.toml index 81d7190860..1aca7a6505 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.10.1-pre.0" +version = "1.11.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.10.1-pre.0" } +tari_hashing = { path = "../../../hashing", version = "1.11.0-pre.0" } minotari_ledger_wallet_common = { path = "../common" } diff --git a/applications/minotari_merge_mining_proxy/Cargo.toml b/applications/minotari_merge_mining_proxy/Cargo.toml index 300f0c291d..4768c220f7 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.10.1-pre.0" +version = "1.11.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.10.1-pre.0" } +tari_features = { path = "../../common/tari_features", version = "1.11.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 80ceb64b0f..57262b56d3 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.10.1-pre.0" +version = "1.11.0-pre.0" edition = "2018" [dependencies] diff --git a/applications/minotari_node/Cargo.toml b/applications/minotari_node/Cargo.toml index 8c669d3b67..526b8a26b4 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.10.1-pre.0" +version = "1.11.0-pre.0" edition = "2018" [dependencies] @@ -26,7 +26,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.10.1-pre.0" } +], version = "1.11.0-pre.0" } anyhow = "1.0.53" async-trait = "0.1.52" @@ -77,7 +77,7 @@ safe = [] libtor = ["tari_libtor"] [build-dependencies] -tari_features = { path = "../../common/tari_features", version = "1.10.1-pre.0" } +tari_features = { path = "../../common/tari_features", version = "1.11.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 c624222047..841aaf9783 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.10.1-pre.0" +version = "1.11.0-pre.0" edition = "2018" [dependencies] diff --git a/base_layer/common_types/Cargo.toml b/base_layer/common_types/Cargo.toml index d4a9b0b93f..8176d18217 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.10.1-pre.0" +version = "1.11.0-pre.0" edition = "2018" [dependencies] tari_crypto = { version = "0.21.0" } tari_utilities = { version = "0.8" } -tari_common = { path = "../../common", version = "1.10.1-pre.0" } +tari_common = { path = "../../common", version = "1.11.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 28bbe451f2..2ff70049e0 100644 --- a/base_layer/contacts/Cargo.toml +++ b/base_layer/contacts/Cargo.toml @@ -3,22 +3,22 @@ name = "tari_contacts" authors = ["The Tari Development Community"] description = "Tari contacts library" license = "BSD-3-Clause" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" edition = "2018" [dependencies] -tari_common = { path = "../../common", version = "1.10.1-pre.0" } -tari_common_sqlite = { path = "../../common_sqlite", version = "1.10.1-pre.0" } -tari_common_types = { path = "../../base_layer/common_types", version = "1.10.1-pre.0" } -tari_comms = { path = "../../comms/core", version = "1.10.1-pre.0" } -tari_comms_dht = { path = "../../comms/dht", version = "1.10.1-pre.0" } +tari_common = { path = "../../common", version = "1.11.0-pre.0" } +tari_common_sqlite = { path = "../../common_sqlite", version = "1.11.0-pre.0" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.11.0-pre.0" } +tari_comms = { path = "../../comms/core", version = "1.11.0-pre.0" } +tari_comms_dht = { path = "../../comms/dht", version = "1.11.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.10.1-pre.0" } -tari_service_framework = { path = "../service_framework", version = "1.10.1-pre.0" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.10.1-pre.0" } +], version = "1.11.0-pre.0" } +tari_service_framework = { path = "../service_framework", version = "1.11.0-pre.0" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.11.0-pre.0" } tari_utilities = { version = "0.8" } chrono = { version = "0.4.39", default-features = false, features = ["serde"] } @@ -48,7 +48,7 @@ tari_test_utils = { path = "../../infrastructure/test_utils" } tempfile = "3.1.0" [build-dependencies] -tari_common = { path = "../../common", version = "1.10.1-pre.0" } +tari_common = { path = "../../common", version = "1.11.0-pre.0" } [package.metadata.cargo-machete] ignored = [ diff --git a/base_layer/contacts/src/chat_client/Cargo.toml b/base_layer/contacts/src/chat_client/Cargo.toml index 4e3fd42c0c..cff6a807bf 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.10.1-pre.0" +version = "1.11.0-pre.0" edition = "2018" diff --git a/base_layer/core/Cargo.toml b/base_layer/core/Cargo.toml index 41419433a7..6961823522 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.10.1-pre.0" +version = "1.11.0-pre.0" edition = "2018" [features] @@ -28,26 +28,26 @@ ledger = ["minotari_ledger_wallet_comms"] metrics = ["tari_metrics"] [dependencies] -minotari_ledger_wallet_comms = { path = "../../applications/minotari_ledger_wallet/comms", version = "1.10.1-pre.0", optional = true } -tari_common = { path = "../../common", version = "1.10.1-pre.0" } -tari_common_types = { path = "../../base_layer/common_types", version = "1.10.1-pre.0" } -tari_comms = { path = "../../comms/core", version = "1.10.1-pre.0" } -tari_comms_dht = { path = "../../comms/dht", version = "1.10.1-pre.0" } -tari_comms_rpc_macros = { path = "../../comms/rpc_macros", version = "1.10.1-pre.0" } +minotari_ledger_wallet_comms = { path = "../../applications/minotari_ledger_wallet/comms", version = "1.11.0-pre.0", optional = true } +tari_common = { path = "../../common", version = "1.11.0-pre.0" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.11.0-pre.0" } +tari_comms = { path = "../../comms/core", version = "1.11.0-pre.0" } +tari_comms_dht = { path = "../../comms/dht", version = "1.11.0-pre.0" } +tari_comms_rpc_macros = { path = "../../comms/rpc_macros", version = "1.11.0-pre.0" } tari_crypto = { version = "0.21.0", features = ["borsh"] } tari_max_size = { path = "../../infrastructure/max_size" } -tari_metrics = { path = "../../infrastructure/metrics", optional = true, version = "1.10.1-pre.0" } -tari_mmr = { path = "../../base_layer/mmr", optional = true, version = "1.10.1-pre.0" } -tari_p2p = { path = "../../base_layer/p2p", version = "1.10.1-pre.0" } -tari_script = { path = "../../infrastructure/tari_script", version = "1.10.1-pre.0" } -tari_service_framework = { path = "../service_framework", version = "1.10.1-pre.0" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.10.1-pre.0" } -tari_storage = { path = "../../infrastructure/storage", version = "1.10.1-pre.0" } -tari_test_utils = { path = "../../infrastructure/test_utils", version = "1.10.1-pre.0" } +tari_metrics = { path = "../../infrastructure/metrics", optional = true, version = "1.11.0-pre.0" } +tari_mmr = { path = "../../base_layer/mmr", optional = true, version = "1.11.0-pre.0" } +tari_p2p = { path = "../../base_layer/p2p", version = "1.11.0-pre.0" } +tari_script = { path = "../../infrastructure/tari_script", version = "1.11.0-pre.0" } +tari_service_framework = { path = "../service_framework", version = "1.11.0-pre.0" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.11.0-pre.0" } +tari_storage = { path = "../../infrastructure/storage", version = "1.11.0-pre.0" } +tari_test_utils = { path = "../../infrastructure/test_utils", version = "1.11.0-pre.0" } tari_utilities = { version = "0.8", features = ["borsh"] } tari_key_manager = { path = "../key_manager", features = [ "key_manager_service", -], version = "1.10.1-pre.0" } +], version = "1.11.0-pre.0" } tari_common_sqlite = { path = "../../common_sqlite" } tari_hashing = { path = "../../hashing" } @@ -117,8 +117,8 @@ static_assertions = "1.1.0" [build-dependencies] tari_common = { path = "../../common", features = [ "build", -], version = "1.10.1-pre.0" } -tari_features = { path = "../../common/tari_features", version = "1.10.1-pre.0" } +], version = "1.11.0-pre.0" } +tari_features = { path = "../../common/tari_features", version = "1.11.0-pre.0" } [[bench]] name = "mempool" diff --git a/base_layer/core/src/blocks/block_header.rs b/base_layer/core/src/blocks/block_header.rs index 7fe9930fb9..1b41865c1a 100644 --- a/base_layer/core/src/blocks/block_header.rs +++ b/base_layer/core/src/blocks/block_header.rs @@ -225,7 +225,7 @@ impl BlockHeader { /// Provides a mining hash of the header, used for the mining. /// This differs from the normal hash by not hashing the nonce and kernel pow. pub fn mining_hash(&self) -> FixedHash { - let incomplete = DomainSeparatedConsensusHasher::>::new("block_header") + DomainSeparatedConsensusHasher::>::new("block_header") .chain(&self.version) .chain(&self.height) .chain(&self.prev_hash) @@ -233,17 +233,15 @@ impl BlockHeader { .chain(&self.input_mr) .chain(&self.output_mr) .chain(&self.output_smt_size) + .chain(&self.block_output_mr) .chain(&self.kernel_mr) .chain(&self.kernel_mmr_size) .chain(&self.total_kernel_offset) .chain(&self.total_script_offset) .chain(&self.validator_node_mr) - .chain(&self.validator_node_size); - - match self.version { - 0 => incomplete.finalize().into(), - _ => incomplete.chain(&self.block_output_mr).finalize().into(), - } + .chain(&self.validator_node_size) + .finalize() + .into() } pub fn merge_mining_hash(&self) -> FixedHash { diff --git a/base_layer/core/src/blocks/genesis_block.rs b/base_layer/core/src/blocks/genesis_block.rs index a75767e192..433860e1eb 100644 --- a/base_layer/core/src/blocks/genesis_block.rs +++ b/base_layer/core/src/blocks/genesis_block.rs @@ -230,7 +230,7 @@ pub fn get_nextnet_genesis_block() -> ChainBlock { fn get_nextnet_genesis_block_raw() -> Block { // Set genesis timestamp - let genesis_timestamp = DateTime::parse_from_rfc2822("11 Sep 2024 08:00:00 +0200").expect("parse may not fail"); + let genesis_timestamp = DateTime::parse_from_rfc2822("28 Jan 2025 08:00:00 +0200").expect("parse may not fail"); // Let us add a "not before" proof to the genesis block let not_before_proof = b"nextnet has a blast, its prowess echoed in every gust \ \ @@ -415,7 +415,7 @@ pub fn get_esmeralda_genesis_block() -> ChainBlock { fn get_esmeralda_genesis_block_raw() -> Block { // Set genesis timestamp - let genesis_timestamp = DateTime::parse_from_rfc2822("07 Oct 2024 08:00:00 +0200").expect("parse may not fail"); + let genesis_timestamp = DateTime::parse_from_rfc2822("28 Jan 2025 08:00:00 +0200").expect("parse may not fail"); // Let us add a "not before" proof to the genesis block let not_before_proof = b"as I sip my drink, thoughts of esmeralda consume my mind, like a refreshing nourishing draught \ diff --git a/base_layer/core/src/consensus/consensus_constants.rs b/base_layer/core/src/consensus/consensus_constants.rs index b504f64a05..72f779da98 100644 --- a/base_layer/core/src/consensus/consensus_constants.rs +++ b/base_layer/core/src/consensus/consensus_constants.rs @@ -407,8 +407,6 @@ impl ConsensusConstants { vn_registration_shuffle_interval: VnEpoch(100), coinbase_output_features_extra_max_length: 256, }]; - #[cfg(any(test, debug_assertions))] - assert_hybrid_pow_constants(&consensus_constants, &[120], &[50], &[50]); consensus_constants } @@ -474,8 +472,6 @@ impl ConsensusConstants { vn_registration_shuffle_interval: VnEpoch(100), coinbase_output_features_extra_max_length: 256, }]; - #[cfg(any(test, debug_assertions))] - assert_hybrid_pow_constants(&consensus_constants, &[target_time], &[randomx_split], &[sha3x_split]); consensus_constants } @@ -532,13 +528,7 @@ impl ConsensusConstants { vn_registration_shuffle_interval: VnEpoch(100), coinbase_output_features_extra_max_length: 256, }; - let mut consensus_constants2 = consensus_constants1.clone(); - consensus_constants2.blockchain_version = 1; - consensus_constants2.effective_from_height = 16000; - consensus_constants2.valid_blockchain_version_range = 1..=1; - let consensus_constants = vec![consensus_constants1, consensus_constants2]; - #[cfg(any(test, debug_assertions))] - assert_hybrid_pow_constants(&consensus_constants, &[120, 120], &[50, 50], &[50, 50]); + let consensus_constants = vec![consensus_constants1]; consensus_constants } @@ -595,15 +585,13 @@ impl ConsensusConstants { vn_registration_shuffle_interval: VnEpoch(100), coinbase_output_features_extra_max_length: 256, }]; - #[cfg(any(test, debug_assertions))] - assert_hybrid_pow_constants(&consensus_constants, &[120], &[50], &[50]); consensus_constants } pub fn nextnet() -> Vec { let mut algos = HashMap::new(); algos.insert(PowAlgorithm::Sha3x, PowAlgorithmConstants { - min_difficulty: Difficulty::from_u64(1_200_000_000).expect("valid difficulty"), + min_difficulty: Difficulty::from_u64(150_000_000_000).expect("valid difficulty"), max_difficulty: Difficulty::max(), target_time: 240, }); @@ -645,19 +633,10 @@ impl ConsensusConstants { vn_registration_min_deposit_amount: MicroMinotari(0), vn_registration_lock_height: 0, vn_registration_shuffle_interval: VnEpoch(100), - coinbase_output_features_extra_max_length: 64, + coinbase_output_features_extra_max_length: 256, }; - let mut con_2 = con_1.clone(); - con_2.effective_from_height = 33000; - con_2.coinbase_output_features_extra_max_length = 256; - let mut con_3 = con_2.clone(); - con_3.effective_from_height = 52000; - con_3.blockchain_version = 1; - con_3.valid_blockchain_version_range = 1..=1; - - let consensus_constants = vec![con_1, con_2, con_3]; - #[cfg(any(test, debug_assertions))] - assert_hybrid_pow_constants(&consensus_constants, &[120, 120, 120], &[50, 50, 50], &[50, 50, 50]); + + let consensus_constants = vec![con_1]; consensus_constants } @@ -710,8 +689,6 @@ impl ConsensusConstants { vn_registration_shuffle_interval: VnEpoch(100), coinbase_output_features_extra_max_length: 256, }]; - #[cfg(any(test, debug_assertions))] - assert_hybrid_pow_constants(&consensus_constants, &[120], &[50], &[50]); consensus_constants } @@ -745,70 +722,6 @@ impl ConsensusConstants { } } -// Assert the hybrid POW constants. -// Note: The math and constants in this function should not be changed without ample consideration that should include -// discussion with the Tari community, modelling and system level tests. -// For SHA3/Monero to have a 40/60 split: -// > sha3x_target_time = randomx_target_time * (100 - 40) / 40 -// > randomx_target_time = sha3x_target_time * (100 - 60) / 60 -// > target_time = randomx_target_time * sha3x_target_time / (ramdomx_target_time + sha3x_target_time) -#[cfg(any(test, debug_assertions))] -fn assert_hybrid_pow_constants( - consensus_constants: &[ConsensusConstants], - target_time: &[u64], - randomx_split: &[u64], // RamdomX - sha3x_split: &[u64], -) { - assert_eq!(consensus_constants.len(), target_time.len()); - assert_eq!(consensus_constants.len(), randomx_split.len()); - assert_eq!(consensus_constants.len(), sha3x_split.len()); - - for (i, constants) in consensus_constants.iter().enumerate() { - let sha3x_constants = constants - .proof_of_work - .get(&PowAlgorithm::Sha3x) - .expect("Sha3 constants not found"); - let randomx_constants = constants - .proof_of_work - .get(&PowAlgorithm::RandomX) - .expect("RandomX constants not found"); - - // POW algorithm dependencies - // - Basics - assert!( - sha3x_constants.min_difficulty <= sha3x_constants.max_difficulty, - "SHA3X min_difficulty > max_difficulty" - ); - assert!( - randomx_constants.min_difficulty <= randomx_constants.max_difficulty, - "RandomX min_difficulty > max_difficulty" - ); - // - Target time (the ratios here are important to determine the SHA3/Monero split and overall block time) - assert_eq!(randomx_split[i] + sha3x_split[i], 100, "Split must add up to 100"); - assert_eq!( - sha3x_constants.target_time * sha3x_split[i], - randomx_constants.target_time * (100 - sha3x_split[i]), - "SHA3 target times are not inversely proportional to SHA3 split" - ); - assert_eq!( - randomx_constants.target_time * randomx_split[i], - sha3x_constants.target_time * (100 - randomx_split[i]), - "Monero target times are not inversely proportional to Monero split" - ); - assert_eq!( - target_time[i] * (randomx_constants.target_time + sha3x_constants.target_time), - randomx_constants.target_time * sha3x_constants.target_time, - "Overall target time is not inversely proportional to target split times" - ); - // General LWMA dependencies - assert_eq!( - constants.future_time_limit * 20, - target_time[i] * constants.difficulty_block_window, - "20x future_time_limit is not target_time * difficulty_block_window" - ); - } -} - const EMISSION_DECAY: [u64; 6] = [21u64, 22, 23, 25, 26, 37]; const ESMERALDA_DECAY_PARAMS: [u64; 6] = EMISSION_DECAY; // less significant values don't matter diff --git a/base_layer/core/src/proof_of_work/sha3x_pow.rs b/base_layer/core/src/proof_of_work/sha3x_pow.rs index af788c3288..55148b96c1 100644 --- a/base_layer/core/src/proof_of_work/sha3x_pow.rs +++ b/base_layer/core/src/proof_of_work/sha3x_pow.rs @@ -99,8 +99,8 @@ pub mod test { #[cfg(tari_target_network_testnet)] fn validate_max_target() { let mut header = get_header(); - header.nonce = 631; + header.nonce = 4; println!("{:?}", header); - assert_eq!(sha3x_difficulty(&header).unwrap(), Difficulty::from_u64(13).unwrap()); + assert_eq!(sha3x_difficulty(&header).unwrap(), Difficulty::from_u64(2366).unwrap()); } } diff --git a/base_layer/core/tests/tests/block_validation.rs b/base_layer/core/tests/tests/block_validation.rs index 8cafff96e0..77cdba9227 100644 --- a/base_layer/core/tests/tests/block_validation.rs +++ b/base_layer/core/tests/tests/block_validation.rs @@ -118,7 +118,7 @@ async fn test_monero_blocks() { max_difficulty: Difficulty::min(), target_time: 200, }) - .with_blockchain_version(1) + .with_blockchain_version(0) .build(); let cm = ConsensusManager::builder(network) .add_consensus_constants(cc) diff --git a/base_layer/key_manager/Cargo.toml b/base_layer/key_manager/Cargo.toml index 7df14b19c1..45c64f3f02 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.10.1-pre.0" +version = "1.11.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.10.1-pre.0" } -tari_common_types = { path = "../../base_layer/common_types", version = "1.10.1-pre.0" } -tari_service_framework = { path = "../service_framework", version = "1.10.1-pre.0" } +tari_common_sqlite = { path = "../../common_sqlite", version = "1.11.0-pre.0" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.11.0-pre.0" } +tari_service_framework = { path = "../service_framework", version = "1.11.0-pre.0" } async-trait = { version = "0.1.50" } chrono = { version = "0.4.39", default-features = false, features = ["serde"] } diff --git a/base_layer/mmr/Cargo.toml b/base_layer/mmr/Cargo.toml index 4c2b0821b7..19e6155a65 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.10.1-pre.0" +version = "1.11.0-pre.0" edition = "2018" [features] diff --git a/base_layer/p2p/Cargo.toml b/base_layer/p2p/Cargo.toml index d5ec8d35e3..1da4c455ee 100644 --- a/base_layer/p2p/Cargo.toml +++ b/base_layer/p2p/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_p2p" -version = "1.10.1-pre.0" +version = "1.11.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,13 +10,13 @@ license = "BSD-3-Clause" edition = "2021" [dependencies] -tari_comms = { path = "../../comms/core", version = "1.10.1-pre.0" } -tari_comms_dht = { path = "../../comms/dht", version = "1.10.1-pre.0" } -tari_common = { path = "../../common", version = "1.10.1-pre.0" } +tari_comms = { path = "../../comms/core", version = "1.11.0-pre.0" } +tari_comms_dht = { path = "../../comms/dht", version = "1.11.0-pre.0" } +tari_common = { path = "../../common", version = "1.11.0-pre.0" } tari_crypto = { version = "0.21.0" } -tari_service_framework = { path = "../service_framework", version = "1.10.1-pre.0" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.10.1-pre.0" } -tari_storage = { path = "../../infrastructure/storage", version = "1.10.1-pre.0" } +tari_service_framework = { path = "../service_framework", version = "1.11.0-pre.0" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.11.0-pre.0" } +tari_storage = { path = "../../infrastructure/storage", version = "1.11.0-pre.0" } tari_utilities = { version = "0.8" } anyhow = "1.0.53" @@ -57,7 +57,7 @@ tempfile = "3.1.0" [build-dependencies] tari_common = { path = "../../common", features = [ "build", -], version = "1.10.1-pre.0" } +], version = "1.11.0-pre.0" } [features] test-mocks = [] diff --git a/base_layer/service_framework/Cargo.toml b/base_layer/service_framework/Cargo.toml index 7c8cfd238a..5efb671520 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.10.1-pre.0" +version = "1.11.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.10.1-pre.0" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.11.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 e6b935e677..f8d702de36 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.10.1-pre.0" +version = "1.11.0-pre.0" edition = "2018" [dependencies] @@ -15,7 +15,7 @@ tari_core = { path = "../core", default-features = false, features = [ "base_node_proto", "base_node", ] } -tari_common_types = { path = "../../base_layer/common_types", version = "1.10.1-pre.0" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.11.0-pre.0" } tari_utilities = { version = "0.8" } libc = "0.2.65" thiserror = "1.0.26" @@ -27,7 +27,7 @@ tari_core = { path = "../core", features = ["transactions", "base_node"] } rand = "0.8" [build-dependencies] -tari_features = { path = "../../common/tari_features", version = "1.10.1-pre.0" } +tari_features = { path = "../../common/tari_features", version = "1.11.0-pre.0" } cbindgen = "0.24.3" tari_common = { path = "../../common", features = [ "build", diff --git a/base_layer/tari_mining_helper_ffi/src/lib.rs b/base_layer/tari_mining_helper_ffi/src/lib.rs index 4b84960ed3..0de0c30533 100644 --- a/base_layer/tari_mining_helper_ffi/src/lib.rs +++ b/base_layer/tari_mining_helper_ffi/src/lib.rs @@ -618,44 +618,6 @@ mod tests { )) } - #[test] - fn detect_change_in_consensus_encoding() { - #[cfg(not(any(tari_target_network_mainnet, tari_target_network_nextnet)))] - { - let (nonce, difficulty, network) = ( - 1209310303936924941, - Difficulty::from_u64(1634).unwrap(), - Network::Esmeralda, - ); - unsafe { - set_network_if_choice_valid(network).unwrap(); - let mut error = -1; - let error_ptr = &mut error as *mut c_int; - let block = create_test_block(); - let header_bytes = borsh::to_vec(&block.header).unwrap(); - #[allow(clippy::cast_possible_truncation)] - let len = header_bytes.len() as u32; - let byte_vec = byte_vector_create(header_bytes.as_ptr(), len, error_ptr); - inject_nonce(byte_vec, nonce, error_ptr); - assert_eq!(error, 0); - let result = share_difficulty(byte_vec, u32::from(network.as_byte()), error_ptr); - if result != difficulty.as_u64() { - // Use this to generate new NONCE and DIFFICULTY - // Use ONLY if you know encoding has changed - let (difficulty, nonce) = generate_nonce_with_min_difficulty(min_difficulty()).unwrap(); - eprintln!("network = {network:?}"); - eprintln!("nonce = {:?}", nonce); - eprintln!("difficulty = {:?}", difficulty); - panic!( - "detect_change_in_consensus_encoding has failed. This might be a change in consensus encoding \ - which requires an update to the pool miner code." - ) - } - byte_vector_destroy(byte_vec); - } - } - } - #[test] fn check_difficulty() { unsafe { diff --git a/base_layer/wallet/Cargo.toml b/base_layer/wallet/Cargo.toml index fd887669c9..ed7db714ea 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.10.1-pre.0" +version = "1.11.0-pre.0" edition = "2018" [dependencies] -tari_common = { path = "../../common", version = "1.10.1-pre.0" } -tari_common_sqlite = { path = "../../common_sqlite", version = "1.10.1-pre.0" } -tari_common_types = { path = "../../base_layer/common_types", version = "1.10.1-pre.0" } -tari_comms = { path = "../../comms/core", version = "1.10.1-pre.0" } -tari_comms_dht = { path = "../../comms/dht", version = "1.10.1-pre.0" } -tari_contacts = { path = "../../base_layer/contacts", version = "1.10.1-pre.0" } +tari_common = { path = "../../common", version = "1.11.0-pre.0" } +tari_common_sqlite = { path = "../../common_sqlite", version = "1.11.0-pre.0" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.11.0-pre.0" } +tari_comms = { path = "../../comms/core", version = "1.11.0-pre.0" } +tari_comms_dht = { path = "../../comms/dht", version = "1.11.0-pre.0" } +tari_contacts = { path = "../../base_layer/contacts", version = "1.11.0-pre.0" } tari_core = { path = "../../base_layer/core", default-features = false, features = [ "transactions", "mempool_proto", "base_node_proto", -], version = "1.10.1-pre.0" } +], version = "1.11.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.10.1-pre.0" } +], version = "1.11.0-pre.0" } tari_p2p = { path = "../p2p", features = [ "auto-update", -], version = "1.10.1-pre.0" } -tari_script = { path = "../../infrastructure/tari_script", version = "1.10.1-pre.0" } -tari_service_framework = { path = "../service_framework", version = "1.10.1-pre.0" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.10.1-pre.0" } +], version = "1.11.0-pre.0" } +tari_script = { path = "../../infrastructure/tari_script", version = "1.11.0-pre.0" } +tari_service_framework = { path = "../service_framework", version = "1.11.0-pre.0" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.11.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.10.1-pre.0" } +], version = "1.11.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 57a6066bec..6b88af69d1 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.10.1-pre.0" +version = "1.11.0-pre.0" edition = "2018" [dependencies] @@ -67,7 +67,7 @@ tari_common = { path = "../../common", features = [ "build", "static-application-info", ] } -tari_features = { path = "../../common/tari_features", version = "1.10.1-pre.0" } +tari_features = { path = "../../common/tari_features", version = "1.11.0-pre.0" } [lints.rust] unexpected_cfgs = { level = "warn", check-cfg = [ diff --git a/changelog-development.md b/changelog-development.md index ac8ef0b4de..cdfcca95c8 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.11.0-pre.0](https://github.com/tari-project/tari/compare/v1.10.1-pre.0...v1.11.0-pre.0) (2025-01-28) + + +### ⚠ BREAKING CHANGES + +* remove coinbases from weight calculations (#6738) + +### Features + +* add wallet state ([#6763](https://github.com/tari-project/tari/issues/6763)) ([d88f7d6](https://github.com/tari-project/tari/commit/d88f7d6947256c625643237b6f60e627dff97704)) +* fix mempool out of sync ([#6761](https://github.com/tari-project/tari/issues/6761)) ([2535e87](https://github.com/tari-project/tari/commit/2535e8771df6a3d3ffa47192d1f83b4c19f43ce8)) +* remove coinbases from weight calculations ([#6738](https://github.com/tari-project/tari/issues/6738)) ([4d68ece](https://github.com/tari-project/tari/commit/4d68ece3c5de6962e508cb0220b3e704dc5d16df)) + + +### Bug Fixes + +* wallet validation ([#6765](https://github.com/tari-project/tari/issues/6765)) ([afee5ad](https://github.com/tari-project/tari/commit/afee5adcbd8608aa6d2802abfc55be36db35a4f8)) + ### [1.10.1-pre.0](https://github.com/tari-project/tari/compare/v1.10.0-pre.1...v1.10.1-pre.0) (2025-01-23) diff --git a/changelog-nextnet.md b/changelog-nextnet.md index 17289682a2..dc32710382 100644 --- a/changelog-nextnet.md +++ b/changelog-nextnet.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. # Changelog +## [1.11.0-rc.0](https://github.com/tari-project/tari/compare/v1.10.1-rc.0...v1.11.0-rc.0) (2025-01-28) + + +### ⚠ BREAKING CHANGES + +* remove coinbases from weight calculations (#6738) + +### Features + +* add wallet state ([#6763](https://github.com/tari-project/tari/issues/6763)) ([d88f7d6](https://github.com/tari-project/tari/commit/d88f7d6947256c625643237b6f60e627dff97704)) +* fix mempool out of sync ([#6761](https://github.com/tari-project/tari/issues/6761)) ([2535e87](https://github.com/tari-project/tari/commit/2535e8771df6a3d3ffa47192d1f83b4c19f43ce8)) +* remove coinbases from weight calculations ([#6738](https://github.com/tari-project/tari/issues/6738)) ([4d68ece](https://github.com/tari-project/tari/commit/4d68ece3c5de6962e508cb0220b3e704dc5d16df)) + + +### Bug Fixes + +* wallet validation ([#6765](https://github.com/tari-project/tari/issues/6765)) ([afee5ad](https://github.com/tari-project/tari/commit/afee5adcbd8608aa6d2802abfc55be36db35a4f8)) + ### [1.10.1-rc.0](https://github.com/tari-project/tari/compare/v1.10.0-rc.1...v1.10.1-rc.0) (2025-01-23) diff --git a/common/Cargo.toml b/common/Cargo.toml index 037fba9f94..745c3ff8de 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.10.1-pre.0" +version = "1.11.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.10.1-pre.0" } +tari_features = { path = "./tari_features", version = "1.11.0-pre.0" } anyhow = "1.0.53" config = { version = "0.14.0", default-features = false, features = ["toml"] } @@ -43,7 +43,7 @@ tari_test_utils = { path = "../infrastructure/test_utils" } toml = "0.5.8" [build-dependencies] -tari_features = { path = "./tari_features", version = "1.10.1-pre.0" } +tari_features = { path = "./tari_features", version = "1.11.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 01b780f90c..c70d087ba8 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.10.1-pre.0" +version = "1.11.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 e5f1b57b49..98a6cd7f5f 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.10.1-pre.0" +version = "1.11.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 db5b1a9079..7f07c54477 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.10.1-pre.0" +version = "1.11.0-pre.0" edition = "2021" [dependencies] tari_crypto = { version = "0.21.0" } -tari_metrics = { path = "../../infrastructure/metrics", optional = true, version = "1.10.1-pre.0" } -tari_storage = { path = "../../infrastructure/storage", version = "1.10.1-pre.0" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.10.1-pre.0" } +tari_metrics = { path = "../../infrastructure/metrics", optional = true, version = "1.11.0-pre.0" } +tari_storage = { path = "../../infrastructure/storage", version = "1.11.0-pre.0" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.11.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.10.1-pre.0" } +], version = "1.11.0-pre.0" } [features] c_integration = [] diff --git a/comms/dht/Cargo.toml b/comms/dht/Cargo.toml index 38a8c1e005..bc013635ed 100644 --- a/comms/dht/Cargo.toml +++ b/comms/dht/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_comms_dht" -version = "1.10.1-pre.0" +version = "1.11.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.10.1-pre.0" } -tari_common = { path = "../../common", version = "1.10.1-pre.0" } -tari_comms_rpc_macros = { path = "../rpc_macros", version = "1.10.1-pre.0" } +tari_comms = { path = "../core", features = ["rpc"], version = "1.11.0-pre.0" } +tari_common = { path = "../../common", version = "1.11.0-pre.0" } +tari_comms_rpc_macros = { path = "../rpc_macros", version = "1.11.0-pre.0" } tari_crypto = { version = "0.21.0" } tari_utilities = { version = "0.8" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.10.1-pre.0" } -tari_storage = { path = "../../infrastructure/storage", version = "1.10.1-pre.0" } -tari_common_sqlite = { path = "../../common_sqlite", version = "1.10.1-pre.0" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.11.0-pre.0" } +tari_storage = { path = "../../infrastructure/storage", version = "1.11.0-pre.0" } +tari_common_sqlite = { path = "../../common_sqlite", version = "1.11.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.10.1-pre.0" } +tari_common = { path = "../../common", version = "1.11.0-pre.0" } [features] test-mocks = [] diff --git a/comms/rpc_macros/Cargo.toml b/comms/rpc_macros/Cargo.toml index f2fc1d4e24..3f48d758ec 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.10.1-pre.0" +version = "1.11.0-pre.0" edition = "2018" [lib] diff --git a/hashing/Cargo.toml b/hashing/Cargo.toml index 6a9674ffe5..e32af5c916 100644 --- a/hashing/Cargo.toml +++ b/hashing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_hashing" -version = "1.10.1-pre.0" +version = "1.11.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 1524f4836f..043a2d86a5 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.10.1-pre.0" +version = "1.11.0-pre.0" edition = "2018" [lib] diff --git a/infrastructure/libtor/Cargo.toml b/infrastructure/libtor/Cargo.toml index dbfc0e6fe1..32a48c1c06 100644 --- a/infrastructure/libtor/Cargo.toml +++ b/infrastructure/libtor/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_libtor" -version = "1.10.1-pre.0" +version = "1.11.0-pre.0" edition = "2021" license = "BSD-3-Clause" diff --git a/infrastructure/max_size/Cargo.toml b/infrastructure/max_size/Cargo.toml index 9f5f4a2e22..3e1d85a4fe 100644 --- a/infrastructure/max_size/Cargo.toml +++ b/infrastructure/max_size/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_max_size" -version = "1.10.1-pre.0" +version = "1.11.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 1e0e36e743..b3c32955ac 100644 --- a/infrastructure/metrics/Cargo.toml +++ b/infrastructure/metrics/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tari_metrics" description = "Tari metrics" -version = "1.10.1-pre.0" +version = "1.11.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 6cb740907b..803c3bda51 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.10.1-pre.0" +version = "1.11.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 d78bcef917..9ac64eb1d5 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.10.1-pre.0" +version = "1.11.0-pre.0" edition = "2018" [dependencies] diff --git a/infrastructure/tari_script/Cargo.toml b/infrastructure/tari_script/Cargo.toml index eaf59f9ddd..a9b86df294 100644 --- a/infrastructure/tari_script/Cargo.toml +++ b/infrastructure/tari_script/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_script" -version = "1.10.1-pre.0" +version = "1.11.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 4e6fced6be..191cfeee09 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.10.1-pre.0" +version = "1.11.0-pre.0" authors = ["The Tari Development Community"] edition = "2018" license = "BSD-3-Clause" @@ -9,8 +9,8 @@ license = "BSD-3-Clause" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tari_shutdown = { path = "../shutdown", version = "1.10.1-pre.0" } -tari_comms = { path = "../../comms/core", version = "1.10.1-pre.0" } +tari_shutdown = { path = "../shutdown", version = "1.11.0-pre.0" } +tari_comms = { path = "../../comms/core", version = "1.11.0-pre.0" } futures = { version = "^0.3.1" } rand = "0.8" diff --git a/package-lock.json b/package-lock.json index 8d9f8d25c9..628f8b8836 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "tari", - "version": "1.10.1-pre.0", + "version": "1.11.0-pre.0", "lockfileVersion": 2, "requires": true, "packages": {}