Merge branch 'development' into nextnet

README.md

@@ -178,10 +178,11 @@ First you'll need to make sure you have a full development environment set up:
 
     - [Build Tools for Visual Studio 2019](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=BuildTools&rel=16)
 
-- Perl for OpenSSL:
+- OpenSSL:
 
-  - OpenSSL is compiled and statically linked by the included [rust-openssl](https://github.com/sfackler/rust-openssl) crate
-  - Perl is required to compile this source on Windows, please download and install [StrawberryPerl](https://strawberryperl.com/)
+  - install `vcpkg`
+  - install static openssl `vcpkg install openssl:x64-windows-static`
+  - set env var: `OPENSSL_DIR=C:\vcpkg\packages\openssl_x64-windows-static`, replace `C:\vcpkg` with the root where you installed vcpkg
 
 - [Protocol Buffers](https://protobuf.dev/)
   - Install from https://github.com/protocolbuffers/protobuf#protobuf-compiler-installation or if you using [The Package Manager for Windows](https://chocolatey.org/), run ```choco upgrade protoc -y```

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.9.1-rc.1"
+version = "1.9.1-pre.2"
 edition = "2021"
 
 [dependencies]
@@ -32,7 +32,7 @@ tonic = { version = "0.12.3", features = ["tls"] }
 zeroize = "1"
 
 [build-dependencies]
-tari_features = { path = "../../common/tari_features", version = "1.9.1-rc.1" }
+tari_features = { path = "../../common/tari_features", version = "1.9.1-pre.2" }
 tonic-build = "0.12.3"
 
 [package.metadata.cargo-machete]

applications/minotari_app_utilities/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "minotari_app_utilities"
-version = "1.9.1-rc.1"
+version = "1.9.1-pre.2"
 authors = ["The Tari Development Community"]
 edition = "2018"
 license = "BSD-3-Clause"
@@ -30,7 +30,7 @@ tari_common = { path = "../../common", features = [
     "build",
     "static-application-info",
 ] }
-tari_features = { path = "../../common/tari_features", version = "1.9.1-rc.1" }
+tari_features = { path = "../../common/tari_features", version = "1.9.1-pre.2" }
 
 [features]
 miner_input = ["minotari_app_grpc"]

applications/minotari_console_wallet/Cargo.toml

@@ -1,14 +1,14 @@
 [package]
 name = "minotari_console_wallet"
-version = "1.9.1-rc.1"
+version = "1.9.1-pre.2"
 authors = ["The Tari Development Community"]
 edition = "2018"
 license = "BSD-3-Clause"
 
 [dependencies]
 minotari_app_grpc = { path = "../minotari_app_grpc" }
 minotari_app_utilities = { path = "../minotari_app_utilities" }
-minotari_ledger_wallet_comms = { path = "../../applications/minotari_ledger_wallet/comms", version = "1.9.1-rc.1", optional = true }
+minotari_ledger_wallet_comms = { path = "../../applications/minotari_ledger_wallet/comms", version = "1.9.1-pre.2", optional = true }
 tari_common = { path = "../../common" }
 tari_common_types = { path = "../../base_layer/common_types" }
 tari_comms = { path = "../../comms/core" }
@@ -84,7 +84,7 @@ default-features = false
 features = ["crossterm"]
 
 [build-dependencies]
-tari_features = { path = "../../common/tari_features", version = "1.9.1-rc.1" }
+tari_features = { path = "../../common/tari_features", version = "1.9.1-pre.2" }
 
 [features]
 default = ["libtor", "ledger"]

applications/minotari_ledger_wallet/common/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "minotari_ledger_wallet_common"
-version = "1.9.1-rc.1"
+version = "1.9.1-pre.2"
 authors = ["The Tari Development Community"]
 license = "BSD-3-Clause"
 edition = "2021"