From ebf926f8a027cb268df8a353b22e036e97778de2 Mon Sep 17 00:00:00 2001 From: SW van Heerden Date: Thu, 14 Mar 2024 17:02:03 +0200 Subject: [PATCH] chore: fix ffi stagenet + new version (#6217) Description --- Fixes FFI build for stagenet Creates new release version for stagenet Motivation and Context --- How Has This Been Tested? --- manual --- 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 | 4 +- 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 +++++----- base_layer/key_manager/Cargo.toml | 8 +-- 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 ++++----- base_layer/wallet_ffi/Cargo.toml | 4 +- base_layer/wallet_ffi/src/lib.rs | 11 +++- base_layer/wallet_ffi/wallet.h | 4 +- changelog-stagenet.md | 6 ++ 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/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 +- 36 files changed, 152 insertions(+), 143 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index feb706bea4..4ddced3971 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3014,7 +3014,7 @@ dependencies = [ [[package]] name = "minotari_app_grpc" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "argon2", "base64 0.13.1", @@ -3042,7 +3042,7 @@ dependencies = [ [[package]] name = "minotari_app_utilities" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "clap 3.2.25", "dialoguer", @@ -3064,7 +3064,7 @@ dependencies = [ [[package]] name = "minotari_chat_ffi" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "cbindgen", "chrono", @@ -3089,7 +3089,7 @@ dependencies = [ [[package]] name = "minotari_console_wallet" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "blake2", "chrono", @@ -3143,7 +3143,7 @@ dependencies = [ [[package]] name = "minotari_merge_mining_proxy" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "anyhow", "bincode", @@ -3182,7 +3182,7 @@ dependencies = [ [[package]] name = "minotari_miner" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "base64 0.13.1", "borsh", @@ -3218,7 +3218,7 @@ dependencies = [ [[package]] name = "minotari_mining_helper_ffi" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "borsh", "cbindgen", @@ -3238,7 +3238,7 @@ dependencies = [ [[package]] name = "minotari_node" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "anyhow", "async-trait", @@ -3293,7 +3293,7 @@ dependencies = [ [[package]] name = "minotari_wallet" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "argon2", "async-trait", @@ -3343,7 +3343,7 @@ dependencies = [ [[package]] name = "minotari_wallet_ffi" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "borsh", "cbindgen", @@ -5552,7 +5552,7 @@ dependencies = [ [[package]] name = "tari_chat_client" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "anyhow", "async-trait", @@ -5578,7 +5578,7 @@ dependencies = [ [[package]] name = "tari_common" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "anyhow", "blake2", @@ -5605,7 +5605,7 @@ dependencies = [ [[package]] name = "tari_common_sqlite" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "diesel", "diesel_migrations", @@ -5619,7 +5619,7 @@ dependencies = [ [[package]] name = "tari_common_types" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "base64 0.21.5", "blake2", @@ -5639,7 +5639,7 @@ dependencies = [ [[package]] name = "tari_comms" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "anyhow", "async-trait", @@ -5688,7 +5688,7 @@ dependencies = [ [[package]] name = "tari_comms_dht" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "anyhow", "bitflags 2.4.1", @@ -5732,7 +5732,7 @@ dependencies = [ [[package]] name = "tari_comms_rpc_macros" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "futures 0.3.29", "proc-macro2", @@ -5747,7 +5747,7 @@ dependencies = [ [[package]] name = "tari_contacts" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "chrono", "diesel", @@ -5780,7 +5780,7 @@ dependencies = [ [[package]] name = "tari_core" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "async-trait", "bincode", @@ -5875,11 +5875,11 @@ dependencies = [ [[package]] name = "tari_features" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" [[package]] name = "tari_hashing" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "blake2", "borsh", @@ -5937,7 +5937,7 @@ dependencies = [ [[package]] name = "tari_key_manager" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "argon2", "async-trait", @@ -5972,7 +5972,7 @@ dependencies = [ [[package]] name = "tari_libtor" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "derivative", "libtor", @@ -5987,7 +5987,7 @@ dependencies = [ [[package]] name = "tari_metrics" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "anyhow", "futures 0.3.29", @@ -6002,7 +6002,7 @@ dependencies = [ [[package]] name = "tari_mmr" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "bincode", "blake2", @@ -6021,7 +6021,7 @@ dependencies = [ [[package]] name = "tari_p2p" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "anyhow", "clap 3.2.25", @@ -6057,7 +6057,7 @@ dependencies = [ [[package]] name = "tari_script" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "blake2", "borsh", @@ -6074,7 +6074,7 @@ dependencies = [ [[package]] name = "tari_service_framework" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "anyhow", "async-trait", @@ -6091,7 +6091,7 @@ dependencies = [ [[package]] name = "tari_shutdown" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "futures 0.3.29", "tokio", @@ -6099,7 +6099,7 @@ dependencies = [ [[package]] name = "tari_storage" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "bincode", "lmdb-zero", @@ -6112,7 +6112,7 @@ dependencies = [ [[package]] name = "tari_test_utils" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" dependencies = [ "futures 0.3.29", "futures-test", diff --git a/applications/minotari_app_grpc/Cargo.toml b/applications/minotari_app_grpc/Cargo.toml index 4854cfba29..660cc38c85 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-alpha.0a" +version = "1.0.0-alpha.1" 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-alpha.0a" } +tari_features = { path = "../../common/tari_features", version = "1.0.0-alpha.1" } 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 6d64ad6e41..b22eb3a2c3 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-alpha.0a" +version = "1.0.0-alpha.1" 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-alpha.0a" } +tari_features = { path = "../../common/tari_features", version = "1.0.0-alpha.1" } [features] miner_input = ["minotari_app_grpc"] diff --git a/applications/minotari_console_wallet/Cargo.toml b/applications/minotari_console_wallet/Cargo.toml index b16e23f252..b91a262570 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-alpha.0a" +version = "1.0.0-alpha.1" authors = ["The Tari Development Community"] edition = "2018" license = "BSD-3-Clause" @@ -82,7 +82,7 @@ default-features = false features = ["crossterm"] [build-dependencies] -tari_features = { path = "../../common/tari_features", version = "1.0.0-alpha.0a" } +tari_features = { path = "../../common/tari_features", version = "1.0.0-alpha.1" } [features] default = ["libtor"] diff --git a/applications/minotari_merge_mining_proxy/Cargo.toml b/applications/minotari_merge_mining_proxy/Cargo.toml index 8bda5c6916..fa560aec35 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-alpha.0a" +version = "1.0.0-alpha.1" edition = "2018" [features] @@ -46,4 +46,4 @@ tracing = "0.1" url = "2.1.1" [build-dependencies] -tari_features = { path = "../../common/tari_features", version = "1.0.0-alpha.0a"} +tari_features = { path = "../../common/tari_features", version = "1.0.0-alpha.1"} diff --git a/applications/minotari_miner/Cargo.toml b/applications/minotari_miner/Cargo.toml index 88187308cc..961d32356e 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-alpha.0a" +version = "1.0.0-alpha.1" edition = "2018" [dependencies] diff --git a/applications/minotari_node/Cargo.toml b/applications/minotari_node/Cargo.toml index f6b8bd4344..e93ae54c1b 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-alpha.0a" +version = "1.0.0-alpha.1" edition = "2018" [dependencies] @@ -58,7 +58,7 @@ safe = [] libtor = ["tari_libtor"] [build-dependencies] -tari_features = { path = "../../common/tari_features", version = "1.0.0-alpha.0a"} +tari_features = { path = "../../common/tari_features", version = "1.0.0-alpha.1"} [package.metadata.cargo-machete] ignored = [ diff --git a/base_layer/chat_ffi/Cargo.toml b/base_layer/chat_ffi/Cargo.toml index 99c1c2137b..8479aaca18 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-alpha.0a" +version = "1.0.0-alpha.1" edition = "2018" [dependencies] diff --git a/base_layer/common_types/Cargo.toml b/base_layer/common_types/Cargo.toml index 14dba2dbfb..5f7e5288fe 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-alpha.0a" +version = "1.0.0-alpha.1" edition = "2018" [dependencies] tari_crypto = { version = "0.20" } tari_utilities = { version = "0.7" } -tari_common = { path = "../../common", version = "1.0.0-alpha.0a" } +tari_common = { path = "../../common", version = "1.0.0-alpha.1" } chacha20poly1305 = "0.10.1" diff --git a/base_layer/contacts/Cargo.toml b/base_layer/contacts/Cargo.toml index 2cdf09d93d..d562f0e036 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-alpha.0a" +version = "1.0.0-alpha.1" edition = "2018" [dependencies] -tari_common = { path = "../../common", version = "1.0.0-alpha.0a" } -tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-alpha.0a" } -tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-alpha.0a" } -tari_comms = { path = "../../comms/core", version = "1.0.0-alpha.0a" } -tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-alpha.0a" } +tari_common = { path = "../../common", version = "1.0.0-alpha.1" } +tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-alpha.1" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-alpha.1" } +tari_comms = { path = "../../comms/core", version = "1.0.0-alpha.1" } +tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-alpha.1" } tari_crypto = { version = "0.20" } -tari_p2p = { path = "../p2p", features = ["auto-update"], version = "1.0.0-alpha.0a" } -tari_service_framework = { path = "../service_framework", version = "1.0.0-alpha.0a" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-alpha.0a" } +tari_p2p = { path = "../p2p", features = ["auto-update"], version = "1.0.0-alpha.1" } +tari_service_framework = { path = "../service_framework", version = "1.0.0-alpha.1" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-alpha.1" } 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-alpha.0a" } +tari_common = { path = "../../common", version = "1.0.0-alpha.1" } [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 a5e52add51..44f6ff39e4 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-alpha.0a" +version = "1.0.0-alpha.1" edition = "2018" diff --git a/base_layer/core/Cargo.toml b/base_layer/core/Cargo.toml index a3f401d11e..bac30bdece 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-alpha.0a" +version = "1.0.0-alpha.1" edition = "2018" [features] @@ -26,24 +26,24 @@ benches = ["base_node"] metrics = ["tari_metrics"] [dependencies] -tari_common = { path = "../../common", version = "1.0.0-alpha.0a" } -tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-alpha.0a" } -tari_comms = { path = "../../comms/core", version = "1.0.0-alpha.0a" } -tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-alpha.0a" } -tari_comms_rpc_macros = { path = "../../comms/rpc_macros", version = "1.0.0-alpha.0a" } +tari_common = { path = "../../common", version = "1.0.0-alpha.1" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-alpha.1" } +tari_comms = { path = "../../comms/core", version = "1.0.0-alpha.1" } +tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-alpha.1" } +tari_comms_rpc_macros = { path = "../../comms/rpc_macros", version = "1.0.0-alpha.1" } tari_crypto = { version = "0.20", features = ["borsh"] } -tari_metrics = { path = "../../infrastructure/metrics", optional = true, version = "1.0.0-alpha.0a" } -tari_mmr = { path = "../../base_layer/mmr", optional = true , version = "1.0.0-alpha.0a"} -tari_p2p = { path = "../../base_layer/p2p", version = "1.0.0-alpha.0a" } -tari_script = { path = "../../infrastructure/tari_script", version = "1.0.0-alpha.0a" } -tari_service_framework = { path = "../service_framework", version = "1.0.0-alpha.0a" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-alpha.0a" } -tari_storage = { path = "../../infrastructure/storage", version = "1.0.0-alpha.0a" } -tari_test_utils = { path = "../../infrastructure/test_utils", version = "1.0.0-alpha.0a" } +tari_metrics = { path = "../../infrastructure/metrics", optional = true, version = "1.0.0-alpha.1" } +tari_mmr = { path = "../../base_layer/mmr", optional = true , version = "1.0.0-alpha.1"} +tari_p2p = { path = "../../base_layer/p2p", version = "1.0.0-alpha.1" } +tari_script = { path = "../../infrastructure/tari_script", version = "1.0.0-alpha.1" } +tari_service_framework = { path = "../service_framework", version = "1.0.0-alpha.1" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-alpha.1" } +tari_storage = { path = "../../infrastructure/storage", version = "1.0.0-alpha.1" } +tari_test_utils = { path = "../../infrastructure/test_utils", version = "1.0.0-alpha.1" } tari_utilities = { version = "0.7", features = ["borsh"] } tari_key_manager = { path = "../key_manager", features = [ "key_manager_service", -], version = "1.0.0-alpha.0a" } +], version = "1.0.0-alpha.1" } tari_common_sqlite = { path = "../../common_sqlite" } tari_hashing = { path = "../../hashing" } @@ -104,8 +104,8 @@ toml = { version = "0.5" } quickcheck = "1.0" [build-dependencies] -tari_common = { path = "../../common", features = ["build"], version = "1.0.0-alpha.0a" } -tari_features = { path = "../../common/tari_features", version = "1.0.0-alpha.0a" } +tari_common = { path = "../../common", features = ["build"], version = "1.0.0-alpha.1" } +tari_features = { path = "../../common/tari_features", version = "1.0.0-alpha.1" } [[bench]] name = "mempool" diff --git a/base_layer/key_manager/Cargo.toml b/base_layer/key_manager/Cargo.toml index f9cf754b00..0dcc29a6cf 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-alpha.0a" +version = "1.0.0-alpha.1" 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-alpha.0a" } -tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-alpha.0a"} -tari_service_framework = { path = "../service_framework", version = "1.0.0-alpha.0a" } +tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-alpha.1" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-alpha.1"} +tari_service_framework = { path = "../service_framework", version = "1.0.0-alpha.1" } 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 3c21264ca9..03dccc8e06 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-alpha.0a" +version = "1.0.0-alpha.1" 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-alpha.0a" } +tari_common = { path = "../../common", version = "1.0.0-alpha.1" } thiserror = "1.0" borsh = "1.2" digest = "0.10" diff --git a/base_layer/p2p/Cargo.toml b/base_layer/p2p/Cargo.toml index 4e166dcb01..2c9a17c0af 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-alpha.0a" +version = "1.0.0-alpha.1" 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-alpha.0a" } -tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-alpha.0a" } -tari_common = { path = "../../common", version = "1.0.0-alpha.0a" } +tari_comms = { path = "../../comms/core", version = "1.0.0-alpha.1" } +tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-alpha.1" } +tari_common = { path = "../../common", version = "1.0.0-alpha.1" } tari_crypto = { version = "0.20" } -tari_service_framework = { path = "../service_framework", version = "1.0.0-alpha.0a" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-alpha.0a" } -tari_storage = { path = "../../infrastructure/storage", version = "1.0.0-alpha.0a" } +tari_service_framework = { path = "../service_framework", version = "1.0.0-alpha.1" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-alpha.1" } +tari_storage = { path = "../../infrastructure/storage", version = "1.0.0-alpha.1" } 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-alpha.0a" } +tari_common = { path = "../../common", features = ["build"], version = "1.0.0-alpha.1" } [features] test-mocks = [] diff --git a/base_layer/service_framework/Cargo.toml b/base_layer/service_framework/Cargo.toml index d90122a775..cc8e1c1e63 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-alpha.0a" +version = "1.0.0-alpha.1" 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-alpha.0a" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-alpha.1" } 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 3240e96f0c..0bc2fcae85 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-alpha.0a" +version = "1.0.0-alpha.1" 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-alpha.0a" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-alpha.1" } 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-alpha.0a" } +tari_features = { path = "../../common/tari_features", version = "1.0.0-alpha.1" } 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 e22cffe664..8fe1d91e8b 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-alpha.0a" +version = "1.0.0-alpha.1" edition = "2018" [dependencies] -tari_core = { path = "../../base_layer/core", default-features = false, features = ["transactions", "mempool_proto", "base_node_proto"], version = "1.0.0-alpha.0a" } -tari_common = { path = "../../common", version = "1.0.0-alpha.0a" } -tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-alpha.0a" } -tari_comms = { path = "../../comms/core", version = "1.0.0-alpha.0a" } -tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-alpha.0a" } +tari_core = { path = "../../base_layer/core", default-features = false, features = ["transactions", "mempool_proto", "base_node_proto"], version = "1.0.0-alpha.1" } +tari_common = { path = "../../common", version = "1.0.0-alpha.1" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-alpha.1" } +tari_comms = { path = "../../comms/core", version = "1.0.0-alpha.1" } +tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-alpha.1" } tari_crypto = { version = "0.20" } -tari_key_manager = { path = "../key_manager", features = ["key_manager_service"], version = "1.0.0-alpha.0a" } -tari_p2p = { path = "../p2p", features = ["auto-update"], version = "1.0.0-alpha.0a"} -tari_script = { path = "../../infrastructure/tari_script", version = "1.0.0-alpha.0a" } -tari_service_framework = { path = "../service_framework", version = "1.0.0-alpha.0a" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-alpha.0a" } -tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-alpha.0a" } +tari_key_manager = { path = "../key_manager", features = ["key_manager_service"], version = "1.0.0-alpha.1" } +tari_p2p = { path = "../p2p", features = ["auto-update"], version = "1.0.0-alpha.1"} +tari_script = { path = "../../infrastructure/tari_script", version = "1.0.0-alpha.1" } +tari_service_framework = { path = "../service_framework", version = "1.0.0-alpha.1" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-alpha.1" } +tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-alpha.1" } tari_utilities = { version = "0.7" } -tari_contacts = { path = "../../base_layer/contacts", version = "1.0.0-alpha.0a" } +tari_contacts = { path = "../../base_layer/contacts", version = "1.0.0-alpha.1" } # 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-alpha.0a" } +tari_common = { path = "../../common", features = ["build", "static-application-info"], version = "1.0.0-alpha.1" } [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 deaecf64c8..7e602f99aa 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-alpha.0a" +version = "1.0.0-alpha.1" 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-alpha.0a" } +tari_features = { path = "../../common/tari_features", version = "1.0.0-alpha.1" } diff --git a/base_layer/wallet_ffi/src/lib.rs b/base_layer/wallet_ffi/src/lib.rs index 9a7ee76877..797d47c362 100644 --- a/base_layer/wallet_ffi/src/lib.rs +++ b/base_layer/wallet_ffi/src/lib.rs @@ -293,7 +293,7 @@ pub struct TariUtxo { pub mined_timestamp: u64, pub lock_height: u64, pub status: u8, - pub coinbase_extra: Vec, + pub coinbase_extra: *const c_char, } impl From for TariUtxo { @@ -322,7 +322,9 @@ impl From for TariUtxo { OutputStatus::SpentMinedUnconfirmed => 9, OutputStatus::NotStored => 10, }, - coinbase_extra: x.wallet_output.features.coinbase_extra, + coinbase_extra: CString::new(x.wallet_output.features.coinbase_extra.to_hex()) + .expect("failed to obtain hex from a commitment") + .into_raw(), } } } @@ -10189,7 +10191,10 @@ mod test { .unwrap(); assert_eq!(output.value.as_u64(), utxo.value); assert_eq!(output.features.maturity, utxo.lock_height); - assert_eq!(output.features.coinbase_extra, utxo.coinbase_extra); + assert_eq!( + output.features.coinbase_extra.to_hex(), + CStr::from_ptr(utxo.coinbase_extra).to_str().unwrap() + ); } println!(); destroy_tari_vector(outputs); diff --git a/base_layer/wallet_ffi/wallet.h b/base_layer/wallet_ffi/wallet.h index 4588864b98..9ef96d45c9 100644 --- a/base_layer/wallet_ffi/wallet.h +++ b/base_layer/wallet_ffi/wallet.h @@ -196,8 +196,6 @@ struct TransportConfig; */ struct UnblindedOutput; -struct Vec_u8; - /** * -------------------------------- Vector ------------------------------------------------ /// */ @@ -349,7 +347,7 @@ struct TariUtxo { uint64_t mined_timestamp; uint64_t lock_height; uint8_t status; - struct Vec_u8 coinbase_extra; + const char *coinbase_extra; }; #ifdef __cplusplus diff --git a/changelog-stagenet.md b/changelog-stagenet.md index 0983855c42..4433112ea5 100644 --- a/changelog-stagenet.md +++ b/changelog-stagenet.md @@ -1,6 +1,12 @@ # Changelog 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.0.0-alpha.1](https://github.com/tari-project/tari/compare/v1.0.0-alpha.0a...v1.0.0-alpha.1) (2024-03-14) + +### Bug Fixes + +* fix Wallet FFI build type + ## [1.0.0-alpha.0a](https://github.com/tari-project/tari/compare/v1.0.0-alpha.0...v1.0.0-alpha.0a) (2024-03-12) ### Bug Fixes diff --git a/common/Cargo.toml b/common/Cargo.toml index 2890ce5a73..08fd8e2484 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-alpha.0a" +version = "1.0.0-alpha.1" 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-alpha.0a"} +tari_features = { path = "./tari_features", version = "1.0.0-alpha.1"} 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-alpha.0a"} +tari_features = { path = "./tari_features", version = "1.0.0-alpha.1"} diff --git a/common/tari_features/Cargo.toml b/common/tari_features/Cargo.toml index c8f801605f..cdd3ff83db 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-alpha.0a" +version = "1.0.0-alpha.1" 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 3489cfa649..3af7ad0d64 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-alpha.0a" +version = "1.0.0-alpha.1" 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 d0176976ee..e20ef97949 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-alpha.0a" +version = "1.0.0-alpha.1" edition = "2018" [dependencies] tari_crypto = { version = "0.20" } -tari_metrics = { path = "../../infrastructure/metrics", optional = true, version = "1.0.0-alpha.0a" } -tari_storage = { path = "../../infrastructure/storage", version = "1.0.0-alpha.0a" } -tari_shutdown = { path = "../../infrastructure/shutdown" , version = "1.0.0-alpha.0a"} +tari_metrics = { path = "../../infrastructure/metrics", optional = true, version = "1.0.0-alpha.1" } +tari_storage = { path = "../../infrastructure/storage", version = "1.0.0-alpha.1" } +tari_shutdown = { path = "../../infrastructure/shutdown" , version = "1.0.0-alpha.1"} 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-alpha.0a" } +tari_common = { path = "../../common", features = ["build"], version = "1.0.0-alpha.1" } [features] c_integration = [] diff --git a/comms/dht/Cargo.toml b/comms/dht/Cargo.toml index 71ccb15e53..0f9831394f 100644 --- a/comms/dht/Cargo.toml +++ b/comms/dht/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_comms_dht" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" 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-alpha.0a" } -tari_common = { path = "../../common", version = "1.0.0-alpha.0a" } -tari_comms_rpc_macros = { path = "../rpc_macros" , version = "1.0.0-alpha.0a"} +tari_comms = { path = "../core", features = ["rpc"], version = "1.0.0-alpha.1" } +tari_common = { path = "../../common", version = "1.0.0-alpha.1" } +tari_comms_rpc_macros = { path = "../rpc_macros" , version = "1.0.0-alpha.1"} tari_crypto = { version = "0.20" } tari_utilities = { version = "0.7" } -tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-alpha.0a" } -tari_storage = { path = "../../infrastructure/storage", version = "1.0.0-alpha.0a" } -tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-alpha.0a" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-alpha.1" } +tari_storage = { path = "../../infrastructure/storage", version = "1.0.0-alpha.1" } +tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-alpha.1" } 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-alpha.0a" } +tari_common = { path = "../../common", version = "1.0.0-alpha.1" } [features] test-mocks = [] diff --git a/comms/rpc_macros/Cargo.toml b/comms/rpc_macros/Cargo.toml index 7b2e76ea8a..c3ad87fe38 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-alpha.0a" +version = "1.0.0-alpha.1" edition = "2018" [lib] diff --git a/hashing/Cargo.toml b/hashing/Cargo.toml index 6e340bbad8..59860cc69c 100644 --- a/hashing/Cargo.toml +++ b/hashing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_hashing" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" edition = "2021" description = "Tari hash domains" authors = ["The Tari Development Community"] diff --git a/infrastructure/libtor/Cargo.toml b/infrastructure/libtor/Cargo.toml index 3e340a3eef..9e29a66f81 100644 --- a/infrastructure/libtor/Cargo.toml +++ b/infrastructure/libtor/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_libtor" -version = "1.0.0-alpha.0a" +version = "1.0.0-alpha.1" edition = "2021" license = "BSD-3-Clause" diff --git a/infrastructure/metrics/Cargo.toml b/infrastructure/metrics/Cargo.toml index 87f3e8e5ed..2989531192 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-alpha.0a" +version = "1.0.0-alpha.1" 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 37747392eb..ca3355bb16 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-alpha.0a" +version = "1.0.0-alpha.1" 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 0dcccc37de..ee67fa8d26 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-alpha.0a" +version = "1.0.0-alpha.1" edition = "2018" [dependencies] diff --git a/infrastructure/tari_script/Cargo.toml b/infrastructure/tari_script/Cargo.toml index 082e38848c..99b63b67ab 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-alpha.0a" +version = "1.0.0-alpha.1" 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 b190b63cfb..f399c9e6f0 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-alpha.0a" +version = "1.0.0-alpha.1" 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-alpha.0a" } -tari_comms = { path = "../../comms/core", version = "1.0.0-alpha.0a" } +tari_shutdown = { path = "../shutdown", version = "1.0.0-alpha.1" } +tari_comms = { path = "../../comms/core", version = "1.0.0-alpha.1" } futures = { version = "^0.3.1" } rand = "0.8" diff --git a/package-lock.json b/package-lock.json index 8f98f19bfb..8a9d375cad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "tari", - "version": "1.0.0-alpha.0a", + "version": "1.0.0-alpha.1", "lockfileVersion": 2, "requires": true, "packages": {}