deps: use web-time instead of instant

Cargo.toml

@@ -76,29 +76,29 @@ futures-bounded = { version = "0.2.3" }
 futures-rustls = { version = "0.26.0", default-features = false }
 libp2p = { version = "0.54.0", path = "libp2p" }
 libp2p-allow-block-list = { version = "0.3.0", path = "misc/allow-block-list" }
-libp2p-autonat = { version = "0.12.0", path = "protocols/autonat" }
+libp2p-autonat = { version = "0.12.1", path = "protocols/autonat" }
 libp2p-connection-limits = { version = "0.3.1", path = "misc/connection-limits" }
-libp2p-core = { version = "0.41.2", path = "core" }
-libp2p-dcutr = { version = "0.11.0", path = "protocols/dcutr" }
+libp2p-core = { version = "0.41.3", path = "core" }
+libp2p-dcutr = { version = "0.11.1", path = "protocols/dcutr" }
 libp2p-dns = { version = "0.41.1", path = "transports/dns" }
 libp2p-floodsub = { version = "0.44.0", path = "protocols/floodsub" }
-libp2p-gossipsub = { version = "0.46.1", path = "protocols/gossipsub" }
+libp2p-gossipsub = { version = "0.46.2", path = "protocols/gossipsub" }
 libp2p-identify = { version = "0.44.2", path = "protocols/identify" }
 libp2p-identity = { version = "0.2.8" }
 libp2p-kad = { version = "0.46.0", path = "protocols/kad" }
 libp2p-mdns = { version = "0.45.1", path = "protocols/mdns" }
 libp2p-memory-connection-limits = { version = "0.2.0", path = "misc/memory-connection-limits" }
-libp2p-metrics = { version = "0.14.1", path = "misc/metrics" }
+libp2p-metrics = { version = "0.14.2", path = "misc/metrics" }
 libp2p-mplex = { version = "0.41.0", path = "muxers/mplex" }
 libp2p-muxer-test-harness = { path = "muxers/test-harness" }
 libp2p-noise = { version = "0.44.0", path = "transports/noise" }
-libp2p-perf = { version = "0.3.0", path = "protocols/perf" }
+libp2p-perf = { version = "0.3.1", path = "protocols/perf" }
 libp2p-ping = { version = "0.44.1", path = "protocols/ping" }
 libp2p-plaintext = { version = "0.41.0", path = "transports/plaintext" }
 libp2p-pnet = { version = "0.24.0", path = "transports/pnet" }
 libp2p-quic = { version = "0.10.3", path = "transports/quic" }
-libp2p-relay = { version = "0.17.2", path = "protocols/relay" }
-libp2p-rendezvous = { version = "0.14.0", path = "protocols/rendezvous" }
+libp2p-relay = { version = "0.17.3", path = "protocols/relay" }
+libp2p-rendezvous = { version = "0.14.1", path = "protocols/rendezvous" }
 libp2p-request-response = { version = "0.26.2", path = "protocols/request-response" }
 libp2p-server = { version = "0.12.7", path = "misc/server" }
 libp2p-stream = { version = "0.1.0-alpha.1", path = "protocols/stream" }
@@ -127,6 +127,7 @@ unsigned-varint = { version = "0.8.0" }
 tokio = { version = "1.37", default-features = false }
 tracing = "0.1.37"
 futures = "0.3.30"
+web-time = "1.1.0"
 ring = "0.17.8"
 
 [patch.crates-io]

core/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.41.3 
+- Use `web-time` instead of `instant`.
+  See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
+
 ## 0.41.2
 
 - Implement `std::fmt::Display` on `ListenerId`.

core/Cargo.toml

