chore: update tari-crypto and curve library dependencies (#6228)

Description --- Updates `tari-crypto` and associated dependencies. Bumps the nightly toolchain. Fixes lints. Removes unused code. Closes #6138. Motivation and Context --- Updates to `tari-crypto` and related dependencies allow for a return to the upstream curve library. This also requires bumping the nightly toolchain, which brings fun new lints that need to be fixed. This PR addresses all of these, and removes unused code. How Has This Been Tested? --- Existing tests pass. What process can a PR reviewer use to test or verify this change? --- Watch that CI! Ensure that the removed code is unused.
tari-project · May 17, 2024 · 69bc94a · 69bc94a
1 parent 64e650b
commit 69bc94a
Show file tree

Hide file tree

Showing 134 changed files with 170 additions and 390 deletions.
diff --git a/.github/workflows/build_binaries.json b/.github/workflows/build_binaries.json
@@ -2,7 +2,7 @@
   {
     "name": "linux-x86_64",
     "runs-on": "ubuntu-20.04",
-    "rust": "nightly-2024-02-04",
+    "rust": "nightly-2024-03-01",
     "target": "x86_64-unknown-linux-gnu",
     "cross": false,
     "build_metric": true

diff --git a/.github/workflows/build_binaries.yml b/.github/workflows/build_binaries.yml
@@ -26,7 +26,7 @@ env:
   TS_FEATURES: "default, safe"
   TS_LIBRARIES: "minotari_mining_helper_ffi"
   TARI_NETWORK_DIR: testnet
-  toolchain: nightly-2024-02-04
+  toolchain: nightly-2024-03-01
   matrix-json-file: ".github/workflows/build_binaries.json"
   CARGO_HTTP_MULTIPLEXING: false
   CARGO_UNSTABLE_SPARSE_REGISTRY: true

diff --git a/.github/workflows/build_dockers.yml b/.github/workflows/build_dockers.yml
@@ -48,7 +48,7 @@ name: Build docker images
           - xmrig
 
 env:
-  toolchain_default: nightly-2024-02-04
+  toolchain_default: nightly-2024-03-01
 
 concurrency:
   # https://docs.github.com/en/actions/examples/using-concurrency-expressions-and-a-test-matrix

diff --git a/.github/workflows/build_dockers_workflow.yml b/.github/workflows/build_dockers_workflow.yml
@@ -14,7 +14,7 @@ name: Build docker images - workflow_call/on-demand
       toolchain:
         type: string
         description: 'Rust toolchain'
-        default: nightly-2024-02-04
+        default: nightly-2024-03-01
       arch:
         type: string
         default: x86-64

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ name: CI
   merge_group:
 
 env:
-  toolchain: nightly-2024-02-04
+  toolchain: nightly-2024-03-01
   CARGO_HTTP_MULTIPLEXING: false
   CARGO_TERM_COLOR: always
   CARGO_UNSTABLE_SPARSE_REGISTRY: true

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -11,7 +11,7 @@ name: Source Coverage
       - ci-coverage-*
 
 env:
-  toolchain: nightly-2024-02-04
+  toolchain: nightly-2024-03-01
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
@@ -27,7 +27,7 @@ name: Integration tests
         type: string
 
 env:
-  toolchain: nightly-2024-02-04
+  toolchain: nightly-2024-03-01
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/applications/minotari_app_grpc/Cargo.toml b/applications/minotari_app_grpc/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2018"
 tari_common_types = {  path = "../../base_layer/common_types" }
 tari_comms = { path = "../../comms/core" }
 tari_core = { path = "../../base_layer/core" }
-tari_crypto = { version = "0.20" }
+tari_crypto = { version = "0.20.1" }
 tari_script = { path = "../../infrastructure/tari_script" }
 tari_utilities = { version = "0.7" }
 

diff --git a/applications/minotari_app_grpc/src/authentication/basic_auth.rs b/applications/minotari_app_grpc/src/authentication/basic_auth.rs
@@ -227,13 +227,9 @@ mod tests {
     }
 
     mod validate {
-        use std::{
-            cmp::{max, min},
-            thread::sleep,
-        };
+        use std::{cmp::max, thread::sleep};
 
-        use rand::RngCore;
-        use tari_utilities::{hex::Hex, ByteArray};
+        use tari_utilities::hex::Hex;
 
         use super::*;
         use crate::authentication::salted_password::create_salted_hashed_password;

diff --git a/applications/minotari_console_wallet/Cargo.toml b/applications/minotari_console_wallet/Cargo.toml
@@ -14,7 +14,7 @@ tari_common_types = { path = "../../base_layer/common_types" }
 tari_comms = { path = "../../comms/core" }
 tari_comms_dht = { path = "../../comms/dht" }
 tari_contacts = { path = "../../base_layer/contacts" }
-tari_crypto = { version = "0.20" }
+tari_crypto = { version = "0.20.1" }
 tari_key_manager = { path = "../../base_layer/key_manager" }
 tari_libtor = { path = "../../infrastructure/libtor", optional = true }
 tari_p2p = { path = "../../base_layer/p2p", features = ["auto-update"] }

diff --git a/applications/minotari_ledger_wallet/comms/Cargo.toml b/applications/minotari_ledger_wallet/comms/Cargo.toml
@@ -11,7 +11,7 @@ tari_common = { path = "../../../common", version = "1.0.0-pre.12" }
 
 ledger-transport = { git = "https://github.com/Zondax/ledger-rs", rev = "20e2a20" }
 ledger-transport-hid = { git = "https://github.com/Zondax/ledger-rs", rev = "20e2a20" }
-num-derive = "0.3.3"
+num-derive = "0.4.2"
 num-traits = "0.2.15"
 serde = { version = "1.0.106", features = ["derive"] }
 thiserror = "1.0.26"
diff --git a/applications/minotari_merge_mining_proxy/src/block_template_data.rs b/applications/minotari_merge_mining_proxy/src/block_template_data.rs
@@ -26,7 +26,7 @@ use std::{collections::HashMap, convert::TryFrom, sync::Arc};
 
 #[cfg(not(test))]
 use chrono::Duration;
-use chrono::{self, DateTime, Utc};
+use chrono::{DateTime, Utc};
 use minotari_node_grpc_client::grpc;
 use tari_common_types::types::FixedHash;
 use tari_core::proof_of_work::monero_rx::FixedByteArray;

diff --git a/applications/minotari_miner/Cargo.toml b/applications/minotari_miner/Cargo.toml
@@ -14,7 +14,7 @@ tari_common_types = { path = "../../base_layer/common_types" }
 tari_comms = { path = "../../comms/core" }
 minotari_app_utilities = { path = "../minotari_app_utilities", features = ["miner_input"] }
 minotari_app_grpc = { path = "../minotari_app_grpc" }
-tari_crypto = { version = "0.20" }
+tari_crypto = { version = "0.20.1" }
 tari_utilities = { version = "0.7" }
 
 base64 = "0.13.0"

diff --git a/applications/minotari_miner/src/stratum/controller.rs b/applications/minotari_miner/src/stratum/controller.rs
@@ -21,7 +21,6 @@
 // USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 use std::{
-    self,
     io::{BufRead, ErrorKind, Write},
     sync::mpsc,
     thread,

diff --git a/applications/minotari_miner/src/stratum/stratum_controller/controller.rs b/applications/minotari_miner/src/stratum/stratum_controller/controller.rs
@@ -20,7 +20,7 @@
 // WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 // USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
-use std::{self, convert::TryFrom, sync::mpsc, thread, time::SystemTime};
+use std::{convert::TryFrom, sync::mpsc, thread, time::SystemTime};
 
 use borsh::BorshDeserialize;
 use futures::stream::StreamExt;

diff --git a/applications/minotari_miner/src/stratum/stream.rs b/applications/minotari_miner/src/stratum/stream.rs
@@ -21,7 +21,6 @@
 // USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 use std::{
-    self,
     io::{self, BufRead, Read, Write},
     net::TcpStream,
 };

diff --git a/applications/minotari_node/Cargo.toml b/applications/minotari_node/Cargo.toml
@@ -15,7 +15,7 @@ tari_comms = { path = "../../comms/core", features = ["rpc"] }
 tari_common_types = { path = "../../base_layer/common_types" }
 tari_comms_dht = { path = "../../comms/dht" }
 tari_core = { path = "../../base_layer/core", default-features = false, features = ["transactions"] }
-tari_crypto = { version = "0.20" }
+tari_crypto = { version = "0.20.1" }
 tari_libtor = { path = "../../infrastructure/libtor", optional = true }
 tari_p2p = { path = "../../base_layer/p2p", features = ["auto-update"] }
 tari_storage = {path="../../infrastructure/storage"}

diff --git a/base_layer/chat_ffi/Cargo.toml b/base_layer/chat_ffi/Cargo.toml
@@ -32,7 +32,7 @@ crate-type = ["staticlib","cdylib"]
 [dev-dependencies]
 chrono = { version = "0.4.19", default-features = false }
 rand = "0.8"
-tari_crypto = { version = "0.20" }
+tari_crypto = { version = "0.20.1" }
 
 [build-dependencies]
 cbindgen = "0.24.3"