diff --git a/Cargo.lock b/Cargo.lock index e8c2844f1f..d33e825715 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5114,7 +5114,7 @@ dependencies = [ [[package]] name = "tari_app_grpc" -version = "0.49.1" +version = "0.49.2" dependencies = [ "argon2", "base64 0.13.1", @@ -5138,7 +5138,7 @@ dependencies = [ [[package]] name = "tari_app_utilities" -version = "0.49.1" +version = "0.49.2" dependencies = [ "clap 3.2.25", "futures 0.3.28", @@ -5157,7 +5157,7 @@ dependencies = [ [[package]] name = "tari_base_node" -version = "0.49.1" +version = "0.49.2" dependencies = [ "anyhow", "async-trait", @@ -5253,7 +5253,7 @@ dependencies = [ [[package]] name = "tari_common" -version = "0.49.1" +version = "0.49.2" dependencies = [ "anyhow", "blake2 0.9.2", @@ -5280,7 +5280,7 @@ dependencies = [ [[package]] name = "tari_common_sqlite" -version = "0.49.1" +version = "0.49.2" dependencies = [ "diesel", "diesel_migrations", @@ -5294,7 +5294,7 @@ dependencies = [ [[package]] name = "tari_common_types" -version = "0.49.1" +version = "0.49.2" dependencies = [ "borsh", "chacha20poly1305 0.10.1", @@ -5312,7 +5312,7 @@ dependencies = [ [[package]] name = "tari_comms" -version = "0.49.1" +version = "0.49.2" dependencies = [ "anyhow", "async-trait", @@ -5361,7 +5361,7 @@ dependencies = [ [[package]] name = "tari_comms_dht" -version = "0.49.1" +version = "0.49.2" dependencies = [ "anyhow", "bitflags 1.3.2", @@ -5405,7 +5405,7 @@ dependencies = [ [[package]] name = "tari_comms_rpc_macros" -version = "0.49.1" +version = "0.49.2" dependencies = [ "futures 0.3.28", "proc-macro2", @@ -5420,7 +5420,7 @@ dependencies = [ [[package]] name = "tari_console_wallet" -version = "0.49.1" +version = "0.49.2" dependencies = [ "bitflags 1.3.2", "chrono", @@ -5469,7 +5469,7 @@ dependencies = [ [[package]] name = "tari_contacts" -version = "0.49.1" +version = "0.49.2" dependencies = [ "chrono", "diesel", @@ -5497,7 +5497,7 @@ dependencies = [ [[package]] name = "tari_core" -version = "0.49.1" +version = "0.49.2" dependencies = [ "bincode", "bitflags 1.3.2", @@ -5593,7 +5593,7 @@ dependencies = [ [[package]] name = "tari_features" -version = "0.49.1" +version = "0.49.2" [[package]] name = "tari_integration_tests" @@ -5641,7 +5641,7 @@ dependencies = [ [[package]] name = "tari_key_manager" -version = "0.49.1" +version = "0.49.2" dependencies = [ "argon2", "async-trait", @@ -5695,7 +5695,7 @@ dependencies = [ [[package]] name = "tari_merge_mining_proxy" -version = "0.49.1" +version = "0.49.2" dependencies = [ "anyhow", "bincode", @@ -5745,7 +5745,7 @@ dependencies = [ [[package]] name = "tari_miner" -version = "0.49.1" +version = "0.49.2" dependencies = [ "base64 0.13.1", "borsh", @@ -5780,7 +5780,7 @@ dependencies = [ [[package]] name = "tari_mining_helper_ffi" -version = "0.49.1" +version = "0.49.2" dependencies = [ "borsh", "hex", @@ -5796,7 +5796,7 @@ dependencies = [ [[package]] name = "tari_mmr" -version = "0.49.1" +version = "0.49.2" dependencies = [ "bincode", "blake2 0.9.2", @@ -5816,7 +5816,7 @@ dependencies = [ [[package]] name = "tari_p2p" -version = "0.49.1" +version = "0.49.2" dependencies = [ "anyhow", "clap 2.34.0", @@ -5870,7 +5870,7 @@ dependencies = [ [[package]] name = "tari_service_framework" -version = "0.49.1" +version = "0.49.2" dependencies = [ "anyhow", "async-trait", @@ -5887,7 +5887,7 @@ dependencies = [ [[package]] name = "tari_shutdown" -version = "0.49.1" +version = "0.49.2" dependencies = [ "futures 0.3.28", "tokio", @@ -5895,7 +5895,7 @@ dependencies = [ [[package]] name = "tari_storage" -version = "0.49.1" +version = "0.49.2" dependencies = [ "bincode", "lmdb-zero", @@ -5908,7 +5908,7 @@ dependencies = [ [[package]] name = "tari_test_utils" -version = "0.49.1" +version = "0.49.2" dependencies = [ "futures 0.3.28", "futures-test", @@ -5940,7 +5940,7 @@ dependencies = [ [[package]] name = "tari_wallet" -version = "0.49.1" +version = "0.49.2" dependencies = [ "argon2", "async-trait", @@ -5990,7 +5990,7 @@ dependencies = [ [[package]] name = "tari_wallet_ffi" -version = "0.49.1" +version = "0.49.2" dependencies = [ "borsh", "cbindgen 0.24.3", diff --git a/README.md b/README.md index 33a885bca6..b4815cfe52 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ The recommended running versions of each network are: | Network | Version | |----------|--------------| -| Stagenet | 0.49.0 | +| Stagenet | 0.49.2 | | Nextnet | 0.50.0-rc.0 | | Development | 0.51.0-pre.0 | diff --git a/applications/tari_app_grpc/Cargo.toml b/applications/tari_app_grpc/Cargo.toml index 5833d5ffad..ca69aa1622 100644 --- a/applications/tari_app_grpc/Cargo.toml +++ b/applications/tari_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 = "0.49.1" +version = "0.49.2" edition = "2018" [dependencies] diff --git a/applications/tari_app_utilities/Cargo.toml b/applications/tari_app_utilities/Cargo.toml index 2546ce53e4..f96069362c 100644 --- a/applications/tari_app_utilities/Cargo.toml +++ b/applications/tari_app_utilities/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_app_utilities" -version = "0.49.1" +version = "0.49.2" authors = ["The Tari Development Community"] edition = "2018" license = "BSD-3-Clause" @@ -9,7 +9,7 @@ license = "BSD-3-Clause" tari_common = { path = "../../common" } tari_common_types = { path = "../../base_layer/common_types" } tari_comms = { path = "../../comms/core" } -tari_features = { version = "0.49.0-rc.1", path = "../../common/tari_features"} +tari_features = { version = "0.49.2", path = "../../common/tari_features"} tari_utilities = { version = "0.4.10"} clap = { version = "3.2.0", features = ["derive", "env"] } @@ -23,4 +23,4 @@ thiserror = "^1.0.26" [build-dependencies] tari_common = { path = "../../common", features = ["build", "static-application-info"] } -tari_features = { version = "0.49.0-rc.1", path = "../../common/tari_features"} +tari_features = { version = "0.49.2", path = "../../common/tari_features"} diff --git a/applications/tari_base_node/Cargo.toml b/applications/tari_base_node/Cargo.toml index 2a618e4e1d..7f8a96353b 100644 --- a/applications/tari_base_node/Cargo.toml +++ b/applications/tari_base_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 = "0.49.1" +version = "0.49.2" edition = "2018" [dependencies] @@ -58,4 +58,4 @@ safe = [] libtor = ["tari_libtor"] [build-dependencies] -tari_features = { version = "0.49.0-rc.1", path = "../../common/tari_features"} +tari_features = { version = "0.49.2", path = "../../common/tari_features"} diff --git a/applications/tari_console_wallet/Cargo.toml b/applications/tari_console_wallet/Cargo.toml index 128e2ebd65..4dc3af1db3 100644 --- a/applications/tari_console_wallet/Cargo.toml +++ b/applications/tari_console_wallet/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_console_wallet" -version = "0.49.1" +version = "0.49.2" authors = ["The Tari Development Community"] edition = "2018" license = "BSD-3-Clause" @@ -64,7 +64,7 @@ default-features = false features = ["crossterm"] [build-dependencies] -tari_features = { version = "0.49.0-rc.0", path = "../../common/tari_features"} +tari_features = { version = "0.49.2", path = "../../common/tari_features"} [features] avx2 = ["tari_core/avx2", "tari_crypto/simd_backend", "tari_wallet/avx2", "tari_comms/avx2", "tari_comms_dht/avx2", "tari_p2p/avx2", "tari_key_manager/avx2"] diff --git a/applications/tari_merge_mining_proxy/Cargo.toml b/applications/tari_merge_mining_proxy/Cargo.toml index abcf017eee..66b1a4b070 100644 --- a/applications/tari_merge_mining_proxy/Cargo.toml +++ b/applications/tari_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 = "0.49.1" +version = "0.49.2" edition = "2018" [features] @@ -42,4 +42,4 @@ tracing = "0.1" url = "2.1.1" [build-dependencies] -tari_features = { version = "0.49.0-rc.1", path = "../../common/tari_features"} +tari_features = { version = "0.49.2", path = "../../common/tari_features"} diff --git a/applications/tari_miner/Cargo.toml b/applications/tari_miner/Cargo.toml index e7d6dc14e8..ea56f25586 100644 --- a/applications/tari_miner/Cargo.toml +++ b/applications/tari_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 = "0.49.1" +version = "0.49.2" edition = "2018" [dependencies] diff --git a/base_layer/common_types/Cargo.toml b/base_layer/common_types/Cargo.toml index 3d6771e2a6..dc351ce51b 100644 --- a/base_layer/common_types/Cargo.toml +++ b/base_layer/common_types/Cargo.toml @@ -3,7 +3,7 @@ name = "tari_common_types" authors = ["The Tari Development Community"] description = "Tari cryptocurrency common types" license = "BSD-3-Clause" -version = "0.49.1" +version = "0.49.2" edition = "2018" [dependencies] diff --git a/base_layer/contacts/Cargo.toml b/base_layer/contacts/Cargo.toml index 83b218fbf9..567fd1055b 100644 --- a/base_layer/contacts/Cargo.toml +++ b/base_layer/contacts/Cargo.toml @@ -3,7 +3,7 @@ name = "tari_contacts" authors = ["The Tari Development Community"] description = "Tari contacts library" license = "BSD-3-Clause" -version = "0.49.1" +version = "0.49.2" edition = "2018" [dependencies] diff --git a/base_layer/core/Cargo.toml b/base_layer/core/Cargo.toml index 9f2e4b9396..f07702b686 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 = "0.49.1" +version = "0.49.2" edition = "2018" [features] diff --git a/base_layer/key_manager/Cargo.toml b/base_layer/key_manager/Cargo.toml index 238b9eef9c..e4fb1aa6b0 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 = "0.49.1" +version = "0.49.2" edition = "2021" [lib] diff --git a/base_layer/mmr/Cargo.toml b/base_layer/mmr/Cargo.toml index dde1e123da..fea62c3c5c 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 = "0.49.1" +version = "0.49.2" edition = "2018" [features] diff --git a/base_layer/p2p/Cargo.toml b/base_layer/p2p/Cargo.toml index 20c9d918c7..c29dede25e 100644 --- a/base_layer/p2p/Cargo.toml +++ b/base_layer/p2p/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_p2p" -version = "0.49.1" +version = "0.49.2" authors = ["The Tari Development community"] description = "Tari base layer-specific peer-to-peer communication features" repository = "https://github.com/tari-project/tari" diff --git a/base_layer/service_framework/Cargo.toml b/base_layer/service_framework/Cargo.toml index 124562b3cd..8c3edc0e4d 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 = "0.49.1" +version = "0.49.2" authors = ["The Tari Development Community"] description = "The Tari communication stack service framework" repository = "https://github.com/tari-project/tari" diff --git a/base_layer/tari_mining_helper_ffi/Cargo.toml b/base_layer/tari_mining_helper_ffi/Cargo.toml index 6f6227bd1b..f17117a29e 100644 --- a/base_layer/tari_mining_helper_ffi/Cargo.toml +++ b/base_layer/tari_mining_helper_ffi/Cargo.toml @@ -3,7 +3,7 @@ name = "tari_mining_helper_ffi" authors = ["The Tari Development Community"] description = "Tari cryptocurrency miningcore C FFI bindings" license = "BSD-3-Clause" -version = "0.49.1" +version = "0.49.2" edition = "2018" [dependencies] diff --git a/base_layer/wallet/Cargo.toml b/base_layer/wallet/Cargo.toml index 71bc75a237..d5d6966cfd 100644 --- a/base_layer/wallet/Cargo.toml +++ b/base_layer/wallet/Cargo.toml @@ -3,7 +3,7 @@ name = "tari_wallet" authors = ["The Tari Development Community"] description = "Tari cryptocurrency wallet library" license = "BSD-3-Clause" -version = "0.49.1" +version = "0.49.2" edition = "2018" [dependencies] diff --git a/base_layer/wallet_ffi/Cargo.toml b/base_layer/wallet_ffi/Cargo.toml index 0f296a510a..29e88e125f 100644 --- a/base_layer/wallet_ffi/Cargo.toml +++ b/base_layer/wallet_ffi/Cargo.toml @@ -3,7 +3,7 @@ name = "tari_wallet_ffi" authors = ["The Tari Development Community"] description = "Tari cryptocurrency wallet C FFI bindings" license = "BSD-3-Clause" -version = "0.49.1" +version = "0.49.2" edition = "2018" [dependencies] diff --git a/base_layer/wallet_ffi/src/lib.rs b/base_layer/wallet_ffi/src/lib.rs index b697bd12eb..a9705b4aa2 100644 --- a/base_layer/wallet_ffi/src/lib.rs +++ b/base_layer/wallet_ffi/src/lib.rs @@ -5388,7 +5388,7 @@ pub unsafe extern "C" fn wallet_create( )); match w { - Ok(mut w) => { + Ok(w) => { // lets ensure the wallet tor_id is saved, this could have been changed during wallet startup if let Some(hs) = w.comms.hidden_service() { if let Err(e) = w.db.set_tor_identity(hs.tor_identity().clone()) { @@ -5430,12 +5430,15 @@ pub unsafe extern "C" fn wallet_create( runtime.spawn(callback_handler.start()); - if let Err(e) = runtime.block_on(w.transaction_service.restart_transaction_protocols()) { - warn!( - target: LOG_TARGET, - "Could not restart transaction negotiation protocols: {:?}", e - ); - } + let mut ts = w.transaction_service.clone(); + runtime.spawn(async move { + if let Err(e) = ts.restart_transaction_protocols().await { + warn!( + target: LOG_TARGET, + "Could not restart transaction negotiation protocols: {:?}", e + ); + } + }); let tari_wallet = TariWallet { wallet: w, diff --git a/changelog-stagenet.md b/changelog-stagenet.md index 9814b87c87..90a48ba228 100644 --- a/changelog-stagenet.md +++ b/changelog-stagenet.md @@ -2,14 +2,18 @@ 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. +### [0.49.2](https://github.com/tari-project/tari/compare/v0.49.1...v0.49.2) (2023-06-28) + +### Features + +* **wallet-ffi:** prevent blocking on start + ### [0.49.1](https://github.com/tari-project/tari/compare/v0.49.0...v0.49.1) (2023-06-12) ### ⚠ BREAKING CHANGES * set gen block time to now (#5454) -* ### Features - ### Bug Fixes * set gen block time to now ([4ba4280](https://github.com/tari-project/tari/commit/4ba4280e614a2984a570c54da533e55441603412)) diff --git a/common/Cargo.toml b/common/Cargo.toml index 2a5c7c1b8b..83e89ab9cb 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 = "0.49.1" +version = "0.49.2" edition = "2018" [features] @@ -40,4 +40,4 @@ tari_test_utils = { path = "../infrastructure/test_utils"} toml = "0.5.8" [build-dependencies] -tari_features = { version = "0.49.0-rc.1", path = "./tari_features"} +tari_features = { version = "0.49.2", path = "./tari_features"} diff --git a/common/tari_features/Cargo.toml b/common/tari_features/Cargo.toml index a5f1a9a181..c4efa8c4d1 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 = "0.49.1" +version = "0.49.2" 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 7e87d359d0..d0d905b187 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 = "0.49.1" +version = "0.49.2" 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 614210e830..3569aab27a 100644 --- a/comms/core/Cargo.toml +++ b/comms/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 = "0.49.1" +version = "0.49.2" edition = "2018" [dependencies] diff --git a/comms/dht/Cargo.toml b/comms/dht/Cargo.toml index e099d041ef..79b0a79342 100644 --- a/comms/dht/Cargo.toml +++ b/comms/dht/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_comms_dht" -version = "0.49.1" +version = "0.49.2" authors = ["The Tari Development Community"] description = "Tari comms DHT module" repository = "https://github.com/tari-project/tari" diff --git a/comms/rpc_macros/Cargo.toml b/comms/rpc_macros/Cargo.toml index a895f6cfd9..46f163cf5f 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 = "0.49.1" +version = "0.49.2" edition = "2018" [lib] diff --git a/infrastructure/derive/Cargo.toml b/infrastructure/derive/Cargo.toml index 099dcef7cf..cbce8fa508 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 = "0.49.1" +version = "0.49.2" edition = "2018" [lib] diff --git a/infrastructure/shutdown/Cargo.toml b/infrastructure/shutdown/Cargo.toml index 1763de5761..476dc4c0e7 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 = "0.49.1" +version = "0.49.2" 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 c9477bd1ae..2465748e95 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 = "0.49.1" +version = "0.49.2" edition = "2018" [dependencies] diff --git a/infrastructure/test_utils/Cargo.toml b/infrastructure/test_utils/Cargo.toml index 7ac29af706..5acc733010 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 = "0.49.1" +version = "0.49.2" authors = ["The Tari Development Community"] edition = "2018" license = "BSD-3-Clause"