@@ -3,19 +3,19 @@ name = "libp2p-core"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Core traits and structs of libp2p"
-version = "0.41.2"
+version = "0.41.3"
 authors = ["Parity Technologies <[email protected]>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
 keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-either = "1.12"
+either = "1.11"
 fnv = "1.0"
 futures = { workspace = true, features = ["executor", "thread-pool"] }
 futures-timer = "3"
-instant = "0.1.13"
+web-time = { workspace = true }
 libp2p-identity = { workspace = true, features = ["peerid", "ed25519"] }
 multiaddr = { workspace = true }
 multihash = { workspace = true }

core/src/peer_record.rs

@@ -1,10 +1,10 @@
 use crate::signed_envelope::SignedEnvelope;
 use crate::{proto, signed_envelope, DecodeError, Multiaddr};
-use instant::SystemTime;
 use libp2p_identity::Keypair;
 use libp2p_identity::PeerId;
 use libp2p_identity::SigningError;
 use quick_protobuf::{BytesReader, Writer};
+use web_time::SystemTime;
 
 const PAYLOAD_TYPE: &str = "/libp2p/routing-state-record";
 const DOMAIN_SEP: &str = "libp2p-routing-state";

interop-tests/Cargo.toml

@@ -13,7 +13,7 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 anyhow = "1"
-either = "1.12.0"
+either = "1.11.0"
 futures = { workspace = true }
 rand = "0.8.5"
 serde = { version = "1", features = ["derive"] }
@@ -46,7 +46,7 @@ libp2p-webrtc-websys = { workspace = true }
 wasm-bindgen = { version = "0.2" }
 wasm-bindgen-futures = { version = "0.4" }
 wasm-logger = { version = "0.2.0" }
-instant = "0.1.13"
+web-time = { workspace = true }
 reqwest = { version = "0.12", features = ["json"] }
 console_error_panic_hook = { version = "0.1.7" }
 futures-timer = "3.0.3"

interop-tests/src/arch.rs

@@ -199,7 +199,7 @@ pub(crate) mod wasm {
 
     use crate::{BlpopRequest, Muxer, SecProtocol, Transport};
 
-    pub(crate) type Instant = instant::Instant;
+    pub(crate) type Instant = web_time::Instant;
 
     pub(crate) fn init_logger() {
         console_error_panic_hook::set_once();

libp2p/CHANGELOG.md

@@ -6,6 +6,9 @@
 - Raise MSRV to 1.73.
   See [PR 5266](https://github.com/libp2p/rust-libp2p/pull/5266).
 
+- Use `web-time` instead of `instant`.
+  See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
+
 ## 0.53.2
 
 - Allow `SwarmBuilder::with_bandwidth_metrics` after `SwarmBuilder::with_websocket`.

libp2p/Cargo.toml

@@ -82,7 +82,7 @@ tcp = ["dep:libp2p-tcp"]
 tls = ["dep:libp2p-tls"]
 tokio = [ "libp2p-swarm/tokio", "libp2p-mdns?/tokio", "libp2p-tcp?/tokio", "libp2p-dns?/tokio", "libp2p-quic?/tokio", "libp2p-upnp?/tokio"]
 uds = ["dep:libp2p-uds"]
-wasm-bindgen = [ "futures-timer/wasm-bindgen", "instant/wasm-bindgen", "getrandom/js", "libp2p-swarm/wasm-bindgen", "libp2p-gossipsub?/wasm-bindgen",]
+wasm-bindgen = [ "futures-timer/wasm-bindgen", "getrandom/js", "libp2p-swarm/wasm-bindgen", "libp2p-gossipsub?/wasm-bindgen"]
 websocket-websys = ["dep:libp2p-websocket-websys"]
 websocket = ["dep:libp2p-websocket"]
 webtransport-websys = ["dep:libp2p-webtransport-websys"]
@@ -95,7 +95,6 @@ either = "1.9.0"
 futures = { workspace = true }
 futures-timer = "3.0.2" # Explicit dependency to be used in `wasm-bindgen` feature
 getrandom = "0.2.3"     # Explicit dependency to be used in `wasm-bindgen` feature
-instant = "0.1.12"      # Explicit dependency to be used in `wasm-bindgen` feature
 # TODO feature flag?
 rw-stream-sink = { workspace = true }
 

misc/metrics/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.14.2
+- Use `web-time` instead of `instant`.
+  See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
+
 ## 0.14.1
 
 - Add `BandwidthTransport`, wrapping an existing `Transport`, exposing Prometheus bandwidth metrics.

misc/metrics/Cargo.toml

@@ -3,7 +3,7 @@ name = "libp2p-metrics"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Metrics for libp2p"
-version = "0.14.1"
+version = "0.14.2"
 authors = ["Max Inden <[email protected]>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -20,7 +20,7 @@ relay = ["libp2p-relay"]
 
 [dependencies]
 futures = { workspace = true }
-instant = "0.1.13"
+web-time = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-dcutr =  { workspace = true, optional = true }
 libp2p-gossipsub =  { workspace = true, optional = true }

misc/metrics/src/swarm.rs

@@ -22,13 +22,13 @@ use std::collections::HashMap;
 use std::sync::{Arc, Mutex};
 
 use crate::protocol_stack;
-use instant::Instant;
 use libp2p_swarm::{ConnectionId, DialError, SwarmEvent};
 use prometheus_client::encoding::{EncodeLabelSet, EncodeLabelValue};
 use prometheus_client::metrics::counter::Counter;
 use prometheus_client::metrics::family::Family;
 use prometheus_client::metrics::histogram::{exponential_buckets, Histogram};
 use prometheus_client::registry::{Registry, Unit};
+use web_time::Instant;
 
 pub(crate) struct Metrics {
     connections_incoming: Family<AddressLabels, Counter>,

protocols/autonat/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.12.1
+- Use `web-time` instead of `instant`.
+  See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
+
 ## 0.12.0
 
 - Remove `Clone`, `PartialEq` and `Eq` implementations on `Event` and its sub-structs.

protocols/autonat/Cargo.toml

@@ -4,7 +4,7 @@ edition = "2021"
 rust-version = { workspace = true }
 description = "NAT and firewall detection for libp2p"
 authors = ["David Craven <[email protected]>", "Elena Frank <[email protected]>"]
-version = "0.12.0"
+version = "0.12.1"
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
 keywords = ["peer-to-peer", "libp2p", "networking"]
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 async-trait = "0.1"
 futures = { workspace = true }
 futures-timer = "3.0"
-instant = "0.1"
+web-time = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-request-response = { workspace = true }

protocols/autonat/src/behaviour.rs

@@ -28,7 +28,6 @@ pub use as_client::{OutboundProbeError, OutboundProbeEvent};
 use as_server::AsServer;
 pub use as_server::{InboundProbeError, InboundProbeEvent};
 use futures_timer::Delay;
-use instant::Instant;
 use libp2p_core::{multiaddr::Protocol, ConnectedPoint, Endpoint, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_request_response::{
@@ -45,6 +44,7 @@ use std::{
     task::{Context, Poll},
     time::Duration,
 };
+use web_time::Instant;
 
 /// Config for the [`Behaviour`].
 #[derive(Debug, Clone, PartialEq, Eq)]

protocols/autonat/src/behaviour/as_client.rs

@@ -26,7 +26,6 @@ use super::{
 };
 use futures::FutureExt;
 use futures_timer::Delay;
-use instant::Instant;
 use libp2p_core::Multiaddr;
 use libp2p_identity::PeerId;
 use libp2p_request_response::{self as request_response, OutboundFailure, OutboundRequestId};
@@ -37,6 +36,7 @@ use std::{
     task::{Context, Poll},
     time::Duration,
 };
+use web_time::Instant;
 
 /// Outbound probe failed or was aborted.
 #[derive(Debug)]

protocols/autonat/src/behaviour/as_server.rs

@@ -22,7 +22,6 @@ use super::{
     Action, AutoNatCodec, Config, DialRequest, DialResponse, Event, HandleInnerEvent, ProbeId,
     ResponseError,
 };
-use instant::Instant;
 use libp2p_core::{multiaddr::Protocol, Multiaddr};
 use libp2p_identity::PeerId;
 use libp2p_request_response::{
@@ -36,6 +35,7 @@ use std::{
     collections::{HashMap, HashSet, VecDeque},
     num::NonZeroU8,
 };
+use web_time::Instant;
 
 /// Inbound probe failed.
 #[derive(Debug)]

protocols/dcutr/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.11.1
+- Use `web-time` instead of `instant`.
+  See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
+
 ## 0.11.0
 
 - Add `ConnectionId` to `Event::DirectConnectionUpgradeSucceeded` and `Event::DirectConnectionUpgradeFailed`.

protocols/dcutr/Cargo.toml

@@ -3,7 +3,7 @@ name = "libp2p-dcutr"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Direct connection upgrade through relay"
-version = "0.11.0"
+version = "0.11.1"
 authors = ["Max Inden <[email protected]>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -12,10 +12,10 @@ categories = ["network-programming", "asynchronous"]
 
 [dependencies]
 asynchronous-codec = { workspace = true }
-either = "1.12.0"
+either = "1.11.0"
 futures = { workspace = true }
 futures-timer = "3.0"
-instant = "0.1.13"
+web-time = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }

protocols/dcutr/src/protocol/outbound.rs

@@ -23,11 +23,11 @@ use crate::PROTOCOL_NAME;
 use asynchronous_codec::Framed;
 use futures::prelude::*;
 use futures_timer::Delay;
-use instant::Instant;
 use libp2p_core::{multiaddr::Protocol, Multiaddr};
 use libp2p_swarm::Stream;
 use std::io;
 use thiserror::Error;
+use web_time::Instant;
 
 pub(crate) async fn handshake(
     stream: Stream,

protocols/gossipsub/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.46.2
+- Use `web-time` instead of `instant`.
+  See [PR 5347](https://github.com/libp2p/rust-libp2p/pull/5347).
+
 ## 0.46.1
 
 - Deprecate `Rpc` in preparation for removing it from the public API because it is an internal type.

protocols/gossipsub/Cargo.toml

@@ -3,28 +3,28 @@ name = "libp2p-gossipsub"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Gossipsub protocol for libp2p"
-version = "0.46.1"
+version = "0.46.2"
 authors = ["Age Manning <[email protected]>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
 keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [features]
-wasm-bindgen = ["getrandom/js", "instant/wasm-bindgen"]
+wasm-bindgen = ["getrandom/js"]
 
 [dependencies]
 asynchronous-codec = { workspace = true }
 base64 = "0.22.1"
 byteorder = "1.5.0"
 bytes = "1.6"
-either = "1.12"
+either = "1.11"
 fnv = "1.0.7"
 futures = { workspace = true }
 futures-ticker = "0.0.3"
 getrandom = "0.2.15"
 hex_fmt = "0.3.0"
-instant = "0.1.13"
+web-time = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["rand"] }
 libp2p-swarm = { workspace = true }

protocols/gossipsub/src/backoff.rs

@@ -20,13 +20,13 @@
 
 //! Data structure for efficiently storing known back-off's when pruning peers.
 use crate::topic::TopicHash;
-use instant::Instant;
 use libp2p_identity::PeerId;
 use std::collections::{
     hash_map::{Entry, HashMap},
     HashSet,
 };
 use std::time::Duration;
+use web_time::Instant;
 
 #[derive(Copy, Clone)]
 struct HeartbeatIndex(usize);

protocols/gossipsub/src/behaviour.rs

@@ -34,7 +34,6 @@ use futures_ticker::Ticker;
 use prometheus_client::registry::Registry;
 use rand::{seq::SliceRandom, thread_rng};
 
-use instant::Instant;
 use libp2p_core::{multiaddr::Protocol::Ip4, multiaddr::Protocol::Ip6, Endpoint, Multiaddr};
 use libp2p_identity::Keypair;
 use libp2p_identity::PeerId;
@@ -44,6 +43,7 @@ use libp2p_swarm::{
     ConnectionDenied, ConnectionId, NetworkBehaviour, NotifyHandler, THandler, THandlerInEvent,
     THandlerOutEvent, ToSwarm,
 };
+use web_time::{Instant, SystemTime};
 
 use crate::backoff::BackoffStorage;
 use crate::config::{Config, ValidationMode};
@@ -64,7 +64,6 @@ use crate::types::{
 use crate::types::{PeerConnections, PeerKind, RpcOut};
 use crate::{rpc_proto::proto, TopicScoreParams};
 use crate::{PublishError, SubscriptionError, ValidationError};
-use instant::SystemTime;
 use quick_protobuf::{MessageWrite, Writer};
 use std::{cmp::Ordering::Equal, fmt::Debug};
 

protocols/gossipsub/src/gossip_promises.rs

@@ -21,9 +21,9 @@
 use crate::peer_score::RejectReason;
 use crate::MessageId;
 use crate::ValidationError;
-use instant::Instant;
 use libp2p_identity::PeerId;
 use std::collections::HashMap;
+use web_time::Instant;
 
 /// Tracks recently sent `IWANT` messages and checks if peers respond to them.
 #[derive(Default)]