Merge remote-tracking branch 'origin/main'

Author: ple1n

.github/workflows/ci.yml

@@ -14,9 +14,6 @@ jobs:
 
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        args: ["--all-features"]
     env:
       FREENET_LOG: error
       CARGO_TARGET_DIR: ${{ github.workspace }}/target
@@ -37,7 +34,7 @@ jobs:
       - uses: Swatinem/rust-cache@v2
 
       - name: Test - features
-        run: cargo test --workspace ${{ matrix.args }}
+        run: cargo test --workspace --features contract,net,testing,trace
 
   build_targets:
     name: Build targets
@@ -112,6 +109,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: stable
+          components: rustfmt
 
       - name: Check code formatting
         run: cargo fmt -- --check

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [0.1.14] - 2025-09-04
+
+### Changed
+- Updated `tokio-tungstenite` from 0.26.1 to 0.27.0
+- Updated `rand` from 0.8 to 0.9 (dev dependency)
+- Fixed `from_entropy()` to use `from_os_rng()` for rand 0.9 compatibility
+
+### Note
+- [AI-assisted debugging and comment]
+- This release updates dependencies to support freenet-core dependency updates
+
 ## [0.1.9] - 2025-06-19
 
 ### Added

rust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "freenet-stdlib"
-version = "0.1.11"
+version = "0.1.22"
 edition = "2021"
 rust-version = "1.71.1"
 publish = true
@@ -32,7 +32,7 @@ freenet-macros = { path = "../rust-macros", version = "0.1.0-rc1" }
 
 [target.'cfg(any(unix, windows))'.dependencies]
 tokio = { version = "1", optional = true, features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] }
-tokio-tungstenite = { version = "0.26.1", optional = true }
+tokio-tungstenite = { version = "0.27.0", optional = true }
 serde_with = { version = "3" }
 
 [target.'cfg(target_family = "wasm")'.dependencies]
@@ -59,7 +59,7 @@ optional = true
 [target.'cfg(any(unix, windows))'.dev-dependencies]
 bincode = "1"
 wasmer = { version = "5.0.4", features = [ "sys-default"] }
-rand = { version = "0.8", features = ["small_rng"] }
+rand = { version = "0.9", features = ["small_rng"] }
 arbitrary = { version = "1", features = ["derive"] }
 
 [features]
@@ -70,3 +70,4 @@ freenet-main-contract = []
 net = ["dep:tokio", "dep:tokio-tungstenite", "dep:wasm-bindgen", "dep:web-sys", "dep:js-sys", "dep:serde-wasm-bindgen"]
 testing = ["dep:arbitrary"]
 trace = []
+wasmer-tests = []

rust/src/client_api/browser.rs

