From ce548b5ddea5c4685006ef8a26f2c64954ea0b96 Mon Sep 17 00:00:00 2001
From: Ericson Soares <ericson.ds999@gmail.com>
Date: Tue, 1 Oct 2024 14:46:27 -0300
Subject: [PATCH] Update schema and deps

---
 Cargo.lock                                    | Bin 337574 -> 337518 bytes
 Cargo.toml                                    |   2 +-
 core/crates/cloud-services/Cargo.toml         |  13 ++++++-------
 .../src/key_manager/key_store.rs              |   6 ++++--
 .../cloud-services/src/key_manager/mod.rs     |   6 ++++--
 core/crates/cloud-services/src/lib.rs         |   1 -
 core/crates/cloud-services/src/p2p/mod.rs     |   2 +-
 core/src/api/cloud/devices.rs                 |   5 +++--
 core/src/api/cloud/mod.rs                     |   4 ++--
 packages/client/src/core.ts                   |   2 +-
 10 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a6d1f8e4f13e472fb509ee06d0a9cd0735b394bf..4c55bf3b9297d54e75ad09aaee62272f026b0eff 100644
GIT binary patch
delta 617
zcmYLGy=&A#5aoBjQ&9^cM9!c@VgwtJ-I@I)nzL6?EJW~{nf<6l^9RH_sl4KfElnZT
zip8%Hg8{WMC<vl<+K32#ASvwJi-pX>3<K}Yd;1=2&whV3`|#HL$#%KCtjM#kFEA(N
zmC_8-8Wn>upalXs&r)duqaYb;1ST0gnyi&}u{_#n29voD7pGjqz!p(ZqL?{>Hv+td
ziV8|(lo~-0Q-ubFq!|rDM(Z^ymysis=0gA6WBc*sm-1uWTwV4SgJ2BSX_*O<t4vu1
zc2z*_#1bt!<s7(7nH0vHK(hp_qI3DV)H^ci_8lrSTg}<tiPL4{etWpPxz+6N?eY%=
zq?pMDk~DQG*jta$D`RCsVC#do(a7WlKo$;yP7Lfd8&!9qJiFU2lvB@}&;RJKy4A=@
zXhR-Ss=Dh18HBSbMXzODnPfz+WtC7~rYsFrRQ>rt<=0YgP>x?}50)n{n(N)smyJC$
z*}OBqwzAW7D?7b=3+2zuo-0FZ87b9hymP@J1sjsEzzG8wp{um10q1HGsG>=nK?$!Z
zM&nq;Nwd0p=0MpTw2R%>LHq5tOc8Bnjg}YxkD(@>GdZQCBdWXtT|yDEAewx7J1EE2
fTi4xKZ-4Jy8;#p;H13bim#1^heE05k|IM|(c^<;F

delta 686
zcmYL`JxG>O6vuhq=P9WWM8tRVgMw&K&iy#|14M<!9Lk}LrgQGc&`?Wb5G^S*IK0pu
zT58a_2zncugoG$*t(LH*A!rF3TI%Yc+u;nq|M~yUua6VkdlN72d_FbD=^mAbkDJv+
zseJ%tWwJ73_KGn;Ak+bftzpha3d1H_;k-m`O^%*}&Y75X9?Y&x4#vN%oDi=qN*lfK
zAw`QGauAj=BB@{$8zYk=8>Nz33K?|LkvT<gF;I?DMp0gV==$aAoA%<XOJ6Vi7%V(m
zT|$joYUgTjayDt5Be+PxCsUV3p;3?{M<R0QY7`P?po(@;SzGpR_a+CgN5)FG(=3b}
zm7ll6<(+1xcf|LZ4Y7l4LkKZB-~^V8Rtj7aIoIM5IeB5FNWmbJH!O`H;J}y$&Ha9v
zrry~y{;v6cNL<te-je}sU0|<-7pN>6@*&HdwIBi&h0~yn2l65r$e=w%Z7f6Czfm0k
z_s*5=-R9=;#s792J71QsG*e~lPt&ch9W=wWgWl8G^7d~tTAqpa@{+TG9Uf9yR6B`c
z@`SO9_SGWR3sTAkjPk6Mg^Wp%bQvWkMs!E64x>lQR==G+j^6FJKktehG@BHO<N1>@
zOJDUsf~bUr`k$&DlB)kOY4CikUmiTEMY@f4?wBSv+TW+kt&R4~`t)WyoZjqcxy<bM
QrpmXyZe+Oise6C@Kc*hnF#rGn

diff --git a/Cargo.toml b/Cargo.toml
index 6efa9eab5..21c13170f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,7 +20,7 @@ rust-version = "1.80"
 
 [workspace.dependencies]
 # First party dependencies
-sd-cloud-schema = { git = "https://github.com/spacedriveapp/cloud-services-schema", rev = "fc4b6edabd" }
+sd-cloud-schema = { git = "https://github.com/spacedriveapp/cloud-services-schema", rev = "ed37fb537b" }
 
 # Third party dependencies used by one or more of our crates
 async-channel       = "2.3"
diff --git a/core/crates/cloud-services/Cargo.toml b/core/crates/cloud-services/Cargo.toml
index ae1d41aca..7298a21b1 100644
--- a/core/crates/cloud-services/Cargo.toml
+++ b/core/crates/cloud-services/Cargo.toml
@@ -36,13 +36,12 @@ uuid                = { workspace = true, features = ["serde"] }
 zeroize             = { workspace = true }
 
 # External dependencies
-anyhow    = "1.0.86"
-iroh-base = { version = "0.25", features = ["key"] }
-iroh-net  = { version = "0.25", features = ["discovery-local-network", "iroh-relay"] }
-paste     = "=1.0.15"
-postcard  = { version = "1.0.8", features = ["use-std"] }
-quic-rpc  = { version = "0.12.0", features = ["quinn-transport"] }
-quinn     = { package = "iroh-quinn", version = "0.11" }
+anyhow   = "1.0.86"
+iroh-net = { version = "0.26", features = ["discovery-local-network", "iroh-relay"] }
+paste    = "=1.0.15"
+postcard = { version = "1.0.8", features = ["use-std"] }
+quic-rpc = { version = "0.12.1", features = ["quinn-transport"] }
+quinn    = { package = "iroh-quinn", version = "0.11" }
 # Using whatever version of reqwest that reqwest-middleware uses, just putting here to enable some features
 reqwest                  = { version = "0.12", features = ["json", "native-tls-vendored", "stream"] }
 reqwest-middleware       = { version = "0.3", features = ["json"] }
diff --git a/core/crates/cloud-services/src/key_manager/key_store.rs b/core/crates/cloud-services/src/key_manager/key_store.rs
index 922597a73..9dc03aaa9 100644
--- a/core/crates/cloud-services/src/key_manager/key_store.rs
+++ b/core/crates/cloud-services/src/key_manager/key_store.rs
@@ -1,6 +1,9 @@
 use crate::Error;
 
-use sd_cloud_schema::sync::{groups, KeyHash};
+use sd_cloud_schema::{
+	sync::{groups, KeyHash},
+	NodeId, SecretKey as IrohSecretKey,
+};
 use sd_crypto::{
 	cloud::{decrypt, encrypt, secret_key::SecretKey},
 	primitives::{EncryptedBlock, OneShotNonce, StreamNonce},
@@ -16,7 +19,6 @@ use std::{
 };
 
 use futures::StreamExt;
-use iroh_base::key::{NodeId, SecretKey as IrohSecretKey};
 use serde::{Deserialize, Serialize};
 use tokio::{
 	fs,
diff --git a/core/crates/cloud-services/src/key_manager/mod.rs b/core/crates/cloud-services/src/key_manager/mod.rs
index 79ac7ecaa..64007a190 100644
--- a/core/crates/cloud-services/src/key_manager/mod.rs
+++ b/core/crates/cloud-services/src/key_manager/mod.rs
@@ -1,6 +1,9 @@
 use crate::Error;
 
-use sd_cloud_schema::sync::{groups, KeyHash};
+use sd_cloud_schema::{
+	sync::{groups, KeyHash},
+	NodeId, SecretKey as IrohSecretKey,
+};
 use sd_crypto::{cloud::secret_key::SecretKey, CryptoRng};
 use sd_utils::error::FileIOError;
 
@@ -9,7 +12,6 @@ use std::{
 	path::{Path, PathBuf},
 };
 
-use iroh_base::key::{NodeId, SecretKey as IrohSecretKey};
 use tokio::{fs, sync::RwLock};
 
 mod key_store;
diff --git a/core/crates/cloud-services/src/lib.rs b/core/crates/cloud-services/src/lib.rs
index a298d0e5e..615d5397d 100644
--- a/core/crates/cloud-services/src/lib.rs
+++ b/core/crates/cloud-services/src/lib.rs
@@ -48,7 +48,6 @@ pub use sync::{
 };
 
 // Re-exports
-pub use iroh_base::key::{NodeId, SecretKey as IrohSecretKey};
 pub use quic_rpc::transport::quinn::QuinnConnection;
 
 // Export URL for the auth server
diff --git a/core/crates/cloud-services/src/p2p/mod.rs b/core/crates/cloud-services/src/p2p/mod.rs
index cfc7b7ded..03fb12b02 100644
--- a/core/crates/cloud-services/src/p2p/mod.rs
+++ b/core/crates/cloud-services/src/p2p/mod.rs
@@ -5,10 +5,10 @@ use sd_cloud_schema::{
 	devices::{self, Device},
 	libraries,
 	sync::groups::GroupWithDevices,
+	SecretKey as IrohSecretKey,
 };
 use sd_crypto::{CryptoRng, SeedableRng};
 
-use iroh_base::key::SecretKey as IrohSecretKey;
 use iroh_net::{
 	discovery::{
 		dns::DnsDiscovery, local_swarm_discovery::LocalSwarmDiscovery, pkarr::dht::DhtDiscovery,
diff --git a/core/src/api/cloud/devices.rs b/core/src/api/cloud/devices.rs
index 64ae5e4d0..ca1a81ad6 100644
--- a/core/src/api/cloud/devices.rs
+++ b/core/src/api/cloud/devices.rs
@@ -1,5 +1,7 @@
 use crate::api::{Ctx, R};
 
+use sd_core_cloud_services::QuinnConnection;
+
 use sd_cloud_schema::{
 	auth::AccessToken,
 	devices::{self, DeviceOS, HardwareModel, PubId},
@@ -8,9 +10,8 @@ use sd_cloud_schema::{
 		ClientRegistration, ClientRegistrationFinishParameters, ClientRegistrationFinishResult,
 		ClientRegistrationStartResult,
 	},
-	Client, Service, SpacedriveCipherSuite,
+	Client, NodeId, Service, SpacedriveCipherSuite,
 };
-use sd_core_cloud_services::{NodeId, QuinnConnection};
 use sd_crypto::{cloud::secret_key::SecretKey, CryptoRng};
 
 use blake3::Hash;
diff --git a/core/src/api/cloud/mod.rs b/core/src/api/cloud/mod.rs
index d1d9e639d..bc9bd00a1 100644
--- a/core/src/api/cloud/mod.rs
+++ b/core/src/api/cloud/mod.rs
@@ -4,13 +4,13 @@ use crate::{
 	Node,
 };
 
-use sd_core_cloud_services::{CloudP2P, IrohSecretKey, KeyManager, QuinnConnection, UserResponse};
+use sd_core_cloud_services::{CloudP2P, KeyManager, QuinnConnection, UserResponse};
 
 use sd_cloud_schema::{
 	auth,
 	error::{ClientSideError, Error},
 	sync::groups,
-	users, Client, Service,
+	users, Client, SecretKey as IrohSecretKey, Service,
 };
 use sd_crypto::{CryptoRng, SeedableRng};
 use sd_utils::error::report_error;
diff --git a/packages/client/src/core.ts b/packages/client/src/core.ts
index c27e7b25c..2f3b8a17e 100644
--- a/packages/client/src/core.ts
+++ b/packages/client/src/core.ts
@@ -216,7 +216,7 @@ export type CloudSyncGroupBaseData = { pub_id: CloudSyncGroupPubId; latest_key_h
 
 export type CloudSyncGroupGetRequestKind = "WithDevices" | "FullData"
 
-export type CloudSyncGroupGetResponseKind = { WithDevices: CloudSyncGroupWithLibraryAndDevices } | { FullData: CloudSyncGroup }
+export type CloudSyncGroupGetResponseKind = { kind: "WithDevices"; data: CloudSyncGroupWithLibraryAndDevices } | { kind: "FullData"; data: CloudSyncGroup }
 
 export type CloudSyncGroupPubId = string