adapt after rebase on main

iroh-bytes/src/util.rs

@@ -82,6 +82,12 @@ impl From<[u8; 32]> for Hash {
     }
 }
 
+impl From<Hash> for [u8; 32]{
+    fn from(value: Hash) -> Self {
+        *value.as_bytes()
+    }
+}
+
 impl From<&[u8; 32]> for Hash {
     fn from(value: &[u8; 32]) -> Self {
         Hash(blake3::Hash::from(*value))

iroh-gossip/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "iroh-gossip"
-version = "0.4.1"
+version = "0.5.1"
 edition = "2021"
 readme = "README.md"
 description = "gossip messages over broadcast trees"
@@ -11,7 +11,7 @@ repository = "https://github.com/n0-computer/iroh-sync"
 [dependencies]
 # proto dependencies (required)
 anyhow = { version = "1", features = ["backtrace"] }
-blake3 = "1.3.3"
+blake3 = { package = "iroh-blake3", version = "1.4.3"}
 bytes = { version = "1.4.0", features = ["serde"] }
 data-encoding = "2.4.0"
 derive_more = { version = "1.0.0-beta.1", features = ["add", "debug", "display", "from", "try_into"] }

iroh-gossip/src/proto/util.rs

@@ -56,7 +56,7 @@ macro_rules! idbytes_impls {
             }
         }
 
-        impl<T: Into<[u8; 32]>> From<T> for $ty {
+        impl<T: Into<[u8; 32]>> std::convert::From<T> for $ty {
             fn from(value: T) -> Self {
                 Self::from_bytes(value.into())
             }

iroh-sync/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "iroh-sync"
-version = "0.1.0"
+version = "0.5.1"
 edition = "2021"
 readme = "README.md"
 description = "Iroh sync"
@@ -10,7 +10,7 @@ repository = "https://github.com/n0-computer/iroh"
 
 [dependencies]
 anyhow = "1.0.71"
-blake3 = "1.3.3"
+blake3 = { package = "iroh-blake3", version = "1.4.3"}
 crossbeam = "0.8.2"
 derive_more = { version = "1.0.0-beta.1", features = ["debug", "display", "from", "try_into"] }
 ed25519-dalek = { version = "2.0.0-rc.2", features = ["serde", "rand_core"] }
@@ -35,4 +35,4 @@ tempfile = "3.4"
 
 [features]
 default = ["fs-store"]
-fs-store = ["redb", "ouroboros"]
+fs-store = ["redb", "ouroboros"]

iroh/Cargo.toml

@@ -26,8 +26,8 @@ iroh-bytes = { version = "0.5.0", path = "../iroh-bytes" }
 iroh-metrics = { version = "0.5.0", path = "../iroh-metrics", optional = true }
 num_cpus = { version = "1.15.0" }
 portable-atomic = "1"
-iroh-sync = { path = "../iroh-sync" }
-iroh-gossip = { path = "../iroh-gossip" }
+iroh-sync = { version = "0.5.1", path = "../iroh-sync" }
+iroh-gossip = { version = "0.5.1", path = "../iroh-gossip" }
 postcard = { version = "1", default-features = false, features = ["alloc", "use-std", "experimental-derive"] }
 quic-rpc = { version = "0.6", default-features = false, features = ["flume-transport"] }
 quinn = "0.10"

iroh/examples/sync.rs

@@ -21,16 +21,16 @@ use iroh::sync::{
 };
 use iroh_bytes::util::runtime;
 use iroh_gossip::{
-    net::{GossipHandle, GOSSIP_ALPN},
+    net::{Gossip, GOSSIP_ALPN},
     proto::TopicId,
 };
 use iroh_metrics::{
     core::{Counter, Metric},
     struct_iterable::Iterable,
 };
 use iroh_net::{
-    defaults::{default_derp_map, DEFAULT_DERP_STUN_PORT},
-    derp::{DerpMap, UseIpv4, UseIpv6},
+    defaults::{default_derp_map},
+    derp::{DerpMap},
     magic_endpoint::get_alpn,
     tls::Keypair,
     MagicEndpoint,
@@ -131,7 +131,7 @@ async fn run(args: Args) -> anyhow::Result<()> {
     // configure our derp map
     let derp_map = match (args.no_derp, args.derp) {
         (false, None) => Some(default_derp_map()),
-        (false, Some(url)) => Some(derp_map_from_url(url)?),
+        (false, Some(url)) => Some(DerpMap::from_url(url, 0)),
         (true, None) => None,
         (true, Some(_)) => bail!("You cannot set --no-derp and --derp at the same time"),
     };
@@ -140,7 +140,7 @@ async fn run(args: Args) -> anyhow::Result<()> {
     // build our magic endpoint and the gossip protocol
     let (endpoint, gossip, initial_endpoints) = {
         // init a cell that will hold our gossip handle to be used in endpoint callbacks
-        let gossip_cell: OnceCell<GossipHandle> = OnceCell::new();
+        let gossip_cell: OnceCell<Gossip> = OnceCell::new();
         // init a channel that will emit once the initial endpoints of our local node are discovered
         let (initial_endpoints_tx, mut initial_endpoints_rx) = mpsc::channel(1);
         // build the magic endpoint
@@ -167,7 +167,7 @@ async fn run(args: Args) -> anyhow::Result<()> {
             .await?;
 
         // initialize the gossip protocol
-        let gossip = GossipHandle::from_endpoint(endpoint.clone(), Default::default());
+        let gossip = Gossip::from_endpoint(endpoint.clone(), Default::default());
         // insert into the gossip cell to be used in the endpoint callbacks above
         gossip_cell.set(gossip.clone()).unwrap();
 
@@ -181,7 +181,7 @@ async fn run(args: Args) -> anyhow::Result<()> {
 
     let (topic, peers) = match &args.command {
         Command::Open { doc_name } => {
-            let topic: TopicId = blake3::hash(doc_name.as_bytes()).into();
+            let topic: TopicId = iroh_bytes::Hash::new(doc_name.as_bytes()).into();
             println!(
                 "> opening document {doc_name} as namespace {} and waiting for peers to join us...",
                 fmt_hash(topic.as_bytes())
@@ -685,7 +685,7 @@ impl FromStr for Cmd {
 
 #[derive(Debug)]
 struct State {
-    gossip: GossipHandle,
+    gossip: Gossip,
     docs: DocStore,
     bytes: IrohBytesHandlers,
 }
@@ -879,25 +879,13 @@ fn parse_keypair(secret: &str) -> anyhow::Result<Keypair> {
 fn fmt_derp_map(derp_map: &Option<DerpMap>) -> String {
     match derp_map {
         None => "None".to_string(),
-        Some(map) => {
-            let regions = map.regions.iter().map(|(id, region)| {
-                let nodes = region.nodes.iter().map(|node| node.url.to_string());
-                (*id, nodes.collect::<Vec<_>>())
-            });
-            format!("{:?}", regions.collect::<Vec<_>>())
-        }
+        Some(map) => map
+            .regions()
+            .flat_map(|region| region.nodes.iter().map(|node| node.url.to_string()))
+            .collect::<Vec<_>>()
+            .join(", "),
     }
 }
-fn derp_map_from_url(url: Url) -> anyhow::Result<DerpMap> {
-    Ok(DerpMap::default_from_node(
-        url,
-        DEFAULT_DERP_STUN_PORT,
-        UseIpv4::TryDns,
-        UseIpv6::TryDns,
-        0,
-    ))
-}
-
 fn canonicalize_path(path: &str) -> anyhow::Result<PathBuf> {
     let path = PathBuf::from(shellexpand::tilde(&path).to_string());
     Ok(path)

iroh/src/sync/live.rs

@@ -8,7 +8,7 @@ use futures::{
     FutureExt, TryFutureExt,
 };
 use iroh_gossip::{
-    net::{Event, GossipHandle},
+    net::{Event, Gossip},
     proto::TopicId,
 };
 use iroh_metrics::inc;
@@ -64,7 +64,7 @@ pub struct LiveSync<S: store::Store> {
 }
 
 impl<S: store::Store> LiveSync<S> {
-    pub fn spawn(endpoint: MagicEndpoint, gossip: GossipHandle) -> Self {
+    pub fn spawn(endpoint: MagicEndpoint, gossip: Gossip) -> Self {
         let (to_actor_tx, to_actor_rx) = mpsc::channel(CHANNEL_CAP);
         let mut actor = Actor::new(endpoint, gossip, to_actor_rx);
         let task = tokio::spawn(async move {
@@ -102,7 +102,7 @@ impl<S: store::Store> LiveSync<S> {
 // Currently peers might double-sync in both directions.
 struct Actor<S: store::Store> {
     endpoint: MagicEndpoint,
-    gossip: GossipHandle,
+    gossip: Gossip,
 
     docs: HashMap<TopicId, Replica<S::Instance>>,
     subscription: BoxStream<'static, Result<(TopicId, Event)>>,
@@ -119,7 +119,7 @@ struct Actor<S: store::Store> {
 impl<S: store::Store> Actor<S> {
     pub fn new(
         endpoint: MagicEndpoint,
-        gossip: GossipHandle,
+        gossip: Gossip,
         to_actor_rx: mpsc::Receiver<ToActor<S>>,
     ) -> Self {
         let (insert_tx, insert_rx) = flume::bounded(64);
@@ -237,13 +237,15 @@ impl<S: store::Store> Actor<S> {
         }
 
         // join gossip for the topic to receive and send message
-        let topic: TopicId = doc.namespace().as_bytes().into();
+        let topic = TopicId::from_bytes(*doc.namespace().as_bytes());
         self.pending_joins.push({
             let peer_ids = peer_ids.clone();
             let gossip = self.gossip.clone();
             async move {
-                let res = gossip.join(topic, peer_ids).await;
-                (topic, res)
+                match gossip.join(topic, peer_ids).await {
+                    Err(err) => (topic, Err(err)),
+                    Ok(fut) => (topic, fut.await),
+                }
             }
             .boxed()
         });