@@ -88,9 +88,12 @@ impl WebApi {
         conn.set_onerror(Some(onerror_callback.as_ref().unchecked_ref()));
         onerror_callback.forget();
 
-        let onopen_callback = Closure::<dyn FnOnce()>::once(move || {
-            onopen_handler();
-        });
+        let onopen_handler = Rc::new(RefCell::new(Some(onopen_handler)));
+        let onopen_callback = Closure::wrap(Box::new(move || {
+            if let Some(handler) = onopen_handler.borrow_mut().take() {
+                handler();
+            }
+        }) as Box<dyn FnMut()>);
         // conn.add_event_listener_with_callback("open", onopen_callback.as_ref().unchecked_ref());
         conn.set_onopen(Some(onopen_callback.as_ref().unchecked_ref()));
         onopen_callback.forget();

rust/src/client_api/client_events.rs

@@ -54,7 +54,7 @@ use crate::{
 
 use super::WsApiError;
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct ClientError {
     kind: Box<ErrorKind>,
 }
@@ -321,7 +321,7 @@ impl ClientRequest<'_> {
         matches!(self, Self::Disconnect { .. })
     }
 
-    pub fn try_decode_fbs(msg: &[u8]) -> Result<ClientRequest, WsApiError> {
+    pub fn try_decode_fbs(msg: &[u8]) -> Result<ClientRequest<'_>, WsApiError> {
         let req = {
             match root_as_client_request(msg) {
                 Ok(client_request) => match client_request.client_request_type() {
@@ -707,7 +707,7 @@ impl<'a> TryFromFbs<&FbsDelegateRequest<'a>> for DelegateRequest<'a> {
 }
 
 /// A response to a previous [`ClientRequest`]
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 #[non_exhaustive]
 pub enum HostResponse<T = WrappedState> {
     ContractResponse(#[serde(bound(deserialize = "T: DeserializeOwned"))] ContractResponse<T>),
@@ -722,11 +722,12 @@ pub enum HostResponse<T = WrappedState> {
 
 type Peer = String;
 
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 pub enum QueryResponse {
     ConnectedPeers { peers: Vec<(Peer, SocketAddr)> },
     NetworkDebug(NetworkDebugInfo),
     NodeDiagnostics(NodeDiagnosticsResponse),
+    ProximityCache(ProximityCacheInfo),
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
@@ -806,6 +807,57 @@ pub enum NodeQuery {
         /// Diagnostic configuration specifying what information to collect
         config: NodeDiagnosticsConfig,
     },
+    /// Phase 3: Query proximity cache information for update propagation
+    ProximityCacheInfo,
+}
+
+/// Phase 3: Proximity cache information for update propagation
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct ProximityCacheInfo {
+    /// Contracts this node is currently caching
+    pub my_cache: Vec<ContractCacheEntry>,
+    /// What we know about neighbor caches
+    pub neighbor_caches: Vec<NeighborCacheInfo>,
+    /// Proximity propagation statistics
+    pub stats: ProximityStats,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct ContractCacheEntry {
+    /// Full contract key as string
+    pub contract_key: String,
+    /// 32-bit hash for proximity matching
+    pub cache_hash: u32,
+    /// When this contract was cached (Unix timestamp)
+    pub cached_since: u64,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct NeighborCacheInfo {
+    /// Peer identifier
+    pub peer_id: String,
+    /// Contract hashes this neighbor is known to cache
+    pub known_contracts: Vec<u32>,
+    /// Last update received from this neighbor (Unix timestamp)
+    pub last_update: u64,
+    /// Number of updates received from this neighbor
+    pub update_count: u64,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct ProximityStats {
+    /// Number of cache announcements sent
+    pub cache_announces_sent: u64,
+    /// Number of cache announcements received
+    pub cache_announces_received: u64,
+    /// Updates forwarded via proximity (not subscription)
+    pub updates_via_proximity: u64,
+    /// Updates forwarded via subscription
+    pub updates_via_subscription: u64,
+    /// False positives due to hash collisions
+    pub false_positive_forwards: u64,
+    /// Average number of contracts per neighbor
+    pub avg_neighbor_cache_size: f32,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]

rust/src/contract_interface.rs

@@ -1554,11 +1554,11 @@ pub(crate) mod wasm_interface {
 mod test {
     use super::*;
     use once_cell::sync::Lazy;
-    use rand::{rngs::SmallRng, Rng, SeedableRng};
+    use rand::{rng, rngs::SmallRng, Rng, SeedableRng};
 
     static RND_BYTES: Lazy<[u8; 1024]> = Lazy::new(|| {
         let mut bytes = [0; 1024];
-        let mut rng = SmallRng::from_entropy();
+        let mut rng = SmallRng::from_rng(&mut rng());
         rng.fill(&mut bytes);
         bytes
     });

rust/src/delegate_interface.rs

@@ -40,15 +40,15 @@ impl Delegate<'_> {
         &self.key
     }
 
-    pub fn code(&self) -> &DelegateCode {
+    pub fn code(&self) -> &DelegateCode<'_> {
         &self.data
     }
 
     pub fn code_hash(&self) -> &CodeHash {
         &self.data.code_hash
     }
 
-    pub fn params(&self) -> &Parameters {
+    pub fn params(&self) -> &Parameters<'_> {
         &self.parameters
     }
 

rust/src/generated/client_request_generated.rs

@@ -4707,7 +4707,7 @@ pub mod client_request {
     /// `root_as_client_request_unchecked`.
     pub fn root_as_client_request(
         buf: &[u8],
-    ) -> Result<ClientRequest, flatbuffers::InvalidFlatbuffer> {
+    ) -> Result<ClientRequest<'_>, flatbuffers::InvalidFlatbuffer> {
         flatbuffers::root::<ClientRequest>(buf)
     }
     #[inline]
@@ -4719,7 +4719,7 @@ pub mod client_request {
     /// `size_prefixed_root_as_client_request_unchecked`.
     pub fn size_prefixed_root_as_client_request(
         buf: &[u8],
-    ) -> Result<ClientRequest, flatbuffers::InvalidFlatbuffer> {
+    ) -> Result<ClientRequest<'_>, flatbuffers::InvalidFlatbuffer> {
         flatbuffers::size_prefixed_root::<ClientRequest>(buf)
     }
     #[inline]
@@ -4752,14 +4752,14 @@ pub mod client_request {
     /// Assumes, without verification, that a buffer of bytes contains a ClientRequest and returns it.
     /// # Safety
     /// Callers must trust the given bytes do indeed contain a valid `ClientRequest`.
-    pub unsafe fn root_as_client_request_unchecked(buf: &[u8]) -> ClientRequest {
+    pub unsafe fn root_as_client_request_unchecked(buf: &[u8]) -> ClientRequest<'_> {
         flatbuffers::root_unchecked::<ClientRequest>(buf)
     }
     #[inline]
     /// Assumes, without verification, that a buffer of bytes contains a size prefixed ClientRequest and returns it.
     /// # Safety
     /// Callers must trust the given bytes do indeed contain a valid size prefixed `ClientRequest`.
-    pub unsafe fn size_prefixed_root_as_client_request_unchecked(buf: &[u8]) -> ClientRequest {
+    pub unsafe fn size_prefixed_root_as_client_request_unchecked(buf: &[u8]) -> ClientRequest<'_> {
         flatbuffers::size_prefixed_root_unchecked::<ClientRequest>(buf)
     }
     #[inline]

rust/src/generated/host_response_generated.rs

@@ -3338,7 +3338,7 @@ pub mod host_response {
     /// `root_as_host_response_unchecked`.
     pub fn root_as_host_response(
         buf: &[u8],
-    ) -> Result<HostResponse, flatbuffers::InvalidFlatbuffer> {
+    ) -> Result<HostResponse<'_>, flatbuffers::InvalidFlatbuffer> {
         flatbuffers::root::<HostResponse>(buf)
     }
     #[inline]
@@ -3350,7 +3350,7 @@ pub mod host_response {
     /// `size_prefixed_root_as_host_response_unchecked`.
     pub fn size_prefixed_root_as_host_response(
         buf: &[u8],
-    ) -> Result<HostResponse, flatbuffers::InvalidFlatbuffer> {
+    ) -> Result<HostResponse<'_>, flatbuffers::InvalidFlatbuffer> {
         flatbuffers::size_prefixed_root::<HostResponse>(buf)
     }
     #[inline]
@@ -3383,14 +3383,14 @@ pub mod host_response {
     /// Assumes, without verification, that a buffer of bytes contains a HostResponse and returns it.
     /// # Safety
     /// Callers must trust the given bytes do indeed contain a valid `HostResponse`.
-    pub unsafe fn root_as_host_response_unchecked(buf: &[u8]) -> HostResponse {
+    pub unsafe fn root_as_host_response_unchecked(buf: &[u8]) -> HostResponse<'_> {
         flatbuffers::root_unchecked::<HostResponse>(buf)
     }
     #[inline]
     /// Assumes, without verification, that a buffer of bytes contains a size prefixed HostResponse and returns it.
     /// # Safety
     /// Callers must trust the given bytes do indeed contain a valid size prefixed `HostResponse`.
-    pub unsafe fn size_prefixed_root_as_host_response_unchecked(buf: &[u8]) -> HostResponse {
+    pub unsafe fn size_prefixed_root_as_host_response_unchecked(buf: &[u8]) -> HostResponse<'_> {
         flatbuffers::size_prefixed_root_unchecked::<HostResponse>(buf)
     }
     #[inline]

rust/src/memory/buf.rs

@@ -340,7 +340,7 @@ fn __frnt__initiate_buffer(capacity: u32) -> i64 {
     buffer as i64
 }
 
-#[cfg(all(test, any(unix, windows)))]
+#[cfg(all(test, any(unix, windows), feature = "wasmer-tests"))]
 mod test {
     use super::*;
     use wasmer::{