From 648d237df5a2693afef44d737fd8f5425b8eebfe Mon Sep 17 00:00:00 2001
From: Luke Parker <lukeparker5132@gmail.com>
Date: Sat, 1 Apr 2023 05:44:18 -0400
Subject: [PATCH] Finish updating to the latest Rust/handle broken cargo update

---
 Cargo.lock              | 19 +++++++++----------
 coins/monero/src/rpc.rs |  2 +-
 processor/src/main.rs   |  3 ++-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6bb3946f..99ae0ac9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1652,9 +1652,9 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "4.0.0-rc.2"
+version = "4.0.0-pre.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03d928d978dbec61a1167414f5ec534f24bea0d7a0d24dd9b6233d3d8223e585"
+checksum = "67bc65846be335cb20f4e52d49a437b773a2c1fdb42b19fc84e79e6f6771536f"
 dependencies = [
  "cfg-if",
  "fiat-crypto",
@@ -2771,9 +2771,9 @@ dependencies = [
 
 [[package]]
 name = "fiat-crypto"
-version = "0.1.19"
+version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93ace6ec7cc19c8ed33a32eaa9ea692d7faea05006b5356b9e2b668ec4bc3955"
+checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77"
 
 [[package]]
 name = "file-per-thread-logger"
@@ -9099,7 +9099,7 @@ dependencies = [
  "aes-gcm 0.9.4",
  "blake2",
  "chacha20poly1305",
- "curve25519-dalek 4.0.0-rc.2",
+ "curve25519-dalek 4.0.0-pre.5",
  "rand_core 0.6.4",
  "ring",
  "rustc_version",
@@ -11540,7 +11540,7 @@ dependencies = [
  "tokio",
  "webpki 0.21.4",
  "webrtc-util",
- "x25519-dalek 2.0.0-rc.2",
+ "x25519-dalek 2.0.0-pre.1",
  "x509-parser 0.13.2",
 ]
 
@@ -11909,13 +11909,12 @@ dependencies = [
 
 [[package]]
 name = "x25519-dalek"
-version = "2.0.0-rc.2"
+version = "2.0.0-pre.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fabd6e16dd08033932fc3265ad4510cc2eab24656058a6dcb107ffe274abcc95"
+checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df"
 dependencies = [
- "curve25519-dalek 4.0.0-rc.2",
+ "curve25519-dalek 3.2.0",
  "rand_core 0.6.4",
- "serde",
  "zeroize",
 ]
 
diff --git a/coins/monero/src/rpc.rs b/coins/monero/src/rpc.rs
index dda15be8..de3dcaf0 100644
--- a/coins/monero/src/rpc.rs
+++ b/coins/monero/src/rpc.rs
@@ -87,7 +87,7 @@ impl Rpc {
   pub fn new(mut url: String) -> Result<Rpc, RpcError> {
     // Parse out the username and password
     let userpass = if url.contains('@') {
-      let url_clone = url.clone();
+      let url_clone = url;
       let split_url = url_clone.split('@').collect::<Vec<_>>();
       if split_url.len() != 2 {
         Err(RpcError::InvalidNode)?;
diff --git a/processor/src/main.rs b/processor/src/main.rs
index e6637a22..02f80c1e 100644
--- a/processor/src/main.rs
+++ b/processor/src/main.rs
@@ -333,7 +333,8 @@ async fn run<C: Coin, D: Db, Co: Coordinator>(raw_db: D, coin: C, mut coordinato
         match msg.msg.clone() {
           CoordinatorMessage::KeyGen(msg) => {
             match key_gen.handle(msg).await {
-              KeyGenEvent::KeyConfirmed { activation_number, substrate_keys, coin_keys } => {
+              // TODO: Handle substrate_keys
+              KeyGenEvent::KeyConfirmed { activation_number, substrate_keys: _, coin_keys } => {
                 let keys = coin_keys;
                 let key = keys.group_key();
                 scanner.rotate_key(activation_number, key).await;