From 4651aa3842cfa6446e25bbebce487c8d75b2ccb4 Mon Sep 17 00:00:00 2001 From: SW van Heerden Date: Fri, 25 Oct 2024 11:42:31 +0200 Subject: [PATCH] chore: new release esmeralda (#6647) Description --- New Release increase coinbase extra field length --- 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.lock | 4 +- .../minotari_ledger_wallet/wallet/Cargo.toml | 4 +- .../minotari_merge_mining_proxy/Cargo.toml | 4 +- .../src/monero_fail.rs | 1 + 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 +++++----- .../core/src/consensus/consensus_constants.rs | 19 ++++-- .../transaction_components/output_features.rs | 2 +- .../core/tests/tests/block_validation.rs | 4 +- 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/wallet/Cargo.toml | 28 ++++---- base_layer/wallet_ffi/Cargo.toml | 4 +- changelog-development.md | 6 ++ changelog-nextnet.md | 5 ++ 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 +- 46 files changed, 179 insertions(+), 162 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0cae8ebe59..d3328104b5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3550,7 +3550,7 @@ dependencies = [ [[package]] name = "minotari_app_grpc" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "argon2", "base64 0.13.1", @@ -3579,7 +3579,7 @@ dependencies = [ [[package]] name = "minotari_app_utilities" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "clap 3.2.25", "dialoguer 0.10.4", @@ -3601,7 +3601,7 @@ dependencies = [ [[package]] name = "minotari_chat_ffi" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "cbindgen", "chrono", @@ -3626,7 +3626,7 @@ dependencies = [ [[package]] name = "minotari_console_wallet" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "blake2", "chrono", @@ -3682,14 +3682,14 @@ dependencies = [ [[package]] name = "minotari_ledger_wallet_common" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "bs58 0.5.1", ] [[package]] name = "minotari_ledger_wallet_comms" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "borsh", "dialoguer 0.11.0", @@ -3711,7 +3711,7 @@ dependencies = [ [[package]] name = "minotari_merge_mining_proxy" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "anyhow", "bincode", @@ -3753,7 +3753,7 @@ dependencies = [ [[package]] name = "minotari_miner" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "base64 0.13.1", "borsh", @@ -3790,7 +3790,7 @@ dependencies = [ [[package]] name = "minotari_mining_helper_ffi" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "borsh", "cbindgen", @@ -3809,7 +3809,7 @@ dependencies = [ [[package]] name = "minotari_node" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "anyhow", "async-trait", @@ -3866,7 +3866,7 @@ dependencies = [ [[package]] name = "minotari_wallet" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "argon2", "async-trait", @@ -3917,7 +3917,7 @@ dependencies = [ [[package]] name = "minotari_wallet_ffi" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "borsh", "cbindgen", @@ -6393,7 +6393,7 @@ dependencies = [ [[package]] name = "tari_chat_client" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "anyhow", "async-trait", @@ -6420,7 +6420,7 @@ dependencies = [ [[package]] name = "tari_common" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "anyhow", "config", @@ -6445,7 +6445,7 @@ dependencies = [ [[package]] name = "tari_common_sqlite" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "diesel", "diesel_migrations", @@ -6459,7 +6459,7 @@ dependencies = [ [[package]] name = "tari_common_types" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "base64 0.21.5", "bitflags 2.4.1", @@ -6484,7 +6484,7 @@ dependencies = [ [[package]] name = "tari_comms" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "anyhow", "async-trait", @@ -6534,7 +6534,7 @@ dependencies = [ [[package]] name = "tari_comms_dht" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "anyhow", "bitflags 2.4.1", @@ -6578,7 +6578,7 @@ dependencies = [ [[package]] name = "tari_comms_rpc_macros" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "futures 0.3.29", "proc-macro2", @@ -6593,7 +6593,7 @@ dependencies = [ [[package]] name = "tari_contacts" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "chrono", "diesel", @@ -6627,7 +6627,7 @@ dependencies = [ [[package]] name = "tari_core" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "async-trait", "bincode", @@ -6727,11 +6727,11 @@ dependencies = [ [[package]] name = "tari_features" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" [[package]] name = "tari_hashing" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "blake2", "borsh", @@ -6789,7 +6789,7 @@ dependencies = [ [[package]] name = "tari_key_manager" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "argon2", "async-trait", @@ -6824,7 +6824,7 @@ dependencies = [ [[package]] name = "tari_libtor" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "derivative", "libtor", @@ -6838,7 +6838,7 @@ dependencies = [ [[package]] name = "tari_max_size" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "borsh", "serde", @@ -6848,7 +6848,7 @@ dependencies = [ [[package]] name = "tari_metrics" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "anyhow", "futures 0.3.29", @@ -6863,7 +6863,7 @@ dependencies = [ [[package]] name = "tari_mmr" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "bincode", "blake2", @@ -6881,7 +6881,7 @@ dependencies = [ [[package]] name = "tari_p2p" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "anyhow", "clap 3.2.25", @@ -6919,7 +6919,7 @@ dependencies = [ [[package]] name = "tari_script" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "blake2", "borsh", @@ -6937,7 +6937,7 @@ dependencies = [ [[package]] name = "tari_service_framework" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "anyhow", "async-trait", @@ -6954,7 +6954,7 @@ dependencies = [ [[package]] name = "tari_shutdown" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "futures 0.3.29", "tokio", @@ -6962,7 +6962,7 @@ dependencies = [ [[package]] name = "tari_storage" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "bincode", "lmdb-zero", @@ -6975,7 +6975,7 @@ dependencies = [ [[package]] name = "tari_test_utils" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "futures 0.3.29", "futures-test", diff --git a/README.md b/README.md index 4531b127e1..324d3ff695 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,8 @@ The recommended running versions of each network are: | Network | Version | |-----------|----------------| | Stagenet | 1.0.0-alpha.0a | -| Nextnet | 1.7.0-rc.3 | -| Esmeralda | 1.7.0-pre.3 | +| Nextnet | 1.7.0-rc.4 | +| Esmeralda | 1.7.0-pre.4 | 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 2eb5f0c015..6e7244d6be 100644 --- a/applications/minotari_app_grpc/Cargo.toml +++ b/applications/minotari_app_grpc/Cargo.toml @@ -4,7 +4,7 @@ authors = ["The Tari Development Community"] description = "This crate is to provide a single source for all cross application grpc files and conversions to and from tari::core" repository = "https://github.com/tari-project/tari" license = "BSD-3-Clause" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" edition = "2021" [dependencies] @@ -32,7 +32,7 @@ tonic = { version = "0.12.3", features = ["tls"] } zeroize = "1" [build-dependencies] -tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.3" } +tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.4" } 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 91270cbb15..f85894371e 100644 --- a/applications/minotari_app_utilities/Cargo.toml +++ b/applications/minotari_app_utilities/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "minotari_app_utilities" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" 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.7.0-pre.3" } +tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.4" } [features] miner_input = ["minotari_app_grpc"] diff --git a/applications/minotari_console_wallet/Cargo.toml b/applications/minotari_console_wallet/Cargo.toml index cbb5b1522b..62c58889ad 100644 --- a/applications/minotari_console_wallet/Cargo.toml +++ b/applications/minotari_console_wallet/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "minotari_console_wallet" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" 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.7.0-pre.3", optional = true } +minotari_ledger_wallet_comms = { path = "../../applications/minotari_ledger_wallet/comms", version = "1.7.0-pre.4", 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.7.0-pre.3" } +tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.4" } [features] default = ["libtor", "ledger"] diff --git a/applications/minotari_ledger_wallet/common/Cargo.toml b/applications/minotari_ledger_wallet/common/Cargo.toml index 170b45bac7..b4eb995259 100644 --- a/applications/minotari_ledger_wallet/common/Cargo.toml +++ b/applications/minotari_ledger_wallet/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "minotari_ledger_wallet_common" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" 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 9fa5a93792..a651a12289 100644 --- a/applications/minotari_ledger_wallet/comms/Cargo.toml +++ b/applications/minotari_ledger_wallet/comms/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "minotari_ledger_wallet_comms" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" 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 36943b1242..0734d0e672 100644 --- a/applications/minotari_ledger_wallet/wallet/Cargo.lock +++ b/applications/minotari_ledger_wallet/wallet/Cargo.lock @@ -432,7 +432,7 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "minotari_ledger_wallet" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "blake2", "borsh", @@ -735,7 +735,7 @@ dependencies = [ [[package]] name = "tari_hashing" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" dependencies = [ "borsh", "digest", diff --git a/applications/minotari_ledger_wallet/wallet/Cargo.toml b/applications/minotari_ledger_wallet/wallet/Cargo.toml index a937524eed..3e8db87f3b 100644 --- a/applications/minotari_ledger_wallet/wallet/Cargo.toml +++ b/applications/minotari_ledger_wallet/wallet/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "minotari_ledger_wallet" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" authors = ["The Tari Development Community"] license = "BSD-3-Clause" edition = "2021" @@ -9,7 +9,7 @@ edition = "2021" tari_crypto = { version = "0.21.0", default-features = false, features = [ "borsh", ] } -tari_hashing = { path = "../../../hashing", version = "1.7.0-pre.3" } +tari_hashing = { path = "../../../hashing", version = "1.7.0-pre.4" } 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 34dc6fd43f..6525a6e987 100644 --- a/applications/minotari_merge_mining_proxy/Cargo.toml +++ b/applications/minotari_merge_mining_proxy/Cargo.toml @@ -4,7 +4,7 @@ authors = ["The Tari Development Community"] description = "The Tari merge mining proxy for xmrig" repository = "https://github.com/tari-project/tari" license = "BSD-3-Clause" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" 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.7.0-pre.3" } +tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.4" } [dev-dependencies] hyper = { version ="0.14.12", features = ["full"] } diff --git a/applications/minotari_merge_mining_proxy/src/monero_fail.rs b/applications/minotari_merge_mining_proxy/src/monero_fail.rs index c77ca692a0..0d6c24f18c 100644 --- a/applications/minotari_merge_mining_proxy/src/monero_fail.rs +++ b/applications/minotari_merge_mining_proxy/src/monero_fail.rs @@ -419,6 +419,7 @@ mod test { } } + #[ignore] #[tokio::test] async fn test_default_monerod_list() { let config = MergeMiningProxyConfig::default(); diff --git a/applications/minotari_miner/Cargo.toml b/applications/minotari_miner/Cargo.toml index 1c2737134e..d13a13faaf 100644 --- a/applications/minotari_miner/Cargo.toml +++ b/applications/minotari_miner/Cargo.toml @@ -4,7 +4,7 @@ authors = ["The Tari Development Community"] description = "The tari miner implementation" repository = "https://github.com/tari-project/tari" license = "BSD-3-Clause" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" edition = "2018" [dependencies] diff --git a/applications/minotari_node/Cargo.toml b/applications/minotari_node/Cargo.toml index a6cb41c164..439a225444 100644 --- a/applications/minotari_node/Cargo.toml +++ b/applications/minotari_node/Cargo.toml @@ -4,7 +4,7 @@ authors = ["The Tari Development Community"] description = "The tari full base node implementation" repository = "https://github.com/tari-project/tari" license = "BSD-3-Clause" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" 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.7.0-pre.3" } +], version = "1.7.0-pre.4" } 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.7.0-pre.3" } +tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.4" } [package.metadata.cargo-machete] ignored = [ diff --git a/base_layer/chat_ffi/Cargo.toml b/base_layer/chat_ffi/Cargo.toml index 49fc6b5428..81c5457aee 100644 --- a/base_layer/chat_ffi/Cargo.toml +++ b/base_layer/chat_ffi/Cargo.toml @@ -3,7 +3,7 @@ name = "minotari_chat_ffi" authors = ["The Tari Development Community"] description = "Tari cryptocurrency chat C FFI bindings" license = "BSD-3-Clause" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" edition = "2018" [dependencies] diff --git a/base_layer/common_types/Cargo.toml b/base_layer/common_types/Cargo.toml index c7fa39724c..3ca2cc61e3 100644 --- a/base_layer/common_types/Cargo.toml +++ b/base_layer/common_types/Cargo.toml @@ -3,13 +3,13 @@ name = "tari_common_types" authors = ["The Tari Development Community"] description = "Tari cryptocurrency common types" license = "BSD-3-Clause" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" edition = "2018" [dependencies] tari_crypto = { version = "0.21.0" } tari_utilities = { version = "0.8" } -tari_common = { path = "../../common", version = "1.7.0-pre.3" } +tari_common = { path = "../../common", version = "1.7.0-pre.4" } 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 b45e565e0d..0800f6716c 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.7.0-pre.3" +version = "1.7.0-pre.4" edition = "2018" [dependencies] -tari_common = { path = "../../common", version = "1.7.0-pre.3" } -tari_common_sqlite = { path = "../../common_sqlite", version = "1.7.0-pre.3" } -tari_common_types = { path = "../../base_layer/common_types", version = "1.7.0-pre.3" } -tari_comms = { path = "../../comms/core", version = "1.7.0-pre.3" } -tari_comms_dht = { path = "../../comms/dht", version = "1.7.0-pre.3" } +tari_common = { path = "../../common", version = "1.7.0-pre.4" } +tari_common_sqlite = { path = "../../common_sqlite", version = "1.7.0-pre.4" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.7.0-pre.4" } +tari_comms = { path = "../../comms/core", version = "1.7.0-pre.4" } +tari_comms_dht = { path = "../../comms/dht", version = "1.7.0-pre.4" } tari_crypto = { version = "0.21.0" } tari_max_size = { path = "../../infrastructure/max_size" } tari_p2p = { path = "../p2p", features = [ "auto-update", -], version = "1.7.0-pre.3" } -tari_service_framework = { path = "../service_framework", version = "1.7.0-pre.3" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.7.0-pre.3" } +], version = "1.7.0-pre.4" } +tari_service_framework = { path = "../service_framework", version = "1.7.0-pre.4" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.7.0-pre.4" } tari_utilities = { version = "0.8" } chrono = { version = "0.4.19", 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.7.0-pre.3" } +tari_common = { path = "../../common", version = "1.7.0-pre.4" } [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 fec17487d0..0b291c0f23 100644 --- a/base_layer/contacts/src/chat_client/Cargo.toml +++ b/base_layer/contacts/src/chat_client/Cargo.toml @@ -3,7 +3,7 @@ name = "tari_chat_client" authors = ["The Tari Development Community"] description = "Tari cucumber chat client" license = "BSD-3-Clause" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" edition = "2018" diff --git a/base_layer/core/Cargo.toml b/base_layer/core/Cargo.toml index acfe58d00f..364a0be3cb 100644 --- a/base_layer/core/Cargo.toml +++ b/base_layer/core/Cargo.toml @@ -6,7 +6,7 @@ repository = "https://github.com/tari-project/tari" homepage = "https://tari.com" readme = "README.md" license = "BSD-3-Clause" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" edition = "2018" [features] @@ -27,26 +27,26 @@ ledger = ["minotari_ledger_wallet_comms"] metrics = ["tari_metrics"] [dependencies] -minotari_ledger_wallet_comms = { path = "../../applications/minotari_ledger_wallet/comms", version = "1.7.0-pre.3", optional = true } -tari_common = { path = "../../common", version = "1.7.0-pre.3" } -tari_common_types = { path = "../../base_layer/common_types", version = "1.7.0-pre.3" } -tari_comms = { path = "../../comms/core", version = "1.7.0-pre.3" } -tari_comms_dht = { path = "../../comms/dht", version = "1.7.0-pre.3" } -tari_comms_rpc_macros = { path = "../../comms/rpc_macros", version = "1.7.0-pre.3" } +minotari_ledger_wallet_comms = { path = "../../applications/minotari_ledger_wallet/comms", version = "1.7.0-pre.4", optional = true } +tari_common = { path = "../../common", version = "1.7.0-pre.4" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.7.0-pre.4" } +tari_comms = { path = "../../comms/core", version = "1.7.0-pre.4" } +tari_comms_dht = { path = "../../comms/dht", version = "1.7.0-pre.4" } +tari_comms_rpc_macros = { path = "../../comms/rpc_macros", version = "1.7.0-pre.4" } tari_crypto = { version = "0.21.0", features = ["borsh"] } tari_max_size = { path = "../../infrastructure/max_size" } -tari_metrics = { path = "../../infrastructure/metrics", optional = true, version = "1.7.0-pre.3" } -tari_mmr = { path = "../../base_layer/mmr", optional = true, version = "1.7.0-pre.3" } -tari_p2p = { path = "../../base_layer/p2p", version = "1.7.0-pre.3" } -tari_script = { path = "../../infrastructure/tari_script", version = "1.7.0-pre.3" } -tari_service_framework = { path = "../service_framework", version = "1.7.0-pre.3" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.7.0-pre.3" } -tari_storage = { path = "../../infrastructure/storage", version = "1.7.0-pre.3" } -tari_test_utils = { path = "../../infrastructure/test_utils", version = "1.7.0-pre.3" } +tari_metrics = { path = "../../infrastructure/metrics", optional = true, version = "1.7.0-pre.4" } +tari_mmr = { path = "../../base_layer/mmr", optional = true, version = "1.7.0-pre.4" } +tari_p2p = { path = "../../base_layer/p2p", version = "1.7.0-pre.4" } +tari_script = { path = "../../infrastructure/tari_script", version = "1.7.0-pre.4" } +tari_service_framework = { path = "../service_framework", version = "1.7.0-pre.4" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.7.0-pre.4" } +tari_storage = { path = "../../infrastructure/storage", version = "1.7.0-pre.4" } +tari_test_utils = { path = "../../infrastructure/test_utils", version = "1.7.0-pre.4" } tari_utilities = { version = "0.8", features = ["borsh"] } tari_key_manager = { path = "../key_manager", features = [ "key_manager_service", -], version = "1.7.0-pre.3" } +], version = "1.7.0-pre.4" } tari_common_sqlite = { path = "../../common_sqlite" } tari_hashing = { path = "../../hashing" } @@ -110,8 +110,8 @@ serial_test = "0.5" [build-dependencies] tari_common = { path = "../../common", features = [ "build", -], version = "1.7.0-pre.3" } -tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.3" } +], version = "1.7.0-pre.4" } +tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.4" } [[bench]] name = "mempool" diff --git a/base_layer/core/src/consensus/consensus_constants.rs b/base_layer/core/src/consensus/consensus_constants.rs index b5235fd6d0..472bbe59e0 100644 --- a/base_layer/core/src/consensus/consensus_constants.rs +++ b/base_layer/core/src/consensus/consensus_constants.rs @@ -417,7 +417,7 @@ 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, }]; #[cfg(any(test, debug_assertions))] assert_hybrid_pow_constants(&consensus_constants, &[120], &[50], &[50]); @@ -483,7 +483,7 @@ 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, }]; #[cfg(any(test, debug_assertions))] assert_hybrid_pow_constants(&consensus_constants, &[target_time], &[randomx_split], &[sha3x_split]); @@ -540,7 +540,7 @@ 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, }]; #[cfg(any(test, debug_assertions))] assert_hybrid_pow_constants(&consensus_constants, &[120], &[50], &[50]); @@ -597,7 +597,7 @@ 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, }]; #[cfg(any(test, debug_assertions))] assert_hybrid_pow_constants(&consensus_constants, &[120], &[50], &[50]); @@ -617,7 +617,7 @@ impl ConsensusConstants { target_time: 240, }); let (input_version_range, output_version_range, kernel_version_range) = version_zero(); - let consensus_constants = vec![ConsensusConstants { + let con_1 = ConsensusConstants { effective_from_height: 0, coinbase_min_maturity: 360, blockchain_version: 0, @@ -649,7 +649,12 @@ impl ConsensusConstants { vn_registration_lock_height: 0, vn_registration_shuffle_interval: VnEpoch(100), coinbase_output_features_extra_max_length: 64, - }]; + }; + let mut con_2 = con_1.clone(); + con_2.effective_from_height = 33000; + con_2.coinbase_output_features_extra_max_length = 256; + + let consensus_constants = vec![con_1, con_2]; #[cfg(any(test, debug_assertions))] assert_hybrid_pow_constants(&consensus_constants, &[120], &[50], &[50]); consensus_constants @@ -701,7 +706,7 @@ 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, }]; #[cfg(any(test, debug_assertions))] assert_hybrid_pow_constants(&consensus_constants, &[120], &[50], &[50]); diff --git a/base_layer/core/src/transactions/transaction_components/output_features.rs b/base_layer/core/src/transactions/transaction_components/output_features.rs index 8eabe476e4..2927dfbb78 100644 --- a/base_layer/core/src/transactions/transaction_components/output_features.rs +++ b/base_layer/core/src/transactions/transaction_components/output_features.rs @@ -45,7 +45,7 @@ use crate::transactions::transaction_components::{ }; /// Coinbase outputs are allowed to have metadata, but it has the following length limit -pub type CoinBaseExtra = MaxSizeBytes<256>; +pub type CoinBaseExtra = MaxSizeBytes<258>; /// Options for UTXO's #[derive(Debug, Clone, Hash, PartialEq, Deserialize, Serialize, Eq, BorshSerialize, BorshDeserialize)] diff --git a/base_layer/core/tests/tests/block_validation.rs b/base_layer/core/tests/tests/block_validation.rs index 76ad5cd916..ded93b6355 100644 --- a/base_layer/core/tests/tests/block_validation.rs +++ b/base_layer/core/tests/tests/block_validation.rs @@ -874,7 +874,7 @@ async fn test_block_sync_body_validator() { ).await; // Coinbase extra field is too large - let extra = CoinBaseExtra::try_from(iter::repeat(1u8).take(65).collect::>()).unwrap(); + let extra = CoinBaseExtra::try_from(iter::repeat(1u8).take(257).collect::>()).unwrap(); let (template, _) = chain_block_with_new_coinbase( &genesis, vec![tx01.clone(), tx02.clone()], @@ -895,7 +895,7 @@ async fn test_block_sync_body_validator() { matches!( err, ValidationError::TransactionError(TransactionError::InvalidOutputFeaturesCoinbaseExtraSize{len, max }) if - len == 65 && max == max_len + len == 257 && max == max_len ), "{}", err diff --git a/base_layer/key_manager/Cargo.toml b/base_layer/key_manager/Cargo.toml index ccb135b1a5..b967120dc8 100644 --- a/base_layer/key_manager/Cargo.toml +++ b/base_layer/key_manager/Cargo.toml @@ -4,7 +4,7 @@ authors = ["The Tari Development Community"] description = "Tari cryptocurrency wallet key management" repository = "https://github.com/tari-project/tari" license = "BSD-3-Clause" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" edition = "2021" [lib] @@ -13,9 +13,9 @@ crate-type = ["lib", "cdylib"] [dependencies] tari_crypto = { version = "0.21.0" } tari_utilities = { version = "0.8" } -tari_common_sqlite = { path = "../../common_sqlite", version = "1.7.0-pre.3" } -tari_common_types = { path = "../../base_layer/common_types", version = "1.7.0-pre.3" } -tari_service_framework = { path = "../service_framework", version = "1.7.0-pre.3" } +tari_common_sqlite = { path = "../../common_sqlite", version = "1.7.0-pre.4" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.7.0-pre.4" } +tari_service_framework = { path = "../service_framework", version = "1.7.0-pre.4" } 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 c729dbc3d9..2316ba9d4e 100644 --- a/base_layer/mmr/Cargo.toml +++ b/base_layer/mmr/Cargo.toml @@ -4,7 +4,7 @@ authors = ["The Tari Development Community"] description = "A Merkle Mountain Range implementation" repository = "https://github.com/tari-project/tari" license = "BSD-3-Clause" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" edition = "2018" [features] diff --git a/base_layer/p2p/Cargo.toml b/base_layer/p2p/Cargo.toml index cdc436dfc4..a58c5b63b1 100644 --- a/base_layer/p2p/Cargo.toml +++ b/base_layer/p2p/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_p2p" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" 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.7.0-pre.3" } -tari_comms_dht = { path = "../../comms/dht", version = "1.7.0-pre.3" } -tari_common = { path = "../../common", version = "1.7.0-pre.3" } +tari_comms = { path = "../../comms/core", version = "1.7.0-pre.4" } +tari_comms_dht = { path = "../../comms/dht", version = "1.7.0-pre.4" } +tari_common = { path = "../../common", version = "1.7.0-pre.4" } tari_crypto = { version = "0.21.0" } -tari_service_framework = { path = "../service_framework", version = "1.7.0-pre.3" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.7.0-pre.3" } -tari_storage = { path = "../../infrastructure/storage", version = "1.7.0-pre.3" } +tari_service_framework = { path = "../service_framework", version = "1.7.0-pre.4" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.7.0-pre.4" } +tari_storage = { path = "../../infrastructure/storage", version = "1.7.0-pre.4" } tari_utilities = { version = "0.8" } anyhow = "1.0.53" @@ -52,7 +52,7 @@ tempfile = "3.1.0" [build-dependencies] tari_common = { path = "../../common", features = [ "build", -], version = "1.7.0-pre.3" } +], version = "1.7.0-pre.4" } [features] test-mocks = [] diff --git a/base_layer/service_framework/Cargo.toml b/base_layer/service_framework/Cargo.toml index 46d5b98723..201c7e9257 100644 --- a/base_layer/service_framework/Cargo.toml +++ b/base_layer/service_framework/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_service_framework" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" authors = ["The Tari Development Community"] description = "The Tari communication stack service framework" repository = "https://github.com/tari-project/tari" @@ -10,7 +10,7 @@ license = "BSD-3-Clause" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.7.0-pre.3" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.7.0-pre.4" } 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 be137c0090..8d8cf13997 100644 --- a/base_layer/tari_mining_helper_ffi/Cargo.toml +++ b/base_layer/tari_mining_helper_ffi/Cargo.toml @@ -3,7 +3,7 @@ name = "minotari_mining_helper_ffi" authors = ["The Tari Development Community"] description = "Tari cryptocurrency miningcore C FFI bindings" license = "BSD-3-Clause" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" 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.7.0-pre.3" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.7.0-pre.4" } 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.7.0-pre.3" } +tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.4" } 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 c4616ea4a6..e81a1cf6ac 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.7.0-pre.3" +version = "1.7.0-pre.4" edition = "2018" [dependencies] -tari_common = { path = "../../common", version = "1.7.0-pre.3" } -tari_common_sqlite = { path = "../../common_sqlite", version = "1.7.0-pre.3" } -tari_common_types = { path = "../../base_layer/common_types", version = "1.7.0-pre.3" } -tari_comms = { path = "../../comms/core", version = "1.7.0-pre.3" } -tari_comms_dht = { path = "../../comms/dht", version = "1.7.0-pre.3" } -tari_contacts = { path = "../../base_layer/contacts", version = "1.7.0-pre.3" } +tari_common = { path = "../../common", version = "1.7.0-pre.4" } +tari_common_sqlite = { path = "../../common_sqlite", version = "1.7.0-pre.4" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.7.0-pre.4" } +tari_comms = { path = "../../comms/core", version = "1.7.0-pre.4" } +tari_comms_dht = { path = "../../comms/dht", version = "1.7.0-pre.4" } +tari_contacts = { path = "../../base_layer/contacts", version = "1.7.0-pre.4" } tari_core = { path = "../../base_layer/core", default-features = false, features = [ "transactions", "mempool_proto", "base_node_proto", -], version = "1.7.0-pre.3" } +], version = "1.7.0-pre.4" } tari_crypto = { version = "0.21.0" } tari_max_size = { path = "../../infrastructure/max_size" } tari_key_manager = { path = "../key_manager", features = [ "key_manager_service", -], version = "1.7.0-pre.3" } +], version = "1.7.0-pre.4" } tari_p2p = { path = "../p2p", features = [ "auto-update", -], version = "1.7.0-pre.3" } -tari_script = { path = "../../infrastructure/tari_script", version = "1.7.0-pre.3" } -tari_service_framework = { path = "../service_framework", version = "1.7.0-pre.3" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.7.0-pre.3" } +], version = "1.7.0-pre.4" } +tari_script = { path = "../../infrastructure/tari_script", version = "1.7.0-pre.4" } +tari_service_framework = { path = "../service_framework", version = "1.7.0-pre.4" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.7.0-pre.4" } 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.7.0-pre.3" } +], version = "1.7.0-pre.4" } [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 0589061f1a..3b4418bd6e 100644 --- a/base_layer/wallet_ffi/Cargo.toml +++ b/base_layer/wallet_ffi/Cargo.toml @@ -3,7 +3,7 @@ name = "minotari_wallet_ffi" authors = ["The Tari Development Community"] description = "Tari cryptocurrency wallet C FFI bindings" license = "BSD-3-Clause" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" edition = "2018" [dependencies] @@ -67,7 +67,7 @@ tari_common = { path = "../../common", features = [ "build", "static-application-info", ] } -tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.3" } +tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.4" } [lints.rust] unexpected_cfgs = { level = "warn", check-cfg = [ diff --git a/changelog-development.md b/changelog-development.md index d62c017859..ac6b9dd765 100644 --- a/changelog-development.md +++ b/changelog-development.md @@ -2,6 +2,12 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [1.7.0-pre.4](https://github.com/tari-project/tari/compare/v1.7.0-pre.3...v1.7.0-pre.4) (2024-10-25) + +### Features + +* increase coinbase extra field max length + ## [1.7.0-pre.3](https://github.com/tari-project/tari/compare/v1.7.0-pre.2...v1.7.0-pre.3) (2024-10-18) diff --git a/changelog-nextnet.md b/changelog-nextnet.md index 7662c43115..123feca47b 100644 --- a/changelog-nextnet.md +++ b/changelog-nextnet.md @@ -2,6 +2,11 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. # Changelog +## [1.7.0-rc.4](https://github.com/tari-project/tari/compare/v1.7.0-rc.3...v1.7.0-rc.4) (2024-10-25) + +### Features + +* increase coinbase extra field max length ## [1.7.0-rc.3](https://github.com/tari-project/tari/compare/v1.7.0-rc.2...v1.7.0-rc.3) (2024-10-18) diff --git a/common/Cargo.toml b/common/Cargo.toml index 6710eec187..f4f863d81f 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -6,7 +6,7 @@ repository = "https://github.com/tari-project/tari" homepage = "https://tari.com" readme = "README.md" license = "BSD-3-Clause" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" edition = "2018" [features] @@ -14,7 +14,7 @@ build = ["toml", "prost-build"] static-application-info = ["git2"] [dependencies] -tari_features = { path = "./tari_features", version = "1.7.0-pre.3" } +tari_features = { path = "./tari_features", version = "1.7.0-pre.4" } 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.7.0-pre.3" } +tari_features = { path = "./tari_features", version = "1.7.0-pre.4" } [lints.rust] unexpected_cfgs = { level = "warn", check-cfg = [ diff --git a/common/tari_features/Cargo.toml b/common/tari_features/Cargo.toml index cced2b2281..bca14e4c31 100644 --- a/common/tari_features/Cargo.toml +++ b/common/tari_features/Cargo.toml @@ -6,7 +6,7 @@ repository = "https://github.com/tari-project/tari" homepage = "https://tari.com" readme = "README.md" license = "BSD-3-Clause" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" 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 ef80d4395e..fd4d5a436a 100644 --- a/common_sqlite/Cargo.toml +++ b/common_sqlite/Cargo.toml @@ -3,7 +3,7 @@ name = "tari_common_sqlite" authors = ["The Tari Development Community"] description = "Tari cryptocurrency wallet library" license = "BSD-3-Clause" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" 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 2df518b686..53885d9e3d 100644 --- a/comms/core/Cargo.toml +++ b/comms/core/Cargo.toml @@ -6,14 +6,14 @@ repository = "https://github.com/tari-project/tari" homepage = "https://tari.com" readme = "README.md" license = "BSD-3-Clause" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" edition = "2021" [dependencies] tari_crypto = { version = "0.21.0" } -tari_metrics = { path = "../../infrastructure/metrics", optional = true, version = "1.7.0-pre.3" } -tari_storage = { path = "../../infrastructure/storage", version = "1.7.0-pre.3" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.7.0-pre.3" } +tari_metrics = { path = "../../infrastructure/metrics", optional = true, version = "1.7.0-pre.4" } +tari_storage = { path = "../../infrastructure/storage", version = "1.7.0-pre.4" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.7.0-pre.4" } tari_utilities = { version = "0.8" } anyhow = "1.0.53" @@ -72,7 +72,7 @@ tempfile = "3.1.0" [build-dependencies] tari_common = { path = "../../common", features = [ "build", -], version = "1.7.0-pre.3" } +], version = "1.7.0-pre.4" } [features] c_integration = [] diff --git a/comms/dht/Cargo.toml b/comms/dht/Cargo.toml index 6fd8586aa5..d2e75f4d92 100644 --- a/comms/dht/Cargo.toml +++ b/comms/dht/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_comms_dht" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" authors = ["The Tari Development Community"] description = "Tari comms DHT module" repository = "https://github.com/tari-project/tari" @@ -10,14 +10,14 @@ license = "BSD-3-Clause" edition = "2021" [dependencies] -tari_comms = { path = "../core", features = ["rpc"], version = "1.7.0-pre.3" } -tari_common = { path = "../../common", version = "1.7.0-pre.3" } -tari_comms_rpc_macros = { path = "../rpc_macros", version = "1.7.0-pre.3" } +tari_comms = { path = "../core", features = ["rpc"], version = "1.7.0-pre.4" } +tari_common = { path = "../../common", version = "1.7.0-pre.4" } +tari_comms_rpc_macros = { path = "../rpc_macros", version = "1.7.0-pre.4" } tari_crypto = { version = "0.21.0" } tari_utilities = { version = "0.8" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.7.0-pre.3" } -tari_storage = { path = "../../infrastructure/storage", version = "1.7.0-pre.3" } -tari_common_sqlite = { path = "../../common_sqlite", version = "1.7.0-pre.3" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.7.0-pre.4" } +tari_storage = { path = "../../infrastructure/storage", version = "1.7.0-pre.4" } +tari_common_sqlite = { path = "../../common_sqlite", version = "1.7.0-pre.4" } anyhow = "1.0.53" bitflags = { version = "2.4", features = ["serde"] } @@ -67,7 +67,7 @@ clap = "3.2" [build-dependencies] -tari_common = { path = "../../common", version = "1.7.0-pre.3" } +tari_common = { path = "../../common", version = "1.7.0-pre.4" } [features] test-mocks = [] diff --git a/comms/rpc_macros/Cargo.toml b/comms/rpc_macros/Cargo.toml index c22ef3a661..2aeeec5758 100644 --- a/comms/rpc_macros/Cargo.toml +++ b/comms/rpc_macros/Cargo.toml @@ -6,7 +6,7 @@ repository = "https://github.com/tari-project/tari" homepage = "https://tari.com" readme = "README.md" license = "BSD-3-Clause" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" edition = "2018" [lib] diff --git a/hashing/Cargo.toml b/hashing/Cargo.toml index a55fbc3984..f86f46fffa 100644 --- a/hashing/Cargo.toml +++ b/hashing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_hashing" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" edition = "2021" description = "Tari hash domains" authors = ["The Tari Development Community"] diff --git a/infrastructure/derive/Cargo.toml b/infrastructure/derive/Cargo.toml index 64ad6f60e3..c0edcf2880 100644 --- a/infrastructure/derive/Cargo.toml +++ b/infrastructure/derive/Cargo.toml @@ -6,7 +6,7 @@ repository = "https://github.com/tari-project/tari" homepage = "https://tari.com" readme = "README.md" license = "BSD-3-Clause" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" edition = "2018" [lib] diff --git a/infrastructure/libtor/Cargo.toml b/infrastructure/libtor/Cargo.toml index 2da6372015..77a8e5dada 100644 --- a/infrastructure/libtor/Cargo.toml +++ b/infrastructure/libtor/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_libtor" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" edition = "2021" license = "BSD-3-Clause" diff --git a/infrastructure/max_size/Cargo.toml b/infrastructure/max_size/Cargo.toml index d039f52102..0a56779851 100644 --- a/infrastructure/max_size/Cargo.toml +++ b/infrastructure/max_size/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_max_size" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" 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 f2f2d913b1..14ac29e51a 100644 --- a/infrastructure/metrics/Cargo.toml +++ b/infrastructure/metrics/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tari_metrics" description = "Tari metrics" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" 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 1429d24504..9575357a9f 100644 --- a/infrastructure/shutdown/Cargo.toml +++ b/infrastructure/shutdown/Cargo.toml @@ -6,7 +6,7 @@ repository = "https://github.com/tari-project/tari" homepage = "https://tari.com" readme = "README.md" license = "BSD-3-Clause" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" 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 8140f0fa4e..ddc097b007 100644 --- a/infrastructure/storage/Cargo.toml +++ b/infrastructure/storage/Cargo.toml @@ -6,7 +6,7 @@ repository = "https://github.com/tari-project/tari" homepage = "https://tari.com" readme = "README.md" license = "BSD-3-Clause" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" edition = "2018" [dependencies] diff --git a/infrastructure/tari_script/Cargo.toml b/infrastructure/tari_script/Cargo.toml index f8d0354a7c..3f45525749 100644 --- a/infrastructure/tari_script/Cargo.toml +++ b/infrastructure/tari_script/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_script" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" 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 7ef4d9989d..9a10244ad5 100644 --- a/infrastructure/test_utils/Cargo.toml +++ b/infrastructure/test_utils/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tari_test_utils" description = "Utility functions used in Tari test functions" -version = "1.7.0-pre.3" +version = "1.7.0-pre.4" authors = ["The Tari Development Community"] edition = "2018" license = "BSD-3-Clause" @@ -9,8 +9,8 @@ license = "BSD-3-Clause" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tari_shutdown = { path = "../shutdown", version = "1.7.0-pre.3" } -tari_comms = { path = "../../comms/core", version = "1.7.0-pre.3" } +tari_shutdown = { path = "../shutdown", version = "1.7.0-pre.4" } +tari_comms = { path = "../../comms/core", version = "1.7.0-pre.4" } futures = { version = "^0.3.1" } rand = "0.8" diff --git a/package-lock.json b/package-lock.json index a9077f252f..e512a3cae5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "tari", - "version": "1.7.0-pre.3", + "version": "1.7.0-pre.4", "lockfileVersion": 2, "requires": true, "packages": {}