From 3ea8c1722f2c512c34ce8ac56eaac5cb0fdd54f1 Mon Sep 17 00:00:00 2001 From: SW van Heerden Date: Mon, 22 Apr 2024 14:57:41 +0200 Subject: [PATCH] chore: new release nextnet 1.0.0-rc.7 (#6302) Description --- New release for nextnet --- Cargo.lock | 62 +++++++++---------- applications/minotari_app_grpc/Cargo.toml | 4 +- .../minotari_app_utilities/Cargo.toml | 4 +- .../minotari_console_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 | 34 +++++----- .../comms_interface/inbound_handlers.rs | 10 ++- base_layer/core/src/blocks/block.rs | 28 ++++----- base_layer/core/src/proto/block.proto | 4 +- base_layer/core/src/proto/block.rs | 30 +++------ base_layer/key_manager/Cargo.toml | 8 +-- .../storage/sqlite_db/key_manager_state.rs | 26 +++----- base_layer/mmr/Cargo.toml | 4 +- 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 ++++----- .../wallet/src/storage/sqlite_db/wallet.rs | 12 +--- base_layer/wallet_ffi/Cargo.toml | 4 +- 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/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 +- 40 files changed, 179 insertions(+), 209 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6358fca2ea..7a3baa2cf3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3206,7 +3206,7 @@ dependencies = [ [[package]] name = "minotari_app_grpc" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "argon2", "base64 0.13.1", @@ -3234,7 +3234,7 @@ dependencies = [ [[package]] name = "minotari_app_utilities" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "clap 3.2.25", "dialoguer", @@ -3256,7 +3256,7 @@ dependencies = [ [[package]] name = "minotari_chat_ffi" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "cbindgen", "chrono", @@ -3281,7 +3281,7 @@ dependencies = [ [[package]] name = "minotari_console_wallet" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "blake2", "chrono", @@ -3336,7 +3336,7 @@ dependencies = [ [[package]] name = "minotari_merge_mining_proxy" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "anyhow", "bincode", @@ -3377,7 +3377,7 @@ dependencies = [ [[package]] name = "minotari_miner" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "base64 0.13.1", "borsh", @@ -3413,7 +3413,7 @@ dependencies = [ [[package]] name = "minotari_mining_helper_ffi" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "borsh", "cbindgen", @@ -3433,7 +3433,7 @@ dependencies = [ [[package]] name = "minotari_node" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "anyhow", "async-trait", @@ -3489,7 +3489,7 @@ dependencies = [ [[package]] name = "minotari_wallet" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "argon2", "async-trait", @@ -3539,7 +3539,7 @@ dependencies = [ [[package]] name = "minotari_wallet_ffi" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "borsh", "cbindgen", @@ -5935,7 +5935,7 @@ dependencies = [ [[package]] name = "tari_chat_client" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "anyhow", "async-trait", @@ -5961,7 +5961,7 @@ dependencies = [ [[package]] name = "tari_common" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "anyhow", "blake2", @@ -5988,7 +5988,7 @@ dependencies = [ [[package]] name = "tari_common_sqlite" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "diesel", "diesel_migrations", @@ -6002,7 +6002,7 @@ dependencies = [ [[package]] name = "tari_common_types" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "base64 0.21.5", "blake2", @@ -6024,7 +6024,7 @@ dependencies = [ [[package]] name = "tari_comms" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "anyhow", "async-trait", @@ -6073,7 +6073,7 @@ dependencies = [ [[package]] name = "tari_comms_dht" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "anyhow", "bitflags 2.4.1", @@ -6117,7 +6117,7 @@ dependencies = [ [[package]] name = "tari_comms_rpc_macros" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "futures 0.3.29", "proc-macro2", @@ -6132,7 +6132,7 @@ dependencies = [ [[package]] name = "tari_contacts" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "chrono", "diesel", @@ -6165,7 +6165,7 @@ dependencies = [ [[package]] name = "tari_core" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "async-trait", "bincode", @@ -6262,11 +6262,11 @@ dependencies = [ [[package]] name = "tari_features" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" [[package]] name = "tari_hashing" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "blake2", "borsh", @@ -6324,7 +6324,7 @@ dependencies = [ [[package]] name = "tari_key_manager" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "argon2", "async-trait", @@ -6359,7 +6359,7 @@ dependencies = [ [[package]] name = "tari_libtor" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "derivative", "libtor", @@ -6374,7 +6374,7 @@ dependencies = [ [[package]] name = "tari_metrics" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "anyhow", "futures 0.3.29", @@ -6389,7 +6389,7 @@ dependencies = [ [[package]] name = "tari_mmr" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "bincode", "blake2", @@ -6408,7 +6408,7 @@ dependencies = [ [[package]] name = "tari_p2p" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "anyhow", "clap 3.2.25", @@ -6444,7 +6444,7 @@ dependencies = [ [[package]] name = "tari_script" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "blake2", "borsh", @@ -6461,7 +6461,7 @@ dependencies = [ [[package]] name = "tari_service_framework" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "anyhow", "async-trait", @@ -6478,7 +6478,7 @@ dependencies = [ [[package]] name = "tari_shutdown" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "futures 0.3.29", "tokio", @@ -6486,7 +6486,7 @@ dependencies = [ [[package]] name = "tari_storage" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "bincode", "lmdb-zero", @@ -6499,7 +6499,7 @@ dependencies = [ [[package]] name = "tari_test_utils" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" dependencies = [ "futures 0.3.29", "futures-test", diff --git a/applications/minotari_app_grpc/Cargo.toml b/applications/minotari_app_grpc/Cargo.toml index 8a24212ac6..e3dcffe824 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.0.0-pre.12" +version = "1.0.0-rc.7" edition = "2018" [dependencies] @@ -31,7 +31,7 @@ tonic = { version = "0.8.3", features = ["tls"]} zeroize = "1" [build-dependencies] -tari_features = { path = "../../common/tari_features", version = "1.0.0-pre.12" } +tari_features = { path = "../../common/tari_features", version = "1.0.0-rc.7" } tonic-build = "0.8.4" [package.metadata.cargo-machete] diff --git a/applications/minotari_app_utilities/Cargo.toml b/applications/minotari_app_utilities/Cargo.toml index 14526ae40a..321b60cabd 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.0.0-pre.12" +version = "1.0.0-rc.7" authors = ["The Tari Development Community"] edition = "2018" license = "BSD-3-Clause" @@ -26,7 +26,7 @@ tonic = "0.8.3" [build-dependencies] tari_common = { path = "../../common", features = ["build", "static-application-info"] } -tari_features = { path = "../../common/tari_features", version = "1.0.0-pre.12" } +tari_features = { path = "../../common/tari_features", version = "1.0.0-rc.7" } [features] miner_input = ["minotari_app_grpc"] diff --git a/applications/minotari_console_wallet/Cargo.toml b/applications/minotari_console_wallet/Cargo.toml index cfaa0dcf43..838ea34995 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.0.0-pre.12" +version = "1.0.0-rc.7" authors = ["The Tari Development Community"] edition = "2018" license = "BSD-3-Clause" @@ -83,7 +83,7 @@ default-features = false features = ["crossterm"] [build-dependencies] -tari_features = { path = "../../common/tari_features", version = "1.0.0-pre.12" } +tari_features = { path = "../../common/tari_features", version = "1.0.0-rc.7" } [features] default = ["libtor"] diff --git a/applications/minotari_merge_mining_proxy/Cargo.toml b/applications/minotari_merge_mining_proxy/Cargo.toml index 61dddffbee..c441a9f0d0 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.0.0-pre.12" +version = "1.0.0-rc.7" edition = "2018" [features] @@ -47,7 +47,7 @@ url = "2.1.1" scraper = "0.19.0" [build-dependencies] -tari_features = { path = "../../common/tari_features", version = "1.0.0-pre.12"} +tari_features = { path = "../../common/tari_features", version = "1.0.0-rc.7"} [dev-dependencies] markup5ever = "0.11.0" \ No newline at end of file diff --git a/applications/minotari_miner/Cargo.toml b/applications/minotari_miner/Cargo.toml index d6138485c9..0097b5e6bb 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.0.0-pre.12" +version = "1.0.0-rc.7" edition = "2018" [dependencies] diff --git a/applications/minotari_node/Cargo.toml b/applications/minotari_node/Cargo.toml index 7f2aaf27d2..6d9e12d701 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.0.0-pre.12" +version = "1.0.0-rc.7" edition = "2018" [dependencies] @@ -24,7 +24,7 @@ tari_shutdown = { path = "../../infrastructure/shutdown" } tari_utilities = { version = "0.7" } tari_key_manager = { path = "../../base_layer/key_manager", features = [ "key_manager_service", -], version = "1.0.0-pre.12" } +], version = "1.0.0-rc.7" } anyhow = "1.0.53" async-trait = "0.1.52" @@ -61,7 +61,7 @@ safe = [] libtor = ["tari_libtor"] [build-dependencies] -tari_features = { path = "../../common/tari_features", version = "1.0.0-pre.12"} +tari_features = { path = "../../common/tari_features", version = "1.0.0-rc.7"} [package.metadata.cargo-machete] ignored = [ diff --git a/base_layer/chat_ffi/Cargo.toml b/base_layer/chat_ffi/Cargo.toml index 82a39945a8..361f433033 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.0.0-pre.12" +version = "1.0.0-rc.7" edition = "2018" [dependencies] diff --git a/base_layer/common_types/Cargo.toml b/base_layer/common_types/Cargo.toml index 763f0903f6..655c17d4ae 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.0.0-pre.12" +version = "1.0.0-rc.7" edition = "2018" [dependencies] tari_crypto = { version = "0.20" } tari_utilities = { version = "0.7" } -tari_common = { path = "../../common", version = "1.0.0-pre.12" } +tari_common = { path = "../../common", version = "1.0.0-rc.7" } chacha20poly1305 = "0.10.1" diff --git a/base_layer/contacts/Cargo.toml b/base_layer/contacts/Cargo.toml index 3dac4179b6..78b34f4c1c 100644 --- a/base_layer/contacts/Cargo.toml +++ b/base_layer/contacts/Cargo.toml @@ -3,19 +3,19 @@ name = "tari_contacts" authors = ["The Tari Development Community"] description = "Tari contacts library" license = "BSD-3-Clause" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" edition = "2018" [dependencies] -tari_common = { path = "../../common", version = "1.0.0-pre.12" } -tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-pre.12" } -tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-pre.12" } -tari_comms = { path = "../../comms/core", version = "1.0.0-pre.12" } -tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-pre.12" } +tari_common = { path = "../../common", version = "1.0.0-rc.7" } +tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-rc.7" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-rc.7" } +tari_comms = { path = "../../comms/core", version = "1.0.0-rc.7" } +tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-rc.7" } tari_crypto = { version = "0.20" } -tari_p2p = { path = "../p2p", features = ["auto-update"], version = "1.0.0-pre.12" } -tari_service_framework = { path = "../service_framework", version = "1.0.0-pre.12" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-pre.12" } +tari_p2p = { path = "../p2p", features = ["auto-update"], version = "1.0.0-rc.7" } +tari_service_framework = { path = "../service_framework", version = "1.0.0-rc.7" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-rc.7" } tari_utilities = { version = "0.7" } chrono = { version = "0.4.19", default-features = false, features = ["serde"] } @@ -40,7 +40,7 @@ tari_test_utils = { path = "../../infrastructure/test_utils" } tempfile = "3.1.0" [build-dependencies] -tari_common = { path = "../../common", version = "1.0.0-pre.12" } +tari_common = { path = "../../common", version = "1.0.0-rc.7" } [package.metadata.cargo-machete] ignored = ["prost"] # this is so we can run cargo machete without getting false positive about macro dependancies diff --git a/base_layer/contacts/src/chat_client/Cargo.toml b/base_layer/contacts/src/chat_client/Cargo.toml index 9c86f3e8ea..6201f51ba2 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.0.0-pre.12" +version = "1.0.0-rc.7" edition = "2018" diff --git a/base_layer/core/Cargo.toml b/base_layer/core/Cargo.toml index 6d249efd68..899b3798f5 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.0.0-pre.12" +version = "1.0.0-rc.7" edition = "2018" [features] @@ -30,24 +30,24 @@ ledger = [ metrics = ["tari_metrics"] [dependencies] -tari_common = { path = "../../common", version = "1.0.0-pre.12" } -tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-pre.12" } -tari_comms = { path = "../../comms/core", version = "1.0.0-pre.12" } -tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-pre.12" } -tari_comms_rpc_macros = { path = "../../comms/rpc_macros", version = "1.0.0-pre.12" } +tari_common = { path = "../../common", version = "1.0.0-rc.7" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-rc.7" } +tari_comms = { path = "../../comms/core", version = "1.0.0-rc.7" } +tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-rc.7" } +tari_comms_rpc_macros = { path = "../../comms/rpc_macros", version = "1.0.0-rc.7" } tari_crypto = { version = "0.20", features = ["borsh"] } -tari_metrics = { path = "../../infrastructure/metrics", optional = true, version = "1.0.0-pre.12" } -tari_mmr = { path = "../../base_layer/mmr", optional = true , version = "1.0.0-pre.12"} -tari_p2p = { path = "../../base_layer/p2p", version = "1.0.0-pre.12" } -tari_script = { path = "../../infrastructure/tari_script", version = "1.0.0-pre.12" } -tari_service_framework = { path = "../service_framework", version = "1.0.0-pre.12" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-pre.12" } -tari_storage = { path = "../../infrastructure/storage", version = "1.0.0-pre.12" } -tari_test_utils = { path = "../../infrastructure/test_utils", version = "1.0.0-pre.12" } +tari_metrics = { path = "../../infrastructure/metrics", optional = true, version = "1.0.0-rc.7" } +tari_mmr = { path = "../../base_layer/mmr", optional = true , version = "1.0.0-rc.7"} +tari_p2p = { path = "../../base_layer/p2p", version = "1.0.0-rc.7" } +tari_script = { path = "../../infrastructure/tari_script", version = "1.0.0-rc.7" } +tari_service_framework = { path = "../service_framework", version = "1.0.0-rc.7" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-rc.7" } +tari_storage = { path = "../../infrastructure/storage", version = "1.0.0-rc.7" } +tari_test_utils = { path = "../../infrastructure/test_utils", version = "1.0.0-rc.7" } tari_utilities = { version = "0.7", features = ["borsh"] } tari_key_manager = { path = "../key_manager", features = [ "key_manager_service", -], version = "1.0.0-pre.12" } +], version = "1.0.0-rc.7" } tari_common_sqlite = { path = "../../common_sqlite" } tari_hashing = { path = "../../hashing" } @@ -110,8 +110,8 @@ toml = { version = "0.5" } quickcheck = "1.0" [build-dependencies] -tari_common = { path = "../../common", features = ["build"], version = "1.0.0-pre.12" } -tari_features = { path = "../../common/tari_features", version = "1.0.0-pre.12" } +tari_common = { path = "../../common", features = ["build"], version = "1.0.0-rc.7" } +tari_features = { path = "../../common/tari_features", version = "1.0.0-rc.7" } [[bench]] name = "mempool" diff --git a/base_layer/core/src/base_node/comms_interface/inbound_handlers.rs b/base_layer/core/src/base_node/comms_interface/inbound_handlers.rs index 67107418d1..727df42046 100644 --- a/base_layer/core/src/base_node/comms_interface/inbound_handlers.rs +++ b/base_layer/core/src/base_node/comms_interface/inbound_handlers.rs @@ -594,16 +594,15 @@ where B: BlockchainBackend + 'static ) -> Result { let NewBlock { header, - coinbase_kernels, - coinbase_outputs, + coinbase_kernel, + coinbase_output, kernel_excess_sigs: excess_sigs, } = new_block; // If the block is empty, we dont have to ask for the block, as we already have the full block available // to us. if excess_sigs.is_empty() { let block = BlockBuilder::new(header.version) - .add_outputs(coinbase_outputs) - .add_kernels(coinbase_kernels) + .with_coinbase_utxo(coinbase_output, coinbase_kernel) .with_header(header) .build(); return Ok(block); @@ -640,8 +639,7 @@ where B: BlockchainBackend + 'static metrics::compact_block_tx_misses(header.height).set(missing_excess_sigs.len() as i64); let mut builder = BlockBuilder::new(header.version) - .add_outputs(coinbase_outputs) - .add_kernels(coinbase_kernels) + .with_coinbase_utxo(coinbase_output, coinbase_kernel) .with_transactions(known_transactions); if missing_excess_sigs.is_empty() { diff --git a/base_layer/core/src/blocks/block.rs b/base_layer/core/src/blocks/block.rs index a3fb89bc25..ccb16c7c81 100644 --- a/base_layer/core/src/blocks/block.rs +++ b/base_layer/core/src/blocks/block.rs @@ -247,34 +247,34 @@ pub struct NewBlock { /// The block header. pub header: BlockHeader, /// Coinbase kernel of the block - pub coinbase_kernels: Vec, + pub coinbase_kernel: TransactionKernel, /// Coinbase output of the block - pub coinbase_outputs: Vec, + pub coinbase_output: TransactionOutput, /// The scalar `s` component of the kernel excess signatures of the transactions contained in the block. pub kernel_excess_sigs: Vec, } impl From<&Block> for NewBlock { fn from(block: &Block) -> Self { - let coinbase_kernels = block + let coinbase_kernel = block .body .kernels() - .clone() - .into_iter() - .filter(|k| k.features.contains(KernelFeatures::COINBASE_KERNEL)) - .collect(); - let coinbase_outputs = block + .iter() + .find(|k| k.features.contains(KernelFeatures::COINBASE_KERNEL)) + .cloned() + .expect("Invalid block given to NewBlock::from, no coinbase kernel"); + let coinbase_output = block .body .outputs() - .clone() - .into_iter() - .filter(|o| o.features.output_type == OutputType::Coinbase) - .collect(); + .iter() + .find(|o| o.features.output_type == OutputType::Coinbase) + .cloned() + .expect("Invalid block given to NewBlock::from, no coinbase output"); Self { header: block.header.clone(), - coinbase_kernels, - coinbase_outputs, + coinbase_kernel, + coinbase_output, kernel_excess_sigs: block .body .kernels() diff --git a/base_layer/core/src/proto/block.proto b/base_layer/core/src/proto/block.proto index 9636958120..db062262bb 100644 --- a/base_layer/core/src/proto/block.proto +++ b/base_layer/core/src/proto/block.proto @@ -73,9 +73,9 @@ message NewBlock { // The block header. BlockHeader header = 1; // Coinbase kernel of the block. - repeated tari.types.TransactionKernel coinbase_kernels = 2; + tari.types.TransactionKernel coinbase_kernel = 2; // Coinbase output of the block. - repeated tari.types.TransactionOutput coinbase_outputs = 3; + tari.types.TransactionOutput coinbase_output = 3; // The scalar `s` component of the kernel excess signatures of the transactions contained in the block. repeated bytes kernel_excess_sigs = 4; } diff --git a/base_layer/core/src/proto/block.rs b/base_layer/core/src/proto/block.rs index b891538799..8118d1f083 100644 --- a/base_layer/core/src/proto/block.rs +++ b/base_layer/core/src/proto/block.rs @@ -184,18 +184,16 @@ impl TryFrom for NewBlock { type Error = String; fn try_from(new_block: proto::NewBlock) -> Result { - let mut coinbase_kernels = Vec::new(); - for coinbase_kernel in new_block.coinbase_kernels { - coinbase_kernels.push(coinbase_kernel.try_into()?) - } - let mut coinbase_outputs = Vec::new(); - for coinbase_output in new_block.coinbase_outputs { - coinbase_outputs.push(coinbase_output.try_into()?) - } Ok(Self { header: new_block.header.ok_or("No new block header provided")?.try_into()?, - coinbase_kernels, - coinbase_outputs, + coinbase_kernel: new_block + .coinbase_kernel + .ok_or("No coinbase kernel given")? + .try_into()?, + coinbase_output: new_block + .coinbase_output + .ok_or("No coinbase kernel given")? + .try_into()?, kernel_excess_sigs: new_block .kernel_excess_sigs .iter() @@ -210,18 +208,10 @@ impl TryFrom for proto::NewBlock { type Error = String; fn try_from(new_block: NewBlock) -> Result { - let mut coinbase_kernels = Vec::new(); - for coinbase_kernel in new_block.coinbase_kernels { - coinbase_kernels.push(coinbase_kernel.into()) - } - let mut coinbase_outputs = Vec::new(); - for coinbase_output in new_block.coinbase_outputs { - coinbase_outputs.push(coinbase_output.try_into()?) - } Ok(Self { header: Some(new_block.header.into()), - coinbase_kernels, - coinbase_outputs, + coinbase_kernel: Some(new_block.coinbase_kernel.into()), + coinbase_output: Some(new_block.coinbase_output.try_into()?), kernel_excess_sigs: new_block.kernel_excess_sigs.into_iter().map(|s| s.to_vec()).collect(), }) } diff --git a/base_layer/key_manager/Cargo.toml b/base_layer/key_manager/Cargo.toml index 176b2ea0a5..00da1f61db 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.0.0-pre.12" +version = "1.0.0-rc.7" edition = "2021" [lib] @@ -13,9 +13,9 @@ crate-type = ["lib", "cdylib"] [dependencies] tari_crypto = { version = "0.20" } tari_utilities = { version = "0.7" } -tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-pre.12" } -tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-pre.12"} -tari_service_framework = { path = "../service_framework", version = "1.0.0-pre.12" } +tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-rc.7" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-rc.7"} +tari_service_framework = { path = "../service_framework", version = "1.0.0-rc.7" } async-trait = {version = "0.1.50"} chrono = { version = "0.4.19", default-features = false, features = ["serde"] } diff --git a/base_layer/key_manager/src/key_manager_service/storage/sqlite_db/key_manager_state.rs b/base_layer/key_manager/src/key_manager_service/storage/sqlite_db/key_manager_state.rs index be569018c5..888744edb3 100644 --- a/base_layer/key_manager/src/key_manager_service/storage/sqlite_db/key_manager_state.rs +++ b/base_layer/key_manager/src/key_manager_service/storage/sqlite_db/key_manager_state.rs @@ -27,7 +27,7 @@ use chrono::{NaiveDateTime, Utc}; use diesel::{prelude::*, SqliteConnection}; use tari_common_sqlite::util::diesel_ext::ExpectedRowsExtension; use tari_common_types::encryption::{decrypt_bytes_integral_nonce, encrypt_bytes_integral_nonce}; -use tari_utilities::{ByteArray, Hidden}; +use tari_utilities::Hidden; use crate::{ key_manager_service::{ @@ -147,15 +147,9 @@ impl KeyManagerStateSql { impl Encryptable for KeyManagerStateSql { fn domain(&self, field_name: &'static str) -> Vec { - // Because there are two variable-length inputs in the concatenation, we prepend the length of the first - [ - Self::KEY_MANAGER, - (self.branch_seed.len() as u64).to_le_bytes().as_bytes(), - self.branch_seed.as_bytes(), - field_name.as_bytes(), - ] - .concat() - .to_vec() + [Self::KEY_MANAGER, self.branch_seed.as_bytes(), field_name.as_bytes()] + .concat() + .to_vec() } fn encrypt(mut self, cipher: &XChaCha20Poly1305) -> Result { @@ -178,15 +172,9 @@ impl Encryptable for KeyManagerStateSql { impl Encryptable for NewKeyManagerStateSql { fn domain(&self, field_name: &'static str) -> Vec { - // Because there are two variable-length inputs in the concatenation, we prepend the length of the first - [ - Self::KEY_MANAGER, - (self.branch_seed.len() as u64).to_le_bytes().as_bytes(), - self.branch_seed.as_bytes(), - field_name.as_bytes(), - ] - .concat() - .to_vec() + [Self::KEY_MANAGER, self.branch_seed.as_bytes(), field_name.as_bytes()] + .concat() + .to_vec() } fn encrypt(mut self, cipher: &XChaCha20Poly1305) -> Result { diff --git a/base_layer/mmr/Cargo.toml b/base_layer/mmr/Cargo.toml index 39f45b9eda..8473965da5 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.0.0-pre.12" +version = "1.0.0-rc.7" edition = "2018" [features] @@ -13,7 +13,7 @@ default = [] [dependencies] tari_utilities = { version = "0.7" } tari_crypto = { version = "0.20" } -tari_common = { path = "../../common", version = "1.0.0-pre.12" } +tari_common = { path = "../../common", version = "1.0.0-rc.7" } thiserror = "1.0" borsh = "1.2" digest = "0.10" diff --git a/base_layer/p2p/Cargo.toml b/base_layer/p2p/Cargo.toml index 5ef7e13095..66fd012184 100644 --- a/base_layer/p2p/Cargo.toml +++ b/base_layer/p2p/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_p2p" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" authors = ["The Tari Development community"] description = "Tari base layer-specific peer-to-peer communication features" repository = "https://github.com/tari-project/tari" @@ -10,13 +10,13 @@ license = "BSD-3-Clause" edition = "2018" [dependencies] -tari_comms = { path = "../../comms/core", version = "1.0.0-pre.12" } -tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-pre.12" } -tari_common = { path = "../../common", version = "1.0.0-pre.12" } +tari_comms = { path = "../../comms/core", version = "1.0.0-rc.7" } +tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-rc.7" } +tari_common = { path = "../../common", version = "1.0.0-rc.7" } tari_crypto = { version = "0.20" } -tari_service_framework = { path = "../service_framework", version = "1.0.0-pre.12" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-pre.12" } -tari_storage = { path = "../../infrastructure/storage", version = "1.0.0-pre.12" } +tari_service_framework = { path = "../service_framework", version = "1.0.0-rc.7" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-rc.7" } +tari_storage = { path = "../../infrastructure/storage", version = "1.0.0-rc.7" } tari_utilities = { version = "0.7" } anyhow = "1.0.53" @@ -46,7 +46,7 @@ clap = "3.2" tempfile = "3.1.0" [build-dependencies] -tari_common = { path = "../../common", features = ["build"], version = "1.0.0-pre.12" } +tari_common = { path = "../../common", features = ["build"], version = "1.0.0-rc.7" } [features] test-mocks = [] diff --git a/base_layer/service_framework/Cargo.toml b/base_layer/service_framework/Cargo.toml index 22e120cd9c..209b9c779c 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.0.0-pre.12" +version = "1.0.0-rc.7" 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.0.0-pre.12" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-rc.7" } 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 b6ce3ba242..4776f2c980 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.0.0-pre.12" +version = "1.0.0-rc.7" edition = "2018" [dependencies] @@ -11,7 +11,7 @@ tari_comms = { path = "../../comms/core" } tari_crypto = { version = "0.20" } tari_common = { path = "../../common" } tari_core = { path = "../core", default-features = false, features = ["transactions", "base_node_proto", "base_node"] } -tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-pre.12" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-rc.7" } tari_utilities = { version = "0.7" } libc = "0.2.65" thiserror = "1.0.26" @@ -24,7 +24,7 @@ tari_core = { path = "../core", features = ["transactions", "base_node"] } rand = "0.8" [build-dependencies] -tari_features = { path = "../../common/tari_features", version = "1.0.0-pre.12" } +tari_features = { path = "../../common/tari_features", version = "1.0.0-rc.7" } cbindgen = "0.24.3" tari_common = { path = "../../common", features = ["build", "static-application-info"] } diff --git a/base_layer/wallet/Cargo.toml b/base_layer/wallet/Cargo.toml index a7271446eb..37af63edfb 100644 --- a/base_layer/wallet/Cargo.toml +++ b/base_layer/wallet/Cargo.toml @@ -3,24 +3,24 @@ name = "minotari_wallet" authors = ["The Tari Development Community"] description = "Tari cryptocurrency wallet library" license = "BSD-3-Clause" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" edition = "2018" [dependencies] -tari_core = { path = "../../base_layer/core", default-features = false, features = ["transactions", "mempool_proto", "base_node_proto"], version = "1.0.0-pre.12" } -tari_common = { path = "../../common", version = "1.0.0-pre.12" } -tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-pre.12" } -tari_comms = { path = "../../comms/core", version = "1.0.0-pre.12" } -tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-pre.12" } +tari_core = { path = "../../base_layer/core", default-features = false, features = ["transactions", "mempool_proto", "base_node_proto"], version = "1.0.0-rc.7" } +tari_common = { path = "../../common", version = "1.0.0-rc.7" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-rc.7" } +tari_comms = { path = "../../comms/core", version = "1.0.0-rc.7" } +tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-rc.7" } tari_crypto = { version = "0.20" } -tari_key_manager = { path = "../key_manager", features = ["key_manager_service"], version = "1.0.0-pre.12" } -tari_p2p = { path = "../p2p", features = ["auto-update"], version = "1.0.0-pre.12"} -tari_script = { path = "../../infrastructure/tari_script", version = "1.0.0-pre.12" } -tari_service_framework = { path = "../service_framework", version = "1.0.0-pre.12" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-pre.12" } -tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-pre.12" } +tari_key_manager = { path = "../key_manager", features = ["key_manager_service"], version = "1.0.0-rc.7" } +tari_p2p = { path = "../p2p", features = ["auto-update"], version = "1.0.0-rc.7"} +tari_script = { path = "../../infrastructure/tari_script", version = "1.0.0-rc.7" } +tari_service_framework = { path = "../service_framework", version = "1.0.0-rc.7" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-rc.7" } +tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-rc.7" } tari_utilities = { version = "0.7" } -tari_contacts = { path = "../../base_layer/contacts", version = "1.0.0-pre.12" } +tari_contacts = { path = "../../base_layer/contacts", version = "1.0.0-rc.7" } # Uncomment for tokio tracing via tokio-console (needs "tracing" features) #console-subscriber = "0.1.3" @@ -57,7 +57,7 @@ chacha20poly1305 = "0.10.1" zeroize = "1" [build-dependencies] -tari_common = { path = "../../common", features = ["build", "static-application-info"], version = "1.0.0-pre.12" } +tari_common = { path = "../../common", features = ["build", "static-application-info"], version = "1.0.0-rc.7" } [dev-dependencies] tari_p2p = { path = "../p2p", features = ["test-mocks"] } diff --git a/base_layer/wallet/src/storage/sqlite_db/wallet.rs b/base_layer/wallet/src/storage/sqlite_db/wallet.rs index 74b073b711..5be73d2888 100644 --- a/base_layer/wallet/src/storage/sqlite_db/wallet.rs +++ b/base_layer/wallet/src/storage/sqlite_db/wallet.rs @@ -954,15 +954,9 @@ impl ClientKeyValueSql { impl Encryptable for ClientKeyValueSql { fn domain(&self, field_name: &'static str) -> Vec { - // Because there are two variable-length inputs in the concatenation, we prepend the length of the first - [ - Self::CLIENT_KEY_VALUE, - (self.key.len() as u64).to_le_bytes().as_bytes(), - self.key.as_bytes(), - field_name.as_bytes(), - ] - .concat() - .to_vec() + [Self::CLIENT_KEY_VALUE, self.key.as_bytes(), field_name.as_bytes()] + .concat() + .to_vec() } #[allow(unused_assignments)] diff --git a/base_layer/wallet_ffi/Cargo.toml b/base_layer/wallet_ffi/Cargo.toml index 351150511e..0368b7f221 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.0.0-pre.12" +version = "1.0.0-rc.7" edition = "2018" [dependencies] @@ -54,4 +54,4 @@ borsh = "1.2" [build-dependencies] cbindgen = "0.24.3" tari_common = { path = "../../common", features = ["build", "static-application-info"] } -tari_features = { path = "../../common/tari_features", version = "1.0.0-pre.12" } +tari_features = { path = "../../common/tari_features", version = "1.0.0-rc.7" } diff --git a/common/Cargo.toml b/common/Cargo.toml index 18c0b1dd51..6257e2f05a 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.0.0-pre.12" +version = "1.0.0-rc.7" edition = "2018" [features] @@ -15,7 +15,7 @@ static-application-info = ["git2"] [dependencies] tari_crypto = { version = "0.20" } -tari_features = { path = "./tari_features", version = "1.0.0-pre.12"} +tari_features = { path = "./tari_features", version = "1.0.0-rc.7"} anyhow = "1.0.53" blake2 = "0.10" @@ -41,4 +41,4 @@ tari_test_utils = { path = "../infrastructure/test_utils"} toml = "0.5.8" [build-dependencies] -tari_features = { path = "./tari_features", version = "1.0.0-pre.12"} +tari_features = { path = "./tari_features", version = "1.0.0-rc.7"} diff --git a/common/tari_features/Cargo.toml b/common/tari_features/Cargo.toml index 7457ac089a..f4f584125e 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.0.0-pre.12" +version = "1.0.0-rc.7" 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 b482a5df19..90fe74bd2a 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.0.0-pre.12" +version = "1.0.0-rc.7" 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 14e6a0aa47..f6e783f611 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.0.0-pre.12" +version = "1.0.0-rc.7" edition = "2018" [dependencies] tari_crypto = { version = "0.20" } -tari_metrics = { path = "../../infrastructure/metrics", optional = true, version = "1.0.0-pre.12" } -tari_storage = { path = "../../infrastructure/storage", version = "1.0.0-pre.12" } -tari_shutdown = { path = "../../infrastructure/shutdown" , version = "1.0.0-pre.12"} +tari_metrics = { path = "../../infrastructure/metrics", optional = true, version = "1.0.0-rc.7" } +tari_storage = { path = "../../infrastructure/storage", version = "1.0.0-rc.7" } +tari_shutdown = { path = "../../infrastructure/shutdown" , version = "1.0.0-rc.7"} tari_utilities = { version = "0.7" } anyhow = "1.0.53" @@ -58,7 +58,7 @@ serde_json = "1.0.39" tempfile = "3.1.0" [build-dependencies] -tari_common = { path = "../../common", features = ["build"], version = "1.0.0-pre.12" } +tari_common = { path = "../../common", features = ["build"], version = "1.0.0-rc.7" } [features] c_integration = [] diff --git a/comms/dht/Cargo.toml b/comms/dht/Cargo.toml index 909b6d5719..2d75c84567 100644 --- a/comms/dht/Cargo.toml +++ b/comms/dht/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_comms_dht" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" 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 = "2018" [dependencies] -tari_comms = { path = "../core", features = ["rpc"], version = "1.0.0-pre.12" } -tari_common = { path = "../../common", version = "1.0.0-pre.12" } -tari_comms_rpc_macros = { path = "../rpc_macros" , version = "1.0.0-pre.12"} +tari_comms = { path = "../core", features = ["rpc"], version = "1.0.0-rc.7" } +tari_common = { path = "../../common", version = "1.0.0-rc.7" } +tari_comms_rpc_macros = { path = "../rpc_macros" , version = "1.0.0-rc.7"} tari_crypto = { version = "0.20" } tari_utilities = { version = "0.7" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-pre.12" } -tari_storage = { path = "../../infrastructure/storage", version = "1.0.0-pre.12" } -tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-pre.12" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-rc.7" } +tari_storage = { path = "../../infrastructure/storage", version = "1.0.0-rc.7" } +tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-rc.7" } anyhow = "1.0.53" bitflags = { version = "2.4", features = ["serde"] } @@ -62,7 +62,7 @@ clap = "3.2" [build-dependencies] -tari_common = { path = "../../common", version = "1.0.0-pre.12" } +tari_common = { path = "../../common", version = "1.0.0-rc.7" } [features] test-mocks = [] diff --git a/comms/rpc_macros/Cargo.toml b/comms/rpc_macros/Cargo.toml index c062c61c91..c6857fd0cb 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.0.0-pre.12" +version = "1.0.0-rc.7" edition = "2018" [lib] diff --git a/hashing/Cargo.toml b/hashing/Cargo.toml index d01d752cc1..e123ad9b62 100644 --- a/hashing/Cargo.toml +++ b/hashing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_hashing" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" edition = "2021" description = "Tari hash domains" authors = ["The Tari Development Community"] diff --git a/infrastructure/derive/Cargo.toml b/infrastructure/derive/Cargo.toml index aa0888e049..8322ff789f 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.0.0-pre.12" +version = "1.0.0-rc.7" edition = "2018" [lib] diff --git a/infrastructure/libtor/Cargo.toml b/infrastructure/libtor/Cargo.toml index 4c59fba917..a44c25b65c 100644 --- a/infrastructure/libtor/Cargo.toml +++ b/infrastructure/libtor/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_libtor" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" edition = "2021" license = "BSD-3-Clause" diff --git a/infrastructure/metrics/Cargo.toml b/infrastructure/metrics/Cargo.toml index c14473b62d..46f7c652db 100644 --- a/infrastructure/metrics/Cargo.toml +++ b/infrastructure/metrics/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tari_metrics" description = "Tari metrics" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" 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 1462916032..e5b7c24355 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.0.0-pre.12" +version = "1.0.0-rc.7" 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 f64db11711..d059d24b87 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.0.0-pre.12" +version = "1.0.0-rc.7" edition = "2018" [dependencies] diff --git a/infrastructure/tari_script/Cargo.toml b/infrastructure/tari_script/Cargo.toml index 95287e795a..c2eebe3fe4 100644 --- a/infrastructure/tari_script/Cargo.toml +++ b/infrastructure/tari_script/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_script" -version = "1.0.0-pre.12" +version = "1.0.0-rc.7" 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 251ecce610..c3541c73cb 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.0.0-pre.12" +version = "1.0.0-rc.7" 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.0.0-pre.12" } -tari_comms = { path = "../../comms/core", version = "1.0.0-pre.12" } +tari_shutdown = { path = "../shutdown", version = "1.0.0-rc.7" } +tari_comms = { path = "../../comms/core", version = "1.0.0-rc.7" } futures = { version = "^0.3.1" } rand = "0.8" diff --git a/package-lock.json b/package-lock.json index 1b717efc20..7d07c63c65 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "tari", - "version": "1.0.0-pre.12", + "version": "1.0.0-rc.7", "lockfileVersion": 2, "requires": true, "packages": {}