From 1e9862b7c24fa7310c15adeb057ee29198886f64 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Tue, 28 May 2024 11:02:05 +0530 Subject: [PATCH 01/37] chore: Update holochain & deno to latest --- .../hc-dna/zomes/agent_store/Cargo.toml | 4 ++-- .../zomes/direct-message-integrity/Cargo.toml | 4 ++-- .../hc-dna/zomes/direct-message/Cargo.toml | 4 ++-- .../hc-dna/zomes/file_storage/Cargo.toml | 4 ++-- .../file-storage/hc-dna/zomes/integrity/Cargo.toml | 6 +++--- .../hc-dna/zomes/perspective_diff_sync/Cargo.toml | 4 ++-- .../perspective_diff_sync_integrity/Cargo.toml | 6 +++--- .../hc-dna/zomes/perspective_diff_sync/Cargo.toml | 4 ++-- .../perspective_diff_sync_integrity/Cargo.toml | 6 +++--- cli/Cargo.toml | 2 +- rust-executor/Cargo.toml | 14 +++++++------- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/Cargo.toml b/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/Cargo.toml index 15d75de88..b462d8877 100644 --- a/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/Cargo.toml +++ b/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/Cargo.toml @@ -14,6 +14,6 @@ serde = "1" chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } thiserror = "1.0.20" -hdk = { version = "0.3.0-beta-dev.33" } -holo_hash = { version = "0.3.0-beta-dev.22" } +hdk = { version = "0.3.1-rc.0" } +holo_hash = { version = "0.3.1-rc.0" } agent_store_integrity = { path = "../agent_store_integrity" } \ No newline at end of file diff --git a/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message-integrity/Cargo.toml b/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message-integrity/Cargo.toml index c2d6ebe78..ea0c19d89 100644 --- a/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message-integrity/Cargo.toml +++ b/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message-integrity/Cargo.toml @@ -13,5 +13,5 @@ derive_more = "0" serde = "1" chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } -hdi = { version = "0.4.0-beta-dev.29" } -holo_hash = { version = "0.3.0-beta-dev.22"} \ No newline at end of file +hdi = { version = "0.4.1-rc.0" } +holo_hash = { version = "0.3.1-rc.0" } \ No newline at end of file diff --git a/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message/Cargo.toml b/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message/Cargo.toml index 9b80c1b74..791cbe450 100644 --- a/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message/Cargo.toml +++ b/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message/Cargo.toml @@ -15,7 +15,7 @@ serde_json = "1" chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } hex = "0.4.3" -hdk = { version = "0.3.0-beta-dev.33" } -holo_hash = { version = "0.3.0-beta-dev.22"} +hdk = { version = "0.3.1-rc.0" } +holo_hash = { version = "0.3.1-rc.0" } direct-message-integrity = { path = "../direct-message-integrity" } \ No newline at end of file diff --git a/bootstrap-languages/file-storage/hc-dna/zomes/file_storage/Cargo.toml b/bootstrap-languages/file-storage/hc-dna/zomes/file_storage/Cargo.toml index 5bde8d81d..73af39e9f 100644 --- a/bootstrap-languages/file-storage/hc-dna/zomes/file_storage/Cargo.toml +++ b/bootstrap-languages/file-storage/hc-dna/zomes/file_storage/Cargo.toml @@ -17,5 +17,5 @@ chrono = { version = "0.4.31", default-features = false, features = ["clock", "s thiserror = "1.0.20" integrity = { path = "../integrity" } sha2 = "0.10.5" -hdk = { version = "0.3.0-beta-dev.33" } -holo_hash = { version = "0.3.0-beta-dev.22"} \ No newline at end of file +hdk = { version = "0.3.1-rc.0" } +holo_hash = { version = "0.3.1-rc.0" } \ No newline at end of file diff --git a/bootstrap-languages/file-storage/hc-dna/zomes/integrity/Cargo.toml b/bootstrap-languages/file-storage/hc-dna/zomes/integrity/Cargo.toml index e6691f48d..27cea3ed4 100644 --- a/bootstrap-languages/file-storage/hc-dna/zomes/integrity/Cargo.toml +++ b/bootstrap-languages/file-storage/hc-dna/zomes/integrity/Cargo.toml @@ -13,6 +13,6 @@ name = "integrity" derive_more = "0" serde = "1" chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } -holo_hash = { version = "0.3.0-beta-dev.22"} -hdi = { version = "0.4.0-beta-dev.29" } -hdk = { version = "0.3.0-beta-dev.33" } +holo_hash = { version = "0.3.1-rc.0" } +hdi = { version = "0.4.1-rc.0" } +hdk = { version = "0.3.1-rc.0" } diff --git a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync/Cargo.toml b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync/Cargo.toml index d0d28ca48..21668fad5 100644 --- a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync/Cargo.toml +++ b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync/Cargo.toml @@ -21,8 +21,8 @@ dot-structures = "0.1.0" itertools = "0.10.3" perspective_diff_sync_integrity = { path = "../perspective_diff_sync_integrity" } sha2 = "0.10.5" -hdk = { version = "0.3.0-beta-dev.33" } -holo_hash = { version = "0.3.0-beta-dev.22"} +hdk = { version = "0.3.1-rc.0" } +holo_hash = { version = "0.3.1-rc.0" } [features] test = [] \ No newline at end of file diff --git a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml index 37610a9a3..a58b3bbc8 100644 --- a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml +++ b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml @@ -13,6 +13,6 @@ derive_more = "0" serde = "1" chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } -holo_hash = { version = "0.3.0-beta-dev.22"} -hdi = { version = "0.4.0-beta-dev.29" } -hdk = { version = "0.3.0-beta-dev.33" } \ No newline at end of file +holo_hash = { version = "0.3.1-rc.0" } +hdi = { version = "0.4.1-rc.0" } +hdk = { version = "0.3.1-rc.0" } \ No newline at end of file diff --git a/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync/Cargo.toml b/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync/Cargo.toml index d0d28ca48..21668fad5 100644 --- a/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync/Cargo.toml +++ b/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync/Cargo.toml @@ -21,8 +21,8 @@ dot-structures = "0.1.0" itertools = "0.10.3" perspective_diff_sync_integrity = { path = "../perspective_diff_sync_integrity" } sha2 = "0.10.5" -hdk = { version = "0.3.0-beta-dev.33" } -holo_hash = { version = "0.3.0-beta-dev.22"} +hdk = { version = "0.3.1-rc.0" } +holo_hash = { version = "0.3.1-rc.0" } [features] test = [] \ No newline at end of file diff --git a/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml b/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml index 37610a9a3..a58b3bbc8 100644 --- a/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml +++ b/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml @@ -13,6 +13,6 @@ derive_more = "0" serde = "1" chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } -holo_hash = { version = "0.3.0-beta-dev.22"} -hdi = { version = "0.4.0-beta-dev.29" } -hdk = { version = "0.3.0-beta-dev.33" } \ No newline at end of file +holo_hash = { version = "0.3.1-rc.0" } +hdi = { version = "0.4.1-rc.0" } +hdk = { version = "0.3.1-rc.0" } \ No newline at end of file diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 75cb056ad..98cef0652 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -44,4 +44,4 @@ syntect = "5.0" ctrlc = "3.4.0" #holochain_kitsune_p2p = "0.3.0-beta-dev.37" -kitsune_p2p_types = { version = "0.3.0-beta-dev.22" } +kitsune_p2p_types = { version = "0.3.1-rc.0" } diff --git a/rust-executor/Cargo.toml b/rust-executor/Cargo.toml index aa7e847b3..1c1e2ecb2 100644 --- a/rust-executor/Cargo.toml +++ b/rust-executor/Cargo.toml @@ -30,8 +30,8 @@ path = "src/main.rs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -deno_core = "0.230.0" -deno_runtime = "0.132.0" +deno_core = "0.283.0" +deno_runtime = "0.161.0" tokio = { version = "1.25.0", features = ["full"] } url = "2.3.1" futures = "0.3.28" @@ -74,11 +74,11 @@ jsonwebtoken = "8.3.0" webbrowser = "0.8.12" -holochain = { version = "0.3.0-beta-dev.39", features = ["test_utils", "default"] } -holochain_cli_bundle = { version = "0.3.0-beta-dev.36" } -holochain_types = { version = "0.3.0-beta-dev.35" } -holochain_cli_run_local_services = { version = "0.3.0-beta-dev.23" } -kitsune_p2p_types = { version = "0.3.0-beta-dev.22" } +holochain = { version = "0.3.1-rc.0", features = ["test_utils", "default"] } +holochain_cli_bundle = { version = "0.3.1-rc.0" } +holochain_types = { version = "0.3.1-rc.0" } +holochain_cli_run_local_services = { version = "0.3.1-rc.0" } +kitsune_p2p_types = { version = "0.3.1-rc.0" } scryer-prolog = { version = "0.9.4" } # scryer-prolog = { path = "../../scryer-prolog", features = ["multi_thread"] } From b2685f0a92164f5532a7ee10d7c434be76f7b76d Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Fri, 31 May 2024 16:32:51 +0530 Subject: [PATCH 02/37] chore: Update holochain & deno to latest --- .../hc-dna/zomes/agent_store/Cargo.toml | 4 ++-- .../hc-dna/zomes/agent_store_integrity/Cargo.toml | 4 ++-- .../hc-dna/zomes/direct-message/Cargo.toml | 4 ++-- .../hc-dna/zomes/file_storage/Cargo.toml | 4 ++-- .../hc-dna/zomes/integrity/Cargo.toml | 4 ++-- .../hc-dna/zomes/perspective_diff_sync/Cargo.toml | 4 ++-- .../perspective_diff_sync_integrity/Cargo.toml | 6 +++--- .../hc-dna/zomes/perspective_diff_sync/Cargo.toml | 4 ++-- .../perspective_diff_sync_integrity/Cargo.toml | 6 +++--- rust-executor/Cargo.toml | 15 ++++++++++----- 10 files changed, 30 insertions(+), 25 deletions(-) diff --git a/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/Cargo.toml b/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/Cargo.toml index b462d8877..08424c6a3 100644 --- a/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/Cargo.toml +++ b/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/Cargo.toml @@ -14,6 +14,6 @@ serde = "1" chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } thiserror = "1.0.20" -hdk = { version = "0.3.1-rc.0" } -holo_hash = { version = "0.3.1-rc.0" } +hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } +holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } agent_store_integrity = { path = "../agent_store_integrity" } \ No newline at end of file diff --git a/bootstrap-languages/agent-language/hc-dna/zomes/agent_store_integrity/Cargo.toml b/bootstrap-languages/agent-language/hc-dna/zomes/agent_store_integrity/Cargo.toml index 76d1f7ba6..fd9845161 100644 --- a/bootstrap-languages/agent-language/hc-dna/zomes/agent_store_integrity/Cargo.toml +++ b/bootstrap-languages/agent-language/hc-dna/zomes/agent_store_integrity/Cargo.toml @@ -13,5 +13,5 @@ derive_more = "0" serde = "1" chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } -hdi = { version = "0.4.0-beta-dev.29"} -hdk = { version = "0.3.0-beta-dev.33"} \ No newline at end of file +hdi = { version = "0.4.0-beta-dev.29", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac"} +hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac"} \ No newline at end of file diff --git a/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message/Cargo.toml b/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message/Cargo.toml index 791cbe450..20ddf3784 100644 --- a/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message/Cargo.toml +++ b/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message/Cargo.toml @@ -15,7 +15,7 @@ serde_json = "1" chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } hex = "0.4.3" -hdk = { version = "0.3.1-rc.0" } -holo_hash = { version = "0.3.1-rc.0" } +hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } +holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } direct-message-integrity = { path = "../direct-message-integrity" } \ No newline at end of file diff --git a/bootstrap-languages/file-storage/hc-dna/zomes/file_storage/Cargo.toml b/bootstrap-languages/file-storage/hc-dna/zomes/file_storage/Cargo.toml index 73af39e9f..e9df22994 100644 --- a/bootstrap-languages/file-storage/hc-dna/zomes/file_storage/Cargo.toml +++ b/bootstrap-languages/file-storage/hc-dna/zomes/file_storage/Cargo.toml @@ -17,5 +17,5 @@ chrono = { version = "0.4.31", default-features = false, features = ["clock", "s thiserror = "1.0.20" integrity = { path = "../integrity" } sha2 = "0.10.5" -hdk = { version = "0.3.1-rc.0" } -holo_hash = { version = "0.3.1-rc.0" } \ No newline at end of file +hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } +holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } \ No newline at end of file diff --git a/bootstrap-languages/file-storage/hc-dna/zomes/integrity/Cargo.toml b/bootstrap-languages/file-storage/hc-dna/zomes/integrity/Cargo.toml index 27cea3ed4..fa066bf61 100644 --- a/bootstrap-languages/file-storage/hc-dna/zomes/integrity/Cargo.toml +++ b/bootstrap-languages/file-storage/hc-dna/zomes/integrity/Cargo.toml @@ -14,5 +14,5 @@ derive_more = "0" serde = "1" chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } holo_hash = { version = "0.3.1-rc.0" } -hdi = { version = "0.4.1-rc.0" } -hdk = { version = "0.3.1-rc.0" } +hdi = { version = "0.4.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } +hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } diff --git a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync/Cargo.toml b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync/Cargo.toml index 21668fad5..9394e329c 100644 --- a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync/Cargo.toml +++ b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync/Cargo.toml @@ -21,8 +21,8 @@ dot-structures = "0.1.0" itertools = "0.10.3" perspective_diff_sync_integrity = { path = "../perspective_diff_sync_integrity" } sha2 = "0.10.5" -hdk = { version = "0.3.1-rc.0" } -holo_hash = { version = "0.3.1-rc.0" } +hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } +holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } [features] test = [] \ No newline at end of file diff --git a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml index a58b3bbc8..6cbc97c53 100644 --- a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml +++ b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml @@ -13,6 +13,6 @@ derive_more = "0" serde = "1" chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } -holo_hash = { version = "0.3.1-rc.0" } -hdi = { version = "0.4.1-rc.0" } -hdk = { version = "0.3.1-rc.0" } \ No newline at end of file +holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } +hdi = { version = "0.4.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } +hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } \ No newline at end of file diff --git a/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync/Cargo.toml b/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync/Cargo.toml index 21668fad5..9394e329c 100644 --- a/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync/Cargo.toml +++ b/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync/Cargo.toml @@ -21,8 +21,8 @@ dot-structures = "0.1.0" itertools = "0.10.3" perspective_diff_sync_integrity = { path = "../perspective_diff_sync_integrity" } sha2 = "0.10.5" -hdk = { version = "0.3.1-rc.0" } -holo_hash = { version = "0.3.1-rc.0" } +hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } +holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } [features] test = [] \ No newline at end of file diff --git a/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml b/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml index a58b3bbc8..6cbc97c53 100644 --- a/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml +++ b/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml @@ -13,6 +13,6 @@ derive_more = "0" serde = "1" chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } -holo_hash = { version = "0.3.1-rc.0" } -hdi = { version = "0.4.1-rc.0" } -hdk = { version = "0.3.1-rc.0" } \ No newline at end of file +holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } +hdi = { version = "0.4.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } +hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } \ No newline at end of file diff --git a/rust-executor/Cargo.toml b/rust-executor/Cargo.toml index 1c1e2ecb2..0658465cd 100644 --- a/rust-executor/Cargo.toml +++ b/rust-executor/Cargo.toml @@ -74,11 +74,16 @@ jsonwebtoken = "8.3.0" webbrowser = "0.8.12" -holochain = { version = "0.3.1-rc.0", features = ["test_utils", "default"] } -holochain_cli_bundle = { version = "0.3.1-rc.0" } -holochain_types = { version = "0.3.1-rc.0" } -holochain_cli_run_local_services = { version = "0.3.1-rc.0" } -kitsune_p2p_types = { version = "0.3.1-rc.0" } +# holochain = { version = "0.3.1-rc.0", features = ["test_utils", "default"] } +# holochain_cli_bundle = { version = "0.3.1-rc.0" } +# holochain_types = { version = "0.3.1-rc.0" } +# holochain_cli_run_local_services = { version = "0.3.1-rc.0" } +# kitsune_p2p_types = { version = "0.3.1-rc.0" } +holochain = { version = "0.3.1-rc.0", features = ["test_utils", "default"], git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } +holochain_cli_bundle = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } +holochain_types = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } +holochain_cli_run_local_services = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } +kitsune_p2p_types = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } scryer-prolog = { version = "0.9.4" } # scryer-prolog = { path = "../../scryer-prolog", features = ["multi_thread"] } From 4df5cbcb70ab3ec0abcf48f8e0ae5c0e39679b57 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Wed, 5 Jun 2024 19:49:35 +0530 Subject: [PATCH 03/37] chore: Update holochain & deno to latest --- Cargo.lock | 3050 ++++++++++------- .../hc-dna/zomes/agent_store/Cargo.toml | 4 +- .../zomes/agent_store_integrity/Cargo.toml | 4 +- .../hc-dna/zomes/direct-message/Cargo.toml | 4 +- .../hc-dna/zomes/file_storage/Cargo.toml | 4 +- .../hc-dna/zomes/integrity/Cargo.toml | 4 +- .../zomes/perspective_diff_sync/Cargo.toml | 4 +- .../Cargo.toml | 6 +- .../zomes/perspective_diff_sync/Cargo.toml | 4 +- .../Cargo.toml | 6 +- rust-executor/Cargo.toml | 10 +- 11 files changed, 1798 insertions(+), 1302 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6123183a7..9a26c5318 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -25,7 +25,7 @@ dependencies = [ "ctrlc", "dirs 4.0.0", "futures", - "kitsune_p2p_types", + "kitsune_p2p_types 0.3.1-rc.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.8.5", "regex", "rustyline 10.1.1", @@ -76,7 +76,7 @@ dependencies = [ "coasys_juniper_subscriptions", "coasys_juniper_warp", "crypto_box", - "deno_core", + "deno_core 0.283.0", "deno_runtime", "did-key", "dirs 5.0.1", @@ -93,7 +93,7 @@ dependencies = [ "itertools 0.10.5", "json5", "jsonwebtoken", - "kitsune_p2p_types", + "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "lazy_static", "log", "maplit", @@ -114,8 +114,8 @@ dependencies = [ "sha2 0.10.8", "tokio", "tokio-stream", - "url 2.4.1", - "uuid 1.7.0", + "url", + "uuid 1.8.0", "warp", "webbrowser", "zip", @@ -129,7 +129,7 @@ dependencies = [ "ad4m-executor", "chrono", "colored", - "directories 4.0.1", + "directories", "env_logger", "libc", "localtunnel-client", @@ -252,9 +252,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.7" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if 1.0.0", "getrandom 0.2.12", @@ -274,14 +274,13 @@ dependencies = [ [[package]] name = "aitia" -version = "0.2.0-beta-dev.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "361de711e26de0bd918ceea7e5bdd2bb2ecac74dc8169cc4a848e993304d8890" +version = "0.2.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "anyhow", "derive_more", - "holochain_trace", - "parking_lot 0.10.2", + "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "parking_lot 0.12.1", "petgraph", "regex", "serde", @@ -393,9 +392,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" dependencies = [ "backtrace", ] @@ -436,7 +435,7 @@ version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac57f2b058a76363e357c056e4f74f1945bf734d37b8b3ef49066c4787dde0fc" dependencies = [ - "clipboard-win", + "clipboard-win 4.5.0", "core-graphics", "image", "log", @@ -485,6 +484,9 @@ name = "arrayvec" version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +dependencies = [ + "serde", +] [[package]] name = "ascii" @@ -492,6 +494,15 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" +[[package]] +name = "ash" +version = "0.37.3+1.3.251" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +dependencies = [ + "libloading 0.7.4", +] + [[package]] name = "asn1-rs" version = "0.5.2" @@ -533,11 +544,10 @@ dependencies = [ [[package]] name = "ast_node" -version = "0.9.5" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c09c69dffe06d222d072c878c3afe86eee2179806f20503faec97250268b4c24" +checksum = "2ab31376d309dd3bfc9cfb3c11c93ce0e0741bbe0354b20e7f8c60b044730b79" dependencies = [ - "pmutil", "proc-macro2 1.0.78", "quote 1.0.35", "swc_macros_common", @@ -705,13 +715,13 @@ dependencies = [ [[package]] name = "async-recursion" -version = "0.3.2" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7d78656ba01f1b93024b7c3a0467f1608e4be67d725749fdcd7d2c7678fd7a2" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2 1.0.78", "quote 1.0.35", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] @@ -971,6 +981,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" +[[package]] +name = "base32" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" + [[package]] name = "base64" version = "0.12.3" @@ -989,13 +1005,28 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "base64-simd" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "781dd20c3aff0bd194fe7d2a977dd92f21c173891f3a03b677359e5fa457e5d5" +dependencies = [ + "simd-abstraction", +] + [[package]] name = "base64-simd" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" dependencies = [ - "outref", + "outref 0.5.1", "vsimd", ] @@ -1067,9 +1098,12 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +dependencies = [ + "serde", +] [[package]] name = "bitvec" @@ -1104,17 +1138,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "blake2b_simd" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" -dependencies = [ - "arrayref", - "arrayvec 0.5.2", - "constant_time_eq 0.1.5", -] - [[package]] name = "blake2b_simd" version = "1.0.2" @@ -1281,7 +1304,7 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce21468c1c9c154a85696bb25c20582511438edb6ad67f846ba1378ffdd80222" dependencies = [ - "ahash 0.8.7", + "ahash 0.8.11", "base64 0.13.1", "bitvec", "chrono", @@ -1294,7 +1317,7 @@ dependencies = [ "serde_bytes", "serde_json", "time", - "uuid 1.7.0", + "uuid 1.8.0", ] [[package]] @@ -1356,9 +1379,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" dependencies = [ "serde", ] @@ -1495,7 +1518,7 @@ checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" dependencies = [ "byteorder", "fnv", - "uuid 1.7.0", + "uuid 1.8.0", ] [[package]] @@ -1504,7 +1527,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7" dependencies = [ - "smallvec 1.13.1", + "smallvec", ] [[package]] @@ -1513,7 +1536,7 @@ version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6100bc57b6209840798d95cb2775684849d332f7bd788db2a8c8caf7ef82a41a" dependencies = [ - "smallvec 1.13.1", + "smallvec", "target-lexicon", ] @@ -1529,6 +1552,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + [[package]] name = "chacha20" version = "0.9.1" @@ -1553,16 +1582,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "chashmap" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47e651a8c1eb0cbbaa730f705e2531e75276c6f2bbe2eb12662cfd305213dff8" -dependencies = [ - "owning_ref", - "parking_lot 0.3.8", -] - [[package]] name = "chrono" version = "0.4.33" @@ -1664,11 +1683,20 @@ version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" dependencies = [ - "error-code", + "error-code 2.3.1", "str-buf", "winapi 0.3.9", ] +[[package]] +name = "clipboard-win" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" +dependencies = [ + "error-code 3.2.0", +] + [[package]] name = "cloudabi" version = "0.0.3" @@ -1696,8 +1724,8 @@ dependencies = [ "serde", "smartstring", "static_assertions", - "url 2.4.1", - "uuid 1.7.0", + "url", + "uuid 1.8.0", "void", ] @@ -1711,7 +1739,7 @@ dependencies = [ "proc-macro2 1.0.78", "quote 1.0.35", "syn 1.0.109", - "url 2.4.1", + "url", ] [[package]] @@ -1780,7 +1808,7 @@ dependencies = [ "cocoa-foundation", "core-foundation", "core-graphics", - "foreign-types", + "foreign-types 0.3.2", "libc", "objc", ] @@ -1799,6 +1827,16 @@ dependencies = [ "objc", ] +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + [[package]] name = "color_quant" version = "1.1.0" @@ -1872,16 +1910,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "console_static_text" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4be93df536dfbcbd39ff7c129635da089901116b88bfc29ec1acb9b56f8ff35" -dependencies = [ - "unicode-width", - "vte", -] - [[package]] name = "const-oid" version = "0.9.6" @@ -1922,13 +1950,19 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +[[package]] +name = "cooked-waker" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147be55d677052dabc6b22252d5dd0fd4c29c8c27aa4f2fbef0f94aa003b406f" + [[package]] name = "cookie" version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cd91cf61412820176e137621345ee43b3f4423e589e7ae4e50d601d93e35ef8" dependencies = [ - "percent-encoding 2.3.0", + "percent-encoding", "time", "version_check", ] @@ -1958,7 +1992,7 @@ dependencies = [ "bitflags 1.3.2", "core-foundation", "core-graphics-types", - "foreign-types", + "foreign-types 0.3.2", "libc", ] @@ -2040,7 +2074,7 @@ dependencies = [ "gimli 0.26.2", "log", "regalloc2", - "smallvec 1.13.1", + "smallvec", "target-lexicon", ] @@ -2070,7 +2104,7 @@ dependencies = [ "hashbrown 0.12.3", "indexmap 1.9.3", "log", - "smallvec 1.13.1", + "smallvec", ] [[package]] @@ -2087,7 +2121,7 @@ checksum = "0d70abacb8cfef3dc8ff7e8836e9c1d70f7967dfdac824a4cd5e30223415aca6" dependencies = [ "cranelift-codegen", "log", - "smallvec 1.13.1", + "smallvec", "target-lexicon", ] @@ -2114,12 +2148,12 @@ checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "cron" -version = "0.9.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e009ed0b762cf7a967a34dfdc67d5967d3f828f12901d37081432c3dd1668f8f" +checksum = "6f8c3e73077b4b4a6ab1ea5047c37c57aee77657bc8ecd6f29b0af082d0b0c07" dependencies = [ "chrono", - "nom 4.1.1", + "nom 7.1.3", "once_cell", ] @@ -2327,7 +2361,7 @@ dependencies = [ "phf 0.8.0", "proc-macro2 1.0.78", "quote 1.0.35", - "smallvec 1.13.1", + "smallvec", "syn 1.0.109", ] @@ -2411,23 +2445,14 @@ dependencies = [ ] [[package]] -name = "darling" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" -dependencies = [ - "darling_core 0.10.2", - "darling_macro 0.10.2", -] - -[[package]] -name = "darling" -version = "0.13.4" +name = "d3d12" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +checksum = "b28bfe653d79bd16c77f659305b195b82bb5ce0c0eb2a4846b82ddbd77586813" dependencies = [ - "darling_core 0.13.4", - "darling_macro 0.13.4", + "bitflags 2.5.0", + "libloading 0.8.1", + "winapi 0.3.9", ] [[package]] @@ -2442,40 +2467,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc5d6b04b3fd0ba9926f945895de7d806260a2d7431ba82e7edaecb043c4c6b8" -dependencies = [ - "darling_core 0.20.5", - "darling_macro 0.20.5", -] - -[[package]] -name = "darling_core" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2 1.0.78", - "quote 1.0.35", - "strsim 0.9.3", - "syn 1.0.109", -] - -[[package]] -name = "darling_core" -version = "0.13.4" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ - "fnv", - "ident_case", - "proc-macro2 1.0.78", - "quote 1.0.35", - "strsim 0.10.0", - "syn 1.0.109", + "darling_core 0.20.9", + "darling_macro 0.20.9", ] [[package]] @@ -2494,40 +2491,18 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.5" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e48a959bcd5c761246f5d090ebc2fbf7b9cd527a492b07a67510c108f1e7e3" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2 1.0.78", "quote 1.0.35", - "strsim 0.10.0", + "strsim 0.11.1", "syn 2.0.48", ] -[[package]] -name = "darling_macro" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" -dependencies = [ - "darling_core 0.10.2", - "quote 1.0.35", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" -dependencies = [ - "darling_core 0.13.4", - "quote 1.0.35", - "syn 1.0.109", -] - [[package]] name = "darling_macro" version = "0.14.4" @@ -2541,11 +2516,11 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.5" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1545d67a2149e1d93b7e5c7752dce5a7426eb5d1357ddcfd89336b94444f77" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ - "darling_core 0.20.5", + "darling_core 0.20.9", "quote 1.0.35", "syn 2.0.48", ] @@ -2574,7 +2549,7 @@ checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if 1.0.0", "hashbrown 0.14.3", - "lock_api 0.4.11", + "lock_api", "once_cell", "parking_lot_core 0.9.9", ] @@ -2707,19 +2682,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" dependencies = [ "serde", - "uuid 1.7.0", + "uuid 1.8.0", ] [[package]] name = "deno_ast" -version = "0.31.6" +version = "0.38.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da7b09db895527a94de1305455338926cd2a7003231ba589b7b7b57e8da344f2" +checksum = "584547d27786a734536fde7088f8429d355569c39410427be44695c300618408" dependencies = [ "anyhow", - "base64 0.13.1", + "base64 0.21.7", "deno_media_type", + "deno_terminal", "dprint-swc-ext", + "once_cell", + "percent-encoding", "serde", "swc_atoms", "swc_common", @@ -2743,89 +2721,145 @@ dependencies = [ "swc_visit", "swc_visit_macros", "text_lines", - "url 2.4.1", + "thiserror", + "unicode-width", + "url", ] [[package]] name = "deno_broadcast_channel" -version = "0.118.0" +version = "0.147.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa088b49b1837e74b64b5398cd26612033922a8dc16fa6234fff2095e01a8ef" +checksum = "da690e382e1dfbe340f015d81c7bc889d01ea2c068ba852b068357823ff79047" dependencies = [ "async-trait", - "deno_core", + "deno_core 0.280.0", "tokio", - "uuid 1.7.0", + "uuid 1.8.0", ] [[package]] name = "deno_cache" -version = "0.56.0" +version = "0.85.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "064b3be33f2d5076b21043434c2cd1f76e5273feb9cc3e2466480d23aeaedc06" +checksum = "a0290c49b49658495f4ecb4728a1a69076107de853c05877d99ed16d9e524cef" dependencies = [ "async-trait", - "deno_core", + "deno_core 0.280.0", "rusqlite", "serde", "sha2 0.10.8", "tokio", ] +[[package]] +name = "deno_canvas" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee874b064cd094dcbaaa63b8dd0a8d25f2f6a684e683c154b6ec993c7f2764c3" +dependencies = [ + "deno_core 0.280.0", + "deno_webgpu", + "image", + "serde", +] + [[package]] name = "deno_console" -version = "0.124.0" +version = "0.153.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be3e75cda1e4dc563ca7dd6a5c24c06043bef5f58351291f525aac0b7c9d6cf1" +checksum = "11ec86c49cdaa521e3224db4e60c0841370735665c05aafdcdb0af138a0faf81" dependencies = [ - "deno_core", + "deno_core 0.280.0", ] [[package]] name = "deno_core" -version = "0.230.0" +version = "0.280.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f040a1d56091d209851d011d4882cb2367fceeb64ec630106ca89fad258430a" +checksum = "12d26f2d3e243bbbdd0851ab542b20ec48ac1fcf6c64ab06e81133da3113ebdd" dependencies = [ "anyhow", + "bincode", + "bit-set", + "bit-vec", "bytes", - "deno_ops", - "deno_unsync 0.3.2", + "cooked-waker", + "deno_core_icudata", + "deno_ops 0.156.0", + "deno_unsync", "futures", "libc", - "log", + "memoffset 0.9.0", "parking_lot 0.12.1", "pin-project", "serde", "serde_json", - "serde_v8", - "smallvec 1.13.1", - "sourcemap 7.0.1", + "serde_v8 0.189.0", + "smallvec", + "sourcemap", + "static_assertions", + "tokio", + "url", + "v8 0.91.1", +] + +[[package]] +name = "deno_core" +version = "0.283.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f5043f9f636a3fe021e63e41c946499e1706d7565126065c60912fe5c77e54e" +dependencies = [ + "anyhow", + "bincode", + "bit-set", + "bit-vec", + "bytes", + "cooked-waker", + "deno_core_icudata", + "deno_ops 0.159.0", + "deno_unsync", + "futures", + "libc", + "memoffset 0.9.0", + "parking_lot 0.12.1", + "pin-project", + "serde", + "serde_json", + "serde_v8 0.192.0", + "smallvec", + "sourcemap", + "static_assertions", "tokio", - "url 2.4.1", - "v8", + "url", + "v8 0.92.0", ] +[[package]] +name = "deno_core_icudata" +version = "0.0.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a13951ea98c0a4c372f162d669193b4c9d991512de9f2381dd161027f34b26b1" + [[package]] name = "deno_cron" -version = "0.4.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "586a1b535ed493a3f024222a8a9142a33e5dcefcf7f57147bd72cf1475d6874b" +checksum = "5d8374901e85ec0ef02a7b59a9cc5eacc1bf36002882a1da03d8bb009d6fcc99" dependencies = [ "anyhow", "async-trait", "chrono", - "deno_core", - "deno_unsync 0.1.1", + "deno_core 0.280.0", "saffron", "tokio", ] [[package]] name = "deno_crypto" -version = "0.138.0" +version = "0.167.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9933d35b22a8aa16639a2ccf47aa61aab2e716227cf867f5f6e72c6e184252ec" +checksum = "1403655527cb7de76ef5260ac6c44306e0008838acd0485280446accef9c7ab6" dependencies = [ "aes", "aes-gcm", @@ -2835,13 +2869,14 @@ dependencies = [ "const-oid", "ctr", "curve25519-dalek 4.1.1", - "deno_core", + "deno_core 0.280.0", "deno_web", "elliptic-curve 0.13.8", "num-traits", "once_cell", "p256 0.13.2", "p384", + "p521", "rand 0.8.5", "ring 0.17.7", "rsa", @@ -2851,72 +2886,72 @@ dependencies = [ "sha2 0.10.8", "signature 2.2.0", "spki 0.7.3", - "tokio", - "uuid 1.7.0", + "uuid 1.8.0", "x25519-dalek 2.0.0", ] [[package]] name = "deno_fetch" -version = "0.148.0" +version = "0.177.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03da8572d0769db998ac4d9b99f039083756b7ecbee458dca709278292d3a740" +checksum = "18d41732acba9fea1a2c135978871a610b44d8eb5324ba64ed3b8954d1543071" dependencies = [ "bytes", "data-url", - "deno_core", + "deno_core 0.280.0", "deno_tls", "dyn-clone", "http 0.2.11", "reqwest", "serde", + "serde_json", "tokio", "tokio-util", ] [[package]] name = "deno_ffi" -version = "0.111.0" +version = "0.140.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac438f4d1ed2b7b15226be6a0db2c4245a4ca71c4832c67db99977287575db29" +checksum = "3afb3e304a4d36aa63908b3f513be432668c0eaaeec62c62a0980202ee2003c6" dependencies = [ - "deno_core", + "deno_core 0.280.0", "dlopen2", "dynasmrt", "libffi", "libffi-sys", + "log", "serde", "serde-value", "serde_json", - "tokio", "winapi 0.3.9", ] [[package]] name = "deno_fs" -version = "0.34.0" +version = "0.63.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645e906d166d106ef935b6ee9e4244866bdf0050aa53348b8e2f374d786adb13" +checksum = "c391e1dc12707f7d8800e64d60e955e499a6decfef20c10bbec1da8e72273ead" dependencies = [ "async-trait", - "deno_core", + "base32", + "deno_core 0.280.0", "deno_io", "filetime", - "fs3", + "junction", "libc", - "log", "nix 0.26.2", "rand 0.8.5", + "rayon", "serde", - "tokio", "winapi 0.3.9", ] [[package]] name = "deno_http" -version = "0.119.0" +version = "0.151.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b32575e8eaa3b2ed51ee1981714011e57fd337fe7e49c157688ffcd0ff94a5b" +checksum = "00598c49aa6be107f7ce94b02ba3134155810daf5badd35de6c6d36eb708bc49" dependencies = [ "async-compression", "async-trait", @@ -2924,25 +2959,27 @@ dependencies = [ "brotli", "bytes", "cache_control", - "deno_core", + "deno_core 0.280.0", "deno_net", "deno_websocket", "flate2", - "fly-accept-encoding", "http 0.2.11", + "http 1.1.0", "httparse", "hyper 0.14.28", - "hyper 1.0.0-rc.4", + "hyper 1.1.0", + "hyper-util", + "itertools 0.10.5", "memmem", "mime", "once_cell", - "percent-encoding 2.3.0", + "percent-encoding", "phf 0.11.2", "pin-project", "ring 0.17.7", "scopeguard", "serde", - "smallvec 1.13.1", + "smallvec", "thiserror", "tokio", "tokio-util", @@ -2950,71 +2987,68 @@ dependencies = [ [[package]] name = "deno_io" -version = "0.34.0" +version = "0.63.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbeb24c251ff0aa1adc60433510b7dafd39f4ab3527613b66149376e3f3b7c08" +checksum = "ed3c0790f18984ed6b7fd47c08f1212ea186b9e196a7fe24f4820aaf6b5d8556" dependencies = [ "async-trait", - "deno_core", + "deno_core 0.280.0", "filetime", "fs3", + "log", "once_cell", + "os_pipe", + "rand 0.8.5", "tokio", "winapi 0.3.9", ] [[package]] name = "deno_kv" -version = "0.32.0" +version = "0.61.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b455d076f9a5f798fa68156943667befd008f96a37887728af9ba10a5d6c9e9" +checksum = "b45251361663076feb51334533697c13f92d227cdff7dff3a7535e34efade19e" dependencies = [ "anyhow", "async-trait", "base64 0.21.7", "chrono", - "deno_core", + "deno_core 0.280.0", "deno_fetch", "deno_node", "deno_tls", - "deno_unsync 0.1.1", "denokv_proto", "denokv_remote", "denokv_sqlite", - "hex", + "faster-hex", "log", "num-bigint", "prost", "prost-build", "rand 0.8.5", - "reqwest", "rusqlite", "serde", - "serde_json", - "termcolor", - "tokio", - "url 2.4.1", - "uuid 1.7.0", + "url", ] [[package]] name = "deno_media_type" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a798670c20308e5770cc0775de821424ff9e85665b602928509c8c70430b3ee0" +checksum = "a8978229b82552bf8457a0125aa20863f023619cfc21ebb007b1e571d68fd85b" dependencies = [ "data-url", "serde", - "url 2.4.1", + "url", ] [[package]] name = "deno_napi" -version = "0.54.0" +version = "0.83.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e70aaaabdbf511e2ce6c7a498d938a317fc1fb68694d4199323c6e1c2bea40e" +checksum = "f7d435e2484b7c60fcd9880de4d6599ed5a67fb0f40822013b0c241461b45643" dependencies = [ - "deno_core", + "deno_core 0.280.0", "libloading 0.7.4", ] @@ -3033,14 +3067,12 @@ dependencies = [ [[package]] name = "deno_net" -version = "0.116.0" +version = "0.145.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55d2446ad319ec7bc9dec30f0c043c69ddb1c4fa5fa8982680810f4fd8ec087f" +checksum = "d05b7de6850ae06496d1cf7eed456f7fd2489713a5742ce776cacf877ff6e8d7" dependencies = [ - "deno_core", + "deno_core 0.280.0", "deno_tls", - "enum-as-inner", - "log", "pin-project", "rustls-tokio-stream", "serde", @@ -3052,31 +3084,34 @@ dependencies = [ [[package]] name = "deno_node" -version = "0.61.0" +version = "0.90.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd79a3f3ec29b110a6e47304f158ecb091513954f3e54ae25a87e9025104bcef" +checksum = "3b9a217a206abaac68fbd50e69105460f538c6a99ba0549fe05488e40290bf5f" dependencies = [ "aead-gcm-stream", "aes", + "async-trait", "brotli", "bytes", "cbc", "const-oid", "data-encoding", - "deno_core", + "deno_core 0.280.0", "deno_fetch", "deno_fs", "deno_media_type", "deno_net", + "deno_permissions", "deno_whoami", "digest 0.10.7", "dsa", "ecb", "elliptic-curve 0.13.8", "errno 0.2.8", - "h2", - "hex", + "faster-hex", + "h2 0.3.26", "hkdf 0.12.4", + "home", "http 0.2.11", "idna 0.3.0", "indexmap 2.2.2", @@ -3096,6 +3131,7 @@ dependencies = [ "p384", "path-clean", "pbkdf2 0.12.2", + "pin-project-lite", "rand 0.8.5", "regex", "reqwest", @@ -3103,23 +3139,41 @@ dependencies = [ "ripemd", "rsa", "scrypt", + "sec1 0.7.3", "serde", "sha-1", "sha2 0.10.8", "signature 2.2.0", + "simd-json", + "spki 0.7.3", "tokio", - "typenum", - "url 2.4.1", + "url", "winapi 0.3.9", + "windows-sys 0.48.0", "x25519-dalek 2.0.0", "x509-parser", ] [[package]] name = "deno_ops" -version = "0.106.0" +version = "0.156.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8237b272db1a6cb941b8a5a63ba63539004a8263e8b0230a11136d76eea273f9" +dependencies = [ + "proc-macro-rules", + "proc-macro2 1.0.78", + "quote 1.0.35", + "strum 0.25.0", + "strum_macros 0.25.3", + "syn 2.0.48", + "thiserror", +] + +[[package]] +name = "deno_ops" +version = "0.159.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "215363aeee70b8ae4dca3557c7b85f48f2c231e798b23913c1d3901785ace01e" +checksum = "b26cc5277982de16514282447f8674f9048d4f1b2c0d55c088d0a7d3bf6db385" dependencies = [ "proc-macro-rules", "proc-macro2 1.0.78", @@ -3130,18 +3184,35 @@ dependencies = [ "thiserror", ] +[[package]] +name = "deno_permissions" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40748585d220170dc4ecb0f158b2ef40e7d0e4c486ab882f0a8eb51937d601a5" +dependencies = [ + "deno_core 0.280.0", + "deno_terminal", + "fqdn", + "libc", + "log", + "once_cell", + "serde", + "which 4.4.2", + "winapi 0.3.9", +] + [[package]] name = "deno_runtime" -version = "0.132.0" +version = "0.161.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1737bdaae83d16cb56cb82bd03ce4bc94a6865a34f7f4d8a0e1fd5155e41b24a" +checksum = "9a5057ea992ad16493dfd682117506c47556e060c56df4db9de98bc275a8ed9e" dependencies = [ - "console_static_text", "deno_ast", "deno_broadcast_channel", "deno_cache", + "deno_canvas", "deno_console", - "deno_core", + "deno_core 0.280.0", "deno_cron", "deno_crypto", "deno_fetch", @@ -3153,21 +3224,24 @@ dependencies = [ "deno_napi", "deno_net", "deno_node", + "deno_permissions", + "deno_terminal", "deno_tls", "deno_url", "deno_web", + "deno_webgpu", "deno_webidl", "deno_websocket", "deno_webstorage", "dlopen2", "encoding_rs", "fastwebsockets", - "filetime", "flate2", - "fs3", - "fwdansi", - "http 0.2.11", + "http 1.1.0", + "http-body-util", "hyper 0.14.28", + "hyper 1.1.0", + "hyper-util", "libc", "log", "netif", @@ -3175,42 +3249,45 @@ dependencies = [ "notify", "ntapi 0.4.1", "once_cell", + "percent-encoding", "regex", - "ring 0.17.7", + "rustyline 13.0.0", "serde", + "signal-hook", "signal-hook-registry", - "termcolor", "tokio", "tokio-metrics", - "uuid 1.7.0", - "which", + "uuid 1.8.0", + "which 4.4.2", "winapi 0.3.9", - "winres", + "windows-sys 0.48.0", ] [[package]] -name = "deno_tls" -version = "0.111.0" +name = "deno_terminal" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d5f09c7ec139e96601cfead355dfdafb06d5dd17433482c9a496cd053406fb4" +checksum = "7e6337d4e7f375f8b986409a76fbeecfa4bd8a1343e63355729ae4befa058eaf" dependencies = [ - "deno_core", - "deno_native_certs", "once_cell", - "rustls 0.21.10", - "rustls-pemfile 1.0.4", - "rustls-webpki 0.101.7", - "serde", - "webpki-roots 0.25.3", + "termcolor", ] [[package]] -name = "deno_unsync" -version = "0.1.1" +name = "deno_tls" +version = "0.140.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac0984205f25e71ddd1be603d76e70255953c12ff864707359ab195d26dfc7b3" +checksum = "053a261f8005e4aa408fe2e123a22842c0583ab9a4bc535fef83554d1b9dd3d0" dependencies = [ + "deno_core 0.280.0", + "deno_native_certs", + "rustls 0.21.11", + "rustls-pemfile 1.0.4", + "rustls-tokio-stream", + "rustls-webpki 0.101.7", + "serde", "tokio", + "webpki-roots 0.25.3", ] [[package]] @@ -3224,57 +3301,71 @@ dependencies = [ [[package]] name = "deno_url" -version = "0.124.0" +version = "0.153.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67d748c3250f82ed4f0032591849c417d9c2c6318a9eaef0b915920113190dc0" +checksum = "46f8da2dc0820062a74a6bf51eb0ec9c27078baf1bbd58caccbe01585cd59bfa" dependencies = [ - "deno_core", - "serde", + "deno_core 0.280.0", "urlpattern", ] [[package]] name = "deno_web" -version = "0.155.0" +version = "0.184.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "562bb45f520abba8bb5a754ae2a1dda04b0042918eed544b5741e352af937f6c" +checksum = "b383f260fcf394a0f4a19b6973a5fd19af31d8775d473a86005d18bde88f1df0" dependencies = [ "async-trait", - "base64-simd", + "base64-simd 0.8.0", "bytes", - "deno_core", + "deno_core 0.280.0", "encoding_rs", "flate2", "futures", "serde", "tokio", - "uuid 1.7.0", - "windows-sys 0.48.0", + "uuid 1.8.0", +] + +[[package]] +name = "deno_webgpu" +version = "0.120.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5c807cdbad9f5ff0635276419076186afa84b0fe8c2dcaed98c64424c265c69" +dependencies = [ + "deno_core 0.280.0", + "raw-window-handle 0.6.2", + "serde", + "tokio", + "wgpu-core", + "wgpu-types", ] [[package]] name = "deno_webidl" -version = "0.124.0" +version = "0.153.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8853c2cb5d4d1c6bd323dd9bfe7c461e47becfe13fa8b4b698c89f0ac785e886" +checksum = "0fb812944890c465c065ae1455904ce13b1d37696e797172dfb5a076972f180c" dependencies = [ - "deno_core", + "deno_core 0.280.0", ] [[package]] name = "deno_websocket" -version = "0.129.0" +version = "0.158.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4c2938c871dae89d7abff0fa68e24cf82f5be1bf29b2c39453c5d2492b17a1" +checksum = "e17a336ae05a7948d9824171ec2d9b09686183f62439bba8e46b0e73078c7a56" dependencies = [ "bytes", - "deno_core", + "deno_core 0.280.0", "deno_net", "deno_tls", "fastwebsockets", - "h2", - "http 0.2.11", - "hyper 0.14.28", + "h2 0.4.5", + "http 1.1.0", + "http-body-util", + "hyper 1.1.0", + "hyper-util", "once_cell", "rustls-tokio-stream", "serde", @@ -3283,14 +3374,13 @@ dependencies = [ [[package]] name = "deno_webstorage" -version = "0.119.0" +version = "0.148.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c71020adbede95679963bd3127d5e2d88feb0fbd65ab5d9b86f3bf9f82f7b40" +checksum = "4768cec014081244837383a85d506807e6399ce0b7b164cfddba145f3ead59ab" dependencies = [ - "deno_core", + "deno_core 0.280.0", "deno_web", "rusqlite", - "serde", ] [[package]] @@ -3305,31 +3395,34 @@ dependencies = [ [[package]] name = "denokv_proto" -version = "0.2.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8952fb8c38c1dcd796d49b00030afb74aa184160ae86817b72a32a994c8e16f0" +checksum = "98a79f7e98bfd3c148ce782c27c1494e77c3c94ab87c9e7e86e901cbc1643449" dependencies = [ "anyhow", "async-trait", "chrono", + "futures", "num-bigint", "prost", "prost-build", "serde", - "uuid 1.7.0", + "uuid 1.8.0", ] [[package]] name = "denokv_remote" -version = "0.2.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfc8447324d783b01e215bd5040ff9149c34d9715c7b7b5080dd648ebf1148a" +checksum = "518e181eb14f1a3b8fc423e48de431048249780fb0815d81e8139faf347c3269" dependencies = [ "anyhow", + "async-stream 0.3.5", "async-trait", "bytes", "chrono", "denokv_proto", + "futures", "log", "prost", "rand 0.8.5", @@ -3337,28 +3430,32 @@ dependencies = [ "serde", "serde_json", "tokio", - "url 2.4.1", - "uuid 1.7.0", + "tokio-util", + "url", + "uuid 1.8.0", ] [[package]] name = "denokv_sqlite" -version = "0.2.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ec76b691ff069f14e56e3e053c2b2163540b27e4b60179f2b120064a7e4960d" +checksum = "90af93f2ab8eec43fea9f8931fa99d38e73fa0af60aba0fae79de3fb87a0ed06" dependencies = [ "anyhow", + "async-stream 0.3.5", "async-trait", "chrono", "denokv_proto", "futures", + "hex", "log", "num-bigint", "rand 0.8.5", "rusqlite", "serde_json", + "thiserror", "tokio", - "uuid 1.7.0", + "uuid 1.8.0", ] [[package]] @@ -3431,27 +3528,33 @@ dependencies = [ [[package]] name = "derive_builder" -version = "0.9.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2658621297f2cf68762a6f7dc0bb7e1ff2cfd6583daef8ee0fed6f7ec468ec0" +checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" dependencies = [ - "darling 0.10.2", - "derive_builder_core", - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 1.0.109", + "derive_builder_macro", ] [[package]] name = "derive_builder_core" -version = "0.9.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2791ea3e372c8495c0bc2033991d76b512cd799d07491fbd6890124db9458bef" +checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" dependencies = [ - "darling 0.10.2", + "darling 0.20.9", "proc-macro2 1.0.78", "quote 1.0.35", - "syn 1.0.109", + "syn 2.0.48", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" +dependencies = [ + "derive_builder_core", + "syn 2.0.48", ] [[package]] @@ -3527,7 +3630,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35b50dba0afdca80b187392b24f2499a88c336d5a8493e4b4ccfb608708be56a" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "proc-macro2 1.0.78", "proc-macro2-diagnostics", "quote 1.0.35", @@ -3573,12 +3676,6 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" -[[package]] -name = "difference" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" - [[package]] name = "difflib" version = "0.4.0" @@ -3615,16 +3712,6 @@ dependencies = [ "subtle 2.4.1", ] -[[package]] -name = "directories" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c" -dependencies = [ - "cfg-if 0.1.10", - "dirs-sys 0.3.7", -] - [[package]] name = "directories" version = "4.0.1" @@ -3752,6 +3839,15 @@ dependencies = [ "quick-error", ] +[[package]] +name = "document-features" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef5282ad69563b5fc40319526ba27e0e7363d552a896f0297d54f767717f9b95" +dependencies = [ + "litrs", +] + [[package]] name = "downcast" version = "0.11.0" @@ -3766,11 +3862,10 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dprint-swc-ext" -version = "0.13.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b2f24ce6b89a06ae3eb08d5d4f88c05d0aef1fa58e2eba8dd92c97b84210c25" +checksum = "019d17f2c2457c5a70a7cf4505b1a562ca8ab168c0ac0c005744efbd29fcb8fe" dependencies = [ - "bumpalo", "num-bigint", "rustc-hash", "swc_atoms", @@ -3817,7 +3912,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e57e12b69e57fad516e01e2b3960f122696fdb13420e1a88ed8e210316f2876" dependencies = [ - "darling 0.20.5", + "darling 0.20.9", "proc-macro2 1.0.78", "quote 1.0.35", "syn 2.0.48", @@ -3921,9 +4016,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "elliptic-curve" @@ -4049,7 +4144,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" dependencies = [ - "darling 0.20.5", + "darling 0.20.9", "proc-macro2 1.0.78", "quote 1.0.35", "syn 2.0.48", @@ -4143,6 +4238,12 @@ dependencies = [ "str-buf", ] +[[package]] +name = "error-code" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" + [[package]] name = "event-listener" version = "2.5.3" @@ -4198,12 +4299,27 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + [[package]] name = "fallible-streaming-iterator" version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" +[[package]] +name = "faster-hex" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" +dependencies = [ + "serde", +] + [[package]] name = "fastrand" version = "1.9.0" @@ -4221,12 +4337,14 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fastwebsockets" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17c35f166afb94b7f8e9449d0ad866daca111ba4053f3b1960bb480ca4382c63" +checksum = "f63dd7b57f9b33b1741fa631c9522eb35d43e96dcca4a6a91d5e4ca7c93acdc1" dependencies = [ "base64 0.21.7", - "hyper 0.14.28", + "http-body-util", + "hyper 1.1.0", + "hyper-util", "pin-project", "rand 0.8.5", "sha1", @@ -4247,6 +4365,17 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "fd-lock" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947" +dependencies = [ + "cfg-if 1.0.0", + "rustix 0.38.30", + "windows-sys 0.52.0", +] + [[package]] name = "fdeflate" version = "0.3.4" @@ -4327,13 +4456,12 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "fixt" -version = "0.3.0-beta-dev.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a05f34f3e013b62b7214ec62fca3d668e0e0b0836855280a036cd678e9750b20" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "holochain_serialized_bytes", "lazy_static", - "parking_lot 0.10.2", + "parking_lot 0.12.1", "paste", "rand 0.8.5", "rand_core 0.6.4", @@ -4352,15 +4480,6 @@ dependencies = [ "miniz_oxide", ] -[[package]] -name = "float-cmp" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4" -dependencies = [ - "num-traits", -] - [[package]] name = "float-cmp" version = "0.9.0" @@ -4370,17 +4489,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "fly-accept-encoding" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3afa7516fdcfd8e5e93a938f8fec857785ced190a1f62d842d1fe1ffbe22ba8" -dependencies = [ - "http 0.2.11", - "itertools 0.10.5", - "thiserror", -] - [[package]] name = "fnv" version = "1.0.7" @@ -4393,7 +4501,28 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared", + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", ] [[package]] @@ -4402,15 +4531,27 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + [[package]] name = "form_urlencoded" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ - "percent-encoding 2.3.0", + "percent-encoding", ] +[[package]] +name = "fqdn" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11629e06e5b6061eed3a00de187f3c9244c1e9755bb9445be1070067bf1ea045" + [[package]] name = "fragile" version = "2.0.0" @@ -4419,11 +4560,10 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "from_variant" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03ec5dc38ee19078d84a692b1c41181ff9f94331c76cee66ff0208c770b5e54f" +checksum = "fdc9cc75639b041067353b9bce2450d6847e547276c6fbe4487d7407980e07db" dependencies = [ - "pmutil", "proc-macro2 1.0.78", "swc_macros_common", "syn 2.0.48", @@ -4457,9 +4597,9 @@ dependencies = [ [[package]] name = "fslock" -version = "0.1.8" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57eafdd0c16f57161105ae1b98a1238f97645f2f588438b2949c99a2af9616bf" +checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb" dependencies = [ "libc", "winapi 0.3.9", @@ -4621,16 +4761,6 @@ dependencies = [ "slab", ] -[[package]] -name = "fwdansi" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c1f5787fe85505d1f7777268db5103d80a7a374d2316a7ce262e57baf8f208" -dependencies = [ - "memchr", - "termcolor", -] - [[package]] name = "fxhash" version = "0.2.1" @@ -4865,7 +4995,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" dependencies = [ - "fallible-iterator", + "fallible-iterator 0.2.0", "indexmap 1.9.3", "stable_deref_trait", ] @@ -4926,6 +5056,17 @@ dependencies = [ "syn 2.0.48", ] +[[package]] +name = "gl_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" +dependencies = [ + "khronos_api", + "log", + "xml-rs", +] + [[package]] name = "glib" version = "0.15.12" @@ -4942,7 +5083,7 @@ dependencies = [ "gobject-sys", "libc", "once_cell", - "smallvec 1.13.1", + "smallvec", "thiserror", ] @@ -5002,6 +5143,27 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "glow" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glutin_wgl_sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +dependencies = [ + "gl_generator", +] + [[package]] name = "gobject-sys" version = "0.15.10" @@ -5027,7 +5189,46 @@ dependencies = [ "parking_lot 0.11.2", "quanta", "rand 0.8.5", - "smallvec 1.13.1", + "smallvec", +] + +[[package]] +name = "gpu-alloc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" +dependencies = [ + "bitflags 2.5.0", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" +dependencies = [ + "bitflags 2.5.0", +] + +[[package]] +name = "gpu-descriptor" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" +dependencies = [ + "bitflags 2.5.0", + "gpu-descriptor-types", + "hashbrown 0.14.3", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" +dependencies = [ + "bitflags 2.5.0", ] [[package]] @@ -5063,7 +5264,7 @@ dependencies = [ "serde", "serde_json", "thiserror", - "uuid 1.7.0", + "uuid 1.8.0", ] [[package]] @@ -5182,11 +5383,20 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "gzip-header" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95cc527b92e6029a62960ad99aa8a6660faa4555fe5f731aab13aa6a921795a2" +dependencies = [ + "crc32fast", +] + [[package]] name = "h2" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -5201,6 +5411,35 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap 2.2.2", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "halfbrown" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8588661a8607108a5ca69cab034063441a0413a0b041c13618a7dd348021ef6f" +dependencies = [ + "hashbrown 0.14.3", + "serde", +] + [[package]] name = "hash32" version = "0.2.1" @@ -5235,7 +5474,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.7", + "ahash 0.8.11", ] [[package]] @@ -5244,7 +5483,7 @@ version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ - "ahash 0.8.7", + "ahash 0.8.11", "allocator-api2", ] @@ -5259,13 +5498,13 @@ dependencies = [ [[package]] name = "hc_seed_bundle" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a160a11a63c03f180389bcbdb8f4823f84805bd07169160e4a0ede592512338" +checksum = "1524f81cc7a05bfacd666324692d1cd46c9f8dce68aa524a4c8a993449617f6b" dependencies = [ "futures", "one_err", - "rmp-serde", + "rmp-serde 0.15.5", "rmpv", "serde", "serde_bytes", @@ -5274,19 +5513,18 @@ dependencies = [ [[package]] name = "hc_sleuth" -version = "0.2.0-beta-dev.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba995e5a3a4e3194b34d998f0e0843ed92629d432e0c9dd8a0be3a757fa6b3d" +version = "0.2.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "aitia", "anyhow", "derive_more", "holochain_state_types", - "holochain_trace", + "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "holochain_types", "kitsune_p2p", "once_cell", - "parking_lot 0.10.2", + "parking_lot 0.12.1", "petgraph", "regex", "serde", @@ -5297,9 +5535,8 @@ dependencies = [ [[package]] name = "hdi" -version = "0.4.0-beta-dev.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31dfc1fec80d7d9292e04e26e94528b0a0cc9baf982d1fb18e3af3e7625cb90" +version = "0.4.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "getrandom 0.2.12", "hdk_derive", @@ -5315,9 +5552,8 @@ dependencies = [ [[package]] name = "hdk" -version = "0.3.0-beta-dev.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99a6ccefa8f3aa8cd8a0f7ab40f3939610133bd32a14785d4d62440f92ab6a11" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "getrandom 0.2.12", "hdi", @@ -5335,12 +5571,11 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.3.0-beta-dev.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcfd466d96f2d19530b1419646b0a52c3bc833b0e7dacad4329cb90708db8665" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "darling 0.14.4", - "heck 0.4.1", + "heck 0.5.0", "holochain_integrity_types", "paste", "proc-macro-error", @@ -5401,6 +5636,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -5428,6 +5669,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + [[package]] name = "hkdf" version = "0.11.0" @@ -5489,20 +5736,19 @@ dependencies = [ [[package]] name = "holo_hash" -version = "0.3.0-beta-dev.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "050e53c0258e6235145fe949b74cedd48c24f4d92e1e7b7e39581a9a2b6996e7" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "arbitrary", - "base64 0.13.1", - "blake2b_simd 0.5.11", + "base64 0.22.1", + "blake2b_simd", "derive_more", "fixt", "futures", "holochain_serialized_bytes", - "holochain_util", + "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "holochain_wasmer_common", - "kitsune_p2p_dht_arc", + "kitsune_p2p_dht_arc 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "must_future", "proptest", "proptest-derive", @@ -5515,27 +5761,23 @@ dependencies = [ [[package]] name = "holochain" -version = "0.3.0-beta-dev.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e17f5a4135fe8b3bde1a7c9077957a6d0b9a9bb3699593180154ebca7b6a032" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "aitia", "anyhow", "arbitrary", "async-once-cell", - "async-recursion", "async-trait", "backtrace", - "base64 0.13.1", - "byteorder", - "cfg-if 0.1.10", + "base64 0.22.1", + "cfg-if 1.0.0", "chrono", "contrafact", "derive_more", "diff", - "directories 2.0.2", "either", - "fallible-iterator", + "fallible-iterator 0.3.0", "fixt", "futures", "get_if_addrs", @@ -5556,40 +5798,35 @@ dependencies = [ "holochain_sqlite", "holochain_state", "holochain_test_wasm_common", - "holochain_trace", + "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "holochain_types", - "holochain_util", + "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "holochain_wasm_test_utils", "holochain_wasmer_host", "holochain_websocket", "holochain_zome_types", - "hostname", + "hostname 0.4.0", "human-panic", - "itertools 0.10.5", + "itertools 0.12.1", "kitsune_p2p", - "kitsune_p2p_bin_data", + "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "kitsune_p2p_block", "kitsune_p2p_bootstrap", - "kitsune_p2p_bootstrap_client", - "kitsune_p2p_types", + "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "lair_keystore", - "lazy_static", "matches", "mockall", "mr_bundle", - "must_future", - "nanoid 0.3.0", - "num_cpus", + "nanoid", "once_cell", "one_err", "opentelemetry_api", - "parking_lot 0.10.2", + "parking_lot 0.12.1", "petgraph", - "predicates 1.0.8", + "predicates 3.1.0", "rand 0.8.5", "rand-utf8", "rand_chacha 0.3.1", - "rpassword 5.0.1", "rusqlite", "sd-notify", "serde", @@ -5607,74 +5844,59 @@ dependencies = [ "tiny-keccak", "tokio", "tokio-stream", - "toml 0.5.11", + "toml 0.8.9", "tracing", "tracing-futures", "tracing-subscriber 0.3.18", "tx5-go-pion-turn", "tx5-signal-srv", "unwrap_to", - "url 2.4.1", + "url", "url2", - "url_serde", - "uuid 0.7.4", + "uuid 1.8.0", "wasmer", "wasmer-middlewares", ] [[package]] name = "holochain_cascade" -version = "0.3.0-beta-dev.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd5458dc0c17d419adc76095465e72811d8ed95e1d8df55795d38b236204dd6f" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "async-trait", - "derive_more", - "either", - "fallible-iterator", "fixt", "futures", - "ghost_actor", - "hdk", - "hdk_derive", "holo_hash", "holochain_nonce", "holochain_p2p", "holochain_serialized_bytes", "holochain_sqlite", "holochain_state", - "holochain_trace", + "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "holochain_types", - "holochain_util", + "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "holochain_zome_types", "kitsune_p2p", "mockall", - "once_cell", "opentelemetry_api", - "serde", - "serde_derive", "thiserror", "tokio", "tracing", - "tracing-futures", ] [[package]] name = "holochain_cli_bundle" -version = "0.3.0-beta-dev.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b757bd1282e5a5da3a399fb29536a99ece86b5c411c30427746499cc489a3e1" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "anyhow", "clap 4.4.18", "futures", "holochain_serialized_bytes", "holochain_types", - "holochain_util", + "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "holochain_wasmer_host", "mr_bundle", - "serde", - "serde_bytes", "serde_yaml 0.9.31", "thiserror", "tokio", @@ -5684,14 +5906,13 @@ dependencies = [ [[package]] name = "holochain_cli_run_local_services" -version = "0.3.0-beta-dev.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b14a6d3fbda4aec1eeb9bb21d05cf6d5b614c4df19f79632cd7f11e2da7525" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "clap 4.4.18", "futures", - "holochain_trace", - "if-addrs 0.10.2", + "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "if-addrs 0.12.0", "kitsune_p2p_bootstrap", "tokio", "tracing", @@ -5700,25 +5921,21 @@ dependencies = [ [[package]] name = "holochain_conductor_api" -version = "0.3.0-beta-dev.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ac28f924e24cf9276b7b66140a76b1e9a01bb0cb81ef7b6a4820363c78cd436" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "derive_more", - "directories 2.0.2", "holo_hash", "holochain_keystore", "holochain_serialized_bytes", "holochain_state_types", "holochain_types", "holochain_zome_types", - "kitsune_p2p_bin_data", - "kitsune_p2p_types", + "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "serde", - "serde_derive", "serde_yaml 0.9.31", "shrinkwraprs", - "structopt", "thiserror", "tracing", "url2", @@ -5726,9 +5943,8 @@ dependencies = [ [[package]] name = "holochain_conductor_services" -version = "0.2.0-beta-dev.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c13a9426f1d135582a3d909814557eafd868d5a3628d61d3f590a9e59424c37" +version = "0.2.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "anyhow", "async-trait", @@ -5737,25 +5953,21 @@ dependencies = [ "holochain_keystore", "holochain_types", "mockall", - "must_future", - "serde", "thiserror", ] [[package]] name = "holochain_integrity_types" -version = "0.3.0-beta-dev.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a76306ea0c825e6bc8f040df4a3fe1ab82f187c108a91e81df957ae4f76efda" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "arbitrary", "derive_builder", "holo_hash", "holochain_secure_primitive", "holochain_serialized_bytes", - "holochain_util", - "kitsune_p2p_timestamp", - "paste", + "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "proptest", "proptest-derive", "serde", @@ -5767,24 +5979,23 @@ dependencies = [ [[package]] name = "holochain_keystore" -version = "0.3.0-beta-dev.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db732e26f52b77e71f10bc6424b397a2891da75a7e956070be21772e996a183e" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ - "base64 0.13.1", + "base64 0.22.1", "derive_more", "futures", "holo_hash", "holochain_secure_primitive", "holochain_serialized_bytes", - "holochain_util", + "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "holochain_zome_types", - "kitsune_p2p_types", + "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "lair_keystore", "must_future", - "nanoid 0.4.0", + "nanoid", "one_err", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "serde", "serde_bytes", "shrinkwraprs", @@ -5796,33 +6007,28 @@ dependencies = [ [[package]] name = "holochain_metrics" -version = "0.3.0-beta-dev.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a65c793858a03b5272e3408bc216cfdd0a21129a3e05fe0bee43ec6d37f0ce" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "influxive", "opentelemetry_api", - "reqwest", - "sct", "tracing", ] [[package]] name = "holochain_nonce" -version = "0.3.0-beta-dev.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fa99c5d38bb8fe463dd0284e2123ad14405f2a62146c4aaa809d5b24134711" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "getrandom 0.2.12", "holochain_secure_primitive", - "kitsune_p2p_timestamp", + "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", ] [[package]] name = "holochain_p2p" -version = "0.3.0-beta-dev.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4824866996d6cbc277ce61adb7341de974b67132d98e0e093bac10e11974f77" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "aitia", "async-trait", @@ -5835,12 +6041,11 @@ dependencies = [ "holochain_keystore", "holochain_nonce", "holochain_serialized_bytes", - "holochain_trace", + "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "holochain_types", - "holochain_util", "holochain_zome_types", "kitsune_p2p", - "kitsune_p2p_types", + "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "mockall", "rand 0.8.5", "serde", @@ -5853,9 +6058,8 @@ dependencies = [ [[package]] name = "holochain_secure_primitive" -version = "0.3.0-beta-dev.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcc25ba91f7898688245db538693d7b26504f91df24709111bb3b1d7506af01a" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "paste", "serde", @@ -5864,15 +6068,14 @@ dependencies = [ [[package]] name = "holochain_serialized_bytes" -version = "0.0.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f7a5fc7c745a107f8ebcb04caab7a6b7a8463e2811f07ced19c281977583de7" +version = "0.0.54" +source = "git+https://github.com/coasys/holochain-serialization.git?rev=6eaa4ea8913bfd977fcc4577e833f4dc18a215f7#6eaa4ea8913bfd977fcc4577e833f4dc18a215f7" dependencies = [ "arbitrary", "holochain_serialized_bytes_derive", "proptest", "proptest-derive", - "rmp-serde", + "rmp-serde 1.1.2", "serde", "serde-transcode", "serde_bytes", @@ -5882,9 +6085,8 @@ dependencies = [ [[package]] name = "holochain_serialized_bytes_derive" -version = "0.0.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3e0cf02005cbf0f514476d40e02125b26df6d4922d7a2c48a84fc588539d71" +version = "0.0.54" +source = "git+https://github.com/coasys/holochain-serialization.git?rev=6eaa4ea8913bfd977fcc4577e833f4dc18a215f7#6eaa4ea8913bfd977fcc4577e833f4dc18a215f7" dependencies = [ "quote 1.0.35", "syn 1.0.109", @@ -5892,43 +6094,40 @@ dependencies = [ [[package]] name = "holochain_sqlite" -version = "0.3.0-beta-dev.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d5ff0f25f26914552c14a91744babbabcbc3d1d55c0cea51e63ae2075a95ca" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "anyhow", "async-trait", - "chashmap", "derive_more", - "fallible-iterator", + "fallible-iterator 0.2.0", "futures", "getrandom 0.2.12", "holo_hash", "holochain_nonce", "holochain_serialized_bytes", - "holochain_util", + "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "holochain_zome_types", - "kitsune_p2p", - "kitsune_p2p_bin_data", - "kitsune_p2p_dht", - "kitsune_p2p_dht_arc", - "kitsune_p2p_timestamp", - "kitsune_p2p_types", + "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_dht 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_dht_arc 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "nanoid", "num_cpus", "once_cell", "opentelemetry_api", - "parking_lot 0.10.2", + "parking_lot 0.12.1", "pretty_assertions", "r2d2", "r2d2_sqlite_neonphog", - "rmp-serde", + "rmp-serde 1.1.2", "rusqlite", "scheduled-thread-pool", "serde", - "serde_derive", "serde_json", "shrinkwraprs", - "sqlformat 0.1.8", + "sqlformat", "tempfile", "thiserror", "tokio", @@ -5937,22 +6136,16 @@ dependencies = [ [[package]] name = "holochain_state" -version = "0.3.0-beta-dev.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cf0fea28fc15c5aeaed396cf285bf122d77d5cf65a6307523595b3a1ac08da8" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "aitia", "async-recursion", - "base64 0.13.1", - "byteorder", - "cfg-if 0.1.10", + "base64 0.22.1", "chrono", "contrafact", "cron", - "derive_more", - "either", - "fallible-iterator", - "futures", + "fallible-iterator 0.2.0", "hc_sleuth", "holo_hash", "holochain_keystore", @@ -5962,14 +6155,11 @@ dependencies = [ "holochain_sqlite", "holochain_state_types", "holochain_types", - "holochain_util", "holochain_zome_types", "kitsune_p2p", - "mockall", - "nanoid 0.3.0", + "nanoid", "one_err", - "parking_lot 0.10.2", - "rand 0.8.5", + "parking_lot 0.12.1", "serde", "serde_json", "shrinkwraprs", @@ -5977,14 +6167,12 @@ dependencies = [ "thiserror", "tokio", "tracing", - "tracing-futures", ] [[package]] name = "holochain_state_types" -version = "0.3.0-beta-dev.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "025c62656b1ff2dea34f711d77f7410a885d53f7a197f2783765a4e626acc04e" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "holo_hash", "holochain_integrity_types", @@ -5993,9 +6181,8 @@ dependencies = [ [[package]] name = "holochain_test_wasm_common" -version = "0.3.0-beta-dev.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "838d7b0ece7b0aa1bf0efd3b4ee5646c158c2eba4b022074914ec6ce972d53f5" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "hdk", "serde", @@ -6003,9 +6190,26 @@ dependencies = [ [[package]] name = "holochain_trace" -version = "0.3.0-beta-dev.7" +version = "0.3.1-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b7a5fcca77738957ac4619743f0bd761468057bf3be49852153ee0d5d2bb708" +checksum = "78532089679f1d3d8bb88cd954f90b04b257ba5231c980633e88df5b60ae95cf" +dependencies = [ + "chrono", + "derive_more", + "inferno", + "once_cell", + "serde_json", + "thiserror", + "tracing", + "tracing-core", + "tracing-serde", + "tracing-subscriber 0.3.18", +] + +[[package]] +name = "holochain_trace" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "chrono", "derive_more", @@ -6021,22 +6225,17 @@ dependencies = [ [[package]] name = "holochain_types" -version = "0.3.0-beta-dev.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40515fd0eef3af0aac447dc3881656a686c34c73ff25afbbcc9e8ab00993b145" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "anyhow", "arbitrary", "async-trait", "automap", "backtrace", - "base64 0.13.1", - "cfg-if 0.1.10", - "chrono", "contrafact", "derive_builder", "derive_more", - "either", "fixt", "flate2", "futures", @@ -6046,20 +6245,17 @@ dependencies = [ "holochain_nonce", "holochain_serialized_bytes", "holochain_sqlite", - "holochain_trace", - "holochain_util", - "holochain_wasmer_host", + "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "holochain_zome_types", "isotest", - "itertools 0.10.5", - "kitsune_p2p_dht", - "lazy_static", - "mockall", + "itertools 0.12.1", + "kitsune_p2p_dht 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "mr_bundle", "must_future", - "nanoid 0.3.0", + "nanoid", "one_err", - "parking_lot 0.10.2", + "parking_lot 0.12.1", "proptest", "proptest-derive", "rand 0.8.5", @@ -6069,7 +6265,7 @@ dependencies = [ "serde_bytes", "serde_derive", "serde_json", - "serde_with 1.14.0", + "serde_with", "serde_yaml 0.9.31", "shrinkwraprs", "strum 0.18.0", @@ -6082,42 +6278,52 @@ dependencies = [ [[package]] name = "holochain_util" -version = "0.3.0-beta-dev.5" +version = "0.3.1-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6225aded80caf004c2214e38b39fb2459ee9a7a8fcd0d09146f49ae0771f0" +checksum = "6461b88941572dc5c9482874fea97ed7b5cd864bd623d096fa0a940ada98ac88" +dependencies = [ + "cfg-if 1.0.0", + "colored", + "dunce", + "futures", + "once_cell", + "tracing", +] + +[[package]] +name = "holochain_util" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "backtrace", - "cfg-if 0.1.10", - "derive_more", + "cfg-if 1.0.0", + "colored", "dunce", "futures", - "getrandom 0.2.12", - "num_cpus", "once_cell", - "rpassword 7.3.1", + "rpassword", "sodoken", "tokio", + "tracing", ] [[package]] name = "holochain_wasm_test_utils" -version = "0.3.0-beta-dev.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ada8f35eed0e0c83c0e021f8ade588d8d2fd7a47a2b51210d683234755b4807" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "holochain_types", - "holochain_util", + "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "strum 0.18.0", "strum_macros 0.18.0", - "toml 0.5.11", + "toml 0.8.9", "walkdir", ] [[package]] name = "holochain_wasmer_common" -version = "0.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72007fd2a72d77e76ffa494e5847bf6e893e25e73fe1d1de902e1b8d5033a64e" +version = "0.0.94" +source = "git+https://github.com/coasys/holochain-wasmer.git?rev=52979e943861530bbafc48297b131fdec52c3e21#52979e943861530bbafc48297b131fdec52c3e21" dependencies = [ "holochain_serialized_bytes", "serde", @@ -6129,9 +6335,8 @@ dependencies = [ [[package]] name = "holochain_wasmer_guest" -version = "0.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c429e84a19ee446f47541a6fed10e1a4376a8a8ba6d3dbff7d07e4a7bb4c85f" +version = "0.0.94" +source = "git+https://github.com/coasys/holochain-wasmer.git?rev=52979e943861530bbafc48297b131fdec52c3e21#52979e943861530bbafc48297b131fdec52c3e21" dependencies = [ "holochain_serialized_bytes", "holochain_wasmer_common", @@ -6143,9 +6348,8 @@ dependencies = [ [[package]] name = "holochain_wasmer_host" -version = "0.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4951f6e1ac6d294631b3d38b8584c84ff510057ac6adca04d1e244b30c2e0b6b" +version = "0.0.94" +source = "git+https://github.com/coasys/holochain-wasmer.git?rev=52979e943861530bbafc48297b131fdec52c3e21#52979e943861530bbafc48297b131fdec52c3e21" dependencies = [ "bimap", "bytes", @@ -6162,12 +6366,13 @@ dependencies = [ [[package]] name = "holochain_websocket" -version = "0.3.0-beta-dev.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0195ee3c2ba62d5d6b905b287edb618528f9b75274a463072459c9da784b2c2f" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ + "async-trait", "futures", "holochain_serialized_bytes", + "holochain_types", "serde", "serde_bytes", "tokio", @@ -6177,9 +6382,8 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.3.0-beta-dev.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1d1b165dcf3d1ae412edf952b1ae4e57a5b5c4a97c11eb97b5fb4fdf06cc6a4" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "arbitrary", "contrafact", @@ -6189,17 +6393,14 @@ dependencies = [ "holo_hash", "holochain_integrity_types", "holochain_nonce", - "holochain_secure_primitive", "holochain_serialized_bytes", "holochain_wasmer_common", - "kitsune_p2p_bin_data", "kitsune_p2p_block", - "kitsune_p2p_dht", - "kitsune_p2p_timestamp", - "nanoid 0.3.0", - "num_enum", + "kitsune_p2p_dht 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "nanoid", + "num_enum 0.7.2", "once_cell", - "paste", "proptest", "proptest-derive", "rand 0.8.5", @@ -6235,17 +6436,29 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "hostname" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "windows 0.52.0", +] + [[package]] name = "hstr" -version = "0.2.7" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17fafeca18cf0927e23ea44d7a5189c10536279dfe9094e0dfa953053fbb5377" +checksum = "96274be293b8877e61974a607105d09c84caebe9620b47774aa8a6b942042dd4" dependencies = [ + "hashbrown 0.14.3", "new_debug_unreachable", "once_cell", "phf 0.11.2", "rustc-hash", - "smallvec 1.13.1", + "triomphe", ] [[package]] @@ -6297,12 +6510,25 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.0-rc.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "951dfc2e32ac02d67c90c0d65bd27009a635dc9b381a2cc7d284ab01e3a0150d" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", - "http 0.2.11", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http 1.1.0", + "http-body 1.0.0", + "pin-project-lite", ] [[package]] @@ -6325,9 +6551,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "human-panic" -version = "1.2.3" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f016c89920bbb30951a8405ecacbb4540db5524313b9445736e7e1855cf370" +checksum = "a4c5d0e9120f6bca6120d142c7ede1ba376dd6bf276d69dd3dbe6cbeb7824179" dependencies = [ "anstream", "anstyle", @@ -6336,7 +6562,7 @@ dependencies = [ "serde", "serde_derive", "toml 0.8.9", - "uuid 1.7.0", + "uuid 1.8.0", ] [[package]] @@ -6355,7 +6581,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.11", "http-body 0.4.6", "httparse", @@ -6371,22 +6597,21 @@ dependencies = [ [[package]] name = "hyper" -version = "1.0.0-rc.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d280a71f348bcc670fc55b02b63c53a04ac0bf2daff2980795aeaf53edae10e6" +checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2", - "http 0.2.11", - "http-body 1.0.0-rc.2", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.0", "httparse", "httpdate", "itoa 1.0.10", "pin-project-lite", "tokio", - "tracing", "want", ] @@ -6399,7 +6624,7 @@ dependencies = [ "futures-util", "http 0.2.11", "hyper 0.14.28", - "rustls 0.21.10", + "rustls 0.21.11", "tokio", "tokio-rustls 0.24.1", ] @@ -6417,6 +6642,24 @@ dependencies = [ "tokio-native-tls", ] +[[package]] +name = "hyper-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdea9aac0dbe5a9240d68cfd9501e2db94222c6dc06843e06640b9e07f0fdc67" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "hyper 1.1.0", + "pin-project-lite", + "socket2 0.5.5", + "tokio", + "tracing", +] + [[package]] name = "iana-time-zone" version = "0.1.59" @@ -6428,7 +6671,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.51.1", ] [[package]] @@ -6456,17 +6699,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idna" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.2.3" @@ -6510,22 +6742,22 @@ dependencies = [ [[package]] name = "if-addrs" -version = "0.8.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b24dd0826eee92c56edcda7ff190f2cf52115c49eadb2c2da8063e2673a8c2" +checksum = "cabb0019d51a643781ff15c9c8a3e5dedc365c47211270f4e8f82812fedd8f0a" dependencies = [ "libc", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] name = "if-addrs" -version = "0.10.2" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cabb0019d51a643781ff15c9c8a3e5dedc365c47211270f4e8f82812fedd8f0a" +checksum = "bb2a33e9c38988ecbda730c85b0fd9ddcdf83c0305ac7fd21c8bb9f57f2f0cc8" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -6625,7 +6857,7 @@ version = "0.11.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "321f0f839cd44a4686e9504b0a62b4d69a50b62072144c71c68f5873c167b8d9" dependencies = [ - "ahash 0.8.7", + "ahash 0.8.11", "clap 4.4.18", "crossbeam-channel", "crossbeam-utils", @@ -6883,15 +7115,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.12.1" @@ -6989,9 +7212,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -7044,6 +7267,16 @@ dependencies = [ "simple_asn1", ] +[[package]] +name = "junction" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be39922b087cecaba4e2d5592dedfc8bda5d4a5a1231f143337cca207950b61d" +dependencies = [ + "scopeguard", + "winapi 0.3.9", +] + [[package]] name = "k256" version = "0.13.3" @@ -7068,14 +7301,30 @@ dependencies = [ ] [[package]] -name = "kitsune_p2p" -version = "0.3.0-beta-dev.32" +name = "khronos-egl" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" +dependencies = [ + "libc", + "libloading 0.8.1", + "pkg-config", +] + +[[package]] +name = "khronos_api" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21ef9c61bf50f75121c2471267d553f7ef13a757b0e51c23a38251628d83baf4" +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" + +[[package]] +name = "kitsune_p2p" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "arrayref", - "base64 0.21.7", - "blake2b_simd 0.5.11", + "base64 0.22.1", + "blake2b_simd", "bloomfilter", "bytes", "derive_more", @@ -7083,21 +7332,21 @@ dependencies = [ "futures", "ghost_actor", "governor", - "holochain_trace", - "itertools 0.11.0", - "kitsune_p2p_bin_data", + "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "itertools 0.12.1", + "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "kitsune_p2p_block", "kitsune_p2p_bootstrap_client", "kitsune_p2p_fetch", "kitsune_p2p_mdns", "kitsune_p2p_proxy", - "kitsune_p2p_timestamp", + "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "kitsune_p2p_transport_quic", - "kitsune_p2p_types", + "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "maplit", "mockall", "must_future", - "nanoid 0.4.0", + "nanoid", "num-traits", "once_cell", "opentelemetry_api", @@ -7116,16 +7365,30 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" -version = "0.3.0-beta-dev.17" +version = "0.3.1-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c89fb7f069f4a90794dff2669cc832a71c9fd93554e92b0f17de97d753283f4" +checksum = "0afa937935e8d3eae00cc3b324988ced94d8efa8039550eeb3f0a89e3e181aee" +dependencies = [ + "base64 0.22.1", + "derive_more", + "holochain_util 0.3.1-rc.0 (registry+https://github.com/rust-lang/crates.io-index)", + "kitsune_p2p_dht_arc 0.3.1-rc.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde", + "serde_bytes", + "shrinkwraprs", +] + +[[package]] +name = "kitsune_p2p_bin_data" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "arbitrary", - "base64 0.13.1", + "base64 0.22.1", "derive_more", "fixt", - "holochain_util", - "kitsune_p2p_dht_arc", + "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_dht_arc 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "proptest", "proptest-derive", "serde", @@ -7135,25 +7398,23 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" -version = "0.3.0-beta-dev.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a32470626b779dd5e36e516d64f8bdde1eac1faec944654d2b85f200b0ac3cee" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ - "kitsune_p2p_bin_data", - "kitsune_p2p_timestamp", + "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "serde", ] [[package]] name = "kitsune_p2p_bootstrap" -version = "0.2.0-beta-dev.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b9b206e371f9ff2e951bfdb4cf4228c1c1c6d54e46df4f3e733b3cb7950e500" +version = "0.2.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "clap 4.4.18", "futures", - "kitsune_p2p_bin_data", - "kitsune_p2p_types", + "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "parking_lot 0.12.1", "rand 0.8.5", "reqwest", @@ -7166,38 +7427,52 @@ dependencies = [ [[package]] name = "kitsune_p2p_bootstrap_client" -version = "0.3.0-beta-dev.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17816778c98f5156475fa6a994b3e9a68fadb4183654984148bfac7bc16ca4b" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ - "ed25519-dalek", - "kitsune_p2p_bin_data", + "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "kitsune_p2p_bootstrap", - "kitsune_p2p_types", - "once_cell", + "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "reqwest", "serde", "serde_bytes", - "tokio", "url2", ] [[package]] name = "kitsune_p2p_dht" -version = "0.3.0-beta-dev.18" +version = "0.3.1-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b6c6664798fd5f34a9ee0cf4c7af16565891ad8f94a193c1468f4d5829f941" +checksum = "87ff93b9d045ebd77781d8b61835f55112b898dc36c61d72557f58792489bee8" +dependencies = [ + "derivative", + "derive_more", + "futures", + "kitsune_p2p_dht_arc 0.3.1-rc.0 (registry+https://github.com/rust-lang/crates.io-index)", + "kitsune_p2p_timestamp 0.3.1-rc.0 (registry+https://github.com/rust-lang/crates.io-index)", + "must_future", + "num-traits", + "rand 0.8.5", + "serde", + "statrs", + "thiserror", + "tracing", +] + +[[package]] +name = "kitsune_p2p_dht" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "arbitrary", "colored", "derivative", "derive_more", "futures", - "kitsune_p2p_dht_arc", - "kitsune_p2p_timestamp", + "kitsune_p2p_dht_arc 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "must_future", "num-traits", - "once_cell", "proptest", "proptest-derive", "rand 0.8.5", @@ -7209,15 +7484,28 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" -version = "0.3.0-beta-dev.16" +version = "0.3.1-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aaba5f7fcb2c0b7faa3f859a3de5c4b893fbf9cfea51530549d11e9738fbfac" +checksum = "5e06db37fa121dfa22ebde3271db5d385cd496ed03d915ad37104cceb87a22ca" +dependencies = [ + "derive_more", + "gcollections", + "intervallum", + "kitsune_p2p_timestamp 0.3.1-rc.0 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits", + "serde", +] + +[[package]] +name = "kitsune_p2p_dht_arc" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "arbitrary", "derive_more", "gcollections", "intervallum", - "kitsune_p2p_timestamp", + "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "num-traits", "proptest", "proptest-derive", @@ -7227,15 +7515,14 @@ dependencies = [ [[package]] name = "kitsune_p2p_fetch" -version = "0.3.0-beta-dev.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42d7a2d5c9f2d27ac88809f8e040d8856fb3e989abbb2dae981f32111a124c4" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "backon", "derive_more", "indexmap 2.2.2", - "kitsune_p2p_timestamp", - "kitsune_p2p_types", + "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "serde", "tokio", "tracing", @@ -7243,13 +7530,12 @@ dependencies = [ [[package]] name = "kitsune_p2p_mdns" -version = "0.3.0-beta-dev.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "432a37bef5d393debb90db429fce674603f761817652da8dae41033006047915" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "err-derive 0.3.1", - "futures-util", + "futures", "libmdns", "mdns", "tokio", @@ -7258,16 +7544,15 @@ dependencies = [ [[package]] name = "kitsune_p2p_proxy" -version = "0.3.0-beta-dev.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48a0106013d08267ea6e2398deae4c30733befd68704cbf37a401ef1f706df4f" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "derive_more", "futures", - "holochain_trace", + "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "kitsune_p2p_transport_quic", - "kitsune_p2p_types", + "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "serde", "serde_bytes", "structopt", @@ -7276,9 +7561,18 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" -version = "0.3.0-beta-dev.8" +version = "0.3.1-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4d587124090ca8e4ab28f3dd3d65aa35fcc72403b7dad4fc790751efd04fbe3" +checksum = "9a1dcdf3cae376a56ab109908d72b9b678e95920c087e7b255c505c84cdb9787" +dependencies = [ + "chrono", + "serde", +] + +[[package]] +name = "kitsune_p2p_timestamp" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "arbitrary", "chrono", @@ -7292,14 +7586,13 @@ dependencies = [ [[package]] name = "kitsune_p2p_transport_quic" -version = "0.3.0-beta-dev.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16bd847614dd15575f66a6a841f1aa3b9eac1750dcc21d881e33deccbb2e6f95" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ - "blake2b_simd 1.0.2", + "blake2b_simd", "futures", - "if-addrs 0.8.0", - "kitsune_p2p_types", + "if-addrs 0.12.0", + "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "quinn", "rustls 0.20.9", "tokio", @@ -7308,21 +7601,51 @@ dependencies = [ [[package]] name = "kitsune_p2p_types" -version = "0.3.0-beta-dev.22" +version = "0.3.1-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c16710587d583bc82597b99c14aded83c317b8697e0e6a2333ba14012ce3830" +checksum = "14901c550c67abdb22fc271730bc3b026bbaa6fd089fee89302e7101a7cfce37" +dependencies = [ + "base64 0.22.1", + "derive_more", + "futures", + "ghost_actor", + "holochain_trace 0.3.1-rc.0 (registry+https://github.com/rust-lang/crates.io-index)", + "kitsune_p2p_bin_data 0.3.1-rc.0 (registry+https://github.com/rust-lang/crates.io-index)", + "kitsune_p2p_dht 0.3.1-rc.0 (registry+https://github.com/rust-lang/crates.io-index)", + "kitsune_p2p_dht_arc 0.3.1-rc.0 (registry+https://github.com/rust-lang/crates.io-index)", + "kitsune_p2p_timestamp 0.3.1-rc.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lair_keystore_api", + "once_cell", + "parking_lot 0.12.1", + "paste", + "rmp-serde 1.1.2", + "rustls 0.20.9", + "serde", + "serde_bytes", + "serde_json", + "sysinfo 0.30.12", + "thiserror", + "tokio", + "url", + "url2", +] + +[[package]] +name = "kitsune_p2p_types" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "arbitrary", - "base64 0.21.7", + "base64 0.22.1", "derive_more", "fixt", "futures", "ghost_actor", - "holochain_trace", - "kitsune_p2p_bin_data", - "kitsune_p2p_dht", - "kitsune_p2p_dht_arc", - "kitsune_p2p_timestamp", + "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_dht 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_dht_arc 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "lair_keystore_api", "mockall", "once_cell", @@ -7330,15 +7653,15 @@ dependencies = [ "paste", "proptest", "proptest-derive", - "rmp-serde", + "rmp-serde 1.1.2", "rustls 0.20.9", "serde", "serde_bytes", "serde_json", - "sysinfo 0.29.11", + "sysinfo 0.30.12", "thiserror", "tokio", - "url 2.4.1", + "url", "url2", ] @@ -7386,15 +7709,15 @@ dependencies = [ [[package]] name = "lair_keystore" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7397cd6d05160fe7041f8c0e7de6672b3345bd68326cd2dc06dfb701669f8bf3" +checksum = "56689c6c7f318e5909c9de1d7eac7f2d383370341632ab845c2da24b5b6bb7aa" dependencies = [ "lair_keystore_api", "pretty_assertions", - "rpassword 7.3.1", + "rpassword", "rusqlite", - "sqlformat 0.2.3", + "sqlformat", "structopt", "sysinfo 0.28.4", "tracing-subscriber 0.3.18", @@ -7402,15 +7725,15 @@ dependencies = [ [[package]] name = "lair_keystore_api" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e485174546b1a95bbf801ce241e1039d182ec99c8ab4a5c0b90af0c8d8c651b" +checksum = "aa27af83a127b28c06d7c175dfc34d762fb66ea36d6ac2110d93a55d0e058dd5" dependencies = [ "base64 0.13.1", "dunce", "hc_seed_bundle", "lru", - "nanoid 0.4.0", + "nanoid", "once_cell", "parking_lot 0.12.1", "rcgen", @@ -7421,7 +7744,7 @@ dependencies = [ "tokio", "toml 0.7.8", "tracing", - "url 2.4.1", + "url", "winapi 0.3.9", "zeroize", ] @@ -7471,7 +7794,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f404a90a744e32e8be729034fc33b90cf2a56418fbf594d69aa3c0214ad414e5" dependencies = [ "cfg-if 1.0.0", - "lexical-core", + "lexical-core 0.7.6", ] [[package]] @@ -7487,6 +7810,70 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "lexical-core" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" +dependencies = [ + "lexical-parse-float", + "lexical-parse-integer", + "lexical-util", + "lexical-write-float", + "lexical-write-integer", +] + +[[package]] +name = "lexical-parse-float" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" +dependencies = [ + "lexical-parse-integer", + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-parse-integer" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" +dependencies = [ + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-util" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" +dependencies = [ + "static_assertions", +] + +[[package]] +name = "lexical-write-float" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" +dependencies = [ + "lexical-util", + "lexical-write-integer", + "static_assertions", +] + +[[package]] +name = "lexical-write-integer" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" +dependencies = [ + "lexical-util", + "static_assertions", +] + [[package]] name = "libappindicator" version = "0.7.1" @@ -7603,7 +7990,7 @@ checksum = "6a60d8339ad1ddf68a81335fcafb6c6cf20d5036138a1e4ef86b8ce87f076c92" dependencies = [ "byteorder", "futures-util", - "hostname", + "hostname 0.3.1", "if-addrs 0.7.0", "log", "multimap", @@ -7621,7 +8008,7 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "libc", "redox_syscall 0.4.1", ] @@ -7741,6 +8128,12 @@ version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" + [[package]] name = "localtunnel-client" version = "0.0.12" @@ -7754,15 +8147,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "lock_api" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" -dependencies = [ - "scopeguard", -] - [[package]] name = "lock_api" version = "0.4.11" @@ -7810,7 +8194,7 @@ dependencies = [ "serde_json", "serde_yaml 0.8.26", "thiserror", - "thread-id 4.2.1", + "thread-id", "typemap-ors", "winapi 0.3.9", ] @@ -7957,12 +8341,6 @@ dependencies = [ "rawpointer", ] -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - [[package]] name = "md-5" version = "0.10.6" @@ -8055,6 +8433,21 @@ dependencies = [ "autocfg 1.1.0", ] +[[package]] +name = "metal" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5637e166ea14be6063a3f8ba5ccb9a4159df7d8f6d61c02fc3d480b1f90dcfcb" +dependencies = [ + "bitflags 2.5.0", + "block", + "core-graphics-types", + "foreign-types 0.5.0", + "log", + "objc", + "paste", +] + [[package]] name = "mime" version = "0.3.17" @@ -8085,9 +8478,9 @@ checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", "simd-adler32", @@ -8162,24 +8555,20 @@ checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" [[package]] name = "mr_bundle" -version = "0.3.0-beta-dev.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b57f5a7ac4af14c37915b66cb01ac7a981d6bbfedab3af9cce740f2718a028c9" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "arbitrary", - "bytes", "derive_more", - "either", "flate2", "futures", - "holochain_util", + "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", "proptest", "proptest-derive", "reqwest", - "rmp-serde", + "rmp-serde 1.1.2", "serde", "serde_bytes", - "serde_derive", "serde_yaml 0.9.31", "test-strategy", "thiserror", @@ -8222,7 +8611,7 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfd8a792c1694c6da4f68db0a9d707c72bd260994da179e6030a5dcee00bb815" dependencies = [ - "blake2b_simd 1.0.2", + "blake2b_simd", "blake2s_simd", "blake3", "core2", @@ -8266,6 +8655,28 @@ dependencies = [ "pin-utils", ] +[[package]] +name = "naga" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e536ae46fcab0876853bd4a632ede5df4b1c2527a58f6c5a4150fe86be858231" +dependencies = [ + "arrayvec 0.7.4", + "bit-set", + "bitflags 2.5.0", + "codespan-reporting", + "hexf-parse", + "indexmap 2.2.2", + "log", + "num-traits", + "rustc-hash", + "serde", + "spirv", + "termcolor", + "thiserror", + "unicode-xid 0.2.4", +] + [[package]] name = "nalgebra" version = "0.29.0" @@ -8295,15 +8706,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "nanoid" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6226bc4e142124cb44e309a37a04cd9bb10e740d8642855441d3b14808f635e" -dependencies = [ - "rand 0.6.5", -] - [[package]] name = "nanoid" version = "0.4.0" @@ -8339,8 +8741,8 @@ checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" dependencies = [ "bitflags 1.3.2", "jni-sys", - "ndk-sys", - "num_enum", + "ndk-sys 0.3.0", + "num_enum 0.5.11", "thiserror", ] @@ -8359,6 +8761,15 @@ dependencies = [ "jni-sys", ] +[[package]] +name = "ndk-sys" +version = "0.5.0+25.2.9519653" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +dependencies = [ + "jni-sys", +] + [[package]] name = "net2" version = "0.2.39" @@ -8392,7 +8803,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" dependencies = [ - "smallvec 1.13.1", + "smallvec", ] [[package]] @@ -8452,7 +8863,7 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg-if 1.0.0", "libc", ] @@ -8472,15 +8883,6 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" -[[package]] -name = "nom" -version = "4.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c349f68f25f596b9f44cf0e7c69752a5c633b0550c3ff849518bfba0233774a" -dependencies = [ - "memchr", -] - [[package]] name = "nom" version = "5.1.3" @@ -8611,7 +9013,7 @@ dependencies = [ "num-traits", "rand 0.8.5", "serde", - "smallvec 1.13.1", + "smallvec", "zeroize", ] @@ -8708,7 +9110,16 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ - "num_enum_derive", + "num_enum_derive 0.5.11", +] + +[[package]] +name = "num_enum" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +dependencies = [ + "num_enum_derive 0.7.2", ] [[package]] @@ -8723,6 +9134,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "num_enum_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +dependencies = [ + "proc-macro-crate", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", +] + [[package]] name = "objc" version = "0.2.7" @@ -8868,9 +9291,9 @@ version = "0.10.63" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg-if 1.0.0", - "foreign-types", + "foreign-types 0.3.2", "libc", "once_cell", "openssl-macros", @@ -8991,6 +9414,12 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "outref" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f222829ae9293e33a9f5e9f440c6760a3d450a64affe1846486b140db81c1f4" + [[package]] name = "outref" version = "0.5.1" @@ -9003,12 +9432,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" -[[package]] -name = "owning_ref" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d52571ddcb42e9c900c901a18d8d67e393df723fcd51dd59c5b1a85d0acb6cc" - [[package]] name = "p224" version = "0.13.2" @@ -9056,6 +9479,20 @@ dependencies = [ "sha2 0.10.8", ] +[[package]] +name = "p521" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc9e2161f1f215afdfce23677034ae137bbd45016a880c2eb3ba8eb95f085b2" +dependencies = [ + "base16ct 0.2.0", + "ecdsa 0.16.9", + "elliptic-curve 0.13.8", + "primeorder", + "rand_core 0.6.4", + "sha2 0.10.8", +] + [[package]] name = "pairing" version = "0.22.0" @@ -9096,27 +9533,6 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" -[[package]] -name = "parking_lot" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa12d706797d42551663426a45e2db2e0364bd1dbf6aeada87e89c5f981f43e9" -dependencies = [ - "owning_ref", - "parking_lot_core 0.2.14", - "thread-id 3.3.0", -] - -[[package]] -name = "parking_lot" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" -dependencies = [ - "lock_api 0.3.4", - "parking_lot_core 0.7.3", -] - [[package]] name = "parking_lot" version = "0.11.2" @@ -9124,7 +9540,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", - "lock_api 0.4.11", + "lock_api", "parking_lot_core 0.8.6", ] @@ -9134,36 +9550,10 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ - "lock_api 0.4.11", + "lock_api", "parking_lot_core 0.9.9", ] -[[package]] -name = "parking_lot_core" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4db1a8ccf734a7bce794cc19b3df06ed87ab2f3907036b693c68f56b4d4537fa" -dependencies = [ - "libc", - "rand 0.4.6", - "smallvec 0.6.14", - "winapi 0.3.9", -] - -[[package]] -name = "parking_lot_core" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93f386bb233083c799e6e642a9d73db98c24a5deeb95ffc85bf281255dffc98" -dependencies = [ - "cfg-if 0.1.10", - "cloudabi", - "libc", - "redox_syscall 0.1.57", - "smallvec 1.13.1", - "winapi 0.3.9", -] - [[package]] name = "parking_lot_core" version = "0.8.6" @@ -9174,7 +9564,7 @@ dependencies = [ "instant", "libc", "redox_syscall 0.2.16", - "smallvec 1.13.1", + "smallvec", "winapi 0.3.9", ] @@ -9187,7 +9577,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall 0.4.1", - "smallvec 1.13.1", + "smallvec", "windows-targets 0.48.5", ] @@ -9296,15 +9686,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" - -[[package]] -name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" @@ -9640,17 +10024,6 @@ dependencies = [ "time", ] -[[package]] -name = "pmutil" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", -] - [[package]] name = "png" version = "0.17.11" @@ -9740,12 +10113,13 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "predicates" -version = "1.0.8" +version = "2.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df" +checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" dependencies = [ - "difference", - "float-cmp 0.8.0", + "difflib", + "float-cmp", + "itertools 0.10.5", "normalize-line-endings", "predicates-core", "regex", @@ -9753,13 +10127,13 @@ dependencies = [ [[package]] name = "predicates" -version = "2.1.5" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" +checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" dependencies = [ + "anstyle", "difflib", - "float-cmp 0.9.0", - "itertools 0.10.5", + "float-cmp", "normalize-line-endings", "predicates-core", "regex", @@ -9904,6 +10278,12 @@ dependencies = [ "yansi 1.0.0-rc.1", ] +[[package]] +name = "profiling" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" + [[package]] name = "prometheus" version = "0.13.3" @@ -9927,7 +10307,7 @@ checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" dependencies = [ "bit-set", "bit-vec", - "bitflags 2.4.2", + "bitflags 2.5.0", "lazy_static", "num-traits", "rand 0.8.5", @@ -9979,7 +10359,7 @@ dependencies = [ "regex", "syn 1.0.109", "tempfile", - "which", + "which 4.4.2", ] [[package]] @@ -10191,19 +10571,6 @@ dependencies = [ "nibble_vec", ] -[[package]] -name = "rand" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi 0.3.9", -] - [[package]] name = "rand" version = "0.6.5" @@ -10419,12 +10786,24 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + [[package]] name = "raw-window-handle" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" +[[package]] +name = "raw-window-handle" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" + [[package]] name = "rawpointer" version = "0.2.1" @@ -10473,12 +10852,6 @@ dependencies = [ "rand_core 0.3.1", ] -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - [[package]] name = "redox_syscall" version = "0.2.16" @@ -10543,7 +10916,7 @@ dependencies = [ "fxhash", "log", "slice-group-by", - "smallvec 1.13.1", + "smallvec", ] [[package]] @@ -10632,9 +11005,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.24" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ "async-compression", "base64 0.21.7", @@ -10642,7 +11015,7 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.11", "http-body 0.4.6", "hyper 0.14.28", @@ -10654,22 +11027,20 @@ dependencies = [ "mime", "native-tls", "once_cell", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project-lite", - "rustls 0.21.10", + "rustls 0.21.11", "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", - "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls 0.24.1", "tokio-socks", "tokio-util", "tower-service", - "url 2.4.1", + "url", "wasm-bindgen", "wasm-bindgen-futures", "wasm-streams", @@ -10684,7 +11055,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" dependencies = [ - "hostname", + "hostname 0.3.1", "quick-error", ] @@ -10726,7 +11097,7 @@ dependencies = [ "objc", "objc-foundation", "objc_id", - "raw-window-handle", + "raw-window-handle 0.5.2", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -10807,7 +11178,7 @@ dependencies = [ "rkyv_derive", "seahash", "tinyvec", - "uuid 1.7.0", + "uuid 1.8.0", ] [[package]] @@ -10849,6 +11220,17 @@ dependencies = [ "serde", ] +[[package]] +name = "rmp-serde" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" +dependencies = [ + "byteorder", + "rmp", + "serde", +] + [[package]] name = "rmpv" version = "1.0.0" @@ -10930,11 +11312,11 @@ dependencies = [ "log", "memchr", "pear", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project-lite", "ref-cast", "serde", - "smallvec 1.13.1", + "smallvec", "stable-pattern", "state 0.6.0", "time", @@ -10943,22 +11325,24 @@ dependencies = [ ] [[package]] -name = "roxmltree" -version = "0.11.0" +name = "ron" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5001f134077069d87f77c8b9452b690df2445f7a43f1c7ca4a1af8dd505789d" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ - "xmlparser", + "base64 0.21.7", + "bitflags 2.5.0", + "serde", + "serde_derive", ] [[package]] -name = "rpassword" -version = "5.0.1" +name = "roxmltree" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" +checksum = "d5001f134077069d87f77c8b9452b690df2445f7a43f1c7ca4a1af8dd505789d" dependencies = [ - "libc", - "winapi 0.3.9", + "xmlparser", ] [[package]] @@ -11008,12 +11392,12 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" dependencies = [ - "bitflags 2.4.2", - "fallible-iterator", + "bitflags 2.5.0", + "fallible-iterator 0.2.0", "fallible-streaming-iterator", "hashlink", "libsqlite3-sys", - "smallvec 1.13.1", + "smallvec", ] [[package]] @@ -11109,7 +11493,7 @@ version = "0.38.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno 0.3.8", "libc", "linux-raw-sys 0.4.13", @@ -11130,9 +11514,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4" dependencies = [ "log", "ring 0.17.7", @@ -11172,12 +11556,13 @@ dependencies = [ [[package]] name = "rustls-tokio-stream" -version = "0.2.16" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897937c68ff975d028e8cc07bc887f2d5a9ec2bc952549f40db9a91dc557974c" +checksum = "fd707225bb670bcd2876886bb571753d1ce03a9cedfa2e629a79984ca9a93cfb" dependencies = [ "futures", - "rustls 0.21.10", + "rustls 0.21.11", + "socket2 0.5.5", "tokio", ] @@ -11227,9 +11612,9 @@ checksum = "c1e83c32c3f3c33b08496e0d1df9ea8c64d39adb8eb36a1ebb1440c690697aef" dependencies = [ "bitflags 1.3.2", "cfg-if 1.0.0", - "clipboard-win", + "clipboard-win 4.5.0", "dirs-next", - "fd-lock", + "fd-lock 3.0.13", "libc", "log", "memchr", @@ -11248,10 +11633,10 @@ version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "994eca4bca05c87e86e15d90fc7a91d1be64b4482b38cb2d27474568fe7c9db9" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg-if 1.0.0", - "clipboard-win", - "fd-lock", + "clipboard-win 4.5.0", + "fd-lock 3.0.13", "home", "libc", "log", @@ -11265,6 +11650,28 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "rustyline" +version = "13.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02a2d683a4ac90aeef5b1013933f6d977bd37d51ff3f4dad829d4931a7e6be86" +dependencies = [ + "bitflags 2.5.0", + "cfg-if 1.0.0", + "clipboard-win 5.3.1", + "fd-lock 4.0.2", + "home", + "libc", + "log", + "memchr", + "nix 0.27.1", + "radix_trie", + "unicode-segmentation", + "unicode-width", + "utf8parse", + "winapi 0.3.9", +] + [[package]] name = "ryu" version = "1.0.16" @@ -11396,7 +11803,7 @@ dependencies = [ "fxhash", "getrandom 0.2.12", "git-version", - "hostname", + "hostname 0.3.1", "indexmap 1.9.3", "js-sys", "lazy_static", @@ -11425,7 +11832,7 @@ dependencies = [ "serde-wasm-bindgen 0.5.0", "serde_json", "sha3 0.8.2", - "smallvec 1.13.1", + "smallvec", "static_assertions", "strum 0.23.0", "strum_macros 0.23.1", @@ -11464,9 +11871,9 @@ dependencies = [ [[package]] name = "sd-notify" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cd08a21f852bd2fe42e3b2a6c76a0db6a95a5b5bd29c0521dd0b30fa1712ec8" +checksum = "621e3680f3e07db4c9c2c3fb07c6223ab2fab2e54bd3c04c3ae037990f428c32" [[package]] name = "seahash" @@ -11572,7 +11979,7 @@ dependencies = [ "phf_codegen 0.8.0", "precomputed-hash", "servo_arc", - "smallvec 1.13.1", + "smallvec", "thin-slice", ] @@ -11626,9 +12033,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.196" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] @@ -11685,9 +12092,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.196" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2 1.0.78", "quote 1.0.35", @@ -11696,9 +12103,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.113" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "indexmap 2.2.2", "itoa 1.0.10", @@ -11740,65 +12147,55 @@ dependencies = [ [[package]] name = "serde_v8" -version = "0.139.0" +version = "0.189.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "340328b061f990810dc28a444078da33da191003a031555dcd30c69314f03840" +checksum = "893c995255d6fbf55c33166b651fd037c4e3cc7864bf82213ea18d0ec94ed165" dependencies = [ - "bytes", - "derive_more", "num-bigint", "serde", - "smallvec 1.13.1", + "smallvec", "thiserror", - "v8", + "v8 0.91.1", ] [[package]] -name = "serde_with" -version = "1.14.0" +name = "serde_v8" +version = "0.192.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" +checksum = "f7b616df6c4ff5643dd503cbfe119175ebebfd4132512e33de4971f1e91d5739" dependencies = [ + "num-bigint", "serde", - "serde_with_macros 1.5.2", + "smallvec", + "thiserror", + "v8 0.92.0", ] [[package]] name = "serde_with" -version = "3.6.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b0ed1662c5a68664f45b76d18deb0e234aff37207086803165c961eb695e981" +checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", "indexmap 2.2.2", "serde", + "serde_derive", "serde_json", - "serde_with_macros 3.6.0", + "serde_with_macros", "time", ] [[package]] name = "serde_with_macros" -version = "1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" -dependencies = [ - "darling 0.13.4", - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 1.0.109", -] - -[[package]] -name = "serde_with_macros" -version = "3.6.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "568577ff0ef47b879f736cd66740e022f3672788cdf002a05a4e609ea5a6fb15" +checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" dependencies = [ - "darling 0.20.5", + "darling 0.20.9", "proc-macro2 1.0.78", "quote 1.0.35", "syn 2.0.48", @@ -12036,12 +12433,37 @@ dependencies = [ "wide", ] +[[package]] +name = "simd-abstraction" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cadb29c57caadc51ff8346233b5cec1d240b68ce55cf1afc764818791876987" +dependencies = [ + "outref 0.1.0", +] + [[package]] name = "simd-adler32" version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" +[[package]] +name = "simd-json" +version = "0.13.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "570c430b3d902ea083097e853263ae782dfe40857d93db019a12356c8e8143fa" +dependencies = [ + "getrandom 0.2.12", + "halfbrown", + "lexical-core 0.8.5", + "ref-cast", + "serde", + "serde_json", + "simdutf8", + "value-trait", +] + [[package]] name = "simdutf8" version = "0.1.4" @@ -12091,12 +12513,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" [[package]] -name = "smallvec" -version = "0.6.14" +name = "slotmap" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" dependencies = [ - "maybe-uninit", + "version_check", ] [[package]] @@ -12138,9 +12560,9 @@ dependencies = [ [[package]] name = "sodoken" -version = "0.0.10" +version = "0.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308b58141d2ddac517b5e606e6f94d72e7a64c1383c9439c4acc712267f2be52" +checksum = "907e0ea9699b846c2586ea5685e9abf5963fca64a5179a406e6ac02b94564e30" dependencies = [ "libc", "libsodium-sys-stable", @@ -12173,42 +12595,29 @@ checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" dependencies = [ "bitflags 1.3.2", "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps 5.0.0", -] - -[[package]] -name = "sourcemap" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4cbf65ca7dc576cf50e21f8d0712d96d4fcfd797389744b7b222a85cdf5bd90" -dependencies = [ - "data-encoding", - "debugid", - "if_chain", - "rustc_version 0.2.3", - "serde", - "serde_json", - "unicode-id", - "url 2.4.1", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 5.0.0", ] [[package]] name = "sourcemap" -version = "7.0.1" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10da010a590ed2fa9ca8467b00ce7e9c5a8017742c0c09c45450efc172208c4b" +checksum = "208d40b9e8cad9f93613778ea295ed8f3c2b1824217c6cfc7219d3f6f45b96d4" dependencies = [ + "base64-simd 0.7.0", + "bitvec", "data-encoding", "debugid", "if_chain", + "rustc-hash", "rustc_version 0.2.3", "serde", "serde_json", - "unicode-id", - "url 2.4.1", + "unicode-id-start", + "url", ] [[package]] @@ -12223,7 +12632,16 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" dependencies = [ - "lock_api 0.4.11", + "lock_api", +] + +[[package]] +name = "spirv" +version = "0.3.0+sdk-1.3.268.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" +dependencies = [ + "bitflags 2.5.0", ] [[package]] @@ -12246,17 +12664,6 @@ dependencies = [ "der 0.7.8", ] -[[package]] -name = "sqlformat" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b7922be017ee70900be125523f38bdd644f4f06a1b16e8fa5a8ee8c34bffd4" -dependencies = [ - "itertools 0.10.5", - "nom 7.1.3", - "unicode_categories", -] - [[package]] name = "sqlformat" version = "0.2.3" @@ -12373,11 +12780,10 @@ dependencies = [ [[package]] name = "string_enum" -version = "0.4.1" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fa4d4f81d7c05b9161f8de839975d3326328b8ba2831164b465524cc2f55252" +checksum = "05e383308aebc257e7d7920224fa055c632478d92744eca77f99be8fa1545b90" dependencies = [ - "pmutil", "proc-macro2 1.0.78", "quote 1.0.35", "swc_macros_common", @@ -12392,15 +12798,15 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "strsim" -version = "0.9.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "structmeta" @@ -12554,9 +12960,9 @@ dependencies = [ [[package]] name = "swc_atoms" -version = "0.6.4" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a9e1b6d97f27b6abe5571f8fe3bdbd2fa987299fc2126450c7cde6214896ef" +checksum = "bb6567e4e67485b3e7662b486f1565bdae54bd5b9d6b16b2ba1a9babb1e42125" dependencies = [ "hstr", "once_cell", @@ -12564,11 +12970,25 @@ dependencies = [ "serde", ] +[[package]] +name = "swc_cached" +version = "0.3.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83406221c501860fce9c27444f44125eafe9e598b8b81be7563d7036784cd05c" +dependencies = [ + "ahash 0.8.11", + "anyhow", + "dashmap 5.5.3", + "once_cell", + "regex", + "serde", +] + [[package]] name = "swc_common" -version = "0.33.9" +version = "0.33.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ccb656cd57c93614e4e8b33a60e75ca095383565c1a8d2bbe6a1103942831e0" +checksum = "a2f9706038906e66f3919028f9f7a37f3ed552f1b85578e93f4468742e2da438" dependencies = [ "ast_node", "better_scoped_tls", @@ -12581,34 +13001,35 @@ dependencies = [ "rustc-hash", "serde", "siphasher 0.3.11", - "sourcemap 6.4.1", + "sourcemap", "swc_atoms", "swc_eq_ignore_macros", "swc_visit", "tracing", "unicode-width", - "url 2.4.1", + "url", ] [[package]] name = "swc_config" -version = "0.1.7" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba1c7a40d38f9dd4e9a046975d3faf95af42937b34b2b963be4d8f01239584b" +checksum = "7be1a689e146be1eae53139482cb061dcf0fa01dff296bbe7b96fff92d8e2936" dependencies = [ - "indexmap 1.9.3", + "anyhow", + "indexmap 2.2.2", "serde", "serde_json", + "swc_cached", "swc_config_macro", ] [[package]] name = "swc_config_macro" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5b5aaca9a0082be4515f0fbbecc191bf5829cd25b5b9c0a2810f6a2bb0d6829" +checksum = "7c5f56139042c1a95b54f5ca48baa0e0172d369bcc9d3d473dad1de36bae8399" dependencies = [ - "pmutil", "proc-macro2 1.0.78", "quote 1.0.35", "swc_macros_common", @@ -12617,11 +13038,11 @@ dependencies = [ [[package]] name = "swc_ecma_ast" -version = "0.110.10" +version = "0.113.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c3d416121da2d56bcbd1b1623725a68890af4552fef0c6d1e4bfa92776ccd6a" +checksum = "dc1690cc0c9ab60b44ac0225ba1e231ac532f7ba1d754df761c6ee607561afae" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "is-macro", "num-bigint", "phf 0.11.2", @@ -12630,21 +13051,21 @@ dependencies = [ "string_enum", "swc_atoms", "swc_common", - "unicode-id", + "unicode-id-start", ] [[package]] name = "swc_ecma_codegen" -version = "0.146.32" +version = "0.149.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b7b37ef40385cc2e294ece3d42048dcda6392838724dd5f02ff8da3fa105271" +checksum = "4fef147127a2926ca26171c7afcbf028ff86dc543ced87d316713f25620a15b9" dependencies = [ "memchr", "num-bigint", "once_cell", "rustc-hash", "serde", - "sourcemap 6.4.1", + "sourcemap", "swc_atoms", "swc_common", "swc_ecma_ast", @@ -12654,11 +13075,10 @@ dependencies = [ [[package]] name = "swc_ecma_codegen_macros" -version = "0.7.3" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcdff076dccca6cc6a0e0b2a2c8acfb066014382bc6df98ec99e755484814384" +checksum = "090e409af49c8d1a3c13b3aab1ed09dd4eda982207eb3e63c2ad342f072b49c8" dependencies = [ - "pmutil", "proc-macro2 1.0.78", "quote 1.0.35", "swc_macros_common", @@ -12667,22 +13087,23 @@ dependencies = [ [[package]] name = "swc_ecma_loader" -version = "0.45.10" +version = "0.45.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31cf7549feec3698d0110a0a71ae547f31ae272dc92db3285ce126d6dcbdadf3" +checksum = "92c68f934bd2c51f29c4ad0bcae09924e9dc30d7ce0680367d45b42d40338a67" dependencies = [ "anyhow", "pathdiff", "serde", + "swc_atoms", "swc_common", "tracing", ] [[package]] name = "swc_ecma_parser" -version = "0.141.26" +version = "0.144.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9590deff1b29aafbff8901b9d38d00211393f6b17b5cab878562db89a8966d88" +checksum = "0499e69683ae5d67a20ff0279b94bc90f29df7922a46331b54d5dd367bf89570" dependencies = [ "either", "new_debug_unreachable", @@ -12690,7 +13111,7 @@ dependencies = [ "num-traits", "phf 0.11.2", "serde", - "smallvec 1.13.1", + "smallvec", "smartstring", "stacker", "swc_atoms", @@ -12702,18 +13123,18 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.134.42" +version = "0.138.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d74ca42a400257d8563624122813c1849c3d87e7abe3b9b2ed7514c76f64ad2f" +checksum = "eddb95c2bdad1c9c29edf35712e1e0f9b9ddc1cdb5ba2d582fd93468cb075a03" dependencies = [ "better_scoped_tls", - "bitflags 2.4.2", - "indexmap 1.9.3", + "bitflags 2.5.0", + "indexmap 2.2.2", "once_cell", "phf 0.11.2", "rustc-hash", "serde", - "smallvec 1.13.1", + "smallvec", "swc_atoms", "swc_common", "swc_ecma_ast", @@ -12725,9 +13146,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_classes" -version = "0.123.43" +version = "0.127.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e68880cf7d65b93e0446b3ee079f33d94e0eddac922f75b736a6ea7669517c0" +checksum = "53043d81678f3c693604eeb1d1f0fe6ba10f303104a31b954dbeebed9cadf530" dependencies = [ "swc_atoms", "swc_common", @@ -12739,11 +13160,10 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_macros" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8188eab297da773836ef5cf2af03ee5cca7a563e1be4b146f8141452c28cc690" +checksum = "500a1dadad1e0e41e417d633b3d6d5de677c9e0d3159b94ba3348436cdb15aab" dependencies = [ - "pmutil", "proc-macro2 1.0.78", "quote 1.0.35", "swc_macros_common", @@ -12752,14 +13172,14 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_proposal" -version = "0.168.52" +version = "0.172.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e1f409e026be953fabb327923ebc5fdc7c664bcac036b76107834798640ed" +checksum = "7fbc414d6a9c5479cfb4c6e92fcdac504582bd7bc89a0ed7f8808b72dc8bd1f0" dependencies = [ "either", "rustc-hash", "serde", - "smallvec 1.13.1", + "smallvec", "swc_atoms", "swc_common", "swc_ecma_ast", @@ -12772,13 +13192,13 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_react" -version = "0.180.52" +version = "0.184.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa7f368a80f28eeaa0f529cff6fb5d7578ef10a60be25bfd2582cb3f8ff5c9e" +checksum = "565a76c4ca47ce31d78301c0beab878e4c2cb4f624691254d834ec8c0e236755" dependencies = [ - "base64 0.13.1", + "base64 0.21.7", "dashmap 5.5.3", - "indexmap 1.9.3", + "indexmap 2.2.2", "once_cell", "serde", "sha-1", @@ -12796,9 +13216,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_typescript" -version = "0.185.52" +version = "0.189.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daa2950c85abb4d555e092503ad2fa4f6dec0ee36a719273fb7a7bb29ead9ab6" +checksum = "e209026c1d3c577cafac257d87e7c0d23119282fbdc8ed03d7f56077e95beb90" dependencies = [ "ryu-js", "serde", @@ -12813,11 +13233,11 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.124.32" +version = "0.128.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a4a0baf6cfa490666a9fe23a17490273f843d19ebc1d6ec89d64c3f8ccdb80" +checksum = "fe5242670bc74e0a0b64b9d4912b37be36944517ce0881314162aeb4381272c3" dependencies = [ - "indexmap 1.9.3", + "indexmap 2.2.2", "num_cpus", "once_cell", "rustc-hash", @@ -12831,9 +13251,9 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.96.10" +version = "0.99.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba962f0becf83bab12a17365dface5a4f636c9e1743d479e292b96910a753743" +checksum = "28a6ce28ad8e591f8d627f1f9cb26b25e5d83052a9bc1b674d95fc28040cfa98" dependencies = [ "num-bigint", "swc_atoms", @@ -12845,11 +13265,10 @@ dependencies = [ [[package]] name = "swc_eq_ignore_macros" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05a95d367e228d52484c53336991fdcf47b6b553ef835d9159db4ba40efb0ee8" +checksum = "695a1d8b461033d32429b5befbf0ad4d7a2c4d6ba9cd5ba4e0645c615839e8e4" dependencies = [ - "pmutil", "proc-macro2 1.0.78", "quote 1.0.35", "syn 2.0.48", @@ -12857,11 +13276,10 @@ dependencies = [ [[package]] name = "swc_macros_common" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a273205ccb09b51fabe88c49f3b34c5a4631c4c00a16ae20e03111d6a42e832" +checksum = "91745f3561057493d2da768437c427c0e979dff7396507ae02f16c981c4a8466" dependencies = [ - "pmutil", "proc-macro2 1.0.78", "quote 1.0.35", "syn 2.0.48", @@ -12869,9 +13287,9 @@ dependencies = [ [[package]] name = "swc_visit" -version = "0.5.7" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c337fbb2d191bf371173dea6a957f01899adb8f189c6c31b122a6cfc98fc3" +checksum = "043d11fe683dcb934583ead49405c0896a5af5face522e4682c16971ef7871b9" dependencies = [ "either", "swc_visit_macros", @@ -12879,12 +13297,11 @@ dependencies = [ [[package]] name = "swc_visit_macros" -version = "0.5.8" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f322730fb82f3930a450ac24de8c98523af7d34ab8cb2f46bcb405839891a99" +checksum = "4ae9ef18ff8daffa999f729db056d2821cd2f790f3a11e46422d19f46bb193e7" dependencies = [ "Inflector", - "pmutil", "proc-macro2 1.0.78", "quote 1.0.35", "swc_macros_common", @@ -12924,12 +13341,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - [[package]] name = "synstructure" version = "0.12.6" @@ -13007,24 +13418,18 @@ dependencies = [ ] [[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" +name = "sysinfo" +version = "0.30.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae" dependencies = [ + "cfg-if 1.0.0", "core-foundation-sys", "libc", + "ntapi 0.4.1", + "once_cell", + "rayon", + "windows 0.52.0", ] [[package]] @@ -13086,17 +13491,17 @@ dependencies = [ "log", "ndk", "ndk-context", - "ndk-sys", + "ndk-sys 0.3.0", "objc", "once_cell", "parking_lot 0.12.1", "png", - "raw-window-handle", + "raw-window-handle 0.5.2", "scopeguard", "serde", "tao-macros", "unicode-segmentation", - "uuid 1.7.0", + "uuid 1.8.0", "windows 0.39.0", "windows-implement", "x11-dl", @@ -13179,9 +13584,9 @@ dependencies = [ "open 3.2.0", "os_info", "os_pipe", - "percent-encoding 2.3.0", + "percent-encoding", "rand 0.8.5", - "raw-window-handle", + "raw-window-handle 0.5.2", "regex", "reqwest", "rfd", @@ -13202,8 +13607,8 @@ dependencies = [ "thiserror", "time", "tokio", - "url 2.4.1", - "uuid 1.7.0", + "url", + "uuid 1.8.0", "webkit2gtk", "webview2-com", "windows 0.39.0", @@ -13251,7 +13656,7 @@ dependencies = [ "tauri-utils", "thiserror", "time", - "uuid 1.7.0", + "uuid 1.8.0", "walkdir", ] @@ -13291,13 +13696,13 @@ dependencies = [ "http 0.2.11", "http-range", "rand 0.8.5", - "raw-window-handle", + "raw-window-handle 0.5.2", "serde", "serde_json", "tauri-utils", "thiserror", - "url 2.4.1", - "uuid 1.7.0", + "url", + "uuid 1.8.0", "webview2-com", "windows 0.39.0", ] @@ -13311,12 +13716,12 @@ dependencies = [ "arboard", "cocoa", "gtk", - "percent-encoding 2.3.0", + "percent-encoding", "rand 0.8.5", - "raw-window-handle", + "raw-window-handle 0.5.2", "tauri-runtime", "tauri-utils", - "uuid 1.7.0", + "uuid 1.8.0", "webkit2gtk", "webview2-com", "windows 0.39.0", @@ -13346,9 +13751,9 @@ dependencies = [ "semver 1.0.21", "serde", "serde_json", - "serde_with 3.6.0", + "serde_with", "thiserror", - "url 2.4.1", + "url", "walkdir", "windows-version", ] @@ -13517,35 +13922,24 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2 1.0.78", "quote 1.0.35", "syn 2.0.48", ] -[[package]] -name = "thread-id" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1" -dependencies = [ - "libc", - "redox_syscall 0.1.57", - "winapi 0.3.9", -] - [[package]] name = "thread-id" version = "4.2.1" @@ -13718,7 +14112,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.10", + "rustls 0.21.11", "tokio", ] @@ -13964,7 +14358,7 @@ dependencies = [ "serde", "serde_json", "sharded-slab", - "smallvec 1.13.1", + "smallvec", "thread_local", "tracing", "tracing-core", @@ -13985,7 +14379,7 @@ dependencies = [ "serde", "serde_json", "sharded-slab", - "smallvec 1.13.1", + "smallvec", "thread_local", "time", "tracing", @@ -14032,6 +14426,16 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "683ba5022fe6dbd7133cad150478ccf51bdb6d861515181e5fc6b4323d4fa424" +[[package]] +name = "triomphe" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b2cb4fbb9995eeb36ac86fadf24031ccd58f99d6b4b2d7b911db70bddb80d90" +dependencies = [ + "serde", + "stable_deref_trait", +] + [[package]] name = "trust-dns-proto" version = "0.22.0" @@ -14050,12 +14454,12 @@ dependencies = [ "lazy_static", "rand 0.8.5", "serde", - "smallvec 1.13.1", + "smallvec", "thiserror", "tinyvec", "tokio", "tracing", - "url 2.4.1", + "url", ] [[package]] @@ -14072,7 +14476,7 @@ dependencies = [ "parking_lot 0.12.1", "resolv-conf", "serde", - "smallvec 1.13.1", + "smallvec", "thiserror", "tokio", "tracing", @@ -14101,7 +14505,7 @@ dependencies = [ "rustls 0.20.9", "sha1", "thiserror", - "url 2.4.1", + "url", "utf-8", "webpki", ] @@ -14121,15 +14525,15 @@ dependencies = [ "rand 0.8.5", "sha1", "thiserror", - "url 2.4.1", + "url", "utf-8", ] [[package]] name = "tx5" -version = "0.0.7-alpha" +version = "0.0.9-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56118fa9f9d16d66caf78f23faac825192ec5893974cd48684b500270e58a2a6" +checksum = "58e2eebc6b3677281091356d4a5dbc0d48ec77b74b3ee39227e94cda1354a679" dependencies = [ "bit_field", "bytes", @@ -14147,14 +14551,14 @@ dependencies = [ "tx5-core", "tx5-go-pion", "tx5-signal", - "url 2.4.1", + "url", ] [[package]] name = "tx5-core" -version = "0.0.7-alpha" +version = "0.0.9-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23f97a8029d045801651d2c00c1214226d8b3e1eda8d7da2a3f6e33e7f706565" +checksum = "9a45e91402a7c17bda8835acb47c7460dc3880dc067235d324401a7359857a75" dependencies = [ "app_dirs2", "base64 0.13.1", @@ -14166,28 +14570,28 @@ dependencies = [ "tempfile", "tokio", "tracing", - "url 2.4.1", + "url", ] [[package]] name = "tx5-go-pion" -version = "0.0.7-alpha" +version = "0.0.9-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8893cfafc7ecb78df0d0c3f5c0302dcc3a83e9a2f43c9496be850165d074d3dc" +checksum = "5731de2cad3c014ddce4552f32c0b0c68b8682390b7ac57c55cbeddf6c1dbe50" dependencies = [ "futures", "parking_lot 0.12.1", "tokio", "tracing", "tx5-go-pion-sys", - "url 2.4.1", + "url", ] [[package]] name = "tx5-go-pion-sys" -version = "0.0.7-alpha" +version = "0.0.9-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7094b90be32dbc232f39168dd7a6b31ba236525c7374e1016b711ccaf93e509" +checksum = "f4f42f441e7c186c5aa846618144d1e041215b7d68ecd747aec1e5478c06fccb" dependencies = [ "Inflector", "base64 0.13.1", @@ -14204,9 +14608,9 @@ dependencies = [ [[package]] name = "tx5-go-pion-turn" -version = "0.0.7-alpha" +version = "0.0.9-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1c6e8200815e00a2ee46bba6bd5090e561d94e3245ceb2c5ec7aa89501e19ae" +checksum = "393e40552c56e0333a2e2e08090869f2494417c25d0168b8366caf4c9ae52391" dependencies = [ "base64 0.13.1", "dirs 5.0.1", @@ -14222,9 +14626,9 @@ dependencies = [ [[package]] name = "tx5-signal" -version = "0.0.7-alpha" +version = "0.0.9-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8f5f50fb29c21f11a183b744953dbaa5812b5ce6cbfccf513d971b00bf86e3" +checksum = "82004d487706b590b75ba858d322473fd11ccc1979f99aa85957554572a92cd5" dependencies = [ "futures", "lair_keystore_api", @@ -14245,15 +14649,15 @@ dependencies = [ "tokio-tungstenite 0.18.0", "tracing", "tx5-core", - "url 2.4.1", + "url", "webpki-roots 0.23.1", ] [[package]] name = "tx5-signal-srv" -version = "0.0.7-alpha" +version = "0.0.9-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "283dcaaa1f389612615fed7d1844d459862d771e2c31c2d3137a34ab584519b5" +checksum = "a24b13f9032042ef2c30647998ba21882dbf411435071b6fe587a2c1e0992b28" dependencies = [ "clap 4.4.18", "dirs 5.0.1", @@ -14384,6 +14788,12 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1b6def86329695390197b82c1e244a54a131ceb66c996f2088a3876e2ae083f" +[[package]] +name = "unicode-id-start" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02aebfa694eccbbbffdd92922c7de136b9fe764396d2f10e21bce1681477cfc1" + [[package]] name = "unicode-ident" version = "1.0.12" @@ -14507,23 +14917,12 @@ dependencies = [ "base64 0.21.7", "log", "once_cell", - "rustls 0.21.10", + "rustls 0.21.11", "rustls-webpki 0.101.7", - "url 2.4.1", + "url", "webpki-roots 0.25.3", ] -[[package]] -name = "url" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -dependencies = [ - "idna 0.1.5", - "matches", - "percent-encoding 1.0.1", -] - [[package]] name = "url" version = "2.4.1" @@ -14532,7 +14931,7 @@ checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna 0.4.0", - "percent-encoding 2.3.0", + "percent-encoding", "serde", ] @@ -14543,17 +14942,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c89cd13f1de9862d363308f5ffdadcd2b64b2a4a812fb296a80b7d3e80011b1e" dependencies = [ "serde", - "url 2.4.1", -] - -[[package]] -name = "url_serde" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74e7d099f1ee52f823d4bdd60c93c3602043c728f5db3b97bdb548467f7bddea" -dependencies = [ - "serde", - "url 1.7.2", + "url", ] [[package]] @@ -14572,7 +14961,7 @@ dependencies = [ "regex", "serde", "unic-ucd-ident", - "url 2.4.1", + "url", ] [[package]] @@ -14589,43 +14978,51 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "rand 0.6.5", - "serde", + "getrandom 0.2.12", ] [[package]] name = "uuid" -version = "0.8.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "getrandom 0.2.12", + "serde", ] [[package]] -name = "uuid" -version = "1.7.0" +name = "v8" +version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +checksum = "69026e2e8af55a4d2f20c0c17f690e8b31472bf76ab75b1205d3a0fab60c8f84" dependencies = [ - "getrandom 0.2.12", - "serde", + "bitflags 2.5.0", + "fslock", + "gzip-header", + "home", + "miniz_oxide", + "once_cell", + "which 5.0.0", ] [[package]] name = "v8" -version = "0.81.0" +version = "0.92.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b75f5f378b9b54aff3b10da8170d26af4cfd217f644cf671badcd13af5db4beb" +checksum = "234589219e37a7496cbce73d971586db8369871be2420372c45a579b6a919b15" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "fslock", + "gzip-header", + "home", + "miniz_oxide", "once_cell", - "which", + "which 5.0.0", ] [[package]] @@ -14640,6 +15037,18 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "126e423afe2dd9ac52142e7e9d5ce4135d7e13776c529d27fd6bc49f19e3280b" +[[package]] +name = "value-trait" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dad8db98c1e677797df21ba03fca7d3bf9bec3ca38db930954e4fe6e1ea27eb4" +dependencies = [ + "float-cmp", + "halfbrown", + "itoa 1.0.10", + "ryu", +] + [[package]] name = "vcpkg" version = "0.2.15" @@ -14702,27 +15111,6 @@ dependencies = [ "libc", ] -[[package]] -name = "vte" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197" -dependencies = [ - "arrayvec 0.7.4", - "utf8parse", - "vte_generate_state_changes", -] - -[[package]] -name = "vte_generate_state_changes" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", -] - [[package]] name = "wait-timeout" version = "0.2.0" @@ -14773,7 +15161,7 @@ dependencies = [ "mime", "mime_guess", "multer", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project", "rustls-pemfile 1.0.4", "scoped-tls", @@ -14803,9 +15191,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -14813,9 +15201,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", @@ -14840,9 +15228,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote 1.0.35", "wasm-bindgen-macro-support", @@ -14850,9 +15238,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2 1.0.78", "quote 1.0.35", @@ -14863,9 +15251,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-encoder" @@ -14878,9 +15266,9 @@ dependencies = [ [[package]] name = "wasm-streams" -version = "0.4.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" dependencies = [ "futures-util", "js-sys", @@ -14891,9 +15279,9 @@ dependencies = [ [[package]] name = "wasmer" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce45cc009177ca345a6d041f9062305ad467d15e7d41494f5b81ab46d62d7a58" +checksum = "4014573f108a246858299eb230031e268316fd57207bd2e8afc79b20fc7ce983" dependencies = [ "bytes", "cfg-if 1.0.0", @@ -14907,6 +15295,7 @@ dependencies = [ "shared-buffer", "target-lexicon", "thiserror", + "tracing", "wasm-bindgen", "wasmer-compiler", "wasmer-compiler-cranelift", @@ -14919,9 +15308,9 @@ dependencies = [ [[package]] name = "wasmer-compiler" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e044f6140c844602b920deb4526aea3cc9c0d7cf23f00730bb9b2034669f522a" +checksum = "3a77bfe259f08e8ec9e77f8f772ebfb4149f799d1f637231c5a5a6a90c447256" dependencies = [ "backtrace", "bytes", @@ -14936,7 +15325,7 @@ dependencies = [ "rkyv", "self_cell", "shared-buffer", - "smallvec 1.13.1", + "smallvec", "thiserror", "wasmer-types", "wasmer-vm", @@ -14946,9 +15335,9 @@ dependencies = [ [[package]] name = "wasmer-compiler-cranelift" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ce02358eb44a149d791c1d6648fb7f8b2f99cd55e3c4eef0474653ec8cc889" +checksum = "9280c47ebc754f95357745a38a995dd766f149e16b26e1b7e35741eb23c03d12" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -14956,7 +15345,7 @@ dependencies = [ "gimli 0.26.2", "more-asserts", "rayon", - "smallvec 1.13.1", + "smallvec", "target-lexicon", "tracing", "wasmer-compiler", @@ -14965,9 +15354,9 @@ dependencies = [ [[package]] name = "wasmer-derive" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c782d80401edb08e1eba206733f7859db6c997fc5a7f5fb44edc3ecd801468f6" +checksum = "e9352877c4f07fc59146d21b56ae6dc469caf342587f49c81b4fbeafead31972" dependencies = [ "proc-macro-error", "proc-macro2 1.0.78", @@ -14977,9 +15366,9 @@ dependencies = [ [[package]] name = "wasmer-middlewares" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d4f27f76b7b5325476c8851f34920ae562ef0de3c830fdbc4feafff6782187" +checksum = "2b5c5d574dfd4674fefc3db98748ddb4193c6750f145736555e938c94c505207" dependencies = [ "wasmer", "wasmer-types", @@ -14988,9 +15377,9 @@ dependencies = [ [[package]] name = "wasmer-types" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd09e80d4d74bb9fd0ce6c3c106b1ceba1a050f9948db9d9b78ae53c172d6157" +checksum = "749214b6170f2b2fbbfe5b7e7f8d381e64930ac4122f3abceb33cde0292d45d2" dependencies = [ "bytecheck", "enum-iterator", @@ -15004,9 +15393,9 @@ dependencies = [ [[package]] name = "wasmer-vm" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdcd8a4fd36414a7b6a003dbfbd32393bce3e155d715dd877c05c1b7a41d224d" +checksum = "300215479de0deeb453e95aeb1b9c8ffd9bc7d9bd27c5f9e8a184e54db4d31a9" dependencies = [ "backtrace", "cc", @@ -15032,12 +15421,13 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.95.0" +version = "0.121.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ea896273ea99b15132414be1da01ab0d8836415083298ecaffbe308eaac87a" +checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" dependencies = [ - "indexmap 1.9.3", - "url 2.4.1", + "bitflags 2.5.0", + "indexmap 2.2.2", + "semver 1.0.21", ] [[package]] @@ -15084,7 +15474,7 @@ checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" dependencies = [ "nix 0.24.3", "once_cell", - "smallvec 1.13.1", + "smallvec", "wayland-sys", ] @@ -15122,9 +15512,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -15142,8 +15532,8 @@ dependencies = [ "log", "ndk-context", "objc", - "raw-window-handle", - "url 2.4.1", + "raw-window-handle 0.5.2", + "url", "web-sys", ] @@ -15263,6 +15653,89 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" +[[package]] +name = "wgpu-core" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac6a86eaa5e763e59c73cf9e97d55fffd4dfda69fd8bda19589fcf851ddfef1f" +dependencies = [ + "arrayvec 0.7.4", + "bit-vec", + "bitflags 2.5.0", + "cfg_aliases", + "codespan-reporting", + "document-features", + "indexmap 2.2.2", + "log", + "naga", + "once_cell", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle 0.6.2", + "ron", + "rustc-hash", + "serde", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d71c8ae05170583049b65ee562fd839fdc0b3e9ddb84f4e40c9d5f8ea0d4c8c" +dependencies = [ + "android_system_properties", + "arrayvec 0.7.4", + "ash", + "bit-set", + "bitflags 2.5.0", + "block", + "cfg_aliases", + "core-graphics-types", + "d3d12", + "glow", + "glutin_wgl_sys", + "gpu-alloc", + "gpu-descriptor", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.8.1", + "log", + "metal", + "naga", + "ndk-sys 0.5.0+25.2.9519653", + "objc", + "once_cell", + "parking_lot 0.12.1", + "profiling", + "range-alloc", + "raw-window-handle 0.6.2", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "winapi 0.3.9", +] + +[[package]] +name = "wgpu-types" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1353d9a46bff7f955a680577f34c69122628cc2076e1d6f3a9be6ef00ae793ef" +dependencies = [ + "bitflags 2.5.0", + "js-sys", + "serde", + "web-sys", +] + [[package]] name = "which" version = "4.4.2" @@ -15275,6 +15748,19 @@ dependencies = [ "rustix 0.38.30", ] +[[package]] +name = "which" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14" +dependencies = [ + "either", + "home", + "once_cell", + "rustix 0.38.30", + "windows-sys 0.48.0", +] + [[package]] name = "whoami" version = "1.4.1" @@ -15389,10 +15875,20 @@ version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" dependencies = [ - "windows-core", + "windows-core 0.51.1", "windows-targets 0.48.5", ] +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core 0.52.0", + "windows-targets 0.52.0", +] + [[package]] name = "windows-bindgen" version = "0.39.0" @@ -15412,6 +15908,15 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", +] + [[package]] name = "windows-implement" version = "0.39.0" @@ -15831,15 +16336,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "winres" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" -dependencies = [ - "toml 0.5.11", -] - [[package]] name = "wl-clipboard-rs" version = "0.7.0" @@ -15888,7 +16384,7 @@ dependencies = [ "soup2", "tao", "thiserror", - "url 2.4.1", + "url", "webkit2gtk", "webkit2gtk-sys", "webview2-com", diff --git a/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/Cargo.toml b/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/Cargo.toml index 08424c6a3..2c8e4472d 100644 --- a/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/Cargo.toml +++ b/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/Cargo.toml @@ -14,6 +14,6 @@ serde = "1" chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } thiserror = "1.0.20" -hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } -holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } +hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } +holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } agent_store_integrity = { path = "../agent_store_integrity" } \ No newline at end of file diff --git a/bootstrap-languages/agent-language/hc-dna/zomes/agent_store_integrity/Cargo.toml b/bootstrap-languages/agent-language/hc-dna/zomes/agent_store_integrity/Cargo.toml index fd9845161..b05cb9196 100644 --- a/bootstrap-languages/agent-language/hc-dna/zomes/agent_store_integrity/Cargo.toml +++ b/bootstrap-languages/agent-language/hc-dna/zomes/agent_store_integrity/Cargo.toml @@ -13,5 +13,5 @@ derive_more = "0" serde = "1" chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } -hdi = { version = "0.4.0-beta-dev.29", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac"} -hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac"} \ No newline at end of file +hdi = { version = "0.4.0-beta-dev.29", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06"} +hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06"} \ No newline at end of file diff --git a/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message/Cargo.toml b/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message/Cargo.toml index 20ddf3784..4e83d0900 100644 --- a/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message/Cargo.toml +++ b/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message/Cargo.toml @@ -15,7 +15,7 @@ serde_json = "1" chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } hex = "0.4.3" -hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } -holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } +hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } +holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } direct-message-integrity = { path = "../direct-message-integrity" } \ No newline at end of file diff --git a/bootstrap-languages/file-storage/hc-dna/zomes/file_storage/Cargo.toml b/bootstrap-languages/file-storage/hc-dna/zomes/file_storage/Cargo.toml index e9df22994..038362480 100644 --- a/bootstrap-languages/file-storage/hc-dna/zomes/file_storage/Cargo.toml +++ b/bootstrap-languages/file-storage/hc-dna/zomes/file_storage/Cargo.toml @@ -17,5 +17,5 @@ chrono = { version = "0.4.31", default-features = false, features = ["clock", "s thiserror = "1.0.20" integrity = { path = "../integrity" } sha2 = "0.10.5" -hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } -holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } \ No newline at end of file +hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } +holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } \ No newline at end of file diff --git a/bootstrap-languages/file-storage/hc-dna/zomes/integrity/Cargo.toml b/bootstrap-languages/file-storage/hc-dna/zomes/integrity/Cargo.toml index fa066bf61..25a557bf1 100644 --- a/bootstrap-languages/file-storage/hc-dna/zomes/integrity/Cargo.toml +++ b/bootstrap-languages/file-storage/hc-dna/zomes/integrity/Cargo.toml @@ -14,5 +14,5 @@ derive_more = "0" serde = "1" chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } holo_hash = { version = "0.3.1-rc.0" } -hdi = { version = "0.4.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } -hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } +hdi = { version = "0.4.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } +hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } diff --git a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync/Cargo.toml b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync/Cargo.toml index 9394e329c..712190eec 100644 --- a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync/Cargo.toml +++ b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync/Cargo.toml @@ -21,8 +21,8 @@ dot-structures = "0.1.0" itertools = "0.10.3" perspective_diff_sync_integrity = { path = "../perspective_diff_sync_integrity" } sha2 = "0.10.5" -hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } -holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } +hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } +holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } [features] test = [] \ No newline at end of file diff --git a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml index 6cbc97c53..0ca4dd174 100644 --- a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml +++ b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml @@ -13,6 +13,6 @@ derive_more = "0" serde = "1" chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } -holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } -hdi = { version = "0.4.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } -hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } \ No newline at end of file +holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } +hdi = { version = "0.4.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } +hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } \ No newline at end of file diff --git a/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync/Cargo.toml b/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync/Cargo.toml index 9394e329c..712190eec 100644 --- a/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync/Cargo.toml +++ b/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync/Cargo.toml @@ -21,8 +21,8 @@ dot-structures = "0.1.0" itertools = "0.10.3" perspective_diff_sync_integrity = { path = "../perspective_diff_sync_integrity" } sha2 = "0.10.5" -hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } -holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } +hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } +holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } [features] test = [] \ No newline at end of file diff --git a/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml b/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml index 6cbc97c53..0ca4dd174 100644 --- a/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml +++ b/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml @@ -13,6 +13,6 @@ derive_more = "0" serde = "1" chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } -holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } -hdi = { version = "0.4.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } -hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } \ No newline at end of file +holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } +hdi = { version = "0.4.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } +hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } \ No newline at end of file diff --git a/rust-executor/Cargo.toml b/rust-executor/Cargo.toml index 0658465cd..339c05f21 100644 --- a/rust-executor/Cargo.toml +++ b/rust-executor/Cargo.toml @@ -79,11 +79,11 @@ webbrowser = "0.8.12" # holochain_types = { version = "0.3.1-rc.0" } # holochain_cli_run_local_services = { version = "0.3.1-rc.0" } # kitsune_p2p_types = { version = "0.3.1-rc.0" } -holochain = { version = "0.3.1-rc.0", features = ["test_utils", "default"], git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } -holochain_cli_bundle = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } -holochain_types = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } -holochain_cli_run_local_services = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } -kitsune_p2p_types = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "173bc41e3df1cb3f7723d92e3feb5cea94ae00ac" } +holochain = { version = "0.3.1-rc.0", features = ["test_utils", "default"], git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } +holochain_cli_bundle = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } +holochain_types = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } +holochain_cli_run_local_services = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } +kitsune_p2p_types = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } scryer-prolog = { version = "0.9.4" } # scryer-prolog = { path = "../../scryer-prolog", features = ["multi_thread"] } From b794f4ab21d12e71814adcd4b0f3844b549f98de Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Wed, 5 Jun 2024 20:01:14 +0530 Subject: [PATCH 04/37] chore: Update serde dependency to version 1.0.198 --- .../agent-language/hc-dna/Cargo.lock | 325 +++++++---------- .../hc-dna/zomes/agent_store/Cargo.toml | 2 +- .../zomes/agent_store_integrity/Cargo.toml | 4 +- .../direct-message-language/hc-dna/Cargo.lock | 325 +++++++---------- .../zomes/direct-message-integrity/Cargo.toml | 6 +- .../hc-dna/zomes/direct-message/Cargo.toml | 2 +- .../file-storage/hc-dna/Cargo.lock | 327 +++++++----------- .../hc-dna/zomes/file_storage/Cargo.toml | 2 +- .../hc-dna/zomes/integrity/Cargo.toml | 4 +- .../hc-dna/Cargo.lock | 319 +++++++---------- .../zomes/perspective_diff_sync/Cargo.toml | 2 +- .../Cargo.toml | 2 +- .../p-diff-sync/hc-dna/Cargo.lock | 319 +++++++---------- .../zomes/perspective_diff_sync/Cargo.toml | 2 +- .../Cargo.toml | 2 +- 15 files changed, 623 insertions(+), 1020 deletions(-) diff --git a/bootstrap-languages/agent-language/hc-dna/Cargo.lock b/bootstrap-languages/agent-language/hc-dna/Cargo.lock index e45667184..30158fc97 100644 --- a/bootstrap-languages/agent-language/hc-dna/Cargo.lock +++ b/bootstrap-languages/agent-language/hc-dna/Cargo.lock @@ -82,12 +82,6 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - [[package]] name = "arrayvec" version = "0.7.4" @@ -108,7 +102,7 @@ checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "miniz_oxide", "object", @@ -117,9 +111,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.13.1" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bincode" @@ -151,6 +145,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + [[package]] name = "bitvec" version = "1.0.1" @@ -165,12 +165,12 @@ dependencies = [ [[package]] name = "blake2b_simd" -version = "0.5.11" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" +checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", - "arrayvec 0.5.2", + "arrayvec", "constant_time_eq", ] @@ -264,12 +264,6 @@ dependencies = [ "libc", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -289,11 +283,21 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "colored" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" +dependencies = [ + "lazy_static", + "windows-sys 0.48.0", +] + [[package]] name = "constant_time_eq" -version = "0.1.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "convert_case" @@ -314,7 +318,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80128832c58ea9cbd041d2a759ec449224487b2c1e400453d99d244eead87a8e" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "libc", "scopeguard", "windows-sys 0.33.0", @@ -344,7 +348,7 @@ version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98b022ed2a5913a38839dfbafe6cf135342661293b08049843362df4301261dc" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", @@ -418,7 +422,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] @@ -430,7 +434,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", "memoffset", "scopeguard", @@ -442,7 +446,7 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] @@ -452,7 +456,7 @@ version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -509,7 +513,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -531,7 +535,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -540,7 +544,7 @@ version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "hashbrown 0.14.3", "lock_api", "once_cell", @@ -631,7 +635,7 @@ dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -652,15 +656,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - [[package]] name = "funty" version = "2.0.0" @@ -723,7 +718,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -793,7 +788,7 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi", ] @@ -832,9 +827,8 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hdi" -version = "0.4.0-beta-dev.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31dfc1fec80d7d9292e04e26e94528b0a0cc9baf982d1fb18e3af3e7625cb90" +version = "0.4.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "getrandom", "hdk_derive", @@ -850,9 +844,8 @@ dependencies = [ [[package]] name = "hdk" -version = "0.3.0-beta-dev.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99a6ccefa8f3aa8cd8a0f7ab40f3939610133bd32a14785d4d62440f92ab6a11" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "getrandom", "hdi", @@ -870,12 +863,11 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.3.0-beta-dev.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcfd466d96f2d19530b1419646b0a52c3bc833b0e7dacad4329cb90708db8665" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "darling 0.14.4", - "heck", + "heck 0.5.0", "holochain_integrity_types", "paste", "proc-macro-error", @@ -891,10 +883,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] -name = "hermit-abi" -version = "0.3.3" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hex" @@ -904,9 +896,8 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" -version = "0.3.0-beta-dev.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "050e53c0258e6235145fe949b74cedd48c24f4d92e1e7b7e39581a9a2b6996e7" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "base64", "blake2b_simd", @@ -922,16 +913,14 @@ dependencies = [ [[package]] name = "holochain_integrity_types" -version = "0.3.0-beta-dev.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a76306ea0c825e6bc8f040df4a3fe1ab82f187c108a91e81df957ae4f76efda" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "holo_hash", "holochain_secure_primitive", "holochain_serialized_bytes", "holochain_util", "kitsune_p2p_timestamp", - "paste", "serde", "serde_bytes", "subtle", @@ -940,9 +929,8 @@ dependencies = [ [[package]] name = "holochain_nonce" -version = "0.3.0-beta-dev.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fa99c5d38bb8fe463dd0284e2123ad14405f2a62146c4aaa809d5b24134711" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "getrandom", "holochain_secure_primitive", @@ -951,9 +939,8 @@ dependencies = [ [[package]] name = "holochain_secure_primitive" -version = "0.3.0-beta-dev.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcc25ba91f7898688245db538693d7b26504f91df24709111bb3b1d7506af01a" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "paste", "serde", @@ -962,9 +949,8 @@ dependencies = [ [[package]] name = "holochain_serialized_bytes" -version = "0.0.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f7a5fc7c745a107f8ebcb04caab7a6b7a8463e2811f07ced19c281977583de7" +version = "0.0.54" +source = "git+https://github.com/coasys/holochain-serialization.git?rev=6eaa4ea8913bfd977fcc4577e833f4dc18a215f7#6eaa4ea8913bfd977fcc4577e833f4dc18a215f7" dependencies = [ "holochain_serialized_bytes_derive", "rmp-serde", @@ -977,9 +963,8 @@ dependencies = [ [[package]] name = "holochain_serialized_bytes_derive" -version = "0.0.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3e0cf02005cbf0f514476d40e02125b26df6d4922d7a2c48a84fc588539d71" +version = "0.0.54" +source = "git+https://github.com/coasys/holochain-serialization.git?rev=6eaa4ea8913bfd977fcc4577e833f4dc18a215f7#6eaa4ea8913bfd977fcc4577e833f4dc18a215f7" dependencies = [ "quote", "syn 1.0.109", @@ -987,24 +972,21 @@ dependencies = [ [[package]] name = "holochain_util" -version = "0.3.0-beta-dev.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6225aded80caf004c2214e38b39fb2459ee9a7a8fcd0d09146f49ae0771f0" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ - "cfg-if 0.1.10", - "derive_more", + "cfg-if", + "colored", "dunce", "futures", - "getrandom", - "num_cpus", "once_cell", + "tracing", ] [[package]] name = "holochain_wasmer_common" -version = "0.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72007fd2a72d77e76ffa494e5847bf6e893e25e73fe1d1de902e1b8d5033a64e" +version = "0.0.94" +source = "git+https://github.com/coasys/holochain-wasmer.git?rev=52979e943861530bbafc48297b131fdec52c3e21#52979e943861530bbafc48297b131fdec52c3e21" dependencies = [ "holochain_serialized_bytes", "serde", @@ -1016,9 +998,8 @@ dependencies = [ [[package]] name = "holochain_wasmer_guest" -version = "0.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c429e84a19ee446f47541a6fed10e1a4376a8a8ba6d3dbff7d07e4a7bb4c85f" +version = "0.0.94" +source = "git+https://github.com/coasys/holochain-wasmer.git?rev=52979e943861530bbafc48297b131fdec52c3e21#52979e943861530bbafc48297b131fdec52c3e21" dependencies = [ "holochain_serialized_bytes", "holochain_wasmer_common", @@ -1030,21 +1011,17 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.3.0-beta-dev.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1d1b165dcf3d1ae412edf952b1ae4e57a5b5c4a97c11eb97b5fb4fdf06cc6a4" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "derive_more", "holo_hash", "holochain_integrity_types", "holochain_nonce", - "holochain_secure_primitive", "holochain_serialized_bytes", "holochain_wasmer_common", - "kitsune_p2p_bin_data", "kitsune_p2p_block", "kitsune_p2p_timestamp", - "paste", "serde", "serde_bytes", "subtle", @@ -1090,16 +1067,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "if_chain" version = "1.0.2" @@ -1165,9 +1132,8 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" -version = "0.3.0-beta-dev.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c89fb7f069f4a90794dff2669cc832a71c9fd93554e92b0f17de97d753283f4" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "base64", "derive_more", @@ -1180,9 +1146,8 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" -version = "0.3.0-beta-dev.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a32470626b779dd5e36e516d64f8bdde1eac1faec944654d2b85f200b0ac3cee" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -1191,9 +1156,8 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" -version = "0.3.0-beta-dev.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aaba5f7fcb2c0b7faa3f859a3de5c4b893fbf9cfea51530549d11e9738fbfac" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "derive_more", "gcollections", @@ -1205,9 +1169,8 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" -version = "0.3.0-beta-dev.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4d587124090ca8e4ab28f3dd3d65aa35fcc72403b7dad4fc790751efd04fbe3" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "chrono", "serde", @@ -1323,16 +1286,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "object" version = "0.32.1" @@ -1364,7 +1317,7 @@ version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall", "smallvec", @@ -1377,12 +1330,6 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - [[package]] name = "pest" version = "2.7.5" @@ -1432,9 +1379,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -1461,9 +1408,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -1500,7 +1447,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1550,7 +1497,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76e189c2369884dce920945e2ddf79b3dff49e071a167dd1817fa9c4c00d512e" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "mach", "winapi", @@ -1607,9 +1554,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "0.15.5" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723ecff9ad04f4ad92fe1c8ca6c20d2196d9286e9c60727c4cb5511629260e9d" +checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" dependencies = [ "byteorder", "rmp", @@ -1699,9 +1646,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.193" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] @@ -1737,13 +1684,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -1764,16 +1711,16 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", ] [[package]] name = "shared-buffer" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cf61602ee61e2f83dd016b3e6387245291cf728ea071c378b35088125b4d995" +checksum = "f6c99835bad52957e7aa241d3975ed17c1e5f8c92026377d117a606f36b84b16" dependencies = [ "bytes", "memmap2 0.6.2", @@ -1785,7 +1732,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e63e6744142336dfb606fe2b068afa2e1cca1ee6a5d8377277a92945d81fa331" dependencies = [ - "bitflags", + "bitflags 1.3.2", "itertools", "proc-macro2", "quote", @@ -1837,7 +1784,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", @@ -1873,9 +1820,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -1968,7 +1915,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -2018,7 +1965,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -2049,27 +1996,12 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - [[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - [[package]] name = "unicode-width" version = "0.1.11" @@ -2087,17 +2019,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - [[package]] name = "uuid" version = "1.6.1" @@ -2138,7 +2059,7 @@ version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] @@ -2153,7 +2074,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -2175,7 +2096,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2197,12 +2118,12 @@ dependencies = [ [[package]] name = "wasmer" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce45cc009177ca345a6d041f9062305ad467d15e7d41494f5b81ab46d62d7a58" +checksum = "4014573f108a246858299eb230031e268316fd57207bd2e8afc79b20fc7ce983" dependencies = [ "bytes", - "cfg-if 1.0.0", + "cfg-if", "derivative", "indexmap 1.9.3", "js-sys", @@ -2213,6 +2134,7 @@ dependencies = [ "shared-buffer", "target-lexicon", "thiserror", + "tracing", "wasm-bindgen", "wasmer-compiler", "wasmer-compiler-cranelift", @@ -2225,13 +2147,13 @@ dependencies = [ [[package]] name = "wasmer-compiler" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e044f6140c844602b920deb4526aea3cc9c0d7cf23f00730bb9b2034669f522a" +checksum = "3a77bfe259f08e8ec9e77f8f772ebfb4149f799d1f637231c5a5a6a90c447256" dependencies = [ "backtrace", "bytes", - "cfg-if 1.0.0", + "cfg-if", "enum-iterator", "enumset", "lazy_static", @@ -2252,9 +2174,9 @@ dependencies = [ [[package]] name = "wasmer-compiler-cranelift" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ce02358eb44a149d791c1d6648fb7f8b2f99cd55e3c4eef0474653ec8cc889" +checksum = "9280c47ebc754f95357745a38a995dd766f149e16b26e1b7e35741eb23c03d12" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -2271,9 +2193,9 @@ dependencies = [ [[package]] name = "wasmer-derive" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c782d80401edb08e1eba206733f7859db6c997fc5a7f5fb44edc3ecd801468f6" +checksum = "e9352877c4f07fc59146d21b56ae6dc469caf342587f49c81b4fbeafead31972" dependencies = [ "proc-macro-error", "proc-macro2", @@ -2283,9 +2205,9 @@ dependencies = [ [[package]] name = "wasmer-types" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd09e80d4d74bb9fd0ce6c3c106b1ceba1a050f9948db9d9b78ae53c172d6157" +checksum = "749214b6170f2b2fbbfe5b7e7f8d381e64930ac4122f3abceb33cde0292d45d2" dependencies = [ "bytecheck", "enum-iterator", @@ -2299,13 +2221,13 @@ dependencies = [ [[package]] name = "wasmer-vm" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdcd8a4fd36414a7b6a003dbfbd32393bce3e155d715dd877c05c1b7a41d224d" +checksum = "300215479de0deeb453e95aeb1b9c8ffd9bc7d9bd27c5f9e8a184e54db4d31a9" dependencies = [ "backtrace", "cc", - "cfg-if 1.0.0", + "cfg-if", "corosensei", "crossbeam-queue", "dashmap", @@ -2327,12 +2249,13 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.95.0" +version = "0.121.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ea896273ea99b15132414be1da01ab0d8836415083298ecaffbe308eaac87a" +checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" dependencies = [ - "indexmap 1.9.3", - "url", + "bitflags 2.5.0", + "indexmap 2.1.0", + "semver 1.0.20", ] [[package]] diff --git a/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/Cargo.toml b/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/Cargo.toml index 2c8e4472d..80a721e22 100644 --- a/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/Cargo.toml +++ b/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/Cargo.toml @@ -10,7 +10,7 @@ name = "agent_store" [dependencies] derive_more = "0" -serde = "1" +serde = "1.0.198" chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } thiserror = "1.0.20" diff --git a/bootstrap-languages/agent-language/hc-dna/zomes/agent_store_integrity/Cargo.toml b/bootstrap-languages/agent-language/hc-dna/zomes/agent_store_integrity/Cargo.toml index b05cb9196..7e2540e42 100644 --- a/bootstrap-languages/agent-language/hc-dna/zomes/agent_store_integrity/Cargo.toml +++ b/bootstrap-languages/agent-language/hc-dna/zomes/agent_store_integrity/Cargo.toml @@ -10,8 +10,8 @@ name = "agent_store_integrity" [dependencies] derive_more = "0" -serde = "1" +serde = "1.0.198" chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } -hdi = { version = "0.4.0-beta-dev.29", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06"} +hdi = { version = "0.4.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06"} \ No newline at end of file diff --git a/bootstrap-languages/direct-message-language/hc-dna/Cargo.lock b/bootstrap-languages/direct-message-language/hc-dna/Cargo.lock index ab5eb4c42..0b6a53bff 100644 --- a/bootstrap-languages/direct-message-language/hc-dna/Cargo.lock +++ b/bootstrap-languages/direct-message-language/hc-dna/Cargo.lock @@ -58,12 +58,6 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - [[package]] name = "arrayvec" version = "0.7.4" @@ -84,7 +78,7 @@ checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "miniz_oxide", "object", @@ -93,9 +87,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.13.1" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bincode" @@ -127,6 +121,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + [[package]] name = "bitvec" version = "1.0.1" @@ -141,12 +141,12 @@ dependencies = [ [[package]] name = "blake2b_simd" -version = "0.5.11" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" +checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", - "arrayvec 0.5.2", + "arrayvec", "constant_time_eq", ] @@ -240,12 +240,6 @@ dependencies = [ "libc", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -265,11 +259,21 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "colored" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" +dependencies = [ + "lazy_static", + "windows-sys 0.48.0", +] + [[package]] name = "constant_time_eq" -version = "0.1.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "convert_case" @@ -290,7 +294,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80128832c58ea9cbd041d2a759ec449224487b2c1e400453d99d244eead87a8e" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "libc", "scopeguard", "windows-sys 0.33.0", @@ -320,7 +324,7 @@ version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98b022ed2a5913a38839dfbafe6cf135342661293b08049843362df4301261dc" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", @@ -394,7 +398,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] @@ -406,7 +410,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", "memoffset", "scopeguard", @@ -418,7 +422,7 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] @@ -428,7 +432,7 @@ version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -485,7 +489,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -507,7 +511,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -516,7 +520,7 @@ version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "hashbrown 0.14.3", "lock_api", "once_cell", @@ -632,7 +636,7 @@ dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -653,15 +657,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - [[package]] name = "funty" version = "2.0.0" @@ -724,7 +719,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -794,7 +789,7 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi", ] @@ -833,9 +828,8 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hdi" -version = "0.4.0-beta-dev.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31dfc1fec80d7d9292e04e26e94528b0a0cc9baf982d1fb18e3af3e7625cb90" +version = "0.4.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "getrandom", "hdk_derive", @@ -851,9 +845,8 @@ dependencies = [ [[package]] name = "hdk" -version = "0.3.0-beta-dev.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99a6ccefa8f3aa8cd8a0f7ab40f3939610133bd32a14785d4d62440f92ab6a11" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "getrandom", "hdi", @@ -871,12 +864,11 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.3.0-beta-dev.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcfd466d96f2d19530b1419646b0a52c3bc833b0e7dacad4329cb90708db8665" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "darling 0.14.4", - "heck", + "heck 0.5.0", "holochain_integrity_types", "paste", "proc-macro-error", @@ -892,10 +884,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] -name = "hermit-abi" -version = "0.3.3" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hex" @@ -905,9 +897,8 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" -version = "0.3.0-beta-dev.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "050e53c0258e6235145fe949b74cedd48c24f4d92e1e7b7e39581a9a2b6996e7" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "base64", "blake2b_simd", @@ -923,16 +914,14 @@ dependencies = [ [[package]] name = "holochain_integrity_types" -version = "0.3.0-beta-dev.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a76306ea0c825e6bc8f040df4a3fe1ab82f187c108a91e81df957ae4f76efda" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "holo_hash", "holochain_secure_primitive", "holochain_serialized_bytes", "holochain_util", "kitsune_p2p_timestamp", - "paste", "serde", "serde_bytes", "subtle", @@ -941,9 +930,8 @@ dependencies = [ [[package]] name = "holochain_nonce" -version = "0.3.0-beta-dev.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fa99c5d38bb8fe463dd0284e2123ad14405f2a62146c4aaa809d5b24134711" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "getrandom", "holochain_secure_primitive", @@ -952,9 +940,8 @@ dependencies = [ [[package]] name = "holochain_secure_primitive" -version = "0.3.0-beta-dev.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcc25ba91f7898688245db538693d7b26504f91df24709111bb3b1d7506af01a" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "paste", "serde", @@ -963,9 +950,8 @@ dependencies = [ [[package]] name = "holochain_serialized_bytes" -version = "0.0.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f7a5fc7c745a107f8ebcb04caab7a6b7a8463e2811f07ced19c281977583de7" +version = "0.0.54" +source = "git+https://github.com/coasys/holochain-serialization.git?rev=6eaa4ea8913bfd977fcc4577e833f4dc18a215f7#6eaa4ea8913bfd977fcc4577e833f4dc18a215f7" dependencies = [ "holochain_serialized_bytes_derive", "rmp-serde", @@ -978,9 +964,8 @@ dependencies = [ [[package]] name = "holochain_serialized_bytes_derive" -version = "0.0.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3e0cf02005cbf0f514476d40e02125b26df6d4922d7a2c48a84fc588539d71" +version = "0.0.54" +source = "git+https://github.com/coasys/holochain-serialization.git?rev=6eaa4ea8913bfd977fcc4577e833f4dc18a215f7#6eaa4ea8913bfd977fcc4577e833f4dc18a215f7" dependencies = [ "quote", "syn 1.0.109", @@ -988,24 +973,21 @@ dependencies = [ [[package]] name = "holochain_util" -version = "0.3.0-beta-dev.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6225aded80caf004c2214e38b39fb2459ee9a7a8fcd0d09146f49ae0771f0" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ - "cfg-if 0.1.10", - "derive_more", + "cfg-if", + "colored", "dunce", "futures", - "getrandom", - "num_cpus", "once_cell", + "tracing", ] [[package]] name = "holochain_wasmer_common" -version = "0.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72007fd2a72d77e76ffa494e5847bf6e893e25e73fe1d1de902e1b8d5033a64e" +version = "0.0.94" +source = "git+https://github.com/coasys/holochain-wasmer.git?rev=52979e943861530bbafc48297b131fdec52c3e21#52979e943861530bbafc48297b131fdec52c3e21" dependencies = [ "holochain_serialized_bytes", "serde", @@ -1017,9 +999,8 @@ dependencies = [ [[package]] name = "holochain_wasmer_guest" -version = "0.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c429e84a19ee446f47541a6fed10e1a4376a8a8ba6d3dbff7d07e4a7bb4c85f" +version = "0.0.94" +source = "git+https://github.com/coasys/holochain-wasmer.git?rev=52979e943861530bbafc48297b131fdec52c3e21#52979e943861530bbafc48297b131fdec52c3e21" dependencies = [ "holochain_serialized_bytes", "holochain_wasmer_common", @@ -1031,21 +1012,17 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.3.0-beta-dev.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1d1b165dcf3d1ae412edf952b1ae4e57a5b5c4a97c11eb97b5fb4fdf06cc6a4" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "derive_more", "holo_hash", "holochain_integrity_types", "holochain_nonce", - "holochain_secure_primitive", "holochain_serialized_bytes", "holochain_wasmer_common", - "kitsune_p2p_bin_data", "kitsune_p2p_block", "kitsune_p2p_timestamp", - "paste", "serde", "serde_bytes", "subtle", @@ -1091,16 +1068,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "if_chain" version = "1.0.2" @@ -1166,9 +1133,8 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" -version = "0.3.0-beta-dev.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c89fb7f069f4a90794dff2669cc832a71c9fd93554e92b0f17de97d753283f4" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "base64", "derive_more", @@ -1181,9 +1147,8 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" -version = "0.3.0-beta-dev.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a32470626b779dd5e36e516d64f8bdde1eac1faec944654d2b85f200b0ac3cee" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -1192,9 +1157,8 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" -version = "0.3.0-beta-dev.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aaba5f7fcb2c0b7faa3f859a3de5c4b893fbf9cfea51530549d11e9738fbfac" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "derive_more", "gcollections", @@ -1206,9 +1170,8 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" -version = "0.3.0-beta-dev.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4d587124090ca8e4ab28f3dd3d65aa35fcc72403b7dad4fc790751efd04fbe3" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "chrono", "serde", @@ -1324,16 +1287,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "object" version = "0.32.1" @@ -1365,7 +1318,7 @@ version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall", "smallvec", @@ -1378,12 +1331,6 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - [[package]] name = "pest" version = "2.7.5" @@ -1433,9 +1380,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -1462,9 +1409,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -1501,7 +1448,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1551,7 +1498,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76e189c2369884dce920945e2ddf79b3dff49e071a167dd1817fa9c4c00d512e" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "mach", "winapi", @@ -1608,9 +1555,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "0.15.5" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723ecff9ad04f4ad92fe1c8ca6c20d2196d9286e9c60727c4cb5511629260e9d" +checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" dependencies = [ "byteorder", "rmp", @@ -1700,9 +1647,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.193" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] @@ -1738,13 +1685,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -1765,16 +1712,16 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", ] [[package]] name = "shared-buffer" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cf61602ee61e2f83dd016b3e6387245291cf728ea071c378b35088125b4d995" +checksum = "f6c99835bad52957e7aa241d3975ed17c1e5f8c92026377d117a606f36b84b16" dependencies = [ "bytes", "memmap2 0.6.2", @@ -1786,7 +1733,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e63e6744142336dfb606fe2b068afa2e1cca1ee6a5d8377277a92945d81fa331" dependencies = [ - "bitflags", + "bitflags 1.3.2", "itertools", "proc-macro2", "quote", @@ -1838,7 +1785,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", @@ -1874,9 +1821,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -1969,7 +1916,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -2019,7 +1966,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -2050,27 +1997,12 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - [[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - [[package]] name = "unicode-width" version = "0.1.11" @@ -2088,17 +2020,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - [[package]] name = "uuid" version = "1.6.1" @@ -2139,7 +2060,7 @@ version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] @@ -2154,7 +2075,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -2176,7 +2097,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2198,12 +2119,12 @@ dependencies = [ [[package]] name = "wasmer" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce45cc009177ca345a6d041f9062305ad467d15e7d41494f5b81ab46d62d7a58" +checksum = "4014573f108a246858299eb230031e268316fd57207bd2e8afc79b20fc7ce983" dependencies = [ "bytes", - "cfg-if 1.0.0", + "cfg-if", "derivative", "indexmap 1.9.3", "js-sys", @@ -2214,6 +2135,7 @@ dependencies = [ "shared-buffer", "target-lexicon", "thiserror", + "tracing", "wasm-bindgen", "wasmer-compiler", "wasmer-compiler-cranelift", @@ -2226,13 +2148,13 @@ dependencies = [ [[package]] name = "wasmer-compiler" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e044f6140c844602b920deb4526aea3cc9c0d7cf23f00730bb9b2034669f522a" +checksum = "3a77bfe259f08e8ec9e77f8f772ebfb4149f799d1f637231c5a5a6a90c447256" dependencies = [ "backtrace", "bytes", - "cfg-if 1.0.0", + "cfg-if", "enum-iterator", "enumset", "lazy_static", @@ -2253,9 +2175,9 @@ dependencies = [ [[package]] name = "wasmer-compiler-cranelift" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ce02358eb44a149d791c1d6648fb7f8b2f99cd55e3c4eef0474653ec8cc889" +checksum = "9280c47ebc754f95357745a38a995dd766f149e16b26e1b7e35741eb23c03d12" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -2272,9 +2194,9 @@ dependencies = [ [[package]] name = "wasmer-derive" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c782d80401edb08e1eba206733f7859db6c997fc5a7f5fb44edc3ecd801468f6" +checksum = "e9352877c4f07fc59146d21b56ae6dc469caf342587f49c81b4fbeafead31972" dependencies = [ "proc-macro-error", "proc-macro2", @@ -2284,9 +2206,9 @@ dependencies = [ [[package]] name = "wasmer-types" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd09e80d4d74bb9fd0ce6c3c106b1ceba1a050f9948db9d9b78ae53c172d6157" +checksum = "749214b6170f2b2fbbfe5b7e7f8d381e64930ac4122f3abceb33cde0292d45d2" dependencies = [ "bytecheck", "enum-iterator", @@ -2300,13 +2222,13 @@ dependencies = [ [[package]] name = "wasmer-vm" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdcd8a4fd36414a7b6a003dbfbd32393bce3e155d715dd877c05c1b7a41d224d" +checksum = "300215479de0deeb453e95aeb1b9c8ffd9bc7d9bd27c5f9e8a184e54db4d31a9" dependencies = [ "backtrace", "cc", - "cfg-if 1.0.0", + "cfg-if", "corosensei", "crossbeam-queue", "dashmap", @@ -2328,12 +2250,13 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.95.0" +version = "0.121.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ea896273ea99b15132414be1da01ab0d8836415083298ecaffbe308eaac87a" +checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" dependencies = [ - "indexmap 1.9.3", - "url", + "bitflags 2.5.0", + "indexmap 2.1.0", + "semver 1.0.20", ] [[package]] diff --git a/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message-integrity/Cargo.toml b/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message-integrity/Cargo.toml index ea0c19d89..ab0fb7fe0 100644 --- a/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message-integrity/Cargo.toml +++ b/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message-integrity/Cargo.toml @@ -10,8 +10,8 @@ name = "direct_message_integrity" [dependencies] derive_more = "0" -serde = "1" +serde = "1.0.198" chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } -hdi = { version = "0.4.1-rc.0" } -holo_hash = { version = "0.3.1-rc.0" } \ No newline at end of file +hdi = { version = "0.4.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } +holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } diff --git a/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message/Cargo.toml b/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message/Cargo.toml index 4e83d0900..d6d806d01 100644 --- a/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message/Cargo.toml +++ b/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message/Cargo.toml @@ -10,7 +10,7 @@ name = "direct_message" [dependencies] derive_more = "0" -serde = "1" +serde = "1.0.198" serde_json = "1" chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } hex = "0.4.3" diff --git a/bootstrap-languages/file-storage/hc-dna/Cargo.lock b/bootstrap-languages/file-storage/hc-dna/Cargo.lock index 33c760d1a..aa70b5728 100644 --- a/bootstrap-languages/file-storage/hc-dna/Cargo.lock +++ b/bootstrap-languages/file-storage/hc-dna/Cargo.lock @@ -58,12 +58,6 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - [[package]] name = "arrayvec" version = "0.7.4" @@ -84,7 +78,7 @@ checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "miniz_oxide", "object", @@ -93,9 +87,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.13.1" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bincode" @@ -127,6 +121,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + [[package]] name = "bitvec" version = "1.0.1" @@ -141,12 +141,12 @@ dependencies = [ [[package]] name = "blake2b_simd" -version = "0.5.11" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" +checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", - "arrayvec 0.5.2", + "arrayvec", "constant_time_eq", ] @@ -240,12 +240,6 @@ dependencies = [ "libc", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -265,11 +259,21 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "colored" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" +dependencies = [ + "lazy_static", + "windows-sys 0.48.0", +] + [[package]] name = "constant_time_eq" -version = "0.1.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "convert_case" @@ -290,7 +294,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80128832c58ea9cbd041d2a759ec449224487b2c1e400453d99d244eead87a8e" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "libc", "scopeguard", "windows-sys 0.33.0", @@ -320,7 +324,7 @@ version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98b022ed2a5913a38839dfbafe6cf135342661293b08049843362df4301261dc" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", @@ -394,7 +398,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] @@ -406,7 +410,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", "memoffset", "scopeguard", @@ -418,7 +422,7 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] @@ -428,7 +432,7 @@ version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -485,7 +489,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -507,7 +511,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -516,7 +520,7 @@ version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "hashbrown 0.14.3", "lock_api", "once_cell", @@ -607,7 +611,7 @@ dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -643,15 +647,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - [[package]] name = "funty" version = "2.0.0" @@ -714,7 +709,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -784,7 +779,7 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi", ] @@ -823,9 +818,8 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hdi" -version = "0.4.0-beta-dev.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31dfc1fec80d7d9292e04e26e94528b0a0cc9baf982d1fb18e3af3e7625cb90" +version = "0.4.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "getrandom", "hdk_derive", @@ -841,9 +835,8 @@ dependencies = [ [[package]] name = "hdk" -version = "0.3.0-beta-dev.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99a6ccefa8f3aa8cd8a0f7ab40f3939610133bd32a14785d4d62440f92ab6a11" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "getrandom", "hdi", @@ -861,12 +854,11 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.3.0-beta-dev.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcfd466d96f2d19530b1419646b0a52c3bc833b0e7dacad4329cb90708db8665" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "darling 0.14.4", - "heck", + "heck 0.5.0", "holochain_integrity_types", "paste", "proc-macro-error", @@ -882,10 +874,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] -name = "hermit-abi" -version = "0.3.3" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hex" @@ -895,9 +887,8 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" -version = "0.3.0-beta-dev.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "050e53c0258e6235145fe949b74cedd48c24f4d92e1e7b7e39581a9a2b6996e7" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "base64", "blake2b_simd", @@ -913,16 +904,14 @@ dependencies = [ [[package]] name = "holochain_integrity_types" -version = "0.3.0-beta-dev.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a76306ea0c825e6bc8f040df4a3fe1ab82f187c108a91e81df957ae4f76efda" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "holo_hash", "holochain_secure_primitive", "holochain_serialized_bytes", "holochain_util", "kitsune_p2p_timestamp", - "paste", "serde", "serde_bytes", "subtle", @@ -931,9 +920,8 @@ dependencies = [ [[package]] name = "holochain_nonce" -version = "0.3.0-beta-dev.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fa99c5d38bb8fe463dd0284e2123ad14405f2a62146c4aaa809d5b24134711" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "getrandom", "holochain_secure_primitive", @@ -942,9 +930,8 @@ dependencies = [ [[package]] name = "holochain_secure_primitive" -version = "0.3.0-beta-dev.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcc25ba91f7898688245db538693d7b26504f91df24709111bb3b1d7506af01a" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "paste", "serde", @@ -953,9 +940,8 @@ dependencies = [ [[package]] name = "holochain_serialized_bytes" -version = "0.0.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f7a5fc7c745a107f8ebcb04caab7a6b7a8463e2811f07ced19c281977583de7" +version = "0.0.54" +source = "git+https://github.com/coasys/holochain-serialization.git?rev=6eaa4ea8913bfd977fcc4577e833f4dc18a215f7#6eaa4ea8913bfd977fcc4577e833f4dc18a215f7" dependencies = [ "holochain_serialized_bytes_derive", "rmp-serde", @@ -968,9 +954,8 @@ dependencies = [ [[package]] name = "holochain_serialized_bytes_derive" -version = "0.0.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3e0cf02005cbf0f514476d40e02125b26df6d4922d7a2c48a84fc588539d71" +version = "0.0.54" +source = "git+https://github.com/coasys/holochain-serialization.git?rev=6eaa4ea8913bfd977fcc4577e833f4dc18a215f7#6eaa4ea8913bfd977fcc4577e833f4dc18a215f7" dependencies = [ "quote", "syn 1.0.109", @@ -978,24 +963,21 @@ dependencies = [ [[package]] name = "holochain_util" -version = "0.3.0-beta-dev.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6225aded80caf004c2214e38b39fb2459ee9a7a8fcd0d09146f49ae0771f0" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ - "cfg-if 0.1.10", - "derive_more", + "cfg-if", + "colored", "dunce", "futures", - "getrandom", - "num_cpus", "once_cell", + "tracing", ] [[package]] name = "holochain_wasmer_common" -version = "0.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72007fd2a72d77e76ffa494e5847bf6e893e25e73fe1d1de902e1b8d5033a64e" +version = "0.0.94" +source = "git+https://github.com/coasys/holochain-wasmer.git?rev=52979e943861530bbafc48297b131fdec52c3e21#52979e943861530bbafc48297b131fdec52c3e21" dependencies = [ "holochain_serialized_bytes", "serde", @@ -1007,9 +989,8 @@ dependencies = [ [[package]] name = "holochain_wasmer_guest" -version = "0.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c429e84a19ee446f47541a6fed10e1a4376a8a8ba6d3dbff7d07e4a7bb4c85f" +version = "0.0.94" +source = "git+https://github.com/coasys/holochain-wasmer.git?rev=52979e943861530bbafc48297b131fdec52c3e21#52979e943861530bbafc48297b131fdec52c3e21" dependencies = [ "holochain_serialized_bytes", "holochain_wasmer_common", @@ -1021,21 +1002,17 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.3.0-beta-dev.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1d1b165dcf3d1ae412edf952b1ae4e57a5b5c4a97c11eb97b5fb4fdf06cc6a4" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "derive_more", "holo_hash", "holochain_integrity_types", "holochain_nonce", - "holochain_secure_primitive", "holochain_serialized_bytes", "holochain_wasmer_common", - "kitsune_p2p_bin_data", "kitsune_p2p_block", "kitsune_p2p_timestamp", - "paste", "serde", "serde_bytes", "subtle", @@ -1081,16 +1058,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "if_chain" version = "1.0.2" @@ -1168,9 +1135,8 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" -version = "0.3.0-beta-dev.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c89fb7f069f4a90794dff2669cc832a71c9fd93554e92b0f17de97d753283f4" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "base64", "derive_more", @@ -1183,9 +1149,8 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" -version = "0.3.0-beta-dev.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a32470626b779dd5e36e516d64f8bdde1eac1faec944654d2b85f200b0ac3cee" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -1194,9 +1159,8 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" -version = "0.3.0-beta-dev.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aaba5f7fcb2c0b7faa3f859a3de5c4b893fbf9cfea51530549d11e9738fbfac" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "derive_more", "gcollections", @@ -1208,9 +1172,8 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" -version = "0.3.0-beta-dev.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4d587124090ca8e4ab28f3dd3d65aa35fcc72403b7dad4fc790751efd04fbe3" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "chrono", "serde", @@ -1326,16 +1289,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "object" version = "0.32.1" @@ -1367,7 +1320,7 @@ version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall", "smallvec", @@ -1380,12 +1333,6 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - [[package]] name = "pest" version = "2.7.5" @@ -1435,9 +1382,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -1464,9 +1411,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -1503,7 +1450,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1553,7 +1500,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76e189c2369884dce920945e2ddf79b3dff49e071a167dd1817fa9c4c00d512e" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "mach", "winapi", @@ -1610,9 +1557,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "0.15.5" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723ecff9ad04f4ad92fe1c8ca6c20d2196d9286e9c60727c4cb5511629260e9d" +checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" dependencies = [ "byteorder", "rmp", @@ -1702,9 +1649,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.193" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] @@ -1740,13 +1687,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -1767,7 +1714,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", ] @@ -1778,16 +1725,16 @@ version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", ] [[package]] name = "shared-buffer" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cf61602ee61e2f83dd016b3e6387245291cf728ea071c378b35088125b4d995" +checksum = "f6c99835bad52957e7aa241d3975ed17c1e5f8c92026377d117a606f36b84b16" dependencies = [ "bytes", "memmap2 0.6.2", @@ -1799,7 +1746,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e63e6744142336dfb606fe2b068afa2e1cca1ee6a5d8377277a92945d81fa331" dependencies = [ - "bitflags", + "bitflags 1.3.2", "itertools", "proc-macro2", "quote", @@ -1851,7 +1798,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", @@ -1887,9 +1834,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -1982,7 +1929,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -2032,7 +1979,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -2063,27 +2010,12 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - [[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - [[package]] name = "unicode-width" version = "0.1.11" @@ -2101,17 +2033,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - [[package]] name = "uuid" version = "1.6.1" @@ -2152,7 +2073,7 @@ version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] @@ -2167,7 +2088,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -2189,7 +2110,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2211,12 +2132,12 @@ dependencies = [ [[package]] name = "wasmer" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce45cc009177ca345a6d041f9062305ad467d15e7d41494f5b81ab46d62d7a58" +checksum = "4014573f108a246858299eb230031e268316fd57207bd2e8afc79b20fc7ce983" dependencies = [ "bytes", - "cfg-if 1.0.0", + "cfg-if", "derivative", "indexmap 1.9.3", "js-sys", @@ -2227,6 +2148,7 @@ dependencies = [ "shared-buffer", "target-lexicon", "thiserror", + "tracing", "wasm-bindgen", "wasmer-compiler", "wasmer-compiler-cranelift", @@ -2239,13 +2161,13 @@ dependencies = [ [[package]] name = "wasmer-compiler" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e044f6140c844602b920deb4526aea3cc9c0d7cf23f00730bb9b2034669f522a" +checksum = "3a77bfe259f08e8ec9e77f8f772ebfb4149f799d1f637231c5a5a6a90c447256" dependencies = [ "backtrace", "bytes", - "cfg-if 1.0.0", + "cfg-if", "enum-iterator", "enumset", "lazy_static", @@ -2266,9 +2188,9 @@ dependencies = [ [[package]] name = "wasmer-compiler-cranelift" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ce02358eb44a149d791c1d6648fb7f8b2f99cd55e3c4eef0474653ec8cc889" +checksum = "9280c47ebc754f95357745a38a995dd766f149e16b26e1b7e35741eb23c03d12" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -2285,9 +2207,9 @@ dependencies = [ [[package]] name = "wasmer-derive" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c782d80401edb08e1eba206733f7859db6c997fc5a7f5fb44edc3ecd801468f6" +checksum = "e9352877c4f07fc59146d21b56ae6dc469caf342587f49c81b4fbeafead31972" dependencies = [ "proc-macro-error", "proc-macro2", @@ -2297,9 +2219,9 @@ dependencies = [ [[package]] name = "wasmer-types" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd09e80d4d74bb9fd0ce6c3c106b1ceba1a050f9948db9d9b78ae53c172d6157" +checksum = "749214b6170f2b2fbbfe5b7e7f8d381e64930ac4122f3abceb33cde0292d45d2" dependencies = [ "bytecheck", "enum-iterator", @@ -2313,13 +2235,13 @@ dependencies = [ [[package]] name = "wasmer-vm" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdcd8a4fd36414a7b6a003dbfbd32393bce3e155d715dd877c05c1b7a41d224d" +checksum = "300215479de0deeb453e95aeb1b9c8ffd9bc7d9bd27c5f9e8a184e54db4d31a9" dependencies = [ "backtrace", "cc", - "cfg-if 1.0.0", + "cfg-if", "corosensei", "crossbeam-queue", "dashmap", @@ -2341,12 +2263,13 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.95.0" +version = "0.121.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ea896273ea99b15132414be1da01ab0d8836415083298ecaffbe308eaac87a" +checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" dependencies = [ - "indexmap 1.9.3", - "url", + "bitflags 2.5.0", + "indexmap 2.1.0", + "semver 1.0.20", ] [[package]] diff --git a/bootstrap-languages/file-storage/hc-dna/zomes/file_storage/Cargo.toml b/bootstrap-languages/file-storage/hc-dna/zomes/file_storage/Cargo.toml index 038362480..67fc43730 100644 --- a/bootstrap-languages/file-storage/hc-dna/zomes/file_storage/Cargo.toml +++ b/bootstrap-languages/file-storage/hc-dna/zomes/file_storage/Cargo.toml @@ -11,7 +11,7 @@ name = "file_storage" [dependencies] derive_more = "0" -serde = "1" +serde = "1.0.198" lazy_static = "*" chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } thiserror = "1.0.20" diff --git a/bootstrap-languages/file-storage/hc-dna/zomes/integrity/Cargo.toml b/bootstrap-languages/file-storage/hc-dna/zomes/integrity/Cargo.toml index 25a557bf1..05def50f7 100644 --- a/bootstrap-languages/file-storage/hc-dna/zomes/integrity/Cargo.toml +++ b/bootstrap-languages/file-storage/hc-dna/zomes/integrity/Cargo.toml @@ -11,8 +11,8 @@ name = "integrity" [dependencies] derive_more = "0" -serde = "1" +serde = "1.0.198" chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } -holo_hash = { version = "0.3.1-rc.0" } +holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } hdi = { version = "0.4.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } diff --git a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/Cargo.lock b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/Cargo.lock index af9a603eb..6ca6dcf15 100644 --- a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/Cargo.lock +++ b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/Cargo.lock @@ -58,12 +58,6 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - [[package]] name = "arrayvec" version = "0.7.4" @@ -84,7 +78,7 @@ checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "miniz_oxide", "object", @@ -93,9 +87,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.13.1" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bincode" @@ -147,12 +141,12 @@ dependencies = [ [[package]] name = "blake2b_simd" -version = "0.5.11" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" +checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", - "arrayvec 0.5.2", + "arrayvec", "constant_time_eq", ] @@ -246,12 +240,6 @@ dependencies = [ "libc", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -271,11 +259,21 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "colored" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" +dependencies = [ + "lazy_static", + "windows-sys 0.48.0", +] + [[package]] name = "constant_time_eq" -version = "0.1.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "convert_case" @@ -296,7 +294,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80128832c58ea9cbd041d2a759ec449224487b2c1e400453d99d244eead87a8e" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "libc", "scopeguard", "windows-sys 0.33.0", @@ -326,7 +324,7 @@ version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98b022ed2a5913a38839dfbafe6cf135342661293b08049843362df4301261dc" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", @@ -400,7 +398,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] @@ -412,7 +410,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", "memoffset", "scopeguard", @@ -424,7 +422,7 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] @@ -434,7 +432,7 @@ version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -491,7 +489,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -513,7 +511,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -522,7 +520,7 @@ version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "hashbrown 0.14.3", "lock_api", "once_cell", @@ -637,7 +635,7 @@ dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -680,15 +678,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - [[package]] name = "funty" version = "2.0.0" @@ -751,7 +740,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -821,7 +810,7 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi", ] @@ -876,9 +865,8 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hdi" -version = "0.4.0-beta-dev.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31dfc1fec80d7d9292e04e26e94528b0a0cc9baf982d1fb18e3af3e7625cb90" +version = "0.4.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "getrandom", "hdk_derive", @@ -894,9 +882,8 @@ dependencies = [ [[package]] name = "hdk" -version = "0.3.0-beta-dev.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99a6ccefa8f3aa8cd8a0f7ab40f3939610133bd32a14785d4d62440f92ab6a11" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "getrandom", "hdi", @@ -914,12 +901,11 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.3.0-beta-dev.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcfd466d96f2d19530b1419646b0a52c3bc833b0e7dacad4329cb90708db8665" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "darling 0.14.4", - "heck", + "heck 0.5.0", "holochain_integrity_types", "paste", "proc-macro-error", @@ -935,10 +921,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] -name = "hermit-abi" -version = "0.3.3" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hex" @@ -948,9 +934,8 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" -version = "0.3.0-beta-dev.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "050e53c0258e6235145fe949b74cedd48c24f4d92e1e7b7e39581a9a2b6996e7" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "base64", "blake2b_simd", @@ -966,16 +951,14 @@ dependencies = [ [[package]] name = "holochain_integrity_types" -version = "0.3.0-beta-dev.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a76306ea0c825e6bc8f040df4a3fe1ab82f187c108a91e81df957ae4f76efda" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "holo_hash", "holochain_secure_primitive", "holochain_serialized_bytes", "holochain_util", "kitsune_p2p_timestamp", - "paste", "serde", "serde_bytes", "subtle", @@ -984,9 +967,8 @@ dependencies = [ [[package]] name = "holochain_nonce" -version = "0.3.0-beta-dev.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fa99c5d38bb8fe463dd0284e2123ad14405f2a62146c4aaa809d5b24134711" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "getrandom", "holochain_secure_primitive", @@ -995,9 +977,8 @@ dependencies = [ [[package]] name = "holochain_secure_primitive" -version = "0.3.0-beta-dev.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcc25ba91f7898688245db538693d7b26504f91df24709111bb3b1d7506af01a" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "paste", "serde", @@ -1006,9 +987,8 @@ dependencies = [ [[package]] name = "holochain_serialized_bytes" -version = "0.0.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f7a5fc7c745a107f8ebcb04caab7a6b7a8463e2811f07ced19c281977583de7" +version = "0.0.54" +source = "git+https://github.com/coasys/holochain-serialization.git?rev=6eaa4ea8913bfd977fcc4577e833f4dc18a215f7#6eaa4ea8913bfd977fcc4577e833f4dc18a215f7" dependencies = [ "holochain_serialized_bytes_derive", "rmp-serde", @@ -1021,9 +1001,8 @@ dependencies = [ [[package]] name = "holochain_serialized_bytes_derive" -version = "0.0.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3e0cf02005cbf0f514476d40e02125b26df6d4922d7a2c48a84fc588539d71" +version = "0.0.54" +source = "git+https://github.com/coasys/holochain-serialization.git?rev=6eaa4ea8913bfd977fcc4577e833f4dc18a215f7#6eaa4ea8913bfd977fcc4577e833f4dc18a215f7" dependencies = [ "quote", "syn 1.0.109", @@ -1031,24 +1010,21 @@ dependencies = [ [[package]] name = "holochain_util" -version = "0.3.0-beta-dev.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6225aded80caf004c2214e38b39fb2459ee9a7a8fcd0d09146f49ae0771f0" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ - "cfg-if 0.1.10", - "derive_more", + "cfg-if", + "colored", "dunce", "futures", - "getrandom", - "num_cpus", "once_cell", + "tracing", ] [[package]] name = "holochain_wasmer_common" -version = "0.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72007fd2a72d77e76ffa494e5847bf6e893e25e73fe1d1de902e1b8d5033a64e" +version = "0.0.94" +source = "git+https://github.com/coasys/holochain-wasmer.git?rev=52979e943861530bbafc48297b131fdec52c3e21#52979e943861530bbafc48297b131fdec52c3e21" dependencies = [ "holochain_serialized_bytes", "serde", @@ -1060,9 +1036,8 @@ dependencies = [ [[package]] name = "holochain_wasmer_guest" -version = "0.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c429e84a19ee446f47541a6fed10e1a4376a8a8ba6d3dbff7d07e4a7bb4c85f" +version = "0.0.94" +source = "git+https://github.com/coasys/holochain-wasmer.git?rev=52979e943861530bbafc48297b131fdec52c3e21#52979e943861530bbafc48297b131fdec52c3e21" dependencies = [ "holochain_serialized_bytes", "holochain_wasmer_common", @@ -1074,21 +1049,17 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.3.0-beta-dev.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1d1b165dcf3d1ae412edf952b1ae4e57a5b5c4a97c11eb97b5fb4fdf06cc6a4" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "derive_more", "holo_hash", "holochain_integrity_types", "holochain_nonce", - "holochain_secure_primitive", "holochain_serialized_bytes", "holochain_wasmer_common", - "kitsune_p2p_bin_data", "kitsune_p2p_block", "kitsune_p2p_timestamp", - "paste", "serde", "serde_bytes", "subtle", @@ -1134,16 +1105,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "if_chain" version = "1.0.2" @@ -1240,9 +1201,8 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" -version = "0.3.0-beta-dev.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c89fb7f069f4a90794dff2669cc832a71c9fd93554e92b0f17de97d753283f4" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "base64", "derive_more", @@ -1255,9 +1215,8 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" -version = "0.3.0-beta-dev.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a32470626b779dd5e36e516d64f8bdde1eac1faec944654d2b85f200b0ac3cee" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -1266,9 +1225,8 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" -version = "0.3.0-beta-dev.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aaba5f7fcb2c0b7faa3f859a3de5c4b893fbf9cfea51530549d11e9738fbfac" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "derive_more", "gcollections", @@ -1280,9 +1238,8 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" -version = "0.3.0-beta-dev.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4d587124090ca8e4ab28f3dd3d65aa35fcc72403b7dad4fc790751efd04fbe3" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "chrono", "serde", @@ -1410,16 +1367,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "object" version = "0.32.1" @@ -1451,7 +1398,7 @@ version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall", "smallvec", @@ -1464,12 +1411,6 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - [[package]] name = "perspective_diff_sync" version = "0.0.1" @@ -1533,7 +1474,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -1601,9 +1542,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -1630,9 +1571,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -1806,9 +1747,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "0.15.5" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723ecff9ad04f4ad92fe1c8ca6c20d2196d9286e9c60727c4cb5511629260e9d" +checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" dependencies = [ "byteorder", "rmp", @@ -1911,9 +1852,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.193" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] @@ -1949,13 +1890,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -1976,7 +1917,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", ] @@ -1987,16 +1928,16 @@ version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", ] [[package]] name = "shared-buffer" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cf61602ee61e2f83dd016b3e6387245291cf728ea071c378b35088125b4d995" +checksum = "f6c99835bad52957e7aa241d3975ed17c1e5f8c92026377d117a606f36b84b16" dependencies = [ "bytes", "memmap2 0.6.2", @@ -2060,7 +2001,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", @@ -2096,9 +2037,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -2123,7 +2064,7 @@ version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "fastrand", "redox_syscall", "rustix", @@ -2204,7 +2145,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -2254,7 +2195,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -2285,27 +2226,12 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - [[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - [[package]] name = "unicode-width" version = "0.1.11" @@ -2323,17 +2249,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - [[package]] name = "uuid" version = "1.6.1" @@ -2374,7 +2289,7 @@ version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] @@ -2389,7 +2304,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -2411,7 +2326,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2433,12 +2348,12 @@ dependencies = [ [[package]] name = "wasmer" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce45cc009177ca345a6d041f9062305ad467d15e7d41494f5b81ab46d62d7a58" +checksum = "4014573f108a246858299eb230031e268316fd57207bd2e8afc79b20fc7ce983" dependencies = [ "bytes", - "cfg-if 1.0.0", + "cfg-if", "derivative", "indexmap 1.9.3", "js-sys", @@ -2449,6 +2364,7 @@ dependencies = [ "shared-buffer", "target-lexicon", "thiserror", + "tracing", "wasm-bindgen", "wasmer-compiler", "wasmer-compiler-cranelift", @@ -2461,13 +2377,13 @@ dependencies = [ [[package]] name = "wasmer-compiler" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e044f6140c844602b920deb4526aea3cc9c0d7cf23f00730bb9b2034669f522a" +checksum = "3a77bfe259f08e8ec9e77f8f772ebfb4149f799d1f637231c5a5a6a90c447256" dependencies = [ "backtrace", "bytes", - "cfg-if 1.0.0", + "cfg-if", "enum-iterator", "enumset", "lazy_static", @@ -2488,9 +2404,9 @@ dependencies = [ [[package]] name = "wasmer-compiler-cranelift" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ce02358eb44a149d791c1d6648fb7f8b2f99cd55e3c4eef0474653ec8cc889" +checksum = "9280c47ebc754f95357745a38a995dd766f149e16b26e1b7e35741eb23c03d12" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -2507,9 +2423,9 @@ dependencies = [ [[package]] name = "wasmer-derive" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c782d80401edb08e1eba206733f7859db6c997fc5a7f5fb44edc3ecd801468f6" +checksum = "e9352877c4f07fc59146d21b56ae6dc469caf342587f49c81b4fbeafead31972" dependencies = [ "proc-macro-error", "proc-macro2", @@ -2519,9 +2435,9 @@ dependencies = [ [[package]] name = "wasmer-types" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd09e80d4d74bb9fd0ce6c3c106b1ceba1a050f9948db9d9b78ae53c172d6157" +checksum = "749214b6170f2b2fbbfe5b7e7f8d381e64930ac4122f3abceb33cde0292d45d2" dependencies = [ "bytecheck", "enum-iterator", @@ -2535,13 +2451,13 @@ dependencies = [ [[package]] name = "wasmer-vm" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdcd8a4fd36414a7b6a003dbfbd32393bce3e155d715dd877c05c1b7a41d224d" +checksum = "300215479de0deeb453e95aeb1b9c8ffd9bc7d9bd27c5f9e8a184e54db4d31a9" dependencies = [ "backtrace", "cc", - "cfg-if 1.0.0", + "cfg-if", "corosensei", "crossbeam-queue", "dashmap", @@ -2563,12 +2479,13 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.95.0" +version = "0.121.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ea896273ea99b15132414be1da01ab0d8836415083298ecaffbe308eaac87a" +checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" dependencies = [ - "indexmap 1.9.3", - "url", + "bitflags 2.4.1", + "indexmap 2.1.0", + "semver 1.0.20", ] [[package]] diff --git a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync/Cargo.toml b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync/Cargo.toml index 712190eec..3b2deb771 100644 --- a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync/Cargo.toml +++ b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync/Cargo.toml @@ -10,7 +10,7 @@ name = "perspective_diff_sync" [dependencies] derive_more = "0" -serde = "1" +serde = "1.0.198" lazy_static = "*" chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } thiserror = "1.0.20" diff --git a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml index 0ca4dd174..11c3a1448 100644 --- a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml +++ b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml @@ -10,7 +10,7 @@ name = "perspective_diff_sync_integrity" [dependencies] derive_more = "0" -serde = "1" +serde = "1.0.198" chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } diff --git a/bootstrap-languages/p-diff-sync/hc-dna/Cargo.lock b/bootstrap-languages/p-diff-sync/hc-dna/Cargo.lock index af9a603eb..6ca6dcf15 100644 --- a/bootstrap-languages/p-diff-sync/hc-dna/Cargo.lock +++ b/bootstrap-languages/p-diff-sync/hc-dna/Cargo.lock @@ -58,12 +58,6 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - [[package]] name = "arrayvec" version = "0.7.4" @@ -84,7 +78,7 @@ checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "miniz_oxide", "object", @@ -93,9 +87,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.13.1" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bincode" @@ -147,12 +141,12 @@ dependencies = [ [[package]] name = "blake2b_simd" -version = "0.5.11" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" +checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", - "arrayvec 0.5.2", + "arrayvec", "constant_time_eq", ] @@ -246,12 +240,6 @@ dependencies = [ "libc", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -271,11 +259,21 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "colored" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" +dependencies = [ + "lazy_static", + "windows-sys 0.48.0", +] + [[package]] name = "constant_time_eq" -version = "0.1.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "convert_case" @@ -296,7 +294,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80128832c58ea9cbd041d2a759ec449224487b2c1e400453d99d244eead87a8e" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "libc", "scopeguard", "windows-sys 0.33.0", @@ -326,7 +324,7 @@ version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98b022ed2a5913a38839dfbafe6cf135342661293b08049843362df4301261dc" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", @@ -400,7 +398,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] @@ -412,7 +410,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", "memoffset", "scopeguard", @@ -424,7 +422,7 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] @@ -434,7 +432,7 @@ version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -491,7 +489,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -513,7 +511,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -522,7 +520,7 @@ version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "hashbrown 0.14.3", "lock_api", "once_cell", @@ -637,7 +635,7 @@ dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -680,15 +678,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - [[package]] name = "funty" version = "2.0.0" @@ -751,7 +740,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -821,7 +810,7 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi", ] @@ -876,9 +865,8 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hdi" -version = "0.4.0-beta-dev.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31dfc1fec80d7d9292e04e26e94528b0a0cc9baf982d1fb18e3af3e7625cb90" +version = "0.4.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "getrandom", "hdk_derive", @@ -894,9 +882,8 @@ dependencies = [ [[package]] name = "hdk" -version = "0.3.0-beta-dev.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99a6ccefa8f3aa8cd8a0f7ab40f3939610133bd32a14785d4d62440f92ab6a11" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "getrandom", "hdi", @@ -914,12 +901,11 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.3.0-beta-dev.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcfd466d96f2d19530b1419646b0a52c3bc833b0e7dacad4329cb90708db8665" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "darling 0.14.4", - "heck", + "heck 0.5.0", "holochain_integrity_types", "paste", "proc-macro-error", @@ -935,10 +921,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] -name = "hermit-abi" -version = "0.3.3" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hex" @@ -948,9 +934,8 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" -version = "0.3.0-beta-dev.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "050e53c0258e6235145fe949b74cedd48c24f4d92e1e7b7e39581a9a2b6996e7" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "base64", "blake2b_simd", @@ -966,16 +951,14 @@ dependencies = [ [[package]] name = "holochain_integrity_types" -version = "0.3.0-beta-dev.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a76306ea0c825e6bc8f040df4a3fe1ab82f187c108a91e81df957ae4f76efda" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "holo_hash", "holochain_secure_primitive", "holochain_serialized_bytes", "holochain_util", "kitsune_p2p_timestamp", - "paste", "serde", "serde_bytes", "subtle", @@ -984,9 +967,8 @@ dependencies = [ [[package]] name = "holochain_nonce" -version = "0.3.0-beta-dev.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fa99c5d38bb8fe463dd0284e2123ad14405f2a62146c4aaa809d5b24134711" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "getrandom", "holochain_secure_primitive", @@ -995,9 +977,8 @@ dependencies = [ [[package]] name = "holochain_secure_primitive" -version = "0.3.0-beta-dev.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcc25ba91f7898688245db538693d7b26504f91df24709111bb3b1d7506af01a" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "paste", "serde", @@ -1006,9 +987,8 @@ dependencies = [ [[package]] name = "holochain_serialized_bytes" -version = "0.0.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f7a5fc7c745a107f8ebcb04caab7a6b7a8463e2811f07ced19c281977583de7" +version = "0.0.54" +source = "git+https://github.com/coasys/holochain-serialization.git?rev=6eaa4ea8913bfd977fcc4577e833f4dc18a215f7#6eaa4ea8913bfd977fcc4577e833f4dc18a215f7" dependencies = [ "holochain_serialized_bytes_derive", "rmp-serde", @@ -1021,9 +1001,8 @@ dependencies = [ [[package]] name = "holochain_serialized_bytes_derive" -version = "0.0.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3e0cf02005cbf0f514476d40e02125b26df6d4922d7a2c48a84fc588539d71" +version = "0.0.54" +source = "git+https://github.com/coasys/holochain-serialization.git?rev=6eaa4ea8913bfd977fcc4577e833f4dc18a215f7#6eaa4ea8913bfd977fcc4577e833f4dc18a215f7" dependencies = [ "quote", "syn 1.0.109", @@ -1031,24 +1010,21 @@ dependencies = [ [[package]] name = "holochain_util" -version = "0.3.0-beta-dev.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6225aded80caf004c2214e38b39fb2459ee9a7a8fcd0d09146f49ae0771f0" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ - "cfg-if 0.1.10", - "derive_more", + "cfg-if", + "colored", "dunce", "futures", - "getrandom", - "num_cpus", "once_cell", + "tracing", ] [[package]] name = "holochain_wasmer_common" -version = "0.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72007fd2a72d77e76ffa494e5847bf6e893e25e73fe1d1de902e1b8d5033a64e" +version = "0.0.94" +source = "git+https://github.com/coasys/holochain-wasmer.git?rev=52979e943861530bbafc48297b131fdec52c3e21#52979e943861530bbafc48297b131fdec52c3e21" dependencies = [ "holochain_serialized_bytes", "serde", @@ -1060,9 +1036,8 @@ dependencies = [ [[package]] name = "holochain_wasmer_guest" -version = "0.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c429e84a19ee446f47541a6fed10e1a4376a8a8ba6d3dbff7d07e4a7bb4c85f" +version = "0.0.94" +source = "git+https://github.com/coasys/holochain-wasmer.git?rev=52979e943861530bbafc48297b131fdec52c3e21#52979e943861530bbafc48297b131fdec52c3e21" dependencies = [ "holochain_serialized_bytes", "holochain_wasmer_common", @@ -1074,21 +1049,17 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.3.0-beta-dev.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1d1b165dcf3d1ae412edf952b1ae4e57a5b5c4a97c11eb97b5fb4fdf06cc6a4" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "derive_more", "holo_hash", "holochain_integrity_types", "holochain_nonce", - "holochain_secure_primitive", "holochain_serialized_bytes", "holochain_wasmer_common", - "kitsune_p2p_bin_data", "kitsune_p2p_block", "kitsune_p2p_timestamp", - "paste", "serde", "serde_bytes", "subtle", @@ -1134,16 +1105,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "if_chain" version = "1.0.2" @@ -1240,9 +1201,8 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" -version = "0.3.0-beta-dev.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c89fb7f069f4a90794dff2669cc832a71c9fd93554e92b0f17de97d753283f4" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "base64", "derive_more", @@ -1255,9 +1215,8 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" -version = "0.3.0-beta-dev.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a32470626b779dd5e36e516d64f8bdde1eac1faec944654d2b85f200b0ac3cee" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -1266,9 +1225,8 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" -version = "0.3.0-beta-dev.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aaba5f7fcb2c0b7faa3f859a3de5c4b893fbf9cfea51530549d11e9738fbfac" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "derive_more", "gcollections", @@ -1280,9 +1238,8 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" -version = "0.3.0-beta-dev.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4d587124090ca8e4ab28f3dd3d65aa35fcc72403b7dad4fc790751efd04fbe3" +version = "0.3.1-rc.0" +source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" dependencies = [ "chrono", "serde", @@ -1410,16 +1367,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "object" version = "0.32.1" @@ -1451,7 +1398,7 @@ version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall", "smallvec", @@ -1464,12 +1411,6 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - [[package]] name = "perspective_diff_sync" version = "0.0.1" @@ -1533,7 +1474,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -1601,9 +1542,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -1630,9 +1571,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -1806,9 +1747,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "0.15.5" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723ecff9ad04f4ad92fe1c8ca6c20d2196d9286e9c60727c4cb5511629260e9d" +checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" dependencies = [ "byteorder", "rmp", @@ -1911,9 +1852,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.193" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] @@ -1949,13 +1890,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -1976,7 +1917,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", ] @@ -1987,16 +1928,16 @@ version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", ] [[package]] name = "shared-buffer" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cf61602ee61e2f83dd016b3e6387245291cf728ea071c378b35088125b4d995" +checksum = "f6c99835bad52957e7aa241d3975ed17c1e5f8c92026377d117a606f36b84b16" dependencies = [ "bytes", "memmap2 0.6.2", @@ -2060,7 +2001,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", @@ -2096,9 +2037,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -2123,7 +2064,7 @@ version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "fastrand", "redox_syscall", "rustix", @@ -2204,7 +2145,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -2254,7 +2195,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", ] [[package]] @@ -2285,27 +2226,12 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - [[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - [[package]] name = "unicode-width" version = "0.1.11" @@ -2323,17 +2249,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - [[package]] name = "uuid" version = "1.6.1" @@ -2374,7 +2289,7 @@ version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] @@ -2389,7 +2304,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -2411,7 +2326,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2433,12 +2348,12 @@ dependencies = [ [[package]] name = "wasmer" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce45cc009177ca345a6d041f9062305ad467d15e7d41494f5b81ab46d62d7a58" +checksum = "4014573f108a246858299eb230031e268316fd57207bd2e8afc79b20fc7ce983" dependencies = [ "bytes", - "cfg-if 1.0.0", + "cfg-if", "derivative", "indexmap 1.9.3", "js-sys", @@ -2449,6 +2364,7 @@ dependencies = [ "shared-buffer", "target-lexicon", "thiserror", + "tracing", "wasm-bindgen", "wasmer-compiler", "wasmer-compiler-cranelift", @@ -2461,13 +2377,13 @@ dependencies = [ [[package]] name = "wasmer-compiler" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e044f6140c844602b920deb4526aea3cc9c0d7cf23f00730bb9b2034669f522a" +checksum = "3a77bfe259f08e8ec9e77f8f772ebfb4149f799d1f637231c5a5a6a90c447256" dependencies = [ "backtrace", "bytes", - "cfg-if 1.0.0", + "cfg-if", "enum-iterator", "enumset", "lazy_static", @@ -2488,9 +2404,9 @@ dependencies = [ [[package]] name = "wasmer-compiler-cranelift" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ce02358eb44a149d791c1d6648fb7f8b2f99cd55e3c4eef0474653ec8cc889" +checksum = "9280c47ebc754f95357745a38a995dd766f149e16b26e1b7e35741eb23c03d12" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -2507,9 +2423,9 @@ dependencies = [ [[package]] name = "wasmer-derive" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c782d80401edb08e1eba206733f7859db6c997fc5a7f5fb44edc3ecd801468f6" +checksum = "e9352877c4f07fc59146d21b56ae6dc469caf342587f49c81b4fbeafead31972" dependencies = [ "proc-macro-error", "proc-macro2", @@ -2519,9 +2435,9 @@ dependencies = [ [[package]] name = "wasmer-types" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd09e80d4d74bb9fd0ce6c3c106b1ceba1a050f9948db9d9b78ae53c172d6157" +checksum = "749214b6170f2b2fbbfe5b7e7f8d381e64930ac4122f3abceb33cde0292d45d2" dependencies = [ "bytecheck", "enum-iterator", @@ -2535,13 +2451,13 @@ dependencies = [ [[package]] name = "wasmer-vm" -version = "4.2.4" +version = "4.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdcd8a4fd36414a7b6a003dbfbd32393bce3e155d715dd877c05c1b7a41d224d" +checksum = "300215479de0deeb453e95aeb1b9c8ffd9bc7d9bd27c5f9e8a184e54db4d31a9" dependencies = [ "backtrace", "cc", - "cfg-if 1.0.0", + "cfg-if", "corosensei", "crossbeam-queue", "dashmap", @@ -2563,12 +2479,13 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.95.0" +version = "0.121.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ea896273ea99b15132414be1da01ab0d8836415083298ecaffbe308eaac87a" +checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" dependencies = [ - "indexmap 1.9.3", - "url", + "bitflags 2.4.1", + "indexmap 2.1.0", + "semver 1.0.20", ] [[package]] diff --git a/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync/Cargo.toml b/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync/Cargo.toml index 712190eec..3b2deb771 100644 --- a/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync/Cargo.toml +++ b/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync/Cargo.toml @@ -10,7 +10,7 @@ name = "perspective_diff_sync" [dependencies] derive_more = "0" -serde = "1" +serde = "1.0.198" lazy_static = "*" chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } thiserror = "1.0.20" diff --git a/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml b/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml index 0ca4dd174..11c3a1448 100644 --- a/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml +++ b/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml @@ -10,7 +10,7 @@ name = "perspective_diff_sync_integrity" [dependencies] derive_more = "0" -serde = "1" +serde = "1.0.198" chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } From 6d77980aa34d29f698ae16ca55cc6418b597fb6b Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 6 Jun 2024 10:53:43 +0530 Subject: [PATCH 05/37] chore: Update dependencies and extensions for rust-executor --- .../entanglement_service_extension.rs | 34 ++++++------- .../holochain_service_extension.rs | 29 +++-------- .../src/js_core/languages_extension.rs | 19 +++---- rust-executor/src/js_core/options.rs | 50 ++++++++----------- rust-executor/src/js_core/pubsub_extension.rs | 17 +++---- .../src/js_core/signature_extension.rs | 17 +++---- rust-executor/src/js_core/utils_extension.rs | 21 +++----- rust-executor/src/js_core/wallet_extension.rs | 24 +++------ .../prolog_service_extension.rs | 19 +++---- .../runtime_service_extension.rs | 18 +++---- 10 files changed, 83 insertions(+), 165 deletions(-) diff --git a/rust-executor/src/entanglement_service/entanglement_service_extension.rs b/rust-executor/src/entanglement_service/entanglement_service_extension.rs index 425014b42..dbede161c 100644 --- a/rust-executor/src/entanglement_service/entanglement_service_extension.rs +++ b/rust-executor/src/entanglement_service/entanglement_service_extension.rs @@ -4,48 +4,42 @@ use deno_core::{error::AnyError, include_js_files, op2, Extension, Op}; use crate::graphql::graphql_types::EntanglementProof; -use super::{add_entanglement_proofs, delete_entanglement_proof, generate_holochain_proof, get_entanglement_proofs, sign_device_key}; +use super::{add_entanglement_proofs as add_entanglement_proofs_service, delete_entanglement_proof as delete_entanglement_proof_service, generate_holochain_proof as generate_holochain_proof_service, get_entanglement_proofs as get_entanglement_proofs_service, sign_device_key as sign_device_key_service}; #[op2] #[serde] pub fn sign_device_key(#[string] device_key: String, #[string] device_key_type: String) -> Result { - Ok(sign_device_key(device_key, device_key_type)) + Ok(sign_device_key_service(device_key, device_key_type)) } #[op2] #[serde] pub fn generate_entanglement_proof(#[string] holochain_key: String, #[string] signed_did: String) -> Result { - Ok(generate_holochain_proof(holochain_key, signed_did)) + Ok(generate_holochain_proof_service(holochain_key, signed_did)) } #[op2] +#[serde] pub fn add_entanglement_proofs(#[serde] proofs: Vec) -> Result<(), AnyError> { - Ok(add_entanglement_proofs(proofs)) + Ok(add_entanglement_proofs_service(proofs)) } #[op2] +#[serde] pub fn delete_entanglement_proof(#[serde] proofs: Vec) -> Result<(), AnyError> { - Ok(delete_entanglement_proof(proofs)) + Ok(delete_entanglement_proof_service(proofs)) } #[op2] #[serde] pub fn get_entanglement_proofs() -> Result, AnyError> { - Ok(get_entanglement_proofs()) + Ok(get_entanglement_proofs_service()) } -pub fn build() -> Extension { - Extension { - name: "entanglement_service", - js_files: Cow::Borrowed(&include_js_files!(entanglement_service "src/entanglement_service/entanglement_service_extension.js",)), - ops: Cow::Borrowed(&[ - sign_device_key::DECL, - generate_entanglement_proof::DECL, - add_entanglement_proofs::DECL, - delete_entanglement_proof::DECL, - get_entanglement_proofs::DECL - ]), - ..Default::default() - } -} +deno_core::extension!( + entanglement_service, + ops = [sign_device_key, generate_entanglement_proof, add_entanglement_proofs, delete_entanglement_proof, get_entanglement_proofs], + esm_entry_point = "ext:entanglement_service/entanglement_service_extension.js", + esm = [dir "src/entanglement_service", "entanglement_service_extension.js"] +); diff --git a/rust-executor/src/holochain_service/holochain_service_extension.rs b/rust-executor/src/holochain_service/holochain_service_extension.rs index f36b7e20d..da2e9ac86 100644 --- a/rust-executor/src/holochain_service/holochain_service_extension.rs +++ b/rust-executor/src/holochain_service/holochain_service_extension.rs @@ -183,26 +183,9 @@ async fn unpack_dna(#[string] path: String) -> Result { } //Implement signal callbacks from dna/holochain to js - -pub fn build() -> Extension { - Extension { - name: "holochain_service", - js_files: Cow::Borrowed(&include_js_files!(holochain_service "src/holochain_service/holochain_service_extension.js",)), - ops: Cow::Borrowed(&[ - start_holochain_conductor::DECL, - log_dht_status::DECL, - install_app::DECL, - get_app_info::DECL, - call_zome_function::DECL, - agent_infos::DECL, - add_agent_infos::DECL, - remove_app::DECL, - sign_string::DECL, - shutdown::DECL, - get_agent_key::DECL, - pack_dna::DECL, - unpack_dna::DECL, - ]), - ..Default::default() - } -} +deno_core::extension!( + holochain_service, + ops = [start_holochain_conductor, log_dht_status, install_app, get_app_info, call_zome_function, agent_infos, add_agent_infos, remove_app, sign_string, shutdown, get_agent_key, pack_dna, unpack_dna], + esm_entry_point = "ext:pubsub_service/holochain_service_extension.js", + esm = [dir "src/holochain_service", "holochain_service_extension.js"] +); \ No newline at end of file diff --git a/rust-executor/src/js_core/languages_extension.rs b/rust-executor/src/js_core/languages_extension.rs index 7e08d2410..3248c4f4f 100644 --- a/rust-executor/src/js_core/languages_extension.rs +++ b/rust-executor/src/js_core/languages_extension.rs @@ -32,16 +32,9 @@ fn telepresence_signal_received( crate::perspectives::handle_telepresence_signal_from_link_language(signal, language_address); } - -pub fn build() -> Extension { - Extension { - name: "agent", - js_files: Cow::Borrowed(&include_js_files!(rust_executor "src/js_core/languages_extension.js",)), - ops: Cow::Borrowed(&[ - perspective_diff_received::DECL, - sync_state_changed::DECL, - telepresence_signal_received::DECL, - ]), - ..Default::default() - } -} \ No newline at end of file +deno_core::extension!( + language_service, + ops = [perspective_diff_received, sync_state_changed, telepresence_signal_received], + esm_entry_point = "ext:language_service/languages_extension.js", + esm = [dir "src/js_core", "languages_extension.js"] +); \ No newline at end of file diff --git a/rust-executor/src/js_core/options.rs b/rust-executor/src/js_core/options.rs index e2b67dbd6..7033760c2 100644 --- a/rust-executor/src/js_core/options.rs +++ b/rust-executor/src/js_core/options.rs @@ -3,14 +3,17 @@ use deno_runtime::worker::WorkerOptions; use std::{collections::HashMap, rc::Rc}; use url::Url; -use super::{ - pubsub_extension, string_module_loader::StringModuleLoader, utils_extension, - wallet_extension, signature_extension, agent_extension, languages_extension, -}; -use crate::entanglement_service::entanglement_service_extension; -use crate::holochain_service::holochain_service_extension; -use crate::prolog_service::prolog_service_extension; -use crate::runtime_service::runtime_service_extension; +use super::agent_extension::agent_service; +use super::languages_extension::language_service; +use super::pubsub_extension::pubsub_service; +use super::signature_extension::signature_service; +use super::utils_extension::utils_service; +use super::wallet_extension::wallet_service; +use super::string_module_loader::StringModuleLoader; +use crate::entanglement_service::entanglement_service_extension::{self, entanglement_service}; +use crate::holochain_service::holochain_service_extension::{self, holochain_service}; +use crate::prolog_service::prolog_service_extension::{self, prolog_service}; +use crate::runtime_service::runtime_service_extension::{self, runtime_service}; pub fn main_module_url() -> Url { Url::parse("https://ad4m.runtime/main").unwrap() @@ -51,29 +54,18 @@ pub fn main_worker_options() -> WorkerOptions { loader.add_module(specifier.as_str(), code.as_str()); } - let wallet_ext = wallet_extension::build(); - let utils_ext = utils_extension::build(); - let sub_ext = pubsub_extension::build(); - let holochain_ext = holochain_service_extension::build(); - let prolog_ext = prolog_service_extension::build(); - let signature_ext = signature_extension::build(); - let agent_ext = agent_extension::build(); - let entanglement_ext = entanglement_service_extension::build(); - let runtime_ext = runtime_service_extension::build(); - let languages_ext = languages_extension::build(); - WorkerOptions { extensions: vec![ - wallet_ext, - utils_ext, - sub_ext, - holochain_ext, - prolog_ext, - signature_ext, - agent_ext, - entanglement_ext, - runtime_ext, - languages_ext, + wallet_service::init_ops_and_esm(), + utils_service::init_ops_and_esm(), + pubsub_service::init_ops_and_esm(), + holochain_service::init_ops_and_esm(), + prolog_service::init_ops_and_esm(), + signature_service::init_ops_and_esm(), + agent_service::init_ops_and_esm(), + entanglement_service::init_ops_and_esm(), + runtime_service::init_ops_and_esm(), + language_service::init_ops_and_esm(), ], module_loader: Rc::new(loader), ..Default::default() diff --git a/rust-executor/src/js_core/pubsub_extension.rs b/rust-executor/src/js_core/pubsub_extension.rs index 52e27faf0..146ddbba1 100644 --- a/rust-executor/src/js_core/pubsub_extension.rs +++ b/rust-executor/src/js_core/pubsub_extension.rs @@ -11,14 +11,9 @@ async fn publish(#[string] topic: String, #[string] data: String) -> Result<(), Ok(()) } - -pub fn build() -> Extension { - Extension { - name: "pubsub", - js_files: Cow::Borrowed(&include_js_files!(holochain_service "src/js_core/pubsub_extension.js",)), - ops: Cow::Borrowed(&[ - publish::DECL - ]), - ..Default::default() - } -} +deno_core::extension!( + pubsub_service, + ops = [publish], + esm_entry_point = "ext:pubsub_service/pubsub_extension.js", + esm = [dir "src/js_core", "pubsub_extension.js"] +); diff --git a/rust-executor/src/js_core/signature_extension.rs b/rust-executor/src/js_core/signature_extension.rs index 429ad3685..6cd90aa8d 100644 --- a/rust-executor/src/js_core/signature_extension.rs +++ b/rust-executor/src/js_core/signature_extension.rs @@ -38,14 +38,9 @@ fn signature_verify( Ok(SignatureVerificationResult { is_valid }) } -pub fn build() -> Extension { - Extension { - name: "signature", - js_files: Cow::Borrowed(&include_js_files!(rust_executor "src/js_core/signature_extension.js",)), - ops: Cow::Borrowed(&[ - signature_verify_string_signed_by_did::DECL, - signature_verify::DECL, - ]), - ..Default::default() - } -} \ No newline at end of file +deno_core::extension!( + signature_service, + ops = [signature_verify_string_signed_by_did, signature_verify], + esm_entry_point = "ext:signature_service/signature_extension.js", + esm = [dir "src/js_core", "signature_extension.js"] +); \ No newline at end of file diff --git a/rust-executor/src/js_core/utils_extension.rs b/rust-executor/src/js_core/utils_extension.rs index 76093e679..8d6e62fe8 100644 --- a/rust-executor/src/js_core/utils_extension.rs +++ b/rust-executor/src/js_core/utils_extension.rs @@ -70,18 +70,9 @@ async fn load_module(#[string] path: String) -> Result { Ok(String::from("temp")) } -pub fn build() -> Extension { - Extension { - name: "utils", - js_files: Cow::Borrowed(&include_js_files!(holochain_service "src/js_core/utils_extension.js",)), - ops: Cow::Borrowed(&[ - hash::DECL, - load_module::DECL, - console_log::DECL, - console_debug::DECL, - console_error::DECL, - console_warn::DECL, - ]), - ..Default::default() - } -} +deno_core::extension!( + utils_service, + ops = [hash, load_module, console_log, console_debug, console_error, console_warn], + esm_entry_point = "ext:utils_service/utils_extension.js", + esm = [dir "src/js_core", "utils_extension.js"] +); diff --git a/rust-executor/src/js_core/wallet_extension.rs b/rust-executor/src/js_core/wallet_extension.rs index 820028f28..d082c8996 100644 --- a/rust-executor/src/js_core/wallet_extension.rs +++ b/rust-executor/src/js_core/wallet_extension.rs @@ -106,21 +106,9 @@ fn wallet_sign(#[buffer] payload: &[u8]) -> Result, AnyError> { crate::agent::sign(payload) } -pub fn build() -> Extension { - Extension { - name: "wallet", - js_files: Cow::Borrowed(&include_js_files!(holochain_service "src/js_core/wallet_extension.js",)), - ops: Cow::Borrowed(&[ - wallet_get_main_key::DECL, - wallet_get_main_key_document::DECL, - wallet_create_main_key::DECL, - wallet_is_unlocked::DECL, - wallet_unlock::DECL, - wallet_lock::DECL, - wallet_export::DECL, - wallet_load::DECL, - wallet_sign::DECL, - ]), - ..Default::default() - } -} +deno_core::extension!( + wallet_service, + ops = [wallet_get_main_key, wallet_get_main_key_document, wallet_create_main_key, wallet_is_unlocked, wallet_unlock, wallet_lock, wallet_export, wallet_load, wallet_sign], + esm_entry_point = "ext:wallet_service/wallet_extension.js", + esm = [dir "src/js_core", "wallet_extension.js"] +); diff --git a/rust-executor/src/prolog_service/prolog_service_extension.rs b/rust-executor/src/prolog_service/prolog_service_extension.rs index d9a43c36e..c6ebed1e5 100644 --- a/rust-executor/src/prolog_service/prolog_service_extension.rs +++ b/rust-executor/src/prolog_service/prolog_service_extension.rs @@ -112,16 +112,9 @@ async fn load_module_string( .await } -pub fn build() -> Extension { - Extension { - name: "prolog_service", - js_files: Cow::Borrowed(&include_js_files!(holochain_service "src/prolog_service/prolog_service_extension.js",)), - ops: Cow::Borrowed(&[ - spawn_engine::DECL, - remove_engine::DECL, - run_query::DECL, - load_module_string::DECL, - ]), - ..Default::default() - } -} +deno_core::extension!( + prolog_service, + ops = [spawn_engine, remove_engine, run_query, load_module_string], + esm_entry_point = "ext:prolog_service/prolog_service_extension.js", + esm = [dir "src/prolog_service", "prolog_service_extension.js"] +); \ No newline at end of file diff --git a/rust-executor/src/runtime_service/runtime_service_extension.rs b/rust-executor/src/runtime_service/runtime_service_extension.rs index e6bccc085..b69ea7956 100644 --- a/rust-executor/src/runtime_service/runtime_service_extension.rs +++ b/rust-executor/src/runtime_service/runtime_service_extension.rs @@ -35,15 +35,9 @@ pub fn add_message_outbox(#[string] did: String, #[serde] message: PerspectiveEx } -pub fn build() -> Extension { - Extension { - name: "runtime_service", - js_files: Cow::Borrowed(&include_js_files!(runtime_service "src/runtime_service/runtime_service_extension.js",)), - ops: Cow::Borrowed(&[ - friends::DECL, - add_message_outbox::DECL, - get_trusted_agents::DECL, - ]), - ..Default::default() - } -} \ No newline at end of file +deno_core::extension!( + runtime_service, + ops = [friends, add_message_outbox, get_trusted_agents], + esm_entry_point = "ext:runtime_service/runtime_service_extension.js", + esm = [dir "src/runtime_service", "runtime_service_extension.js"] +); \ No newline at end of file From 92bac1d26201e8057574d6ffe514112eafe8f558 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 6 Jun 2024 10:54:11 +0530 Subject: [PATCH 06/37] chore: Update chrono dependency to version 0.4.38 --- Cargo.lock | 480 ++++++++---------- .../agent-language/hc-dna/Cargo.lock | 26 +- .../hc-dna/zomes/agent_store/Cargo.toml | 6 +- .../zomes/agent_store_integrity/Cargo.toml | 6 +- .../direct-message-language/hc-dna/Cargo.lock | 26 +- .../zomes/direct-message-integrity/Cargo.toml | 6 +- .../hc-dna/zomes/direct-message/Cargo.toml | 6 +- .../file-storage/hc-dna/Cargo.lock | 26 +- .../hc-dna/zomes/file_storage/Cargo.toml | 6 +- .../hc-dna/zomes/integrity/Cargo.toml | 8 +- .../hc-dna/Cargo.lock | 26 +- .../zomes/perspective_diff_sync/Cargo.toml | 6 +- .../Cargo.toml | 8 +- .../p-diff-sync/hc-dna/Cargo.lock | 26 +- .../zomes/perspective_diff_sync/Cargo.toml | 6 +- .../Cargo.toml | 8 +- cli/Cargo.toml | 2 +- rust-client/Cargo.toml | 2 +- rust-executor/Cargo.toml | 14 +- 19 files changed, 328 insertions(+), 366 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9a26c5318..482c57f04 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -76,7 +76,7 @@ dependencies = [ "coasys_juniper_subscriptions", "coasys_juniper_warp", "crypto_box", - "deno_core 0.283.0", + "deno_core", "deno_runtime", "did-key", "dirs 5.0.1", @@ -93,7 +93,7 @@ dependencies = [ "itertools 0.10.5", "json5", "jsonwebtoken", - "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "lazy_static", "log", "maplit", @@ -275,11 +275,11 @@ dependencies = [ [[package]] name = "aitia" version = "0.2.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "anyhow", "derive_more", - "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "parking_lot 0.12.1", "petgraph", "regex", @@ -1584,9 +1584,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.33" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -2728,24 +2728,24 @@ dependencies = [ [[package]] name = "deno_broadcast_channel" -version = "0.147.0" +version = "0.148.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da690e382e1dfbe340f015d81c7bc889d01ea2c068ba852b068357823ff79047" +checksum = "fc90f73f38d20100c779e6355a478f8c14127262a5a2009af4f5fd5174780d83" dependencies = [ "async-trait", - "deno_core 0.280.0", + "deno_core", "tokio", "uuid 1.8.0", ] [[package]] name = "deno_cache" -version = "0.85.0" +version = "0.86.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0290c49b49658495f4ecb4728a1a69076107de853c05877d99ed16d9e524cef" +checksum = "643590ee7fd2b58fb0c577213deeeeb31a4bb64c1c53db21646f220e37e5afde" dependencies = [ "async-trait", - "deno_core 0.280.0", + "deno_core", "rusqlite", "serde", "sha2 0.10.8", @@ -2754,11 +2754,11 @@ dependencies = [ [[package]] name = "deno_canvas" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee874b064cd094dcbaaa63b8dd0a8d25f2f6a684e683c154b6ec993c7f2764c3" +checksum = "b7e98f15c33dd267f84a2591ca02cd3ff15895e755ac4ad0bedd5aee39db37ce" dependencies = [ - "deno_core 0.280.0", + "deno_core", "deno_webgpu", "image", "serde", @@ -2766,42 +2766,11 @@ dependencies = [ [[package]] name = "deno_console" -version = "0.153.0" +version = "0.154.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11ec86c49cdaa521e3224db4e60c0841370735665c05aafdcdb0af138a0faf81" +checksum = "30bd1f9b4320510678af1d1cc46911535cf9d7a5af5439f7dc9f245709cc93fa" dependencies = [ - "deno_core 0.280.0", -] - -[[package]] -name = "deno_core" -version = "0.280.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12d26f2d3e243bbbdd0851ab542b20ec48ac1fcf6c64ab06e81133da3113ebdd" -dependencies = [ - "anyhow", - "bincode", - "bit-set", - "bit-vec", - "bytes", - "cooked-waker", - "deno_core_icudata", - "deno_ops 0.156.0", - "deno_unsync", - "futures", - "libc", - "memoffset 0.9.0", - "parking_lot 0.12.1", - "pin-project", - "serde", - "serde_json", - "serde_v8 0.189.0", - "smallvec", - "sourcemap", - "static_assertions", - "tokio", - "url", - "v8 0.91.1", + "deno_core", ] [[package]] @@ -2817,7 +2786,7 @@ dependencies = [ "bytes", "cooked-waker", "deno_core_icudata", - "deno_ops 0.159.0", + "deno_ops", "deno_unsync", "futures", "libc", @@ -2826,13 +2795,13 @@ dependencies = [ "pin-project", "serde", "serde_json", - "serde_v8 0.192.0", + "serde_v8", "smallvec", "sourcemap", "static_assertions", "tokio", "url", - "v8 0.92.0", + "v8", ] [[package]] @@ -2843,23 +2812,23 @@ checksum = "a13951ea98c0a4c372f162d669193b4c9d991512de9f2381dd161027f34b26b1" [[package]] name = "deno_cron" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8374901e85ec0ef02a7b59a9cc5eacc1bf36002882a1da03d8bb009d6fcc99" +checksum = "3f805dbab676793ac0bfefaefb66c8f7d962c406e113e15187cb03e66134529d" dependencies = [ "anyhow", "async-trait", "chrono", - "deno_core 0.280.0", + "deno_core", "saffron", "tokio", ] [[package]] name = "deno_crypto" -version = "0.167.0" +version = "0.168.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1403655527cb7de76ef5260ac6c44306e0008838acd0485280446accef9c7ab6" +checksum = "5aba097a3869cf521ada7f5463750b84894939bf09b30b420c07719577ed4f5a" dependencies = [ "aes", "aes-gcm", @@ -2869,7 +2838,7 @@ dependencies = [ "const-oid", "ctr", "curve25519-dalek 4.1.1", - "deno_core 0.280.0", + "deno_core", "deno_web", "elliptic-curve 0.13.8", "num-traits", @@ -2892,13 +2861,13 @@ dependencies = [ [[package]] name = "deno_fetch" -version = "0.177.0" +version = "0.178.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18d41732acba9fea1a2c135978871a610b44d8eb5324ba64ed3b8954d1543071" +checksum = "bbd6f454cb4cf1ae4e9a762ea9ae1b0c169c1af3c978b7372ab8b642e9681760" dependencies = [ "bytes", "data-url", - "deno_core 0.280.0", + "deno_core", "deno_tls", "dyn-clone", "http 0.2.11", @@ -2911,11 +2880,11 @@ dependencies = [ [[package]] name = "deno_ffi" -version = "0.140.0" +version = "0.141.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3afb3e304a4d36aa63908b3f513be432668c0eaaeec62c62a0980202ee2003c6" +checksum = "0a3f7da9fd61d9749d53c9ca8c013180277960ecc6daa027f342cdc3a562368a" dependencies = [ - "deno_core 0.280.0", + "deno_core", "dlopen2", "dynasmrt", "libffi", @@ -2929,13 +2898,13 @@ dependencies = [ [[package]] name = "deno_fs" -version = "0.63.0" +version = "0.64.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c391e1dc12707f7d8800e64d60e955e499a6decfef20c10bbec1da8e72273ead" +checksum = "629015c161fd64301c7edb7980a949bd0e80c651155742dcc2e977f332bb5432" dependencies = [ "async-trait", "base32", - "deno_core 0.280.0", + "deno_core", "deno_io", "filetime", "junction", @@ -2949,9 +2918,9 @@ dependencies = [ [[package]] name = "deno_http" -version = "0.151.0" +version = "0.152.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00598c49aa6be107f7ce94b02ba3134155810daf5badd35de6c6d36eb708bc49" +checksum = "75561da8e349c74365c600ea42fb0c54238531106ecf3392be716923cc258bad" dependencies = [ "async-compression", "async-trait", @@ -2959,7 +2928,7 @@ dependencies = [ "brotli", "bytes", "cache_control", - "deno_core 0.280.0", + "deno_core", "deno_net", "deno_websocket", "flate2", @@ -2987,17 +2956,18 @@ dependencies = [ [[package]] name = "deno_io" -version = "0.63.0" +version = "0.64.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3c0790f18984ed6b7fd47c08f1212ea186b9e196a7fe24f4820aaf6b5d8556" +checksum = "f74ca365761111c2d02daf1470a2b43034c0fa0a218bede2251cf18168fba669" dependencies = [ "async-trait", - "deno_core 0.280.0", + "deno_core", "filetime", "fs3", "log", "once_cell", "os_pipe", + "parking_lot 0.12.1", "rand 0.8.5", "tokio", "winapi 0.3.9", @@ -3005,15 +2975,15 @@ dependencies = [ [[package]] name = "deno_kv" -version = "0.61.0" +version = "0.62.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45251361663076feb51334533697c13f92d227cdff7dff3a7535e34efade19e" +checksum = "ecfce7848436477ecd41aa53d8b02b24d45ebd92be13cf6d7a68baba178df1a3" dependencies = [ "anyhow", "async-trait", "base64 0.21.7", "chrono", - "deno_core 0.280.0", + "deno_core", "deno_fetch", "deno_node", "deno_tls", @@ -3044,11 +3014,11 @@ dependencies = [ [[package]] name = "deno_napi" -version = "0.83.0" +version = "0.84.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d435e2484b7c60fcd9880de4d6599ed5a67fb0f40822013b0c241461b45643" +checksum = "0efba1fbdcec6adb7be3d48d5bad89cc3964c3bdb01234206846efdc428059b3" dependencies = [ - "deno_core 0.280.0", + "deno_core", "libloading 0.7.4", ] @@ -3067,11 +3037,11 @@ dependencies = [ [[package]] name = "deno_net" -version = "0.145.0" +version = "0.146.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d05b7de6850ae06496d1cf7eed456f7fd2489713a5742ce776cacf877ff6e8d7" +checksum = "5f67bd11e26ca503e9804cff329be9144393674d2af99fb3e5be0eb13abb78d7" dependencies = [ - "deno_core 0.280.0", + "deno_core", "deno_tls", "pin-project", "rustls-tokio-stream", @@ -3084,9 +3054,9 @@ dependencies = [ [[package]] name = "deno_node" -version = "0.90.0" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9a217a206abaac68fbd50e69105460f538c6a99ba0549fe05488e40290bf5f" +checksum = "4832c110becc9393a29eec2b1ff900394911b4f2500bb36db7c2eb843f5770d0" dependencies = [ "aead-gcm-stream", "aes", @@ -3096,7 +3066,7 @@ dependencies = [ "cbc", "const-oid", "data-encoding", - "deno_core 0.280.0", + "deno_core", "deno_fetch", "deno_fs", "deno_media_type", @@ -3154,21 +3124,6 @@ dependencies = [ "x509-parser", ] -[[package]] -name = "deno_ops" -version = "0.156.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8237b272db1a6cb941b8a5a63ba63539004a8263e8b0230a11136d76eea273f9" -dependencies = [ - "proc-macro-rules", - "proc-macro2 1.0.78", - "quote 1.0.35", - "strum 0.25.0", - "strum_macros 0.25.3", - "syn 2.0.48", - "thiserror", -] - [[package]] name = "deno_ops" version = "0.159.0" @@ -3186,11 +3141,11 @@ dependencies = [ [[package]] name = "deno_permissions" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40748585d220170dc4ecb0f158b2ef40e7d0e4c486ab882f0a8eb51937d601a5" +checksum = "973845c6be759b82def170205686a08719fb0770a82a473b8eafc167fd8b1a31" dependencies = [ - "deno_core 0.280.0", + "deno_core", "deno_terminal", "fqdn", "libc", @@ -3203,16 +3158,16 @@ dependencies = [ [[package]] name = "deno_runtime" -version = "0.161.0" +version = "0.162.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a5057ea992ad16493dfd682117506c47556e060c56df4db9de98bc275a8ed9e" +checksum = "9f42a57bd283a794e624d6679576ff3c95ede086882327ab28384e937eaad9a9" dependencies = [ "deno_ast", "deno_broadcast_channel", "deno_cache", "deno_canvas", "deno_console", - "deno_core 0.280.0", + "deno_core", "deno_cron", "deno_crypto", "deno_fetch", @@ -3257,6 +3212,7 @@ dependencies = [ "signal-hook-registry", "tokio", "tokio-metrics", + "twox-hash", "uuid 1.8.0", "which 4.4.2", "winapi 0.3.9", @@ -3275,11 +3231,11 @@ dependencies = [ [[package]] name = "deno_tls" -version = "0.140.0" +version = "0.141.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053a261f8005e4aa408fe2e123a22842c0583ab9a4bc535fef83554d1b9dd3d0" +checksum = "580200c3eb2d6c6d2cc1d00faa1a83308df9690d9f6f752e65b35e7893c1676e" dependencies = [ - "deno_core 0.280.0", + "deno_core", "deno_native_certs", "rustls 0.21.11", "rustls-pemfile 1.0.4", @@ -3301,24 +3257,24 @@ dependencies = [ [[package]] name = "deno_url" -version = "0.153.0" +version = "0.154.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46f8da2dc0820062a74a6bf51eb0ec9c27078baf1bbd58caccbe01585cd59bfa" +checksum = "130d1a0b2a3d8a3a9dfbdc62382817ea0f6e0331bfd0b031fb200edd557e37a7" dependencies = [ - "deno_core 0.280.0", + "deno_core", "urlpattern", ] [[package]] name = "deno_web" -version = "0.184.0" +version = "0.185.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b383f260fcf394a0f4a19b6973a5fd19af31d8775d473a86005d18bde88f1df0" +checksum = "286ba01b1867c6bca0cb8ff0f7679d9f20df19a872ea27a7ffc15916933c980f" dependencies = [ "async-trait", "base64-simd 0.8.0", "bytes", - "deno_core 0.280.0", + "deno_core", "encoding_rs", "flate2", "futures", @@ -3329,11 +3285,11 @@ dependencies = [ [[package]] name = "deno_webgpu" -version = "0.120.0" +version = "0.121.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5c807cdbad9f5ff0635276419076186afa84b0fe8c2dcaed98c64424c265c69" +checksum = "2d02cc2b6379bafa99b8732df3cf506c4cc5c346228c1b93d524aa54030456ad" dependencies = [ - "deno_core 0.280.0", + "deno_core", "raw-window-handle 0.6.2", "serde", "tokio", @@ -3343,21 +3299,21 @@ dependencies = [ [[package]] name = "deno_webidl" -version = "0.153.0" +version = "0.154.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fb812944890c465c065ae1455904ce13b1d37696e797172dfb5a076972f180c" +checksum = "7b704d098ccba863c6efcbd4e3f264c1672b22d48137fd3aea8cf1f5640b01e3" dependencies = [ - "deno_core 0.280.0", + "deno_core", ] [[package]] name = "deno_websocket" -version = "0.158.0" +version = "0.159.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17a336ae05a7948d9824171ec2d9b09686183f62439bba8e46b0e73078c7a56" +checksum = "47d0f16a56569a38722e380c1c5ec23f435e2a799e30f1ba84f985c3f00cb647" dependencies = [ "bytes", - "deno_core 0.280.0", + "deno_core", "deno_net", "deno_tls", "fastwebsockets", @@ -3374,11 +3330,11 @@ dependencies = [ [[package]] name = "deno_webstorage" -version = "0.148.0" +version = "0.149.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4768cec014081244837383a85d506807e6399ce0b7b164cfddba145f3ead59ab" +checksum = "3efd92e4c15d17359b766deba417f32cee66655d9f26aed793cd19c3766513c1" dependencies = [ - "deno_core 0.280.0", + "deno_core", "deno_web", "rusqlite", ] @@ -3395,9 +3351,9 @@ dependencies = [ [[package]] name = "denokv_proto" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98a79f7e98bfd3c148ce782c27c1494e77c3c94ab87c9e7e86e901cbc1643449" +checksum = "bd644ad038e7b6e8453463e96c278ba378e8bdc9f557959d511ac830ea0ec969" dependencies = [ "anyhow", "async-trait", @@ -3412,9 +3368,9 @@ dependencies = [ [[package]] name = "denokv_remote" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518e181eb14f1a3b8fc423e48de431048249780fb0815d81e8139faf347c3269" +checksum = "23cfa4786f9c609711aab89ce173232ceda0617167881e58fd5e0b78868a6932" dependencies = [ "anyhow", "async-stream 0.3.5", @@ -3437,9 +3393,9 @@ dependencies = [ [[package]] name = "denokv_sqlite" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90af93f2ab8eec43fea9f8931fa99d38e73fa0af60aba0fae79de3fb87a0ed06" +checksum = "f36c1c54cda2de93d0f4ded0392d0b6917bcd9b1d13c056dd7c309668aa43e17" dependencies = [ "anyhow", "async-stream 0.3.5", @@ -3455,7 +3411,9 @@ dependencies = [ "serde_json", "thiserror", "tokio", + "tokio-stream", "uuid 1.8.0", + "v8_valueserializer", ] [[package]] @@ -4457,7 +4415,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "fixt" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "holochain_serialized_bytes", "lazy_static", @@ -5514,13 +5472,13 @@ dependencies = [ [[package]] name = "hc_sleuth" version = "0.2.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "aitia", "anyhow", "derive_more", "holochain_state_types", - "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "holochain_types", "kitsune_p2p", "once_cell", @@ -5536,7 +5494,7 @@ dependencies = [ [[package]] name = "hdi" version = "0.4.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "getrandom 0.2.12", "hdk_derive", @@ -5553,7 +5511,7 @@ dependencies = [ [[package]] name = "hdk" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "getrandom 0.2.12", "hdi", @@ -5572,7 +5530,7 @@ dependencies = [ [[package]] name = "hdk_derive" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "darling 0.14.4", "heck 0.5.0", @@ -5737,7 +5695,7 @@ dependencies = [ [[package]] name = "holo_hash" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "arbitrary", "base64 0.22.1", @@ -5746,9 +5704,9 @@ dependencies = [ "fixt", "futures", "holochain_serialized_bytes", - "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "holochain_wasmer_common", - "kitsune_p2p_dht_arc 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_dht_arc 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "must_future", "proptest", "proptest-derive", @@ -5762,7 +5720,7 @@ dependencies = [ [[package]] name = "holochain" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "aitia", "anyhow", @@ -5798,9 +5756,9 @@ dependencies = [ "holochain_sqlite", "holochain_state", "holochain_test_wasm_common", - "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "holochain_types", - "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "holochain_wasm_test_utils", "holochain_wasmer_host", "holochain_websocket", @@ -5809,10 +5767,10 @@ dependencies = [ "human-panic", "itertools 0.12.1", "kitsune_p2p", - "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "kitsune_p2p_block", "kitsune_p2p_bootstrap", - "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "lair_keystore", "matches", "mockall", @@ -5861,7 +5819,7 @@ dependencies = [ [[package]] name = "holochain_cascade" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "async-trait", "fixt", @@ -5872,9 +5830,9 @@ dependencies = [ "holochain_serialized_bytes", "holochain_sqlite", "holochain_state", - "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "holochain_types", - "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "holochain_zome_types", "kitsune_p2p", "mockall", @@ -5887,14 +5845,14 @@ dependencies = [ [[package]] name = "holochain_cli_bundle" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "anyhow", "clap 4.4.18", "futures", "holochain_serialized_bytes", "holochain_types", - "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "holochain_wasmer_host", "mr_bundle", "serde_yaml 0.9.31", @@ -5907,11 +5865,11 @@ dependencies = [ [[package]] name = "holochain_cli_run_local_services" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "clap 4.4.18", "futures", - "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "if-addrs 0.12.0", "kitsune_p2p_bootstrap", "tokio", @@ -5922,7 +5880,7 @@ dependencies = [ [[package]] name = "holochain_conductor_api" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "derive_more", "holo_hash", @@ -5931,8 +5889,8 @@ dependencies = [ "holochain_state_types", "holochain_types", "holochain_zome_types", - "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", - "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "serde", "serde_yaml 0.9.31", "shrinkwraprs", @@ -5944,7 +5902,7 @@ dependencies = [ [[package]] name = "holochain_conductor_services" version = "0.2.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "anyhow", "async-trait", @@ -5959,15 +5917,15 @@ dependencies = [ [[package]] name = "holochain_integrity_types" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "arbitrary", "derive_builder", "holo_hash", "holochain_secure_primitive", "holochain_serialized_bytes", - "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", - "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "proptest", "proptest-derive", "serde", @@ -5980,7 +5938,7 @@ dependencies = [ [[package]] name = "holochain_keystore" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "base64 0.22.1", "derive_more", @@ -5988,9 +5946,9 @@ dependencies = [ "holo_hash", "holochain_secure_primitive", "holochain_serialized_bytes", - "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "holochain_zome_types", - "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "lair_keystore", "must_future", "nanoid", @@ -6008,7 +5966,7 @@ dependencies = [ [[package]] name = "holochain_metrics" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "influxive", "opentelemetry_api", @@ -6018,17 +5976,17 @@ dependencies = [ [[package]] name = "holochain_nonce" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "getrandom 0.2.12", "holochain_secure_primitive", - "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", ] [[package]] name = "holochain_p2p" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "aitia", "async-trait", @@ -6041,11 +5999,11 @@ dependencies = [ "holochain_keystore", "holochain_nonce", "holochain_serialized_bytes", - "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "holochain_types", "holochain_zome_types", "kitsune_p2p", - "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "mockall", "rand 0.8.5", "serde", @@ -6059,7 +6017,7 @@ dependencies = [ [[package]] name = "holochain_secure_primitive" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "paste", "serde", @@ -6095,7 +6053,7 @@ dependencies = [ [[package]] name = "holochain_sqlite" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "anyhow", "async-trait", @@ -6106,13 +6064,13 @@ dependencies = [ "holo_hash", "holochain_nonce", "holochain_serialized_bytes", - "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "holochain_zome_types", - "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", - "kitsune_p2p_dht 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", - "kitsune_p2p_dht_arc 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", - "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", - "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_dht 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_dht_arc 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "nanoid", "num_cpus", "once_cell", @@ -6137,7 +6095,7 @@ dependencies = [ [[package]] name = "holochain_state" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "aitia", "async-recursion", @@ -6172,7 +6130,7 @@ dependencies = [ [[package]] name = "holochain_state_types" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "holo_hash", "holochain_integrity_types", @@ -6182,7 +6140,7 @@ dependencies = [ [[package]] name = "holochain_test_wasm_common" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "hdk", "serde", @@ -6209,7 +6167,7 @@ dependencies = [ [[package]] name = "holochain_trace" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "chrono", "derive_more", @@ -6226,7 +6184,7 @@ dependencies = [ [[package]] name = "holochain_types" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "anyhow", "arbitrary", @@ -6245,12 +6203,12 @@ dependencies = [ "holochain_nonce", "holochain_serialized_bytes", "holochain_sqlite", - "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", - "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "holochain_zome_types", "isotest", "itertools 0.12.1", - "kitsune_p2p_dht 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_dht 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "mr_bundle", "must_future", "nanoid", @@ -6293,7 +6251,7 @@ dependencies = [ [[package]] name = "holochain_util" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "backtrace", "cfg-if 1.0.0", @@ -6310,10 +6268,10 @@ dependencies = [ [[package]] name = "holochain_wasm_test_utils" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "holochain_types", - "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "strum 0.18.0", "strum_macros 0.18.0", "toml 0.8.9", @@ -6367,7 +6325,7 @@ dependencies = [ [[package]] name = "holochain_websocket" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "async-trait", "futures", @@ -6383,7 +6341,7 @@ dependencies = [ [[package]] name = "holochain_zome_types" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "arbitrary", "contrafact", @@ -6396,8 +6354,8 @@ dependencies = [ "holochain_serialized_bytes", "holochain_wasmer_common", "kitsune_p2p_block", - "kitsune_p2p_dht 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", - "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_dht 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "nanoid", "num_enum 0.7.2", "once_cell", @@ -6671,7 +6629,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core 0.51.1", + "windows-core 0.52.0", ] [[package]] @@ -7320,7 +7278,7 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] name = "kitsune_p2p" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "arrayref", "base64 0.22.1", @@ -7332,17 +7290,17 @@ dependencies = [ "futures", "ghost_actor", "governor", - "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "itertools 0.12.1", - "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "kitsune_p2p_block", "kitsune_p2p_bootstrap_client", "kitsune_p2p_fetch", "kitsune_p2p_mdns", "kitsune_p2p_proxy", - "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "kitsune_p2p_transport_quic", - "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "maplit", "mockall", "must_future", @@ -7381,14 +7339,14 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "arbitrary", "base64 0.22.1", "derive_more", "fixt", - "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", - "kitsune_p2p_dht_arc 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_dht_arc 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "proptest", "proptest-derive", "serde", @@ -7399,22 +7357,22 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ - "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", - "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "serde", ] [[package]] name = "kitsune_p2p_bootstrap" version = "0.2.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "clap 4.4.18", "futures", - "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", - "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "parking_lot 0.12.1", "rand 0.8.5", "reqwest", @@ -7428,11 +7386,11 @@ dependencies = [ [[package]] name = "kitsune_p2p_bootstrap_client" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ - "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "kitsune_p2p_bootstrap", - "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "reqwest", "serde", "serde_bytes", @@ -7462,15 +7420,15 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "arbitrary", "colored", "derivative", "derive_more", "futures", - "kitsune_p2p_dht_arc 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", - "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_dht_arc 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "must_future", "num-traits", "proptest", @@ -7499,13 +7457,13 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "arbitrary", "derive_more", "gcollections", "intervallum", - "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "num-traits", "proptest", "proptest-derive", @@ -7516,13 +7474,13 @@ dependencies = [ [[package]] name = "kitsune_p2p_fetch" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "backon", "derive_more", "indexmap 2.2.2", - "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", - "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "serde", "tokio", "tracing", @@ -7531,7 +7489,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_mdns" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "base64 0.22.1", "err-derive 0.3.1", @@ -7545,14 +7503,14 @@ dependencies = [ [[package]] name = "kitsune_p2p_proxy" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "base64 0.22.1", "derive_more", "futures", - "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "kitsune_p2p_transport_quic", - "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "serde", "serde_bytes", "structopt", @@ -7572,7 +7530,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "arbitrary", "chrono", @@ -7587,12 +7545,12 @@ dependencies = [ [[package]] name = "kitsune_p2p_transport_quic" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "blake2b_simd", "futures", "if-addrs 0.12.0", - "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "quinn", "rustls 0.20.9", "tokio", @@ -7633,7 +7591,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_types" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "arbitrary", "base64 0.22.1", @@ -7641,11 +7599,11 @@ dependencies = [ "fixt", "futures", "ghost_actor", - "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", - "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", - "kitsune_p2p_dht 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", - "kitsune_p2p_dht_arc 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", - "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_dht 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_dht_arc 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "lair_keystore_api", "mockall", "once_cell", @@ -8556,13 +8514,13 @@ checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" [[package]] name = "mr_bundle" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "arbitrary", "derive_more", "flate2", "futures", - "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06)", + "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", "proptest", "proptest-derive", "reqwest", @@ -12145,19 +12103,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_v8" -version = "0.189.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "893c995255d6fbf55c33166b651fd037c4e3cc7864bf82213ea18d0ec94ed165" -dependencies = [ - "num-bigint", - "serde", - "smallvec", - "thiserror", - "v8 0.91.1", -] - [[package]] name = "serde_v8" version = "0.192.0" @@ -12168,7 +12113,7 @@ dependencies = [ "serde", "smallvec", "thiserror", - "v8 0.92.0", + "v8", ] [[package]] @@ -14529,6 +14474,17 @@ dependencies = [ "utf-8", ] +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if 1.0.0", + "rand 0.8.5", + "static_assertions", +] + [[package]] name = "tx5" version = "0.0.9-alpha" @@ -14997,9 +14953,9 @@ dependencies = [ [[package]] name = "v8" -version = "0.91.1" +version = "0.92.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69026e2e8af55a4d2f20c0c17f690e8b31472bf76ab75b1205d3a0fab60c8f84" +checksum = "234589219e37a7496cbce73d971586db8369871be2420372c45a579b6a919b15" dependencies = [ "bitflags 2.5.0", "fslock", @@ -15011,18 +14967,18 @@ dependencies = [ ] [[package]] -name = "v8" -version = "0.92.0" +name = "v8_valueserializer" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234589219e37a7496cbce73d971586db8369871be2420372c45a579b6a919b15" +checksum = "97599c400fc79925922b58303e98fcb8fa88f573379a08ddb652e72cbd2e70f6" dependencies = [ "bitflags 2.5.0", - "fslock", - "gzip-header", - "home", - "miniz_oxide", - "once_cell", - "which 5.0.0", + "encoding_rs", + "indexmap 2.2.2", + "num-bigint", + "serde", + "thiserror", + "wtf8", ] [[package]] @@ -16392,6 +16348,12 @@ dependencies = [ "windows-implement", ] +[[package]] +name = "wtf8" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c01ae8492c38f52376efd3a17d0994b6bcf3df1e39c0226d458b7d81670b2a06" + [[package]] name = "wyz" version = "0.5.1" diff --git a/bootstrap-languages/agent-language/hc-dna/Cargo.lock b/bootstrap-languages/agent-language/hc-dna/Cargo.lock index 30158fc97..218f905d3 100644 --- a/bootstrap-languages/agent-language/hc-dna/Cargo.lock +++ b/bootstrap-languages/agent-language/hc-dna/Cargo.lock @@ -828,7 +828,7 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hdi" version = "0.4.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "getrandom", "hdk_derive", @@ -845,7 +845,7 @@ dependencies = [ [[package]] name = "hdk" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "getrandom", "hdi", @@ -864,7 +864,7 @@ dependencies = [ [[package]] name = "hdk_derive" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "darling 0.14.4", "heck 0.5.0", @@ -897,7 +897,7 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "base64", "blake2b_simd", @@ -914,7 +914,7 @@ dependencies = [ [[package]] name = "holochain_integrity_types" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "holo_hash", "holochain_secure_primitive", @@ -930,7 +930,7 @@ dependencies = [ [[package]] name = "holochain_nonce" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "getrandom", "holochain_secure_primitive", @@ -940,7 +940,7 @@ dependencies = [ [[package]] name = "holochain_secure_primitive" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "paste", "serde", @@ -973,7 +973,7 @@ dependencies = [ [[package]] name = "holochain_util" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "cfg-if", "colored", @@ -1012,7 +1012,7 @@ dependencies = [ [[package]] name = "holochain_zome_types" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "derive_more", "holo_hash", @@ -1133,7 +1133,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "base64", "derive_more", @@ -1147,7 +1147,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -1157,7 +1157,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "derive_more", "gcollections", @@ -1170,7 +1170,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "chrono", "serde", diff --git a/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/Cargo.toml b/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/Cargo.toml index 80a721e22..4ab576010 100644 --- a/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/Cargo.toml +++ b/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/Cargo.toml @@ -11,9 +11,9 @@ name = "agent_store" [dependencies] derive_more = "0" serde = "1.0.198" -chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } +chrono = { version = "0.4.38", default-features = false, features = ["clock", "std", "oldtime", "serde"] } thiserror = "1.0.20" -hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } -holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } +hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } +holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } agent_store_integrity = { path = "../agent_store_integrity" } \ No newline at end of file diff --git a/bootstrap-languages/agent-language/hc-dna/zomes/agent_store_integrity/Cargo.toml b/bootstrap-languages/agent-language/hc-dna/zomes/agent_store_integrity/Cargo.toml index 7e2540e42..c7629aa66 100644 --- a/bootstrap-languages/agent-language/hc-dna/zomes/agent_store_integrity/Cargo.toml +++ b/bootstrap-languages/agent-language/hc-dna/zomes/agent_store_integrity/Cargo.toml @@ -11,7 +11,7 @@ name = "agent_store_integrity" [dependencies] derive_more = "0" serde = "1.0.198" -chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } +chrono = { version = "0.4.38", default-features = false, features = ["clock", "std", "oldtime", "serde"] } -hdi = { version = "0.4.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } -hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06"} \ No newline at end of file +hdi = { version = "0.4.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } +hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a"} \ No newline at end of file diff --git a/bootstrap-languages/direct-message-language/hc-dna/Cargo.lock b/bootstrap-languages/direct-message-language/hc-dna/Cargo.lock index 0b6a53bff..e71e89a57 100644 --- a/bootstrap-languages/direct-message-language/hc-dna/Cargo.lock +++ b/bootstrap-languages/direct-message-language/hc-dna/Cargo.lock @@ -829,7 +829,7 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hdi" version = "0.4.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "getrandom", "hdk_derive", @@ -846,7 +846,7 @@ dependencies = [ [[package]] name = "hdk" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "getrandom", "hdi", @@ -865,7 +865,7 @@ dependencies = [ [[package]] name = "hdk_derive" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "darling 0.14.4", "heck 0.5.0", @@ -898,7 +898,7 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "base64", "blake2b_simd", @@ -915,7 +915,7 @@ dependencies = [ [[package]] name = "holochain_integrity_types" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "holo_hash", "holochain_secure_primitive", @@ -931,7 +931,7 @@ dependencies = [ [[package]] name = "holochain_nonce" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "getrandom", "holochain_secure_primitive", @@ -941,7 +941,7 @@ dependencies = [ [[package]] name = "holochain_secure_primitive" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "paste", "serde", @@ -974,7 +974,7 @@ dependencies = [ [[package]] name = "holochain_util" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "cfg-if", "colored", @@ -1013,7 +1013,7 @@ dependencies = [ [[package]] name = "holochain_zome_types" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "derive_more", "holo_hash", @@ -1134,7 +1134,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "base64", "derive_more", @@ -1148,7 +1148,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -1158,7 +1158,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "derive_more", "gcollections", @@ -1171,7 +1171,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "chrono", "serde", diff --git a/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message-integrity/Cargo.toml b/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message-integrity/Cargo.toml index ab0fb7fe0..718ae630f 100644 --- a/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message-integrity/Cargo.toml +++ b/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message-integrity/Cargo.toml @@ -11,7 +11,7 @@ name = "direct_message_integrity" [dependencies] derive_more = "0" serde = "1.0.198" -chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } +chrono = { version = "0.4.38", default-features = false, features = ["clock", "std", "oldtime", "serde"] } -hdi = { version = "0.4.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } -holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } +hdi = { version = "0.4.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } +holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } diff --git a/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message/Cargo.toml b/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message/Cargo.toml index d6d806d01..3093873cd 100644 --- a/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message/Cargo.toml +++ b/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message/Cargo.toml @@ -12,10 +12,10 @@ name = "direct_message" derive_more = "0" serde = "1.0.198" serde_json = "1" -chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } +chrono = { version = "0.4.38", default-features = false, features = ["clock", "std", "oldtime", "serde"] } hex = "0.4.3" -hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } -holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } +hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } +holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } direct-message-integrity = { path = "../direct-message-integrity" } \ No newline at end of file diff --git a/bootstrap-languages/file-storage/hc-dna/Cargo.lock b/bootstrap-languages/file-storage/hc-dna/Cargo.lock index aa70b5728..865598728 100644 --- a/bootstrap-languages/file-storage/hc-dna/Cargo.lock +++ b/bootstrap-languages/file-storage/hc-dna/Cargo.lock @@ -819,7 +819,7 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hdi" version = "0.4.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "getrandom", "hdk_derive", @@ -836,7 +836,7 @@ dependencies = [ [[package]] name = "hdk" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "getrandom", "hdi", @@ -855,7 +855,7 @@ dependencies = [ [[package]] name = "hdk_derive" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "darling 0.14.4", "heck 0.5.0", @@ -888,7 +888,7 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "base64", "blake2b_simd", @@ -905,7 +905,7 @@ dependencies = [ [[package]] name = "holochain_integrity_types" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "holo_hash", "holochain_secure_primitive", @@ -921,7 +921,7 @@ dependencies = [ [[package]] name = "holochain_nonce" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "getrandom", "holochain_secure_primitive", @@ -931,7 +931,7 @@ dependencies = [ [[package]] name = "holochain_secure_primitive" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "paste", "serde", @@ -964,7 +964,7 @@ dependencies = [ [[package]] name = "holochain_util" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "cfg-if", "colored", @@ -1003,7 +1003,7 @@ dependencies = [ [[package]] name = "holochain_zome_types" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "derive_more", "holo_hash", @@ -1136,7 +1136,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "base64", "derive_more", @@ -1150,7 +1150,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -1160,7 +1160,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "derive_more", "gcollections", @@ -1173,7 +1173,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "chrono", "serde", diff --git a/bootstrap-languages/file-storage/hc-dna/zomes/file_storage/Cargo.toml b/bootstrap-languages/file-storage/hc-dna/zomes/file_storage/Cargo.toml index 67fc43730..bd3721751 100644 --- a/bootstrap-languages/file-storage/hc-dna/zomes/file_storage/Cargo.toml +++ b/bootstrap-languages/file-storage/hc-dna/zomes/file_storage/Cargo.toml @@ -13,9 +13,9 @@ name = "file_storage" derive_more = "0" serde = "1.0.198" lazy_static = "*" -chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } +chrono = { version = "0.4.38", default-features = false, features = ["clock", "std", "oldtime", "serde"] } thiserror = "1.0.20" integrity = { path = "../integrity" } sha2 = "0.10.5" -hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } -holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } \ No newline at end of file +hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } +holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } \ No newline at end of file diff --git a/bootstrap-languages/file-storage/hc-dna/zomes/integrity/Cargo.toml b/bootstrap-languages/file-storage/hc-dna/zomes/integrity/Cargo.toml index 05def50f7..038b40cc2 100644 --- a/bootstrap-languages/file-storage/hc-dna/zomes/integrity/Cargo.toml +++ b/bootstrap-languages/file-storage/hc-dna/zomes/integrity/Cargo.toml @@ -12,7 +12,7 @@ name = "integrity" [dependencies] derive_more = "0" serde = "1.0.198" -chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } -holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } -hdi = { version = "0.4.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } -hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } +chrono = { version = "0.4.38", default-features = false, features = ["clock", "std", "oldtime", "serde"] } +holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } +hdi = { version = "0.4.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } +hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } diff --git a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/Cargo.lock b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/Cargo.lock index 6ca6dcf15..7607d22e6 100644 --- a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/Cargo.lock +++ b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/Cargo.lock @@ -866,7 +866,7 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hdi" version = "0.4.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "getrandom", "hdk_derive", @@ -883,7 +883,7 @@ dependencies = [ [[package]] name = "hdk" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "getrandom", "hdi", @@ -902,7 +902,7 @@ dependencies = [ [[package]] name = "hdk_derive" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "darling 0.14.4", "heck 0.5.0", @@ -935,7 +935,7 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "base64", "blake2b_simd", @@ -952,7 +952,7 @@ dependencies = [ [[package]] name = "holochain_integrity_types" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "holo_hash", "holochain_secure_primitive", @@ -968,7 +968,7 @@ dependencies = [ [[package]] name = "holochain_nonce" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "getrandom", "holochain_secure_primitive", @@ -978,7 +978,7 @@ dependencies = [ [[package]] name = "holochain_secure_primitive" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "paste", "serde", @@ -1011,7 +1011,7 @@ dependencies = [ [[package]] name = "holochain_util" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "cfg-if", "colored", @@ -1050,7 +1050,7 @@ dependencies = [ [[package]] name = "holochain_zome_types" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "derive_more", "holo_hash", @@ -1202,7 +1202,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "base64", "derive_more", @@ -1216,7 +1216,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -1226,7 +1226,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "derive_more", "gcollections", @@ -1239,7 +1239,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "chrono", "serde", diff --git a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync/Cargo.toml b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync/Cargo.toml index 3b2deb771..91dc04a03 100644 --- a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync/Cargo.toml +++ b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync/Cargo.toml @@ -12,7 +12,7 @@ name = "perspective_diff_sync" derive_more = "0" serde = "1.0.198" lazy_static = "*" -chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } +chrono = { version = "0.4.38", default-features = false, features = ["clock", "std", "oldtime", "serde"] } thiserror = "1.0.20" petgraph = "0.6.2" maplit = "1.0.2" @@ -21,8 +21,8 @@ dot-structures = "0.1.0" itertools = "0.10.3" perspective_diff_sync_integrity = { path = "../perspective_diff_sync_integrity" } sha2 = "0.10.5" -hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } -holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } +hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } +holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } [features] test = [] \ No newline at end of file diff --git a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml index 11c3a1448..47a18749a 100644 --- a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml +++ b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml @@ -11,8 +11,8 @@ name = "perspective_diff_sync_integrity" [dependencies] derive_more = "0" serde = "1.0.198" -chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } +chrono = { version = "0.4.38", default-features = false, features = ["clock", "std", "oldtime", "serde"] } -holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } -hdi = { version = "0.4.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } -hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } \ No newline at end of file +holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } +hdi = { version = "0.4.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } +hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } \ No newline at end of file diff --git a/bootstrap-languages/p-diff-sync/hc-dna/Cargo.lock b/bootstrap-languages/p-diff-sync/hc-dna/Cargo.lock index 6ca6dcf15..7607d22e6 100644 --- a/bootstrap-languages/p-diff-sync/hc-dna/Cargo.lock +++ b/bootstrap-languages/p-diff-sync/hc-dna/Cargo.lock @@ -866,7 +866,7 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hdi" version = "0.4.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "getrandom", "hdk_derive", @@ -883,7 +883,7 @@ dependencies = [ [[package]] name = "hdk" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "getrandom", "hdi", @@ -902,7 +902,7 @@ dependencies = [ [[package]] name = "hdk_derive" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "darling 0.14.4", "heck 0.5.0", @@ -935,7 +935,7 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "base64", "blake2b_simd", @@ -952,7 +952,7 @@ dependencies = [ [[package]] name = "holochain_integrity_types" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "holo_hash", "holochain_secure_primitive", @@ -968,7 +968,7 @@ dependencies = [ [[package]] name = "holochain_nonce" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "getrandom", "holochain_secure_primitive", @@ -978,7 +978,7 @@ dependencies = [ [[package]] name = "holochain_secure_primitive" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "paste", "serde", @@ -1011,7 +1011,7 @@ dependencies = [ [[package]] name = "holochain_util" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "cfg-if", "colored", @@ -1050,7 +1050,7 @@ dependencies = [ [[package]] name = "holochain_zome_types" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "derive_more", "holo_hash", @@ -1202,7 +1202,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "base64", "derive_more", @@ -1216,7 +1216,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -1226,7 +1226,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "derive_more", "gcollections", @@ -1239,7 +1239,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=74a67c65717a1a30f47572c8a2f6daadb9e70d06#74a67c65717a1a30f47572c8a2f6daadb9e70d06" +source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" dependencies = [ "chrono", "serde", diff --git a/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync/Cargo.toml b/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync/Cargo.toml index 3b2deb771..91dc04a03 100644 --- a/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync/Cargo.toml +++ b/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync/Cargo.toml @@ -12,7 +12,7 @@ name = "perspective_diff_sync" derive_more = "0" serde = "1.0.198" lazy_static = "*" -chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } +chrono = { version = "0.4.38", default-features = false, features = ["clock", "std", "oldtime", "serde"] } thiserror = "1.0.20" petgraph = "0.6.2" maplit = "1.0.2" @@ -21,8 +21,8 @@ dot-structures = "0.1.0" itertools = "0.10.3" perspective_diff_sync_integrity = { path = "../perspective_diff_sync_integrity" } sha2 = "0.10.5" -hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } -holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } +hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } +holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } [features] test = [] \ No newline at end of file diff --git a/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml b/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml index 11c3a1448..47a18749a 100644 --- a/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml +++ b/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml @@ -11,8 +11,8 @@ name = "perspective_diff_sync_integrity" [dependencies] derive_more = "0" serde = "1.0.198" -chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "oldtime", "serde"] } +chrono = { version = "0.4.38", default-features = false, features = ["clock", "std", "oldtime", "serde"] } -holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } -hdi = { version = "0.4.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } -hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } \ No newline at end of file +holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } +hdi = { version = "0.4.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } +hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } \ No newline at end of file diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 98cef0652..e8c131f64 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -32,7 +32,7 @@ futures = "0.3" tokio = { version = "1.25.0", features = ["full"] } rustyline = "10" dirs = "4" -chrono = { version = "0.4.31", features = ["serde"] } +chrono = { version = "0.4.38", features = ["serde"] } serde_json = "1" urlencoding = "2" unicode-width = "0.1" diff --git a/rust-client/Cargo.toml b/rust-client/Cargo.toml index d7b0179a3..3eee53e4b 100644 --- a/rust-client/Cargo.toml +++ b/rust-client/Cargo.toml @@ -21,7 +21,7 @@ futures = "0.3" tokio = { version = "1.25.0", features = ["full"] } rustyline = "10" dirs = "4" -chrono = { version = "0.4.31", features = ["serde"] } +chrono = { version = "0.4.38", features = ["serde"] } serde_json = "1" graphql-ws-client = { version = "0.4", default-features = false, features = ["async-tungstenite", "graphql_client"] } async-tungstenite = { version = "0.20.0", features = ["tokio-runtime"] } diff --git a/rust-executor/Cargo.toml b/rust-executor/Cargo.toml index 339c05f21..74b2206f8 100644 --- a/rust-executor/Cargo.toml +++ b/rust-executor/Cargo.toml @@ -31,14 +31,14 @@ path = "src/main.rs" [dependencies] deno_core = "0.283.0" -deno_runtime = "0.161.0" +deno_runtime = "0.162.0" tokio = { version = "1.25.0", features = ["full"] } url = "2.3.1" futures = "0.3.28" tokio-stream = { version = "0.1.12", features = ["sync"] } lazy_static = "1.4.0" -chrono = { version = "0.4.31", features = ["serde"] } +chrono = { version = "0.4.6", features = ["serde"] } env_logger = "0.10.0" serde_json = "1.0.95" uuid = "1.3.0" @@ -79,11 +79,11 @@ webbrowser = "0.8.12" # holochain_types = { version = "0.3.1-rc.0" } # holochain_cli_run_local_services = { version = "0.3.1-rc.0" } # kitsune_p2p_types = { version = "0.3.1-rc.0" } -holochain = { version = "0.3.1-rc.0", features = ["test_utils", "default"], git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } -holochain_cli_bundle = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } -holochain_types = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } -holochain_cli_run_local_services = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } -kitsune_p2p_types = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "74a67c65717a1a30f47572c8a2f6daadb9e70d06" } +holochain = { version = "0.3.1-rc.0", features = ["test_utils", "default"], git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } +holochain_cli_bundle = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } +holochain_types = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } +holochain_cli_run_local_services = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } +kitsune_p2p_types = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } scryer-prolog = { version = "0.9.4" } # scryer-prolog = { path = "../../scryer-prolog", features = ["multi_thread"] } From ec3dfd2aa60e693382df0f2447a80f4f6a6803ab Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 6 Jun 2024 10:54:32 +0530 Subject: [PATCH 07/37] chore: Update agent_service extension in rust-executor --- rust-executor/src/js_core/agent_extension.rs | 29 ++++---------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/rust-executor/src/js_core/agent_extension.rs b/rust-executor/src/js_core/agent_extension.rs index 74bd6d81b..da7ff65bd 100644 --- a/rust-executor/src/js_core/agent_extension.rs +++ b/rust-executor/src/js_core/agent_extension.rs @@ -123,26 +123,9 @@ fn save_agent_profile(#[serde] agent: Agent) -> Result<(), AnyError> { }) } -pub fn build() -> Extension { - Extension { - name: "agent", - js_files: Cow::Borrowed(&include_js_files!(rust_executor "src/js_core/agent_extension.js",)), - ops: Cow::Borrowed(&[ - agent_did_document::DECL, - agent_signing_key_id::DECL, - agent_did::DECL, - agent_create_signed_expression::DECL, - agent_create_signed_expression_stringified::DECL, - agent_sign::DECL, - agent_sign_string_hex::DECL, - agent_is_initialized::DECL, - agent_is_unlocked::DECL, - agent::DECL, - agent_load::DECL, - agent_unlock::DECL, - agent_lock::DECL, - save_agent_profile::DECL, - ]), - ..Default::default() - } -} \ No newline at end of file +deno_core::extension!( + agent_service, + ops = [agent_did_document, agent_signing_key_id, agent_did, agent_create_signed_expression, agent_create_signed_expression_stringified, agent_sign, agent_sign_string_hex, agent_is_initialized, agent_is_unlocked, agent, agent_load, agent_unlock, agent_lock, save_agent_profile], + esm_entry_point = "ext:agent_service/agent_extension.js", + esm = [dir "src/js_core", "agent_extension.js"] +); \ No newline at end of file From e3bbedb1875d91813212c6d541f5b3449785e527 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 6 Jun 2024 10:55:16 +0530 Subject: [PATCH 08/37] chore: Update holochain_service to allow any origin for app interface --- rust-executor/src/holochain_service/mod.rs | 6 ++++- rust-executor/src/js_core/futures.rs | 7 ++++-- rust-executor/src/js_core/mod.rs | 2 +- .../src/js_core/string_module_loader.rs | 24 ++++++++++--------- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/rust-executor/src/holochain_service/mod.rs b/rust-executor/src/holochain_service/mod.rs index 68d74e8aa..765a7cb89 100644 --- a/rust-executor/src/holochain_service/mod.rs +++ b/rust-executor/src/holochain_service/mod.rs @@ -11,6 +11,8 @@ use holochain::conductor::paths::DataRootPath; use holochain::conductor::{ConductorBuilder, ConductorHandle}; use holochain::prelude::agent_store::AgentInfoSigned; use holochain::prelude::hash_type::Agent; +use holochain::tracing::instrument::WithSubscriber; +use holochain_types::websocket::AllowedOrigins; use kitsune_p2p_types::config::{KitsuneP2pTuningParams, KitsuneP2pConfig, NetworkType, TransportConfig}; use kitsune_p2p_types::dependencies::url2::Url2; use holochain::prelude::{ @@ -104,6 +106,8 @@ impl HolochainService { let spawned_sig = tokio::spawn(async move { let sig_broadcasters = conductor_clone.signal_broadcaster(); + conductor_clone.with_subscriber(subscriber) + let mut streams = tokio_stream::StreamMap::new(); for (i, rx) in sig_broadcasters .subscribe_separately() @@ -398,7 +402,7 @@ impl HolochainService { let interface = conductor .clone() - .add_app_interface(Either::Left(local_config.app_port)) + .add_app_interface(Either::Left(local_config.app_port), AllowedOrigins::Any, None) .await; info!("Added app interface: {:?}", interface); diff --git a/rust-executor/src/js_core/futures.rs b/rust-executor/src/js_core/futures.rs index ece737c17..9bd443c40 100644 --- a/rust-executor/src/js_core/futures.rs +++ b/rust-executor/src/js_core/futures.rs @@ -1,5 +1,5 @@ use deno_core::error::AnyError; -use deno_core::v8; +use deno_core::{v8, PollEventLoopOptions}; use deno_runtime::worker::MainWorker; use std::future::Future; use std::pin::Pin; @@ -25,7 +25,10 @@ impl Future for EventLoopFuture { sleep(std::time::Duration::from_millis(1)); let worker = self.worker.try_lock(); if let Ok(mut worker) = worker { - let res = worker.poll_event_loop(cx, false); + let res = worker.js_runtime.poll_event_loop(cx, PollEventLoopOptions { + pump_v8_message_loop: true, + wait_for_inspector: false, + }); cx.waker().wake_by_ref(); res } else { diff --git a/rust-executor/src/js_core/mod.rs b/rust-executor/src/js_core/mod.rs index 4ff43475c..94556a20e 100644 --- a/rust-executor/src/js_core/mod.rs +++ b/rust-executor/src/js_core/mod.rs @@ -151,7 +151,7 @@ impl JsCore { async fn load_module(&self, file_path: String) -> Result<(), AnyError> { let mut worker = self.worker.lock().await; let url = resolve_url_or_path(&file_path, current_dir()?.as_path())?; - let _module_id = worker.js_runtime.load_side_module(&url, None).await?; + let _module_id = worker.js_runtime.load_side_es_module(&url).await?; //TODO; this likely needs to be run (although might be handled by the import in the js code when import() is called) //worker.js_runtime.mod_evaluate(module_id); Ok(()) diff --git a/rust-executor/src/js_core/string_module_loader.rs b/rust-executor/src/js_core/string_module_loader.rs index f132bb425..1e105b667 100644 --- a/rust-executor/src/js_core/string_module_loader.rs +++ b/rust-executor/src/js_core/string_module_loader.rs @@ -1,16 +1,17 @@ use deno_core::anyhow; use deno_core::error::generic_error; +use deno_core::ModuleLoadResponse; use deno_core::ModuleLoader; use deno_core::ModuleSource; -use deno_core::ModuleSourceFuture; +use deno_core::ModuleSourceCode; use deno_core::ModuleSpecifier; use deno_core::ModuleType; +use deno_core::RequestedModuleType; use deno_core::ResolutionKind; use deno_runtime::deno_core::error::AnyError; use log::info; use url::Url; use std::collections::HashMap; -use std::pin::Pin; pub struct StringModuleLoader { modules: HashMap, @@ -44,7 +45,8 @@ impl ModuleLoader for StringModuleLoader { module_specifier: &ModuleSpecifier, _maybe_referrer: std::option::Option<&Url>, _is_dyn_import: bool, - ) -> Pin> { + _request_module_type: RequestedModuleType + ) -> ModuleLoadResponse { let path = module_specifier.to_file_path().map_err(|_| { generic_error(format!( "Provided module specifier \"{module_specifier}\" is not a file URL." @@ -66,22 +68,22 @@ impl ModuleLoader for StringModuleLoader { let code = std::fs::read_to_string(path).expect("Could not read file path to string"); let module_specifier = module_specifier.clone(); - let fut = async move { - Ok(ModuleSource::new(module_type, code.into(), &module_specifier)) - }; - Box::pin(fut) + + ModuleLoadResponse::Sync( + Ok(ModuleSource::new(module_type, ModuleSourceCode::String(code.into()), &module_specifier, None)) + ) } Err(_err) => { info!("Module is not a file path, importing as raw module string"); let module_code = self.modules.get(module_specifier.as_str()).cloned(); let module_specifier = module_specifier.clone(); - let fut = async move { + + ModuleLoadResponse::Sync( match module_code { - Some(code) => Ok(ModuleSource::new(deno_core::ModuleType::JavaScript, code.into(), &module_specifier)), + Some(code) => Ok(ModuleSource::new(deno_core::ModuleType::JavaScript, ModuleSourceCode::String(code.into()), &module_specifier, None)), None => Err(anyhow::anyhow!("Module not found: {}", module_specifier)), } - }; - Box::pin(fut) + ) } } } From 416ce475676ba1ec9d3c9de1664f521cddafac3b Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 6 Jun 2024 10:56:27 +0530 Subject: [PATCH 09/37] chore: Update holochain_service to allow any origin for app interface --- rust-executor/src/holochain_service/mod.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/rust-executor/src/holochain_service/mod.rs b/rust-executor/src/holochain_service/mod.rs index 765a7cb89..2dbb04a9c 100644 --- a/rust-executor/src/holochain_service/mod.rs +++ b/rust-executor/src/holochain_service/mod.rs @@ -106,8 +106,6 @@ impl HolochainService { let spawned_sig = tokio::spawn(async move { let sig_broadcasters = conductor_clone.signal_broadcaster(); - conductor_clone.with_subscriber(subscriber) - let mut streams = tokio_stream::StreamMap::new(); for (i, rx) in sig_broadcasters .subscribe_separately() From fe581e782e4edf2b006211aed9164e1259eba9a0 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 6 Jun 2024 11:28:04 +0530 Subject: [PATCH 10/37] chore: Update deno_core to use JsRuntime instead of v8::Global for SmartGlobalVariableFuture --- rust-executor/src/js_core/futures.rs | 36 ++++++++++++---------------- rust-executor/src/js_core/mod.rs | 5 ++-- 2 files changed, 17 insertions(+), 24 deletions(-) diff --git a/rust-executor/src/js_core/futures.rs b/rust-executor/src/js_core/futures.rs index 9bd443c40..d9b174123 100644 --- a/rust-executor/src/js_core/futures.rs +++ b/rust-executor/src/js_core/futures.rs @@ -1,6 +1,6 @@ use deno_core::error::AnyError; -use deno_core::{v8, PollEventLoopOptions}; -use deno_runtime::worker::MainWorker; +use deno_core::{v8, PollEventLoopOptions, JsRuntime}; +use deno_runtime::worker::MainWorker; // Import the JsRuntime struct. use std::future::Future; use std::pin::Pin; use std::sync::Arc; @@ -39,11 +39,11 @@ impl Future for EventLoopFuture { pub struct SmartGlobalVariableFuture { worker: Arc>, - value: v8::Global, + value: String, } impl SmartGlobalVariableFuture { - pub fn new(worker: Arc>, value: v8::Global) -> Self { + pub fn new(worker: Arc>, value: String) -> Self { SmartGlobalVariableFuture { worker, value } } } @@ -54,25 +54,19 @@ impl Future for SmartGlobalVariableFuture { fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { //println!("Trying to get the worker lock: {}", self.name); let mut worker = self.worker.try_lock().expect("Failed to lock worker"); - let poll_value = worker.js_runtime.poll_value(&self.value, cx); + let scope = &mut worker.js_runtime.handle_scope(); + let context = v8::Context::new(scope); + let scope = &mut v8::ContextScope::new(scope, context); + + let code = v8::String::new(scope, &self.value).unwrap(); + let script = v8::Script::compile(scope, code, None).unwrap(); - match poll_value { - Poll::Pending => { - cx.waker().wake_by_ref(); - Poll::Pending - }, - Poll::Ready(value) => { - match value { - Ok(value) => { - let scope = &mut v8::HandleScope::new(worker.js_runtime.v8_isolate()); - let context = v8::Context::new(scope); - let scope = &mut v8::ContextScope::new(scope, context); - let value = value.open(scope).to_rust_string_lossy(scope); - Poll::Ready(Ok(value)) - }, - Err(err) => Poll::Ready(Err(err)) - } + match script.run(scope) { + Some(result) => { + let result_str = result.to_string(scope).unwrap().to_rust_string_lossy(scope); + Poll::Ready(Ok(result_str)) } + None => Poll::Ready(Err(AnyError::msg("Failed to execute script"))), } } } diff --git a/rust-executor/src/js_core/mod.rs b/rust-executor/src/js_core/mod.rs index 94556a20e..f2e27d211 100644 --- a/rust-executor/src/js_core/mod.rs +++ b/rust-executor/src/js_core/mod.rs @@ -1,7 +1,7 @@ use ::futures::Future; use deno_core::anyhow::anyhow; use deno_core::error::AnyError; -use deno_core::resolve_url_or_path; +use deno_core::{resolve_url_or_path, PollEventLoopOptions}; use deno_runtime::worker::MainWorker; use deno_runtime::{permissions::PermissionsContainer, BootstrapOptions}; use holochain::prelude::{ExternIO, Signal}; @@ -187,8 +187,7 @@ impl JsCore { "#, script ); //info!("Sending script: {}", wrapped_script); - let execute_async = worker.execute_script("js_core", wrapped_script.into())?; - Ok(SmartGlobalVariableFuture::new(self.worker.clone(), execute_async)) + Ok(SmartGlobalVariableFuture::new(self.worker.clone(), wrapped_script.into())) } fn generate_execution_slot( From b7d6c748b9123ed154e3d7d55dea451501b5444a Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Sat, 8 Jun 2024 11:09:18 +0530 Subject: [PATCH 11/37] chore: Update dependencies and extensions for rust-executor --- .../entanglement_service_extension.js | 17 ++++++---- .../holochain_service_extension.js | 32 ++++++++++------- rust-executor/src/js_core/agent_extension.js | 34 +++++++++++-------- .../src/js_core/languages_extension.js | 12 ++++--- rust-executor/src/js_core/pubsub_extension.js | 8 +++-- .../src/js_core/signature_extension.js | 11 +++--- rust-executor/src/js_core/utils_extension.js | 16 ++++----- rust-executor/src/js_core/wallet_extension.js | 26 ++++++++------ .../prolog_service_extension.js | 14 ++++---- .../runtime_service_extension.js | 12 ++++--- 10 files changed, 106 insertions(+), 76 deletions(-) diff --git a/rust-executor/src/entanglement_service/entanglement_service_extension.js b/rust-executor/src/entanglement_service/entanglement_service_extension.js index 71bfee213..ac542bbbb 100644 --- a/rust-executor/src/entanglement_service/entanglement_service_extension.js +++ b/rust-executor/src/entanglement_service/entanglement_service_extension.js @@ -1,21 +1,24 @@ -((globalThis) => { - const core = Deno.core; +import { + sign_device_key, generate_entanglement_proof, add_entanglement_proofs, + delete_entanglement_proofs, get_entanglement_proofs +} from 'ext:core/ops'; +((globalThis) => { globalThis.ENTANGLEMENT_SERVICE = { signDeviceKey: async (deviceKey, deviceKeyType) => { - return core.ops.sign_device_key(deviceKey, deviceKeyType); + return sign_device_key(deviceKey, deviceKeyType); }, generateHolochainProof: async (holochainPubkey, signedDid) => { - return core.ops.generate_entanglement_proof(holochainPubkey, signedDid); + return generate_entanglement_proof(holochainPubkey, signedDid); }, addEntaglementProofs: async (proofs) => { - return core.ops.add_entanglement_proofs(proofs); + return add_entanglement_proofs(proofs); }, deleteEntanglementProofs: async (proofs) => { - return core.ops.delete_entanglement_proofs(proofs); + return delete_entanglement_proofs(proofs); }, getEntanglementProofs: async () => { - return core.ops.get_entanglement_proofs(proofs); + return get_entanglement_proofs(proofs); } } })(globalThis); \ No newline at end of file diff --git a/rust-executor/src/holochain_service/holochain_service_extension.js b/rust-executor/src/holochain_service/holochain_service_extension.js index 8fa8f9fcf..1cae5ff0a 100644 --- a/rust-executor/src/holochain_service/holochain_service_extension.js +++ b/rust-executor/src/holochain_service/holochain_service_extension.js @@ -1,45 +1,51 @@ +import { + start_holochain_conductor, log_dht_status, install_app, get_app_info, + call_zome_function, agent_infos, add_agent_infos, remove_app, + sign_string, shutdown, get_agent_key, pack_dna, unpack_dna +} from 'ext:core/ops'; + ((globalThis) => { const core = Deno.core; globalThis.HOLOCHAIN_SERVICE = { startHolochainConductor: async (config) => { - return core.opAsync("start_holochain_conductor", config); + return start_holochain_conductor(config); }, logDhtStatus: async () => { - return core.opAsync("log_dht_status"); + return log_dht_status(); }, installApp: async (install_app_payload) => { - return core.opAsync("install_app", install_app_payload); + return install_app(install_app_payload); }, getAppInfo: async (app_id) => { - return core.opAsync("get_app_info", app_id); + return get_app_info(app_id); }, callZomeFunction: async (app_id, cell_name, zome_name, fn_name, payload) => { - return core.opAsync("call_zome_function", app_id, cell_name, zome_name, fn_name, payload); + return call_zome_function(app_id, cell_name, zome_name, fn_name, payload); }, agentInfos: async () => { - return core.opAsync("agent_infos"); + return agent_infos(); }, addAgentInfos: async (agent_infos) => { - return core.opAsync("add_agent_infos", agent_infos); + return add_agent_infos(agent_infos); }, removeApp: async (app_id) => { - return core.opAsync("remove_app", app_id); + return remove_app(app_id); }, signString: async (string) => { - return core.opAsync("sign_string", string); + return sign_string(string); }, shutdown: async () => { - return core.opAsync("shutdown") + return shutdown() }, getAgentKey: async () => { - return core.opAsync("get_agent_key") + return get_agent_key() }, packDna: async (path) => { - return core.opAsync("pack_dna", path) + return pack_dna(path) }, unPackDna: async (path) => { - return core.opAsync("unpack_dna", path) + return unpack_dna(path) } }; })(globalThis); diff --git a/rust-executor/src/js_core/agent_extension.js b/rust-executor/src/js_core/agent_extension.js index 90356f2f8..0d14020dc 100644 --- a/rust-executor/src/js_core/agent_extension.js +++ b/rust-executor/src/js_core/agent_extension.js @@ -1,26 +1,32 @@ +import { + agent_did_document, agent_signing_key_id, agent_did, agent_create_signed_expression, agent_sign, + agent_sign_string_hex, agent_load, agent, agent_is_initialized, agent_is_unlocked, agent_unlock, + agent_lock, agent_create_signed_expression_stringified, save_agent_profile +} from 'ext:core/ops'; + ((globalThis) => { const core = Deno.core; globalThis.AGENT = { didDocument: () => { - return core.ops.agent_did_document(); + return agent_did_document(); }, signingKeyId: () => { - return core.ops.agent_signing_key_id(); + return agent_signing_key_id(); }, did: () => { - return core.ops.agent_did(); + return agent_did(); }, createSignedExpression: (data) => { try { - return core.ops.agent_create_signed_expression(data); + return agent_create_signed_expression(data); } catch (error) { console.error("Error calling agent_create_signed_expression:", error); console.error("Data was:", data) console.log("Falling back to stringified version") try { let stringified = JSON.stringify(data); - let resultString = core.ops.agent_create_signed_expression_stringified(stringified) + let resultString = agent_create_signed_expression_stringified(stringified) let result = JSON.parse(resultString); return result; } catch (error) { @@ -30,31 +36,31 @@ } }, sign: (payload) => { - return core.ops.agent_sign(payload); + return agent_sign(payload); }, signStringHex: (payload) => { - return core.ops.agent_sign_string_hex(payload); + return agent_sign_string_hex(payload); }, load: () => { - return core.ops.agent_load(); + return agent_load(); }, agent: () => { - return core.ops.agent(); + return agent(); }, isInitialized: () => { - return core.ops.agent_is_initialized(); + return agent_is_initialized(); }, isUnlocked: () => { - return core.ops.agent_is_unlocked(); + return agent_is_unlocked(); }, unlock: (password) => { - return core.ops.agent_unlock(password); + return agent_unlock(password); }, lock: () => { - return core.ops.agent_lock(); + return agent_lock(); }, save_agent_profile: (profile) => { - return core.ops.save_agent_profile(profile); + return save_agent_profile(profile); } }; })(globalThis); \ No newline at end of file diff --git a/rust-executor/src/js_core/languages_extension.js b/rust-executor/src/js_core/languages_extension.js index d586344bf..00e663dc9 100644 --- a/rust-executor/src/js_core/languages_extension.js +++ b/rust-executor/src/js_core/languages_extension.js @@ -1,15 +1,17 @@ -((globalThis) => { - const core = Deno.core; +import { + perspective_diff_received, sync_state_changed, telepresence_signal_received +} from 'ext:core/ops'; +((globalThis) => { globalThis.LANGUAGE_CONTROLLER = { perspectiveDiffReceived: (diff, language_address) => { - return core.ops.perspective_diff_received(diff, language_address); + return perspective_diff_received(diff, language_address); }, syncStateChanged: (syncState, language_address) => { - return core.ops.sync_state_changed(syncState, language_address); + return sync_state_changed(syncState, language_address); }, telepresenceSignalReceived: (signal, language_address) => { - return core.ops.telepresence_signal_received(signal, language_address); + return telepresence_signal_received(signal, language_address); }, }; })(globalThis); diff --git a/rust-executor/src/js_core/pubsub_extension.js b/rust-executor/src/js_core/pubsub_extension.js index 2ac02208a..c25c5e4b5 100644 --- a/rust-executor/src/js_core/pubsub_extension.js +++ b/rust-executor/src/js_core/pubsub_extension.js @@ -1,9 +1,11 @@ -((globalThis) => { - const core = Deno.core; +import { + publish +} from 'ext:core/ops'; +((globalThis) => { globalThis.PUBSUB = { publish: async (topic, data) => { - return core.opAsync("publish", topic, JSON.stringify(data)); + return publish(topic, JSON.stringify(data)); } }; })(globalThis); diff --git a/rust-executor/src/js_core/signature_extension.js b/rust-executor/src/js_core/signature_extension.js index 64118d8e1..321b429c6 100644 --- a/rust-executor/src/js_core/signature_extension.js +++ b/rust-executor/src/js_core/signature_extension.js @@ -1,13 +1,16 @@ -((globalThis) => { - const core = Deno.core; +import { + signature_verify_string_signed_by_did, + signature_verify +} from 'ext:core/ops' +((globalThis) => { globalThis.SIGNATURE = { verifyStringSignedByDID: (did, didSigningKeyId, data, signedData) => { - let { isValid } = core.ops.signature_verify_string_signed_by_did(did, didSigningKeyId, data, signedData) + let { isValid } = signature_verify_string_signed_by_did(did, didSigningKeyId, data, signedData) return isValid; }, verify: (expression) => { - let { isValid } = core.ops.signature_verify(expression); + let { isValid } = signature_verify(expression); return isValid; } }; diff --git a/rust-executor/src/js_core/utils_extension.js b/rust-executor/src/js_core/utils_extension.js index f570d8a9a..714ac3060 100644 --- a/rust-executor/src/js_core/utils_extension.js +++ b/rust-executor/src/js_core/utils_extension.js @@ -1,24 +1,24 @@ -((globalThis) => { - const core = Deno.core; +import { console_log, console_debug, console_error, console_warn, hash, load_module } from "ext:core/ops"; +((globalThis) => { globalThis.UTILS = { hash: (data) => { - return core.ops.hash(data); + return hash(data); }, loadModule: async (path) => { - return core.opAsync("load_module", path); + return load_module(path); }, consoleLog: (args) => { - return core.ops.console_log(args); + return console_log(args); }, consoleDebug: (args) => { - return core.ops.console_debug(args); + return console_debug(args); }, consoleError: (args) => { - return core.ops.console_error(args); + return console_error(args); }, consoleWarn: (args) => { - return core.ops.console_warn(args); + return console_warn(args); } }; })(globalThis); diff --git a/rust-executor/src/js_core/wallet_extension.js b/rust-executor/src/js_core/wallet_extension.js index 4893380a4..97d745345 100644 --- a/rust-executor/src/js_core/wallet_extension.js +++ b/rust-executor/src/js_core/wallet_extension.js @@ -1,33 +1,37 @@ -((globalThis) => { - const core = Deno.core; +import { + wallet_create_main_key, wallet_get_main_key, wallet_get_main_key_document, + wallet_is_unlocked, wallet_unlock, wallet_lock, wallet_export, wallet_load, + wallet_sign +} from 'ext:core/ops' +((globalThis) => { globalThis.WALLET = { getMainKey: () => { - return core.ops.wallet_get_main_key(); + return wallet_get_main_key(); }, getMainKeyDocument: () => { - return core.ops.wallet_get_main_key_document(); + return wallet_get_main_key_document(); }, createMainKey: () => { - return core.ops.wallet_create_main_key(); + return wallet_create_main_key(); }, isUnlocked: () => { - return core.ops.wallet_is_unlocked(); + return wallet_is_unlocked(); }, unlock: (password) => { - return core.ops.wallet_unlock(password); + return wallet_unlock(password); }, lock: (password) => { - return core.ops.wallet_lock(password); + return wallet_lock(password); }, export: (password) => { - return core.ops.wallet_export(password); + return wallet_export(password); }, load: (data) => { - return core.ops.wallet_load(data); + return wallet_load(data); }, sign: (payload) => { - return core.ops.wallet_sign(payload); + return wallet_sign(payload); }, }; })(globalThis); diff --git a/rust-executor/src/prolog_service/prolog_service_extension.js b/rust-executor/src/prolog_service/prolog_service_extension.js index d0ecb9f7d..8a7ca3e29 100644 --- a/rust-executor/src/prolog_service/prolog_service_extension.js +++ b/rust-executor/src/prolog_service/prolog_service_extension.js @@ -1,19 +1,21 @@ -((globalThis) => { - const core = Deno.core; +import { + spawn_engine, remove_engine, run_query, load_module_string +} from 'ext:core/ops' +((globalThis) => { globalThis.PROLOG_SERVICE = { spawnEngine: async (engineName) => { - return core.opAsync("spawn_engine", engineName); + return spawn_engine(engineName); }, removeEngine: async (engineName) => { - return core.opAsync("remove_engine", engineName); + return remove_engine(engineName); }, runQuery: async (engineName, query) => { if(!query.endsWith(".")) query = query+"."; - return JSON.parse(await core.opAsync("run_query", engineName, query)); + return JSON.parse(await run_query(engineName, query)); }, loadModuleString: async (engineName, module_name, program_lines) => { - return core.opAsync("load_module_string", engineName, module_name, program_lines); + return load_module_string(engineName, module_name, program_lines); } }; })(globalThis); diff --git a/rust-executor/src/runtime_service/runtime_service_extension.js b/rust-executor/src/runtime_service/runtime_service_extension.js index 287c58101..4db559cb3 100644 --- a/rust-executor/src/runtime_service/runtime_service_extension.js +++ b/rust-executor/src/runtime_service/runtime_service_extension.js @@ -1,15 +1,17 @@ -((globalThis) => { - const core = Deno.core; +import { + friends, add_message_outbox, get_trusted_agents +} from 'ext:core/ops'; +((globalThis) => { globalThis.RUNTIME_SERVICE = { friends: async () => { - return core.ops.friends(); + return friends(); }, addMessageOutbox: async (did, message, wasSent) => { - return core.ops.add_message_outbox(did, message, wasSent); + return add_message_outbox(did, message, wasSent); }, getTrustedAgents: async () => { - return core.ops.get_trusted_agents(); + return get_trusted_agents(); }, } })(globalThis); \ No newline at end of file From 6accd570cb03ce41ecfcbf890ad3ba5d8256ab4a Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Sat, 8 Jun 2024 11:09:38 +0530 Subject: [PATCH 12/37] chore: Update entanglement_service_extension.js to use synchronous functions instead of async functions --- .../entanglement_service_extension.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rust-executor/src/entanglement_service/entanglement_service_extension.js b/rust-executor/src/entanglement_service/entanglement_service_extension.js index ac542bbbb..6138cf422 100644 --- a/rust-executor/src/entanglement_service/entanglement_service_extension.js +++ b/rust-executor/src/entanglement_service/entanglement_service_extension.js @@ -5,19 +5,19 @@ import { ((globalThis) => { globalThis.ENTANGLEMENT_SERVICE = { - signDeviceKey: async (deviceKey, deviceKeyType) => { + signDeviceKey: (deviceKey, deviceKeyType) => { return sign_device_key(deviceKey, deviceKeyType); }, - generateHolochainProof: async (holochainPubkey, signedDid) => { + generateHolochainProof: (holochainPubkey, signedDid) => { return generate_entanglement_proof(holochainPubkey, signedDid); }, - addEntaglementProofs: async (proofs) => { + addEntaglementProofs: (proofs) => { return add_entanglement_proofs(proofs); }, - deleteEntanglementProofs: async (proofs) => { + deleteEntanglementProofs: (proofs) => { return delete_entanglement_proofs(proofs); }, - getEntanglementProofs: async () => { + getEntanglementProofs: () => { return get_entanglement_proofs(proofs); } } From b54c2246cea8238a712a25ff8f93077c2e3b6746 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Sat, 8 Jun 2024 11:10:07 +0530 Subject: [PATCH 13/37] chore: Refactor SmartGlobalVariableFuture to improve code readability and error handling --- rust-executor/src/js_core/futures.rs | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/rust-executor/src/js_core/futures.rs b/rust-executor/src/js_core/futures.rs index d9b174123..a793235c0 100644 --- a/rust-executor/src/js_core/futures.rs +++ b/rust-executor/src/js_core/futures.rs @@ -55,18 +55,20 @@ impl Future for SmartGlobalVariableFuture { //println!("Trying to get the worker lock: {}", self.name); let mut worker = self.worker.try_lock().expect("Failed to lock worker"); let scope = &mut worker.js_runtime.handle_scope(); - let context = v8::Context::new(scope); - let scope = &mut v8::ContextScope::new(scope, context); - let code = v8::String::new(scope, &self.value).unwrap(); - let script = v8::Script::compile(scope, code, None).unwrap(); - - match script.run(scope) { - Some(result) => { - let result_str = result.to_string(scope).unwrap().to_rust_string_lossy(scope); - Poll::Ready(Ok(result_str)) - } - None => Poll::Ready(Err(AnyError::msg("Failed to execute script"))), + let script = v8::Script::compile(scope, code, None); + match script { + Some(script) => { + let result = script.run(scope); + match result { + Some(result) => { + let result_str = result.to_string(scope).unwrap().to_rust_string_lossy(scope); + Poll::Ready(Ok(result_str)) + } + None => Poll::Ready(Err(AnyError::msg("Failed to execute script"))), + } + }, + None => Poll::Ready(Err(AnyError::msg("Failed to compile script"))), } } -} +} \ No newline at end of file From 561f5c925e20a320fc6bc209dfd630279adb2614 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Sat, 8 Jun 2024 11:10:19 +0530 Subject: [PATCH 14/37] chore: Update esm_entry_point in holochain_service_extension.rs --- .../src/holochain_service/holochain_service_extension.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-executor/src/holochain_service/holochain_service_extension.rs b/rust-executor/src/holochain_service/holochain_service_extension.rs index da2e9ac86..37b822b64 100644 --- a/rust-executor/src/holochain_service/holochain_service_extension.rs +++ b/rust-executor/src/holochain_service/holochain_service_extension.rs @@ -186,6 +186,6 @@ async fn unpack_dna(#[string] path: String) -> Result { deno_core::extension!( holochain_service, ops = [start_holochain_conductor, log_dht_status, install_app, get_app_info, call_zome_function, agent_infos, add_agent_infos, remove_app, sign_string, shutdown, get_agent_key, pack_dna, unpack_dna], - esm_entry_point = "ext:pubsub_service/holochain_service_extension.js", + esm_entry_point = "ext:holochain_service/holochain_service_extension.js", esm = [dir "src/holochain_service", "holochain_service_extension.js"] ); \ No newline at end of file From d56b9229840af9cc5cfef67fb4bb5d3d31e0ef41 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Sat, 8 Jun 2024 14:59:06 +0530 Subject: [PATCH 15/37] chore: Update holochain_service to use tokio_stream::StreamMap for signal handling --- rust-executor/src/holochain_service/mod.rs | 23 ++++++++++------------ 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/rust-executor/src/holochain_service/mod.rs b/rust-executor/src/holochain_service/mod.rs index 2dbb04a9c..e8f19dce6 100644 --- a/rust-executor/src/holochain_service/mod.rs +++ b/rust-executor/src/holochain_service/mod.rs @@ -5,7 +5,7 @@ use chrono::Duration; use crypto_box::rand_core::OsRng; use deno_core::anyhow::anyhow; use deno_core::error::AnyError; -use holochain::conductor::api::{AppInfo, CellInfo, ZomeCall}; +use holochain::conductor::api::{AppInfo, AppStatusFilter, CellInfo, ZomeCall}; use holochain::conductor::config::ConductorConfig; use holochain::conductor::paths::DataRootPath; use holochain::conductor::{ConductorBuilder, ConductorHandle}; @@ -104,18 +104,15 @@ impl HolochainService { // Spawn a new task to forward items from the stream to the receiver let spawned_sig = tokio::spawn(async move { - let sig_broadcasters = conductor_clone.signal_broadcaster(); - - let mut streams = tokio_stream::StreamMap::new(); - for (i, rx) in sig_broadcasters - .subscribe_separately() - .into_iter() - .enumerate() - { - streams.insert(i, tokio_stream::wrappers::BroadcastStream::new(rx)); - } - let mut stream = - streams.map(|(_, signal)| signal.expect("Couldn't receive a signal")); + let streams: tokio_stream::StreamMap> = tokio_stream::StreamMap::new(); + conductor_clone.list_apps(Some(AppStatusFilter::Running)).await.unwrap().into_iter().for_each(|app| { + let sig_broadcasters = conductor_clone.subscribe_to_app_signals(app.installed_app_id.clone()); + + let mut streams = tokio_stream::StreamMap::new(); + streams.insert(app.installed_app_id.clone(), tokio_stream::wrappers::BroadcastStream::new(sig_broadcasters)); + }); + + let mut stream = streams.map(|(_, signal)| signal.expect("Couldn't receive a signal")); response_sender .send(HolochainServiceResponse::InitComplete(Ok(()))) From 983b4b079d213a4f5d034df0082d616a83c6db96 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Tue, 11 Jun 2024 11:26:40 +0530 Subject: [PATCH 16/37] chore: Update delete_entanglement_proof function name to delete_entanglement_proofs --- .../entanglement_service/entanglement_service_extension.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rust-executor/src/entanglement_service/entanglement_service_extension.rs b/rust-executor/src/entanglement_service/entanglement_service_extension.rs index dbede161c..b408171f1 100644 --- a/rust-executor/src/entanglement_service/entanglement_service_extension.rs +++ b/rust-executor/src/entanglement_service/entanglement_service_extension.rs @@ -26,7 +26,7 @@ pub fn add_entanglement_proofs(#[serde] proofs: Vec) -> Resul #[op2] #[serde] -pub fn delete_entanglement_proof(#[serde] proofs: Vec) -> Result<(), AnyError> { +pub fn delete_entanglement_proofs(#[serde] proofs: Vec) -> Result<(), AnyError> { Ok(delete_entanglement_proof_service(proofs)) } @@ -38,7 +38,7 @@ pub fn get_entanglement_proofs() -> Result, AnyError> { deno_core::extension!( entanglement_service, - ops = [sign_device_key, generate_entanglement_proof, add_entanglement_proofs, delete_entanglement_proof, get_entanglement_proofs], + ops = [sign_device_key, generate_entanglement_proof, add_entanglement_proofs, delete_entanglement_proofs, get_entanglement_proofs], esm_entry_point = "ext:entanglement_service/entanglement_service_extension.js", esm = [dir "src/entanglement_service", "entanglement_service_extension.js"] ); From 9ea8287e36cd691c2e42fae8c49b8bd47a24b672 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Tue, 11 Jun 2024 13:02:09 +0530 Subject: [PATCH 17/37] chore: adding agent infos in holochain_service because it would break because the agent info is wrong --- rust-executor/src/holochain_service/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-executor/src/holochain_service/mod.rs b/rust-executor/src/holochain_service/mod.rs index e8f19dce6..5f4961c0d 100644 --- a/rust-executor/src/holochain_service/mod.rs +++ b/rust-executor/src/holochain_service/mod.rs @@ -312,7 +312,7 @@ impl HolochainService { _ => unreachable!(), }; - inteface.add_agent_infos(agent_infos_from_str(COASYS_BOOTSTRAP_AGENT_INFO).expect("Couldn't deserialize hard-wired AgentInfo")).await?; + // inteface.add_agent_infos(agent_infos_from_str(COASYS_BOOTSTRAP_AGENT_INFO).expect("Couldn't deserialize hard-wired AgentInfo")).await?; set_holochain_service(inteface).await; From 584f671e85bdc50e95515f141c4df46452c260ce Mon Sep 17 00:00:00 2001 From: Nicolas Luck Date: Wed, 12 Jun 2024 15:14:23 +0200 Subject: [PATCH 18/37] WIP: update Holochain signal streams after app install --- rust-executor/src/holochain_service/mod.rs | 25 ++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/rust-executor/src/holochain_service/mod.rs b/rust-executor/src/holochain_service/mod.rs index 5f4961c0d..720b580cc 100644 --- a/rust-executor/src/holochain_service/mod.rs +++ b/rust-executor/src/holochain_service/mod.rs @@ -28,6 +28,7 @@ use tokio::select; use tokio::sync::{mpsc, oneshot, Mutex}; use tokio::task::yield_now; use tokio::time::timeout; +use tokio_stream::wrappers::BroadcastStream; use tokio_stream::StreamExt; pub(crate) mod holochain_service_extension; @@ -81,6 +82,7 @@ impl HolochainService { pub async fn init(local_config: LocalConductorConfig) -> Result<(), AnyError> { let (sender, mut receiver) = mpsc::unbounded_channel::(); let (stream_sender, stream_receiver) = mpsc::unbounded_channel::(); + let (new_app_ids_sender, mut new_app_ids_receiver) = mpsc::unbounded_channel::(); let inteface = HolochainServiceInterface { sender, @@ -104,23 +106,31 @@ impl HolochainService { // Spawn a new task to forward items from the stream to the receiver let spawned_sig = tokio::spawn(async move { - let streams: tokio_stream::StreamMap> = tokio_stream::StreamMap::new(); + let mut streams: tokio_stream::StreamMap> = tokio_stream::StreamMap::new(); conductor_clone.list_apps(Some(AppStatusFilter::Running)).await.unwrap().into_iter().for_each(|app| { let sig_broadcasters = conductor_clone.subscribe_to_app_signals(app.installed_app_id.clone()); - let mut streams = tokio_stream::StreamMap::new(); + //let mut streams = tokio_stream::StreamMap::new(); streams.insert(app.installed_app_id.clone(), tokio_stream::wrappers::BroadcastStream::new(sig_broadcasters)); }); - let mut stream = streams.map(|(_, signal)| signal.expect("Couldn't receive a signal")); - + let multiplex_streams = Box::new(|streams: tokio_stream::StreamMap>| streams.map(|(_, signal)| signal.expect("Couldn't receive a signal"))); + let mut stream = multiplex_streams(streams); response_sender .send(HolochainServiceResponse::InitComplete(Ok(()))) .unwrap(); loop { - while let Some(item) = stream.next().await { - let _ = stream_sender.send(item); + tokio::select! { + Some(item) = stream.next() => { + let _ = stream_sender.send(item); + }, + Some(new_app_id) = new_app_ids_receiver.recv() => { + let sig_broadcasters = conductor_clone.subscribe_to_app_signals(new_app_id.installed_app_id.clone()); + streams.insert(new_app_id.installed_app_id.clone(), tokio_stream::wrappers::BroadcastStream::new(sig_broadcasters)); + stream = multiplex_streams(streams); + } + else => break, } yield_now().await; } @@ -135,6 +145,9 @@ impl HolochainService { service.install_app(payload) ).await.map_err(|_| anyhow!("Timeout error; InstallApp call")) { Ok(result) => { + if let Ok(app_info) = &result { + let _ = new_app_ids_sender.send(app_info.clone()); + } let _ = response.send(HolochainServiceResponse::InstallApp(result)); }, Err(err) => { From ce85fc199850a6749a882bf99cccfee0930a95b5 Mon Sep 17 00:00:00 2001 From: Nicolas Luck Date: Wed, 12 Jun 2024 15:16:14 +0200 Subject: [PATCH 19/37] Update cargo.lock files --- .../agent-language/hc-dna/Cargo.lock | 80 +++++++++++++++++-- .../direct-message-language/hc-dna/Cargo.lock | 80 +++++++++++++++++-- .../file-storage/hc-dna/Cargo.lock | 80 +++++++++++++++++-- .../hc-dna/Cargo.lock | 6 +- .../p-diff-sync/hc-dna/Cargo.lock | 6 +- 5 files changed, 222 insertions(+), 30 deletions(-) diff --git a/bootstrap-languages/agent-language/hc-dna/Cargo.lock b/bootstrap-languages/agent-language/hc-dna/Cargo.lock index 218f905d3..e8ce9b3d4 100644 --- a/bootstrap-languages/agent-language/hc-dna/Cargo.lock +++ b/bootstrap-languages/agent-language/hc-dna/Cargo.lock @@ -272,15 +272,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets", + "windows-targets 0.52.5", ] [[package]] @@ -1321,7 +1321,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -2316,7 +2316,7 @@ version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -2338,7 +2338,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -2347,21 +2347,43 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", + "windows_aarch64_gnullvm 0.48.5", "windows_aarch64_msvc 0.48.5", "windows_i686_gnu 0.48.5", "windows_i686_msvc 0.48.5", "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm", + "windows_x86_64_gnullvm 0.48.5", "windows_x86_64_msvc 0.48.5", ] +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + [[package]] name = "windows_aarch64_msvc" version = "0.33.0" @@ -2374,6 +2396,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + [[package]] name = "windows_i686_gnu" version = "0.33.0" @@ -2386,6 +2414,18 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + [[package]] name = "windows_i686_msvc" version = "0.33.0" @@ -2398,6 +2438,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + [[package]] name = "windows_x86_64_gnu" version = "0.33.0" @@ -2410,12 +2456,24 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + [[package]] name = "windows_x86_64_msvc" version = "0.33.0" @@ -2428,6 +2486,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + [[package]] name = "wyz" version = "0.5.1" diff --git a/bootstrap-languages/direct-message-language/hc-dna/Cargo.lock b/bootstrap-languages/direct-message-language/hc-dna/Cargo.lock index e71e89a57..5ca68f659 100644 --- a/bootstrap-languages/direct-message-language/hc-dna/Cargo.lock +++ b/bootstrap-languages/direct-message-language/hc-dna/Cargo.lock @@ -248,15 +248,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets", + "windows-targets 0.52.5", ] [[package]] @@ -1322,7 +1322,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -2317,7 +2317,7 @@ version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -2339,7 +2339,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -2348,21 +2348,43 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", + "windows_aarch64_gnullvm 0.48.5", "windows_aarch64_msvc 0.48.5", "windows_i686_gnu 0.48.5", "windows_i686_msvc 0.48.5", "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm", + "windows_x86_64_gnullvm 0.48.5", "windows_x86_64_msvc 0.48.5", ] +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + [[package]] name = "windows_aarch64_msvc" version = "0.33.0" @@ -2375,6 +2397,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + [[package]] name = "windows_i686_gnu" version = "0.33.0" @@ -2387,6 +2415,18 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + [[package]] name = "windows_i686_msvc" version = "0.33.0" @@ -2399,6 +2439,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + [[package]] name = "windows_x86_64_gnu" version = "0.33.0" @@ -2411,12 +2457,24 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + [[package]] name = "windows_x86_64_msvc" version = "0.33.0" @@ -2429,6 +2487,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + [[package]] name = "wyz" version = "0.5.1" diff --git a/bootstrap-languages/file-storage/hc-dna/Cargo.lock b/bootstrap-languages/file-storage/hc-dna/Cargo.lock index 865598728..f6df7b938 100644 --- a/bootstrap-languages/file-storage/hc-dna/Cargo.lock +++ b/bootstrap-languages/file-storage/hc-dna/Cargo.lock @@ -248,15 +248,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets", + "windows-targets 0.52.5", ] [[package]] @@ -1324,7 +1324,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -2330,7 +2330,7 @@ version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -2352,7 +2352,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -2361,21 +2361,43 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", + "windows_aarch64_gnullvm 0.48.5", "windows_aarch64_msvc 0.48.5", "windows_i686_gnu 0.48.5", "windows_i686_msvc 0.48.5", "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm", + "windows_x86_64_gnullvm 0.48.5", "windows_x86_64_msvc 0.48.5", ] +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + [[package]] name = "windows_aarch64_msvc" version = "0.33.0" @@ -2388,6 +2410,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + [[package]] name = "windows_i686_gnu" version = "0.33.0" @@ -2400,6 +2428,18 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + [[package]] name = "windows_i686_msvc" version = "0.33.0" @@ -2412,6 +2452,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + [[package]] name = "windows_x86_64_gnu" version = "0.33.0" @@ -2424,12 +2470,24 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + [[package]] name = "windows_x86_64_msvc" version = "0.33.0" @@ -2442,6 +2500,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + [[package]] name = "wyz" version = "0.5.1" diff --git a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/Cargo.lock b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/Cargo.lock index 7607d22e6..e9a79a743 100644 --- a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/Cargo.lock +++ b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/Cargo.lock @@ -248,15 +248,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets 0.48.5", + "windows-targets 0.52.0", ] [[package]] diff --git a/bootstrap-languages/p-diff-sync/hc-dna/Cargo.lock b/bootstrap-languages/p-diff-sync/hc-dna/Cargo.lock index 7607d22e6..e9a79a743 100644 --- a/bootstrap-languages/p-diff-sync/hc-dna/Cargo.lock +++ b/bootstrap-languages/p-diff-sync/hc-dna/Cargo.lock @@ -248,15 +248,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets 0.48.5", + "windows-targets 0.52.0", ] [[package]] From a94d65d41a5b52c47dd6d422798ec11c70a593f2 Mon Sep 17 00:00:00 2001 From: Nicolas Luck Date: Thu, 13 Jun 2024 16:58:23 +0200 Subject: [PATCH 20/37] Update CI Dockerfile to use Rust 1.78 --- .circleci/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/Dockerfile b/.circleci/Dockerfile index 2da2e1f6c..c393fac4b 100644 --- a/.circleci/Dockerfile +++ b/.circleci/Dockerfile @@ -29,6 +29,8 @@ RUN echo 'export PATH="/usr/local/bin:$PATH"' >> $HOME/.bashrc # Install Rust RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y RUN echo 'export PATH="$HOME/.cargo/bin:$PATH"' >> /home/circleci/.bashrc +RUN ~/.cargo/bin/rustup install 1.78 +RUN ~/.cargo/bin/rustup default 1.78 RUN ~/.cargo/bin/rustup target add wasm32-unknown-unknown # Install Deno From 526717704f9c50d3f1971b19320b28b004426869 Mon Sep 17 00:00:00 2001 From: Nicolas Luck Date: Thu, 13 Jun 2024 16:58:53 +0200 Subject: [PATCH 21/37] Just await next item in stream map to multiplex holochain app signals --- rust-executor/src/holochain_service/mod.rs | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/rust-executor/src/holochain_service/mod.rs b/rust-executor/src/holochain_service/mod.rs index 720b580cc..a6924df8b 100644 --- a/rust-executor/src/holochain_service/mod.rs +++ b/rust-executor/src/holochain_service/mod.rs @@ -5,6 +5,7 @@ use chrono::Duration; use crypto_box::rand_core::OsRng; use deno_core::anyhow::anyhow; use deno_core::error::AnyError; +use futures::stream_select; use holochain::conductor::api::{AppInfo, AppStatusFilter, CellInfo, ZomeCall}; use holochain::conductor::config::ConductorConfig; use holochain::conductor::paths::DataRootPath; @@ -104,31 +105,34 @@ impl HolochainService { let mut service = HolochainService::new(local_config).await.unwrap(); let conductor_clone = service.conductor.clone(); + + // Spawn a new task to forward items from the stream to the receiver let spawned_sig = tokio::spawn(async move { + let mut streams: tokio_stream::StreamMap> = tokio_stream::StreamMap::new(); conductor_clone.list_apps(Some(AppStatusFilter::Running)).await.unwrap().into_iter().for_each(|app| { let sig_broadcasters = conductor_clone.subscribe_to_app_signals(app.installed_app_id.clone()); - - //let mut streams = tokio_stream::StreamMap::new(); streams.insert(app.installed_app_id.clone(), tokio_stream::wrappers::BroadcastStream::new(sig_broadcasters)); - }); + }); + - let multiplex_streams = Box::new(|streams: tokio_stream::StreamMap>| streams.map(|(_, signal)| signal.expect("Couldn't receive a signal"))); - let mut stream = multiplex_streams(streams); response_sender .send(HolochainServiceResponse::InitComplete(Ok(()))) .unwrap(); loop { tokio::select! { - Some(item) = stream.next() => { - let _ = stream_sender.send(item); - }, + Some((_, maybe_signal)) = streams.next() => { + if let Ok(signal) = maybe_signal { + let _ = stream_sender.send(signal); + } else { + log::error!("Got error from Holochain through app signal stream: {:?}", maybe_signal.err().expect("to be error since we're in else case")) + } + } Some(new_app_id) = new_app_ids_receiver.recv() => { let sig_broadcasters = conductor_clone.subscribe_to_app_signals(new_app_id.installed_app_id.clone()); streams.insert(new_app_id.installed_app_id.clone(), tokio_stream::wrappers::BroadcastStream::new(sig_broadcasters)); - stream = multiplex_streams(streams); } else => break, } From 93f91a7ea770b16a5f42a2f2652a9f3094d682e6 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Mon, 24 Jun 2024 13:09:51 +0530 Subject: [PATCH 22/37] chore: Remove the use of SmartGlobalVariableFuture --- .../src/graphql/mutation_resolvers.rs | 3 ++ rust-executor/src/js_core/futures.rs | 9 +++- rust-executor/src/js_core/mod.rs | 41 ++++++++++++++----- 3 files changed, 41 insertions(+), 12 deletions(-) diff --git a/rust-executor/src/graphql/mutation_resolvers.rs b/rust-executor/src/graphql/mutation_resolvers.rs index c8e9699bf..dad159642 100644 --- a/rust-executor/src/graphql/mutation_resolvers.rs +++ b/rust-executor/src/graphql/mutation_resolvers.rs @@ -422,8 +422,11 @@ impl Mutation { ))"#, language_meta_json, language_path ); + let result = js.execute(script).await?; + println!("language_publish result: {:?}", result); let result: JsResultType = serde_json::from_str(&result)?; + println!("language_publish result 1: {:?}", result); result.get_graphql_result() } diff --git a/rust-executor/src/js_core/futures.rs b/rust-executor/src/js_core/futures.rs index a793235c0..3efc0f0c5 100644 --- a/rust-executor/src/js_core/futures.rs +++ b/rust-executor/src/js_core/futures.rs @@ -1,6 +1,8 @@ use deno_core::error::AnyError; +use deno_core::v8::Handle; use deno_core::{v8, PollEventLoopOptions, JsRuntime}; -use deno_runtime::worker::MainWorker; // Import the JsRuntime struct. +use deno_runtime::worker::MainWorker; +use log::info; // Import the JsRuntime struct. use std::future::Future; use std::pin::Pin; use std::sync::Arc; @@ -62,7 +64,10 @@ impl Future for SmartGlobalVariableFuture { let result = script.run(scope); match result { Some(result) => { - let result_str = result.to_string(scope).unwrap().to_rust_string_lossy(scope); + info!("Result: {:?}", result.clone()); + let result_str = result.open(scope).to_rust_string_lossy(scope); + // let result_str = result.to_string(scope).unwrap().to_rust_string_lossy(scope); + info!("Result: {}", result_str); Poll::Ready(Ok(result_str)) } None => Poll::Ready(Err(AnyError::msg("Failed to execute script"))), diff --git a/rust-executor/src/js_core/mod.rs b/rust-executor/src/js_core/mod.rs index f2e27d211..f9c69dfc7 100644 --- a/rust-executor/src/js_core/mod.rs +++ b/rust-executor/src/js_core/mod.rs @@ -1,7 +1,7 @@ use ::futures::Future; use deno_core::anyhow::anyhow; use deno_core::error::AnyError; -use deno_core::{resolve_url_or_path, PollEventLoopOptions}; +use deno_core::{resolve_url_or_path, v8, PollEventLoopOptions}; use deno_runtime::worker::MainWorker; use deno_runtime::{permissions::PermissionsContainer, BootstrapOptions}; use holochain::prelude::{ExternIO, Signal}; @@ -74,7 +74,7 @@ impl JsCoreHandle { let response = response_rx.await?; - //info!("Got response: {:?}", response.id); + info!("Got response: {:?}", response); response .result @@ -177,8 +177,7 @@ impl JsCore { async fn execute_async_smart( &self, script: String - ) -> Result { - let mut worker = self.worker.lock().await; + ) -> Result { let wrapped_script = format!( r#" (async () => {{ @@ -186,8 +185,30 @@ impl JsCore { }})(); "#, script ); - //info!("Sending script: {}", wrapped_script); - Ok(SmartGlobalVariableFuture::new(self.worker.clone(), wrapped_script.into())) + + let mut worker = self.worker.lock().await; + + let execute_async = worker.execute_script("js_core", wrapped_script.into()); + + let execute_async = execute_async.map_err(|err| anyhow!(err))?; + + println!("execute_async: {:?}", execute_async); + + let result = worker.js_runtime.resolve(execute_async.into()).await?; + + println!("result: {:?}", result); + + let result = { + let mut worker = self.worker.lock().await; + + let mut scope = worker.js_runtime.handle_scope(); + + result.open(&mut scope).to_rust_string_lossy(&mut scope) + }; + + println!("result: {:?}", result); + + Ok(result) } fn generate_execution_slot( @@ -210,9 +231,9 @@ impl JsCore { // info!("Spawn local driving: {}", id); //let local_variable_name = uuid_to_valid_variable_name(&id); let script_fut = - js_core_cloned.execute_async_smart(script).await.unwrap(); + js_core_cloned.execute_async_smart(script).await; //info!("Script fut created: {}", id); - match script_fut.await { + match script_fut { Ok(res) => { //info!("Script execution completed Succesfully: {}", id); response_tx @@ -262,11 +283,11 @@ impl JsCore { let init_core_future = js_core .execute_async_smart(format!("initCore({})", config.get_json()).into()); - let result = init_core_future.await.unwrap().await; + let result = init_core_future.await; match result { Ok(res) => { - info!("AD4M coreInit() completed Succesfully: {}", res); + info!("AD4M coreInit() completed Succesfully: {:?}", res); tx_inside .send(JsCoreResponse { result: Ok(String::from("initialized")), From db2536378a2ce71941bf1951911811fe3464edf1 Mon Sep 17 00:00:00 2001 From: Nicolas Luck Date: Wed, 26 Jun 2024 23:21:24 +0200 Subject: [PATCH 23/37] Fix awaiting of JS execution by using .with_event_loop_future() in async block Might have made event loop polling in JS thread loop redundant.. --- rust-executor/src/js_core/mod.rs | 56 ++++++++++++++++---------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/rust-executor/src/js_core/mod.rs b/rust-executor/src/js_core/mod.rs index f9c69dfc7..7db95050f 100644 --- a/rust-executor/src/js_core/mod.rs +++ b/rust-executor/src/js_core/mod.rs @@ -177,7 +177,7 @@ impl JsCore { async fn execute_async_smart( &self, script: String - ) -> Result { + ) -> Result>, AnyError> { let wrapped_script = format!( r#" (async () => {{ @@ -189,26 +189,22 @@ impl JsCore { let mut worker = self.worker.lock().await; let execute_async = worker.execute_script("js_core", wrapped_script.into()); - let execute_async = execute_async.map_err(|err| anyhow!(err))?; - - println!("execute_async: {:?}", execute_async); - - let result = worker.js_runtime.resolve(execute_async.into()).await?; - - println!("result: {:?}", result); - - let result = { - let mut worker = self.worker.lock().await; - - let mut scope = worker.js_runtime.handle_scope(); - - result.open(&mut scope).to_rust_string_lossy(&mut scope) - }; - - println!("result: {:?}", result); - - Ok(result) + let resolve_fut = worker.js_runtime.resolve(execute_async.into()); + + let self_clone = self.clone(); + Ok(async move { + let mut worker = self_clone.worker.lock().await; + let result_fut = worker.js_runtime.with_event_loop_future(resolve_fut, PollEventLoopOptions::default()); + match result_fut.await { + Ok(value) => { + let mut scope = worker.js_runtime.handle_scope(); + let result = value.open(&mut scope).to_rust_string_lossy(&mut scope); + Ok(result) + } + Err(e) => Err(e) + } + }) } fn generate_execution_slot( @@ -230,10 +226,12 @@ impl JsCore { tokio::task::spawn_local(async move { // info!("Spawn local driving: {}", id); //let local_variable_name = uuid_to_valid_variable_name(&id); - let script_fut = - js_core_cloned.execute_async_smart(script).await; + let script_fut = js_core_cloned + .execute_async_smart(script) + .await + .expect("Couldn't create execute_async_smart future"); //info!("Script fut created: {}", id); - match script_fut { + match script_fut.await { Ok(res) => { //info!("Script execution completed Succesfully: {}", id); response_tx @@ -281,9 +279,11 @@ impl JsCore { let result = js_core.init_engine().await; info!("AD4M JS engine init completed, with result: {:?}", result); - let init_core_future = js_core - .execute_async_smart(format!("initCore({})", config.get_json()).into()); - let result = init_core_future.await; + let result = js_core + .execute_async_smart(format!("initCore({})", config.get_json()).into()) + .await + .expect("to be able to create js execution future") + .await ; match result { Ok(res) => { @@ -305,7 +305,7 @@ impl JsCore { } loop { - info!("Main loop running"); + //info!("Main loop running"); //Listener future for loading JS modules into runtime let module_load_fut = async { loop { @@ -391,7 +391,7 @@ impl JsCore { event_loop_result = js_core.event_loop() => { match event_loop_result { - Ok(_) => info!("AD4M event loop finished"), + Ok(_) => {} //info!("AD4M event loop finished"), Err(err) => { error!("AD4M event loop closed with error: {}", err); break; From fb7b7b54ea2fd6e9e36b76b3aa0b52eb59570636 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 27 Jun 2024 15:50:33 +0530 Subject: [PATCH 24/37] chore: Update JS module loading in Rust executor --- rust-executor/src/js_core/mod.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rust-executor/src/js_core/mod.rs b/rust-executor/src/js_core/mod.rs index 7db95050f..8eda7aa07 100644 --- a/rust-executor/src/js_core/mod.rs +++ b/rust-executor/src/js_core/mod.rs @@ -93,7 +93,7 @@ impl JsCoreHandle { .expect("couldn't send on channel... it is likely that the main worker thread has crashed..."); let response = response_rx.await?; - + response .result .map_err(|err| anyhow!(err)) @@ -151,9 +151,9 @@ impl JsCore { async fn load_module(&self, file_path: String) -> Result<(), AnyError> { let mut worker = self.worker.lock().await; let url = resolve_url_or_path(&file_path, current_dir()?.as_path())?; - let _module_id = worker.js_runtime.load_side_es_module(&url).await?; - //TODO; this likely needs to be run (although might be handled by the import in the js code when import() is called) - //worker.js_runtime.mod_evaluate(module_id); + let module_id = worker.js_runtime.load_side_es_module(&url).await?; + let evaluate_fut = worker.js_runtime.mod_evaluate(module_id); + worker.js_runtime.with_event_loop_future(evaluate_fut, PollEventLoopOptions::default()).await?; Ok(()) } From 032986b05ed6dbc2898308fbf566cc6b8c4493ab Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Mon, 1 Jul 2024 15:32:44 +0530 Subject: [PATCH 25/37] chore: Refactor SmartGlobalVariableFuture to use generics for value type --- rust-executor/src/js_core/futures.rs | 80 ++++++++++++++++++---------- rust-executor/src/js_core/mod.rs | 30 ++++------- 2 files changed, 62 insertions(+), 48 deletions(-) diff --git a/rust-executor/src/js_core/futures.rs b/rust-executor/src/js_core/futures.rs index 3efc0f0c5..91e320e3b 100644 --- a/rust-executor/src/js_core/futures.rs +++ b/rust-executor/src/js_core/futures.rs @@ -1,9 +1,10 @@ +use deno_core::anyhow::Error; use deno_core::error::AnyError; use deno_core::v8::Handle; -use deno_core::{v8, PollEventLoopOptions, JsRuntime}; +use deno_core::{anyhow, v8, JsRuntime, PollEventLoopOptions}; use deno_runtime::worker::MainWorker; use log::info; // Import the JsRuntime struct. -use std::future::Future; +use futures::{Future, FutureExt}; use std::pin::Pin; use std::sync::Arc; use std::task::{Context, Poll}; @@ -39,41 +40,66 @@ impl Future for EventLoopFuture { } } -pub struct SmartGlobalVariableFuture { +pub struct SmartGlobalVariableFuture +where + F: Future, AnyError>> + Unpin, +{ worker: Arc>, - value: String, + value: F, } -impl SmartGlobalVariableFuture { - pub fn new(worker: Arc>, value: String) -> Self { +impl SmartGlobalVariableFuture +where + F: Future, AnyError>> + Unpin, +{ + pub fn new(worker: Arc>, value: F) -> Self { SmartGlobalVariableFuture { worker, value } } } -impl Future for SmartGlobalVariableFuture { - type Output = Result; // You can customize the output type. +impl Future for SmartGlobalVariableFuture +where + F: Future, AnyError>> + Unpin, +{ + type Output = Result; - fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { - //println!("Trying to get the worker lock: {}", self.name); - let mut worker = self.worker.try_lock().expect("Failed to lock worker"); + fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { + let mut value_pin = Pin::new(&mut self.value); + let mut worker = match self.worker.try_lock() { + Ok(w) => w, + Err(_) => return Poll::Pending, + }; + let scope = &mut worker.js_runtime.handle_scope(); - let code = v8::String::new(scope, &self.value).unwrap(); - let script = v8::Script::compile(scope, code, None); - match script { - Some(script) => { - let result = script.run(scope); + + if let Poll::Ready(result) = value_pin.as_mut().poll(cx) { + match result { + Ok(result) => { + let result = result.open(scope).to_rust_string_lossy(scope); + return Poll::Ready(Ok(result)); + }, + Err(err) => return Poll::Ready(Err(err)), + }; + } + + if let Poll::Ready(event_loop_result) = &mut worker.js_runtime.poll_event_loop(cx, deno_core::PollEventLoopOptions::default()) { + if let Err(err) = event_loop_result { + return Poll::Ready(Err(anyhow::anyhow!("Error polling event loop: {:?}", err))); + } + + if let Poll::Ready(result) = value_pin.poll(cx) { match result { - Some(result) => { - info!("Result: {:?}", result.clone()); - let result_str = result.open(scope).to_rust_string_lossy(scope); - // let result_str = result.to_string(scope).unwrap().to_rust_string_lossy(scope); - info!("Result: {}", result_str); - Poll::Ready(Ok(result_str)) - } - None => Poll::Ready(Err(AnyError::msg("Failed to execute script"))), - } - }, - None => Poll::Ready(Err(AnyError::msg("Failed to compile script"))), + Ok(result) => { + let result = result.open(scope).to_rust_string_lossy(scope); + return Poll::Ready(Ok(result)); + }, + Err(err) => return Poll::Ready(Err(err)), + }; + } + + return Poll::Ready(Err(anyhow::anyhow!("Promise resolution is still pending but the event loop has already resolved."))); } + + Poll::Pending } } \ No newline at end of file diff --git a/rust-executor/src/js_core/mod.rs b/rust-executor/src/js_core/mod.rs index 8eda7aa07..af8c40ff6 100644 --- a/rust-executor/src/js_core/mod.rs +++ b/rust-executor/src/js_core/mod.rs @@ -177,7 +177,7 @@ impl JsCore { async fn execute_async_smart( &self, script: String - ) -> Result>, AnyError> { + ) -> Result, AnyError>>>, AnyError> { let wrapped_script = format!( r#" (async () => {{ @@ -185,26 +185,14 @@ impl JsCore { }})(); "#, script ); - - let mut worker = self.worker.lock().await; - - let execute_async = worker.execute_script("js_core", wrapped_script.into()); - let execute_async = execute_async.map_err(|err| anyhow!(err))?; - let resolve_fut = worker.js_runtime.resolve(execute_async.into()); - - let self_clone = self.clone(); - Ok(async move { - let mut worker = self_clone.worker.lock().await; - let result_fut = worker.js_runtime.with_event_loop_future(resolve_fut, PollEventLoopOptions::default()); - match result_fut.await { - Ok(value) => { - let mut scope = worker.js_runtime.handle_scope(); - let result = value.open(&mut scope).to_rust_string_lossy(&mut scope); - Ok(result) - } - Err(e) => Err(e) - } - }) + + let resolve_fut = { + let mut worker = self.worker.lock().await; + let execute_async = worker.execute_script("js_core", wrapped_script.into()); + worker.js_runtime.resolve(execute_async.unwrap().into()) + }; + + Ok(SmartGlobalVariableFuture::new(self.worker.clone(), resolve_fut)) } fn generate_execution_slot( From 329a90aff8da34b2fd554f2ffe7adc08cc4269ac Mon Sep 17 00:00:00 2001 From: Nicolas Luck Date: Mon, 1 Jul 2024 16:03:15 +0200 Subject: [PATCH 26/37] Fix borrow-checker errors --- rust-executor/src/js_core/futures.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/rust-executor/src/js_core/futures.rs b/rust-executor/src/js_core/futures.rs index 91e320e3b..fc810f5ab 100644 --- a/rust-executor/src/js_core/futures.rs +++ b/rust-executor/src/js_core/futures.rs @@ -64,17 +64,18 @@ where type Output = Result; fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { - let mut value_pin = Pin::new(&mut self.value); - let mut worker = match self.worker.try_lock() { + let worker = self.worker.clone(); + let mut worker = match worker.try_lock() { Ok(w) => w, Err(_) => return Poll::Pending, }; - - let scope = &mut worker.js_runtime.handle_scope(); + let mut value_pin = Pin::new(&mut self.value); + if let Poll::Ready(result) = value_pin.as_mut().poll(cx) { match result { Ok(result) => { + let scope = &mut worker.js_runtime.handle_scope(); let result = result.open(scope).to_rust_string_lossy(scope); return Poll::Ready(Ok(result)); }, @@ -90,6 +91,7 @@ where if let Poll::Ready(result) = value_pin.poll(cx) { match result { Ok(result) => { + let scope = &mut worker.js_runtime.handle_scope(); let result = result.open(scope).to_rust_string_lossy(scope); return Poll::Ready(Ok(result)); }, From 78daaa29705f4680c6f73879e68792dddd676cc3 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Tue, 2 Jul 2024 12:31:17 +0530 Subject: [PATCH 27/37] chore: Update ExceptionType enum values to use uppercase snake case --- test-runner/example/languages/social-context.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test-runner/example/languages/social-context.js b/test-runner/example/languages/social-context.js index 0fc4e749a..cb347071b 100644 --- a/test-runner/example/languages/social-context.js +++ b/test-runner/example/languages/social-context.js @@ -4084,10 +4084,10 @@ LinkQuery = __decorate$7([ var ExceptionType; (function (ExceptionType) { - ExceptionType[ExceptionType["LanguageIsNotLoaded"] = 0] = "LanguageIsNotLoaded"; - ExceptionType[ExceptionType["ExpressionIsNotVerified"] = 1] = "ExpressionIsNotVerified"; - ExceptionType[ExceptionType["AgentIsUntrusted"] = 2] = "AgentIsUntrusted"; - ExceptionType[ExceptionType["CapabilityRequested"] = 3] = "CapabilityRequested"; + ExceptionType[ExceptionType["LanguageIsNotLoaded"] = 0] = "LANGUAGE_IS_NOT_LOADED"; + ExceptionType[ExceptionType["ExpressionIsNotVerified"] = 1] = "EXPRESSION_IS_NOT_VERIFIED"; + ExceptionType[ExceptionType["AgentIsUntrusted"] = 2] = "AGENT_IS_UNTRUSTED"; + ExceptionType[ExceptionType["CapabilityRequested"] = 3] = "CAPABILITY_REQUESTED"; })(ExceptionType || (ExceptionType = {})); var __decorate$6 = function (decorators, target, key, desc) { From 0ba76763beb32c874a6a94794a52dc2203178f79 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Tue, 2 Jul 2024 12:31:51 +0530 Subject: [PATCH 28/37] chore: Update local language persistence to handle missing meta file --- bootstrap-languages/local-language-persistence-0.0.9.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bootstrap-languages/local-language-persistence-0.0.9.js b/bootstrap-languages/local-language-persistence-0.0.9.js index 463545858..430c5fac4 100644 --- a/bootstrap-languages/local-language-persistence-0.0.9.js +++ b/bootstrap-languages/local-language-persistence-0.0.9.js @@ -1144,11 +1144,12 @@ class Adapter { async get(address) { const metaPath = join3(this.#storagePath, `meta-${address}.json`); try { - await exists(metaPath); - const metaFile = JSON.parse(Deno.readTextFileSync(metaPath)); - console.log("Found meta file info", metaFile); + // await Deno.stat(metaPath); + const metaFileText = Deno.readTextFileSync(metaPath); + const metaFile = JSON.parse(metaFileText); return metaFile; - } catch { + } catch (e) { + console.log("Did not find meta file for given address:" + address, e); return null; } } From d016e9502ef8e1ec0aa23c901b8491bff6f6f4a2 Mon Sep 17 00:00:00 2001 From: Nicolas Luck Date: Tue, 2 Jul 2024 09:48:06 +0200 Subject: [PATCH 29/37] Updated bootstrap seed with new language builds --- cli/mainnet_seed.json | 8 ++++---- rust-executor/src/mainnet_seed.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cli/mainnet_seed.json b/cli/mainnet_seed.json index 90cba2320..b438836ea 100644 --- a/cli/mainnet_seed.json +++ b/cli/mainnet_seed.json @@ -4,12 +4,12 @@ "did:key:z6MkvPpWxwXAnLtMcoc9sX7GEoJ96oNnQ3VcQJRLspNJfpE7" ], "knownLinkLanguages": [ - "QmzSYwdj7LmLiY7p5vEzBPuQpW3CmAB41vEJe9hkVB9w6ndhcE5", - "QmzSYwdnyTVrzufV8HfUfFRwDSiZZjRoBimrm95qjh6KCG9Z6YW", + "QmzSYwdpcT5AhCyY9YSDjhp9GeAe3tByT42iMkDucj5gerddw4r", + "QmzSYwdZpvwfS4BxVE1cwMcrKHQEJn8YmAVwxpHb3hRsqHRoshm", "QmzSYwdnHrRH8MmuPWKKrDvFoVyW5CophNpT1ipQUCcenPVTQnd" ], - "directMessageLanguage": "QmzSYwdbXD5LGiAHJAJknFgfigD2rb6ZYRUC8o8LRR9peP3pFGc", - "agentLanguage": "QmzSYwdoGSndfmEVKuP4Tsof64bSdiqYWgV9wypbvmgSELYoKet", + "directMessageLanguage": "QmzSYwdh2bVY4Xn39a8HteJuWD3bQfMSr1WHXKBvUebeCEYfX3b", + "agentLanguage": "QmzSYwdYQdQSxpsTWVACmXvDwK7uRaaUAfr2JCH5tGydcwFprkA", "perspectiveLanguage": "QmzSYwddxFCzVD63LgR8MTBaUEcwf9jhB3XjLbYBp2q8V1MqVtS", "neighbourhoodLanguage": "QmzSYwdo2a6E4XghRHrN5eCReyYRDeRE8VnRbvqgoWZsr9B4pxV", "languageLanguageBundle": "// https://deno.land/x/url_join@1.0.0/mod.ts\nvar urlJoin = function(...args) {\n let input;\n if (typeof args[0] === \"object\") {\n input = args[0];\n } else {\n input = [].slice.call(args);\n }\n return normalize(input);\n};\nvar normalize = (strArray) => {\n const resultArray = [];\n if (strArray.length === 0) {\n return \"\";\n }\n if (typeof strArray[0] !== \"string\") {\n throw new TypeError(\"Url must be a string. Received \" + strArray[0]);\n }\n if (strArray[0].match(/^[^/:]+:\\/*$/) && strArray.length > 1) {\n const first = strArray.shift();\n strArray[0] = first + strArray[0];\n }\n if (strArray[0].match(/^file:\\/\\/\\//)) {\n strArray[0] = strArray[0].replace(/^([^/:]+):\\/*/, \"$1:///\");\n } else {\n strArray[0] = strArray[0].replace(/^([^/:]+):\\/*/, \"$1://\");\n }\n for (let i = 0; i < strArray.length; i++) {\n let component = strArray[i];\n if (typeof component !== \"string\") {\n throw new TypeError(\"Url must be a string. Received \" + component);\n }\n if (component === \"\") {\n continue;\n }\n if (i > 0) {\n component = component.replace(/^[\\/]+/, \"\");\n }\n if (i < strArray.length - 1) {\n component = component.replace(/[\\/]+$/, \"\");\n } else {\n component = component.replace(/[\\/]+$/, \"/\");\n }\n resultArray.push(component);\n }\n let str = resultArray.join(\"/\");\n str = str.replace(/\\/(\\?|&|#[^!])/g, \"$1\");\n let parts = str.split(\"?\");\n str = parts.shift() + (parts.length > 0 ? \"?\" : \"\") + parts.join(\"&\");\n return str;\n};\n\n// https://deno.land/x/axiod@0.26.2/helpers.ts\nvar methods = [\n \"get\",\n \"post\",\n \"put\",\n \"delete\",\n \"options\",\n \"head\",\n \"connect\",\n \"trace\",\n \"patch\"\n];\nvar addInterceptor = () => {\n const interceptor = {\n list: [],\n use: function(fulfilled, rejected) {\n const id = this.list.length;\n this.list.push({\n fulfilled,\n rejected\n });\n return id;\n },\n eject: function(index) {\n if (this.list[index]) {\n this.list[index] = null;\n }\n }\n };\n return interceptor;\n};\n\n// https://deno.land/x/axiod@0.26.2/mod.ts\nfunction axiod(url, config) {\n if (typeof url === \"string\") {\n return axiod.request(Object.assign({}, axiod.defaults, { url }, config));\n }\n return axiod.request(Object.assign({}, axiod.defaults, url));\n}\naxiod.defaults = {\n url: \"/\",\n method: \"get\",\n timeout: 0,\n withCredentials: false,\n validateStatus: (status) => {\n return status >= 200 && status < 300;\n }\n};\naxiod.create = (config) => {\n const instance = axiod.bind({});\n instance.defaults = Object.assign({}, axiod.defaults, config);\n instance._request = request;\n instance.request = (options) => {\n return instance._request(Object.assign({}, instance.defaults, options));\n };\n instance.get = (url, config2) => {\n return instance.request(\n Object.assign({}, { url }, config2, { method: \"get\" })\n );\n };\n instance.post = (url, data, config2) => {\n return instance.request(\n Object.assign({}, { url }, config2, { method: \"post\", data })\n );\n };\n instance.put = (url, data, config2) => {\n return instance.request(\n Object.assign({}, { url }, config2, { method: \"put\", data })\n );\n };\n instance.delete = (url, data, config2) => {\n return instance.request(\n Object.assign({}, { url }, config2, { method: \"delete\", data })\n );\n };\n instance.options = (url, data, config2) => {\n return instance.request(\n Object.assign({}, { url }, config2, { method: \"options\", data })\n );\n };\n instance.head = (url, data, config2) => {\n return instance.request(\n Object.assign({}, { url }, config2, { method: \"head\", data })\n );\n };\n instance.connect = (url, data, config2) => {\n return instance.request(\n Object.assign({}, { url }, config2, { method: \"connect\", data })\n );\n };\n instance.trace = (url, data, config2) => {\n return instance.request(\n Object.assign({}, { url }, config2, { method: \"trace\", data })\n );\n };\n instance.patch = (url, data, config2) => {\n return instance.request(\n Object.assign({}, { url }, config2, { method: \"patch\", data })\n );\n };\n instance.interceptors = {\n request: addInterceptor(),\n response: addInterceptor()\n };\n instance.interceptors.request.list = [];\n instance.interceptors.response.list = [];\n return instance;\n};\nasync function request(config) {\n if (this.interceptors.request.list.length > 0) {\n for (const interceptor of this.interceptors.request.list) {\n if (interceptor) {\n const { fulfilled } = interceptor;\n if (fulfilled && config) {\n config = await fulfilled(config);\n }\n }\n }\n }\n let {\n url = \"/\",\n baseURL,\n method,\n headers,\n params = {},\n data,\n timeout,\n withCredentials,\n auth,\n validateStatus,\n paramsSerializer,\n transformRequest,\n transformResponse,\n redirect,\n responseType = \"json\"\n } = config;\n if (baseURL) {\n url = urlJoin(baseURL, url);\n }\n if (method) {\n if (methods.indexOf(method.toLowerCase().trim()) === -1) {\n throw new Error(`Method ${method} is not supported`);\n } else {\n method = method.toLowerCase().trim();\n }\n } else {\n method = \"get\";\n }\n let _params = \"\";\n if (params) {\n if (paramsSerializer) {\n _params = paramsSerializer(params);\n } else {\n _params = Object.keys(params).map((key) => {\n return encodeURIComponent(key) + \"=\" + encodeURIComponent(params[key]);\n }).join(\"&\");\n }\n }\n if (withCredentials) {\n if (auth?.username && auth?.password) {\n if (!headers) {\n headers = {};\n }\n headers[\"Authorization\"] = \"Basic \" + btoa(unescape(encodeURIComponent(`${auth.username}:${auth.password}`)));\n }\n }\n const fetchRequestObject = {};\n if (method !== \"get\") {\n fetchRequestObject.method = method.toUpperCase();\n }\n if (_params) {\n url = urlJoin(url, `?${_params}`);\n }\n if (data && method !== \"get\") {\n if (transformRequest && Array.isArray(transformRequest) && transformRequest.length > 0) {\n for (var i = 0; i < (transformRequest || []).length; i++) {\n if (transformRequest && transformRequest[i]) {\n data = transformRequest[i](data, headers);\n }\n }\n }\n if (typeof data === \"string\" || data instanceof FormData || data instanceof URLSearchParams) {\n fetchRequestObject.body = data;\n } else {\n try {\n fetchRequestObject.body = JSON.stringify(data);\n if (!headers) {\n headers = {};\n }\n headers[\"Accept\"] = \"application/json\";\n headers[\"Content-Type\"] = \"application/json\";\n } catch (ex) {\n }\n }\n }\n if (headers) {\n const _headers = new Headers();\n Object.keys(headers).forEach((header) => {\n if (headers && headers[header]) {\n _headers.set(header, headers[header]);\n }\n });\n fetchRequestObject.headers = _headers;\n }\n const controller = new AbortController();\n fetchRequestObject.signal = controller.signal;\n let timeoutCounter = 0;\n if ((timeout || 0) > 0) {\n timeoutCounter = setTimeout(() => {\n timeoutCounter = 0;\n controller.abort();\n }, timeout);\n }\n if (redirect) {\n fetchRequestObject.redirect = redirect;\n }\n return fetch(url, fetchRequestObject).then(async (x) => {\n if (timeoutCounter) {\n clearTimeout(timeoutCounter);\n }\n const _status = x.status;\n const _statusText = x.statusText;\n let _data = null;\n try {\n const response2 = x.clone();\n if (responseType === \"json\") {\n _data = await response2.json();\n } else if (responseType === \"text\") {\n _data = await response2.text();\n } else if (responseType === \"arraybuffer\") {\n _data = await response2.arrayBuffer();\n } else if (responseType === \"blob\") {\n _data = await response2.blob();\n } else if (responseType === \"stream\") {\n _data = (await response2.blob()).stream();\n } else {\n _data = await response2.text();\n }\n } catch (ex) {\n _data = await x.clone().text();\n }\n if (transformResponse) {\n if (transformResponse && Array.isArray(transformResponse) && transformResponse.length > 0) {\n for (var i2 = 0; i2 < (transformResponse || []).length; i2++) {\n if (transformResponse && transformResponse[i2]) {\n _data = transformResponse[i2](_data);\n }\n }\n }\n }\n const _headers = x.headers;\n const _config = {\n url,\n baseURL,\n method,\n headers,\n params,\n data,\n timeout,\n withCredentials,\n auth,\n paramsSerializer,\n redirect,\n responseType\n };\n let isValidStatus = true;\n if (validateStatus) {\n isValidStatus = validateStatus(_status);\n } else {\n isValidStatus = _status >= 200 && _status <= 303;\n }\n let response = null;\n let error = null;\n if (isValidStatus) {\n response = {\n status: _status,\n statusText: _statusText,\n data: _data,\n headers: _headers,\n config: _config\n };\n } else {\n error = {\n response: {\n status: _status,\n statusText: _statusText,\n data: _data,\n headers: _headers\n },\n config: _config\n };\n }\n if (this.interceptors.response.list.length > 0) {\n for (const interceptor of this.interceptors.response.list) {\n if (interceptor) {\n const { fulfilled, rejected } = interceptor;\n if (fulfilled && response) {\n response = await fulfilled(response);\n }\n if (rejected && error) {\n error = await rejected(error);\n }\n }\n }\n }\n if (error) {\n return Promise.reject(error);\n }\n return Promise.resolve(response);\n });\n}\naxiod._request = request;\naxiod.request = request;\naxiod.get = (url, config) => {\n return axiod.request(\n Object.assign({}, { url }, config, { method: \"get\" })\n );\n};\naxiod.post = (url, data, config) => {\n return axiod.request(\n Object.assign({}, { url }, config, { method: \"post\", data })\n );\n};\naxiod.put = (url, data, config) => {\n return axiod.request(\n Object.assign({}, { url }, config, { method: \"put\", data })\n );\n};\naxiod.delete = (url, data, config) => {\n return axiod.request(\n Object.assign({}, { url }, config, { method: \"delete\", data })\n );\n};\naxiod.options = (url, data, config) => {\n return axiod.request(\n Object.assign({}, { url }, config, { method: \"options\", data })\n );\n};\naxiod.head = (url, data, config) => {\n return axiod.request(\n Object.assign({}, { url }, config, { method: \"head\", data })\n );\n};\naxiod.connect = (url, data, config) => {\n return axiod.request(\n Object.assign({}, { url }, config, { method: \"connect\", data })\n );\n};\naxiod.trace = (url, data, config) => {\n return axiod.request(\n Object.assign({}, { url }, config, { method: \"trace\", data })\n );\n};\naxiod.patch = (url, data, config) => {\n return axiod.request(\n Object.assign({}, { url }, config, { method: \"patch\", data })\n );\n};\naxiod.interceptors = {\n request: addInterceptor(),\n response: addInterceptor()\n};\nvar mod_default = axiod;\n\n// languageAdapter.ts\nvar LangAdapter = class {\n constructor(context) {\n }\n async getLanguageSource(address) {\n if (address.substring(0, 2) != \"Qm\") {\n console.error(\"LanguageLanguage.getLanguageSource(): The address is not a valid hash\");\n return \"\";\n }\n const cid = address.toString();\n let presignedUrl;\n try {\n const getPresignedUrl = await mod_default.get(PROXY_URL + `?key=${cid}`);\n presignedUrl = getPresignedUrl.data.url;\n } catch (e) {\n console.error(\"Get language source failed at getting presigned url\", address);\n throw e;\n }\n let languageSource;\n try {\n const getLanguageSource = await mod_default.get(presignedUrl);\n languageSource = getLanguageSource.data;\n } catch (e) {\n console.error(\"Get language source failed at getting language source\", address);\n throw e;\n }\n return languageSource;\n }\n};\n\n// putAdapter.ts\nvar CloudflarePutAdapter = class {\n #agent;\n constructor(context) {\n this.#agent = context.agent;\n }\n async createPublic(language) {\n const hash = UTILS.hash(language.bundle.toString());\n if (hash != language.meta.address)\n throw new Error(`Language Persistence: Can't store language. Address stated in meta differs from actual file\nWanted: ${language.meta.address}\nGot: ${hash}`);\n const agent = this.#agent;\n const expression = agent.createSignedExpression(language.meta);\n const key = `meta-${hash}`;\n const metaPostData = {\n key,\n // Content of the new object.\n value: JSON.stringify(expression)\n };\n try {\n const metaPostResult = await mod_default.post(PROXY_URL, metaPostData);\n if (metaPostResult.status != 200) {\n console.error(\"Upload language meta data gets error: \", metaPostResult);\n }\n const languageBundleBucketParams = {\n key: hash,\n // Content of the new object.\n value: language.bundle.toString()\n };\n const bundlePostResult = await mod_default.post(PROXY_URL, languageBundleBucketParams);\n if (bundlePostResult.status != 200) {\n console.error(\"Upload language bundle data gets error: \", metaPostResult);\n }\n return hash;\n } catch (e) {\n if (e.response.status == 400 && e.response.data.includes(\"Key already exists\")) {\n console.log(\"[Cloudflare-based Language Language]: Tried to replace existing language. Ignoring...\");\n return hash;\n }\n console.error(\"[Cloudflare-based Language Language]: Error storing Language: \", e.response.data);\n throw e;\n }\n }\n};\n\n// adapter.ts\nvar Adapter = class {\n constructor(context) {\n this.putAdapter = new CloudflarePutAdapter(context);\n }\n async get(address) {\n if (address.substring(0, 2) != \"Qm\") {\n console.error(\"LanguageLanguage.get(): The address is not a valid hash\");\n return null;\n }\n const metaDataKey = `meta-${address}`;\n let presignedUrl;\n try {\n const getPresignedUrl = await mod_default.get(PROXY_URL + `?key=${metaDataKey}`);\n presignedUrl = getPresignedUrl.data.url;\n } catch (e) {\n console.error(\"Get meta information failed at getting presigned url\", address);\n return null;\n }\n let metaObject;\n try {\n const getMetaObject = await mod_default.get(presignedUrl);\n metaObject = getMetaObject.data;\n } catch (e) {\n console.error(\"Get meta information failed at getting meta information\", presignedUrl);\n return null;\n }\n return metaObject;\n }\n};\n\n// index.ts\nvar name = \"languages\";\nvar PROXY_URL = \"https://bootstrap-store-gateway.perspect3vism.workers.dev\";\nfunction interactions(expression) {\n return [];\n}\nasync function create(context) {\n const expressionAdapter = new Adapter(context);\n const languageAdapter = new LangAdapter(context);\n return {\n name,\n expressionAdapter,\n languageAdapter,\n interactions\n };\n}\nexport {\n PROXY_URL,\n create as default,\n name\n};\n" diff --git a/rust-executor/src/mainnet_seed.json b/rust-executor/src/mainnet_seed.json index 90cba2320..b438836ea 100644 --- a/rust-executor/src/mainnet_seed.json +++ b/rust-executor/src/mainnet_seed.json @@ -4,12 +4,12 @@ "did:key:z6MkvPpWxwXAnLtMcoc9sX7GEoJ96oNnQ3VcQJRLspNJfpE7" ], "knownLinkLanguages": [ - "QmzSYwdj7LmLiY7p5vEzBPuQpW3CmAB41vEJe9hkVB9w6ndhcE5", - "QmzSYwdnyTVrzufV8HfUfFRwDSiZZjRoBimrm95qjh6KCG9Z6YW", + "QmzSYwdpcT5AhCyY9YSDjhp9GeAe3tByT42iMkDucj5gerddw4r", + "QmzSYwdZpvwfS4BxVE1cwMcrKHQEJn8YmAVwxpHb3hRsqHRoshm", "QmzSYwdnHrRH8MmuPWKKrDvFoVyW5CophNpT1ipQUCcenPVTQnd" ], - "directMessageLanguage": "QmzSYwdbXD5LGiAHJAJknFgfigD2rb6ZYRUC8o8LRR9peP3pFGc", - "agentLanguage": "QmzSYwdoGSndfmEVKuP4Tsof64bSdiqYWgV9wypbvmgSELYoKet", + "directMessageLanguage": "QmzSYwdh2bVY4Xn39a8HteJuWD3bQfMSr1WHXKBvUebeCEYfX3b", + "agentLanguage": "QmzSYwdYQdQSxpsTWVACmXvDwK7uRaaUAfr2JCH5tGydcwFprkA", "perspectiveLanguage": "QmzSYwddxFCzVD63LgR8MTBaUEcwf9jhB3XjLbYBp2q8V1MqVtS", "neighbourhoodLanguage": "QmzSYwdo2a6E4XghRHrN5eCReyYRDeRE8VnRbvqgoWZsr9B4pxV", "languageLanguageBundle": "// https://deno.land/x/url_join@1.0.0/mod.ts\nvar urlJoin = function(...args) {\n let input;\n if (typeof args[0] === \"object\") {\n input = args[0];\n } else {\n input = [].slice.call(args);\n }\n return normalize(input);\n};\nvar normalize = (strArray) => {\n const resultArray = [];\n if (strArray.length === 0) {\n return \"\";\n }\n if (typeof strArray[0] !== \"string\") {\n throw new TypeError(\"Url must be a string. Received \" + strArray[0]);\n }\n if (strArray[0].match(/^[^/:]+:\\/*$/) && strArray.length > 1) {\n const first = strArray.shift();\n strArray[0] = first + strArray[0];\n }\n if (strArray[0].match(/^file:\\/\\/\\//)) {\n strArray[0] = strArray[0].replace(/^([^/:]+):\\/*/, \"$1:///\");\n } else {\n strArray[0] = strArray[0].replace(/^([^/:]+):\\/*/, \"$1://\");\n }\n for (let i = 0; i < strArray.length; i++) {\n let component = strArray[i];\n if (typeof component !== \"string\") {\n throw new TypeError(\"Url must be a string. Received \" + component);\n }\n if (component === \"\") {\n continue;\n }\n if (i > 0) {\n component = component.replace(/^[\\/]+/, \"\");\n }\n if (i < strArray.length - 1) {\n component = component.replace(/[\\/]+$/, \"\");\n } else {\n component = component.replace(/[\\/]+$/, \"/\");\n }\n resultArray.push(component);\n }\n let str = resultArray.join(\"/\");\n str = str.replace(/\\/(\\?|&|#[^!])/g, \"$1\");\n let parts = str.split(\"?\");\n str = parts.shift() + (parts.length > 0 ? \"?\" : \"\") + parts.join(\"&\");\n return str;\n};\n\n// https://deno.land/x/axiod@0.26.2/helpers.ts\nvar methods = [\n \"get\",\n \"post\",\n \"put\",\n \"delete\",\n \"options\",\n \"head\",\n \"connect\",\n \"trace\",\n \"patch\"\n];\nvar addInterceptor = () => {\n const interceptor = {\n list: [],\n use: function(fulfilled, rejected) {\n const id = this.list.length;\n this.list.push({\n fulfilled,\n rejected\n });\n return id;\n },\n eject: function(index) {\n if (this.list[index]) {\n this.list[index] = null;\n }\n }\n };\n return interceptor;\n};\n\n// https://deno.land/x/axiod@0.26.2/mod.ts\nfunction axiod(url, config) {\n if (typeof url === \"string\") {\n return axiod.request(Object.assign({}, axiod.defaults, { url }, config));\n }\n return axiod.request(Object.assign({}, axiod.defaults, url));\n}\naxiod.defaults = {\n url: \"/\",\n method: \"get\",\n timeout: 0,\n withCredentials: false,\n validateStatus: (status) => {\n return status >= 200 && status < 300;\n }\n};\naxiod.create = (config) => {\n const instance = axiod.bind({});\n instance.defaults = Object.assign({}, axiod.defaults, config);\n instance._request = request;\n instance.request = (options) => {\n return instance._request(Object.assign({}, instance.defaults, options));\n };\n instance.get = (url, config2) => {\n return instance.request(\n Object.assign({}, { url }, config2, { method: \"get\" })\n );\n };\n instance.post = (url, data, config2) => {\n return instance.request(\n Object.assign({}, { url }, config2, { method: \"post\", data })\n );\n };\n instance.put = (url, data, config2) => {\n return instance.request(\n Object.assign({}, { url }, config2, { method: \"put\", data })\n );\n };\n instance.delete = (url, data, config2) => {\n return instance.request(\n Object.assign({}, { url }, config2, { method: \"delete\", data })\n );\n };\n instance.options = (url, data, config2) => {\n return instance.request(\n Object.assign({}, { url }, config2, { method: \"options\", data })\n );\n };\n instance.head = (url, data, config2) => {\n return instance.request(\n Object.assign({}, { url }, config2, { method: \"head\", data })\n );\n };\n instance.connect = (url, data, config2) => {\n return instance.request(\n Object.assign({}, { url }, config2, { method: \"connect\", data })\n );\n };\n instance.trace = (url, data, config2) => {\n return instance.request(\n Object.assign({}, { url }, config2, { method: \"trace\", data })\n );\n };\n instance.patch = (url, data, config2) => {\n return instance.request(\n Object.assign({}, { url }, config2, { method: \"patch\", data })\n );\n };\n instance.interceptors = {\n request: addInterceptor(),\n response: addInterceptor()\n };\n instance.interceptors.request.list = [];\n instance.interceptors.response.list = [];\n return instance;\n};\nasync function request(config) {\n if (this.interceptors.request.list.length > 0) {\n for (const interceptor of this.interceptors.request.list) {\n if (interceptor) {\n const { fulfilled } = interceptor;\n if (fulfilled && config) {\n config = await fulfilled(config);\n }\n }\n }\n }\n let {\n url = \"/\",\n baseURL,\n method,\n headers,\n params = {},\n data,\n timeout,\n withCredentials,\n auth,\n validateStatus,\n paramsSerializer,\n transformRequest,\n transformResponse,\n redirect,\n responseType = \"json\"\n } = config;\n if (baseURL) {\n url = urlJoin(baseURL, url);\n }\n if (method) {\n if (methods.indexOf(method.toLowerCase().trim()) === -1) {\n throw new Error(`Method ${method} is not supported`);\n } else {\n method = method.toLowerCase().trim();\n }\n } else {\n method = \"get\";\n }\n let _params = \"\";\n if (params) {\n if (paramsSerializer) {\n _params = paramsSerializer(params);\n } else {\n _params = Object.keys(params).map((key) => {\n return encodeURIComponent(key) + \"=\" + encodeURIComponent(params[key]);\n }).join(\"&\");\n }\n }\n if (withCredentials) {\n if (auth?.username && auth?.password) {\n if (!headers) {\n headers = {};\n }\n headers[\"Authorization\"] = \"Basic \" + btoa(unescape(encodeURIComponent(`${auth.username}:${auth.password}`)));\n }\n }\n const fetchRequestObject = {};\n if (method !== \"get\") {\n fetchRequestObject.method = method.toUpperCase();\n }\n if (_params) {\n url = urlJoin(url, `?${_params}`);\n }\n if (data && method !== \"get\") {\n if (transformRequest && Array.isArray(transformRequest) && transformRequest.length > 0) {\n for (var i = 0; i < (transformRequest || []).length; i++) {\n if (transformRequest && transformRequest[i]) {\n data = transformRequest[i](data, headers);\n }\n }\n }\n if (typeof data === \"string\" || data instanceof FormData || data instanceof URLSearchParams) {\n fetchRequestObject.body = data;\n } else {\n try {\n fetchRequestObject.body = JSON.stringify(data);\n if (!headers) {\n headers = {};\n }\n headers[\"Accept\"] = \"application/json\";\n headers[\"Content-Type\"] = \"application/json\";\n } catch (ex) {\n }\n }\n }\n if (headers) {\n const _headers = new Headers();\n Object.keys(headers).forEach((header) => {\n if (headers && headers[header]) {\n _headers.set(header, headers[header]);\n }\n });\n fetchRequestObject.headers = _headers;\n }\n const controller = new AbortController();\n fetchRequestObject.signal = controller.signal;\n let timeoutCounter = 0;\n if ((timeout || 0) > 0) {\n timeoutCounter = setTimeout(() => {\n timeoutCounter = 0;\n controller.abort();\n }, timeout);\n }\n if (redirect) {\n fetchRequestObject.redirect = redirect;\n }\n return fetch(url, fetchRequestObject).then(async (x) => {\n if (timeoutCounter) {\n clearTimeout(timeoutCounter);\n }\n const _status = x.status;\n const _statusText = x.statusText;\n let _data = null;\n try {\n const response2 = x.clone();\n if (responseType === \"json\") {\n _data = await response2.json();\n } else if (responseType === \"text\") {\n _data = await response2.text();\n } else if (responseType === \"arraybuffer\") {\n _data = await response2.arrayBuffer();\n } else if (responseType === \"blob\") {\n _data = await response2.blob();\n } else if (responseType === \"stream\") {\n _data = (await response2.blob()).stream();\n } else {\n _data = await response2.text();\n }\n } catch (ex) {\n _data = await x.clone().text();\n }\n if (transformResponse) {\n if (transformResponse && Array.isArray(transformResponse) && transformResponse.length > 0) {\n for (var i2 = 0; i2 < (transformResponse || []).length; i2++) {\n if (transformResponse && transformResponse[i2]) {\n _data = transformResponse[i2](_data);\n }\n }\n }\n }\n const _headers = x.headers;\n const _config = {\n url,\n baseURL,\n method,\n headers,\n params,\n data,\n timeout,\n withCredentials,\n auth,\n paramsSerializer,\n redirect,\n responseType\n };\n let isValidStatus = true;\n if (validateStatus) {\n isValidStatus = validateStatus(_status);\n } else {\n isValidStatus = _status >= 200 && _status <= 303;\n }\n let response = null;\n let error = null;\n if (isValidStatus) {\n response = {\n status: _status,\n statusText: _statusText,\n data: _data,\n headers: _headers,\n config: _config\n };\n } else {\n error = {\n response: {\n status: _status,\n statusText: _statusText,\n data: _data,\n headers: _headers\n },\n config: _config\n };\n }\n if (this.interceptors.response.list.length > 0) {\n for (const interceptor of this.interceptors.response.list) {\n if (interceptor) {\n const { fulfilled, rejected } = interceptor;\n if (fulfilled && response) {\n response = await fulfilled(response);\n }\n if (rejected && error) {\n error = await rejected(error);\n }\n }\n }\n }\n if (error) {\n return Promise.reject(error);\n }\n return Promise.resolve(response);\n });\n}\naxiod._request = request;\naxiod.request = request;\naxiod.get = (url, config) => {\n return axiod.request(\n Object.assign({}, { url }, config, { method: \"get\" })\n );\n};\naxiod.post = (url, data, config) => {\n return axiod.request(\n Object.assign({}, { url }, config, { method: \"post\", data })\n );\n};\naxiod.put = (url, data, config) => {\n return axiod.request(\n Object.assign({}, { url }, config, { method: \"put\", data })\n );\n};\naxiod.delete = (url, data, config) => {\n return axiod.request(\n Object.assign({}, { url }, config, { method: \"delete\", data })\n );\n};\naxiod.options = (url, data, config) => {\n return axiod.request(\n Object.assign({}, { url }, config, { method: \"options\", data })\n );\n};\naxiod.head = (url, data, config) => {\n return axiod.request(\n Object.assign({}, { url }, config, { method: \"head\", data })\n );\n};\naxiod.connect = (url, data, config) => {\n return axiod.request(\n Object.assign({}, { url }, config, { method: \"connect\", data })\n );\n};\naxiod.trace = (url, data, config) => {\n return axiod.request(\n Object.assign({}, { url }, config, { method: \"trace\", data })\n );\n};\naxiod.patch = (url, data, config) => {\n return axiod.request(\n Object.assign({}, { url }, config, { method: \"patch\", data })\n );\n};\naxiod.interceptors = {\n request: addInterceptor(),\n response: addInterceptor()\n};\nvar mod_default = axiod;\n\n// languageAdapter.ts\nvar LangAdapter = class {\n constructor(context) {\n }\n async getLanguageSource(address) {\n if (address.substring(0, 2) != \"Qm\") {\n console.error(\"LanguageLanguage.getLanguageSource(): The address is not a valid hash\");\n return \"\";\n }\n const cid = address.toString();\n let presignedUrl;\n try {\n const getPresignedUrl = await mod_default.get(PROXY_URL + `?key=${cid}`);\n presignedUrl = getPresignedUrl.data.url;\n } catch (e) {\n console.error(\"Get language source failed at getting presigned url\", address);\n throw e;\n }\n let languageSource;\n try {\n const getLanguageSource = await mod_default.get(presignedUrl);\n languageSource = getLanguageSource.data;\n } catch (e) {\n console.error(\"Get language source failed at getting language source\", address);\n throw e;\n }\n return languageSource;\n }\n};\n\n// putAdapter.ts\nvar CloudflarePutAdapter = class {\n #agent;\n constructor(context) {\n this.#agent = context.agent;\n }\n async createPublic(language) {\n const hash = UTILS.hash(language.bundle.toString());\n if (hash != language.meta.address)\n throw new Error(`Language Persistence: Can't store language. Address stated in meta differs from actual file\nWanted: ${language.meta.address}\nGot: ${hash}`);\n const agent = this.#agent;\n const expression = agent.createSignedExpression(language.meta);\n const key = `meta-${hash}`;\n const metaPostData = {\n key,\n // Content of the new object.\n value: JSON.stringify(expression)\n };\n try {\n const metaPostResult = await mod_default.post(PROXY_URL, metaPostData);\n if (metaPostResult.status != 200) {\n console.error(\"Upload language meta data gets error: \", metaPostResult);\n }\n const languageBundleBucketParams = {\n key: hash,\n // Content of the new object.\n value: language.bundle.toString()\n };\n const bundlePostResult = await mod_default.post(PROXY_URL, languageBundleBucketParams);\n if (bundlePostResult.status != 200) {\n console.error(\"Upload language bundle data gets error: \", metaPostResult);\n }\n return hash;\n } catch (e) {\n if (e.response.status == 400 && e.response.data.includes(\"Key already exists\")) {\n console.log(\"[Cloudflare-based Language Language]: Tried to replace existing language. Ignoring...\");\n return hash;\n }\n console.error(\"[Cloudflare-based Language Language]: Error storing Language: \", e.response.data);\n throw e;\n }\n }\n};\n\n// adapter.ts\nvar Adapter = class {\n constructor(context) {\n this.putAdapter = new CloudflarePutAdapter(context);\n }\n async get(address) {\n if (address.substring(0, 2) != \"Qm\") {\n console.error(\"LanguageLanguage.get(): The address is not a valid hash\");\n return null;\n }\n const metaDataKey = `meta-${address}`;\n let presignedUrl;\n try {\n const getPresignedUrl = await mod_default.get(PROXY_URL + `?key=${metaDataKey}`);\n presignedUrl = getPresignedUrl.data.url;\n } catch (e) {\n console.error(\"Get meta information failed at getting presigned url\", address);\n return null;\n }\n let metaObject;\n try {\n const getMetaObject = await mod_default.get(presignedUrl);\n metaObject = getMetaObject.data;\n } catch (e) {\n console.error(\"Get meta information failed at getting meta information\", presignedUrl);\n return null;\n }\n return metaObject;\n }\n};\n\n// index.ts\nvar name = \"languages\";\nvar PROXY_URL = \"https://bootstrap-store-gateway.perspect3vism.workers.dev\";\nfunction interactions(expression) {\n return [];\n}\nasync function create(context) {\n const expressionAdapter = new Adapter(context);\n const languageAdapter = new LangAdapter(context);\n return {\n name,\n expressionAdapter,\n languageAdapter,\n interactions\n };\n}\nexport {\n PROXY_URL,\n create as default,\n name\n};\n" From ff30342df0835fe32ea0884524950bc490bd62c7 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Fri, 5 Jul 2024 20:12:17 +0530 Subject: [PATCH 30/37] chore: Update JS module loading in Rust executor --- rust-executor/src/js_core/mod.rs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/rust-executor/src/js_core/mod.rs b/rust-executor/src/js_core/mod.rs index af8c40ff6..6c7a0cff4 100644 --- a/rust-executor/src/js_core/mod.rs +++ b/rust-executor/src/js_core/mod.rs @@ -6,6 +6,7 @@ use deno_runtime::worker::MainWorker; use deno_runtime::{permissions::PermissionsContainer, BootstrapOptions}; use holochain::prelude::{ExternIO, Signal}; use once_cell::sync::Lazy; +use std::collections::HashSet; use std::env::current_dir; use std::sync::Arc; use tokio::runtime::Builder; @@ -116,6 +117,7 @@ struct JsCoreResponse { #[derive(Clone)] pub struct JsCore { worker: Arc>, + loaded_modules: Arc>> } pub struct ExternWrapper(ExternIO); @@ -145,13 +147,20 @@ impl JsCore { PermissionsContainer::allow_all(), main_worker_options(), ))), + loaded_modules: Arc::new(TokioMutex::new(HashSet::new())) } } async fn load_module(&self, file_path: String) -> Result<(), AnyError> { let mut worker = self.worker.lock().await; + let mut loaded_modules = self.loaded_modules.lock().await; let url = resolve_url_or_path(&file_path, current_dir()?.as_path())?; + if loaded_modules.contains(url.clone().as_str()) { + return Ok(()); + } + let module_id = worker.js_runtime.load_side_es_module(&url).await?; + loaded_modules.insert(url.clone().to_string()); let evaluate_fut = worker.js_runtime.mod_evaluate(module_id); worker.js_runtime.with_event_loop_future(evaluate_fut, PollEventLoopOptions::default()).await?; Ok(()) From 7ed970d004723832925b76a5b85404e13e39f0cc Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Fri, 5 Jul 2024 20:17:55 +0530 Subject: [PATCH 31/37] chore: Comment out logging of DHT status in HolochainService constructor --- .../src/core/storage-services/Holochain/HolochainService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/executor/src/core/storage-services/Holochain/HolochainService.ts b/executor/src/core/storage-services/Holochain/HolochainService.ts index 6ca24a36d..b2c6440c5 100644 --- a/executor/src/core/storage-services/Holochain/HolochainService.ts +++ b/executor/src/core/storage-services/Holochain/HolochainService.ts @@ -56,7 +56,7 @@ export default class HolochainService { this.#languageDnaHashes = new Map(); if (logHolochainMetrics) { - this.logDhtStatus(); + // this.logDhtStatus(); } } From ddbe9ee2330e79cd0edc2fbc980f51633ca917bc Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Fri, 12 Jul 2024 20:36:22 +0530 Subject: [PATCH 32/37] chore: Remove logging of DHT status in HolochainService constructor --- rust-executor/src/js_core/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-executor/src/js_core/mod.rs b/rust-executor/src/js_core/mod.rs index 6c7a0cff4..42d3fddb2 100644 --- a/rust-executor/src/js_core/mod.rs +++ b/rust-executor/src/js_core/mod.rs @@ -75,7 +75,7 @@ impl JsCoreHandle { let response = response_rx.await?; - info!("Got response: {:?}", response); + // info!("Got response: {:?}", response); response .result From 0a8e0e130132d807a0604d7e74e534b042d4d745 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Mon, 22 Jul 2024 10:56:58 +0530 Subject: [PATCH 33/37] chore: Update dependencies for HolochainService and Rust executor --- Cargo.lock | 4752 +++++++++-------- Cargo.toml | 5 +- bootstrap-languages/agent-language/adapter.ts | 12 +- .../agent-language/hc-dna/Cargo.lock | 579 +- .../hc-dna/zomes/agent_store/Cargo.toml | 6 +- .../hc-dna/zomes/agent_store/src/lib.rs | 8 + .../zomes/agent_store_integrity/Cargo.toml | 5 +- .../direct-message-language/hc-dna/Cargo.lock | 581 +- .../zomes/direct-message-integrity/Cargo.toml | 4 +- .../hc-dna/zomes/direct-message/Cargo.toml | 4 +- .../file-storage/hc-dna/Cargo.lock | 568 +- .../hc-dna/zomes/file_storage/Cargo.toml | 4 +- .../hc-dna/zomes/integrity/Cargo.toml | 6 +- .../hc-dna/Cargo.lock | 518 +- .../zomes/perspective_diff_sync/Cargo.toml | 4 +- .../Cargo.toml | 6 +- .../p-diff-sync/hc-dna/Cargo.lock | 518 +- .../zomes/perspective_diff_sync/Cargo.toml | 4 +- .../Cargo.toml | 6 +- cli/Cargo.toml | 2 +- .../src/core/graphQL-interface/GraphQL.ts | 12 +- rust-executor/Cargo.toml | 28 +- rust-executor/src/holochain_service/mod.rs | 2 + 23 files changed, 5034 insertions(+), 2600 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 27ef940e8..2bbf0796c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -20,12 +20,12 @@ dependencies = [ "ad4m-executor", "anyhow", "chrono", - "clap 4.4.18", + "clap 4.5.9", "colour", "ctrlc", "dirs 4.0.0", "futures", - "kitsune_p2p_types 0.3.1-rc.0 (registry+https://github.com/rust-lang/crates.io-index)", + "kitsune_p2p_types", "rand 0.8.5", "regex", "rustyline 10.1.1", @@ -44,7 +44,7 @@ dependencies = [ "anyhow", "async-tungstenite", "chrono", - "clap 4.4.18", + "clap 4.5.9", "dirs 4.0.0", "futures", "graphql-ws-client", @@ -70,7 +70,7 @@ dependencies = [ "base64 0.21.7", "chrono", "cid", - "clap 4.4.18", + "clap 4.5.9", "coasys_juniper", "coasys_juniper_graphql_transport_ws", "coasys_juniper_subscriptions", @@ -80,7 +80,7 @@ dependencies = [ "deno_runtime", "did-key", "dirs 5.0.1", - "env_logger", + "env_logger 0.10.2", "fake", "fs_extra", "futures", @@ -93,7 +93,7 @@ dependencies = [ "itertools 0.10.5", "json5", "jsonwebtoken", - "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_types", "lazy_static", "log", "maplit", @@ -107,22 +107,22 @@ dependencies = [ "rocket", "rusqlite", "rust-embed", - "rustls 0.23.8", + "rustls 0.23.11", "rustls-pemfile 2.1.2", "scryer-prolog", "secp256k1", - "semver 1.0.21", + "semver 1.0.23", "serde", "serde_json", "sha2 0.10.8", "tokio", "tokio-rustls 0.26.0", "tokio-stream", - "url", - "uuid 1.8.0", + "url 2.5.2", + "uuid 1.10.0", "warp", "webbrowser", - "zip", + "zip 2.1.3", ] [[package]] @@ -134,7 +134,7 @@ dependencies = [ "chrono", "colored", "directories", - "env_logger", + "env_logger 0.10.2", "libc", "localtunnel-client", "log", @@ -160,11 +160,11 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ - "gimli 0.28.1", + "gimli 0.29.0", ] [[package]] @@ -200,7 +200,7 @@ dependencies = [ "cipher", "ctr", "ghash", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -225,7 +225,7 @@ dependencies = [ "cipher", "ctr", "ghash", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -245,11 +245,11 @@ checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" [[package]] name = "ahash" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ - "getrandom 0.2.12", + "getrandom 0.2.15", "once_cell", "version_check", ] @@ -261,7 +261,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if 1.0.0", - "getrandom 0.2.12", + "getrandom 0.2.15", "once_cell", "version_check", "zerocopy", @@ -269,22 +269,21 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "aitia" -version = "0.2.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.3.0-dev.3" dependencies = [ "anyhow", "derive_more", - "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", - "parking_lot 0.12.1", + "holochain_trace", + "parking_lot 0.12.3", "petgraph", "regex", "serde", @@ -318,9 +317,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-tzdata" @@ -348,47 +347,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.11" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.5" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2faccea4cc4ab4a667ce676a30e8ec13922a692c99bb8f5b11f1502c72e04220" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -435,29 +435,28 @@ dependencies = [ [[package]] name = "arboard" -version = "3.2.1" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac57f2b058a76363e357c056e4f74f1945bf734d37b8b3ef49066c4787dde0fc" +checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" dependencies = [ - "clipboard-win 4.5.0", - "core-graphics", - "image", + "clipboard-win 5.4.0", + "core-graphics 0.23.2", + "image 0.25.1", "log", - "objc", - "objc-foundation", - "objc_id", - "parking_lot 0.12.1", - "thiserror", - "winapi 0.3.9", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "parking_lot 0.12.3", + "windows-sys 0.48.0", "wl-clipboard-rs", "x11rb", ] [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "argon2" @@ -468,7 +467,7 @@ dependencies = [ "base64ct", "blake2 0.10.6", "cpufeatures", - "password-hash 0.5.0", + "password-hash", ] [[package]] @@ -529,8 +528,8 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", "synstructure", ] @@ -541,8 +540,8 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -552,10 +551,10 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ab31376d309dd3bfc9cfb3c11c93ce0e0741bbe0354b20e7f8c60b044730b79" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "swc_macros_common", - "syn 2.0.48", + "syn 2.0.71", ] [[package]] @@ -564,7 +563,7 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" dependencies = [ - "quote 1.0.35", + "quote", "syn 1.0.109", ] @@ -581,12 +580,11 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.1.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 4.0.3", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -594,11 +592,11 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.6" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" +checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5" dependencies = [ - "brotli", + "brotli 6.0.0", "flate2", "futures-core", "memchr", @@ -608,15 +606,14 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.8.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ - "async-lock 3.3.0", "async-task", "concurrent-queue", - "fastrand 2.0.1", - "futures-lite 2.2.0", + "fastrand 2.1.0", + "futures-lite 2.3.0", "slab", ] @@ -626,12 +623,12 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ - "async-channel 2.1.1", + "async-channel 2.3.1", "async-executor", - "async-io 2.3.1", - "async-lock 3.3.0", + "async-io 2.3.3", + "async-lock 3.4.0", "blocking", - "futures-lite 2.2.0", + "futures-lite 2.3.0", "once_cell", ] @@ -642,7 +639,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ "async-lock 2.8.0", - "autocfg 1.1.0", + "autocfg 1.3.0", "cfg-if 1.0.0", "concurrent-queue", "futures-lite 1.13.0", @@ -657,18 +654,18 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.1" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" dependencies = [ - "async-lock 3.3.0", + "async-lock 3.4.0", "cfg-if 1.0.0", "concurrent-queue", "futures-io", - "futures-lite 2.2.0", + "futures-lite 2.3.0", "parking", - "polling 3.3.2", - "rustix 0.38.30", + "polling 3.7.2", + "rustix 0.38.34", "slab", "tracing", "windows-sys 0.52.0", @@ -685,11 +682,11 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 4.0.3", + "event-listener 5.3.1", "event-listener-strategy", "pin-project-lite", ] @@ -713,7 +710,7 @@ dependencies = [ "cfg-if 1.0.0", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.30", + "rustix 0.38.34", "windows-sys 0.48.0", ] @@ -723,27 +720,27 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] name = "async-signal" -version = "0.2.5" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" dependencies = [ - "async-io 2.3.1", - "async-lock 2.8.0", + "async-io 2.3.3", + "async-lock 3.4.0", "atomic-waker", "cfg-if 1.0.0", "futures-core", "futures-io", - "rustix 0.38.30", + "rustix 0.38.34", "signal-hook-registry", "slab", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -801,8 +798,8 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25f9db3b38af870bf7e5cc649167533b493928e50744e2c30ae350230b414670" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -812,26 +809,26 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] name = "async-task" -version = "4.7.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] @@ -869,7 +866,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -919,14 +916,14 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "automap" @@ -942,9 +939,9 @@ dependencies = [ [[package]] name = "aws-lc-rs" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "474d7cec9d0a1126fad1b224b767fcbf351c23b0309bb21ec210bcfd379926a5" +checksum = "a8a47f2fb521b70c11ce7369a6c5fa4bd6af7e5d62ec06303875bafe7c6ba245" dependencies = [ "aws-lc-sys", "mirai-annotations", @@ -954,9 +951,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.17.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7505fc3cb7acbf42699a43a79dd9caa4ed9e99861dfbb837c5c0fb5a0a8d2980" +checksum = "2927c7af777b460b7ccd95f8b67acd7b4c04ec8896bf0c8e80ba30523cffc057" dependencies = [ "bindgen", "cc", @@ -969,11 +966,11 @@ dependencies = [ [[package]] name = "backon" -version = "0.4.1" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c1a6197b2120bb2185a267f6515038558b019e92b832bb0320e96d66268dcf9" +checksum = "d67782c3f868daa71d3533538e98a8e13713231969def7536e8039606fc46bf0" dependencies = [ - "fastrand 1.9.0", + "fastrand 2.1.0", "futures-core", "pin-project", "tokio", @@ -981,9 +978,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -1103,20 +1100,20 @@ version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cexpr", "clang-sys", "itertools 0.12.1", "lazy_static", "lazycell", "log", - "prettyplease 0.2.17", - "proc-macro2 1.0.78", - "quote 1.0.35", + "prettyplease 0.2.20", + "proc-macro2", + "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.48", + "syn 2.0.71", "which 4.4.2", ] @@ -1126,7 +1123,16 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" dependencies = [ - "bit-vec", + "bit-vec 0.6.3", +] + +[[package]] +name = "bit-set" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" +dependencies = [ + "bit-vec 0.7.0", ] [[package]] @@ -1134,6 +1140,12 @@ name = "bit-vec" version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bit-vec" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" dependencies = [ "serde", ] @@ -1152,9 +1164,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] @@ -1200,7 +1212,7 @@ checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", "arrayvec 0.7.4", - "constant_time_eq 0.3.0", + "constant_time_eq", ] [[package]] @@ -1211,20 +1223,20 @@ checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae" dependencies = [ "arrayref", "arrayvec 0.7.4", - "constant_time_eq 0.3.0", + "constant_time_eq", ] [[package]] name = "blake3" -version = "1.5.0" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" +checksum = "e9ec96fe9a81b5e365f9db71fe00edc4fe4ca2cc7dcb7861f0603012a7caa210" dependencies = [ "arrayref", "arrayvec 0.7.4", "cc", "cfg-if 1.0.0", - "constant_time_eq 0.3.0", + "constant_time_eq", ] [[package]] @@ -1281,31 +1293,37 @@ dependencies = [ "generic-array 0.14.7", ] +[[package]] +name = "block2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2", +] + [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ - "async-channel 2.1.1", - "async-lock 3.3.0", + "async-channel 2.3.1", "async-task", - "fastrand 2.0.1", "futures-io", - "futures-lite 2.2.0", + "futures-lite 2.3.0", "piper", - "tracing", ] [[package]] name = "bloomfilter" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b64d54e47a7f4fd723f082e8f11429f3df6ba8adaeca355a76556f9f0602bbcf" +checksum = "bc0bdbcf2078e0ba8a74e1fe0cf36f54054a04485759b61dfd60b174658e9607" dependencies = [ - "bit-vec", - "getrandom 0.2.12", - "siphasher 1.0.0", + "bit-vec 0.7.0", + "getrandom 0.2.15", + "siphasher 1.0.1", ] [[package]] @@ -1321,19 +1339,30 @@ dependencies = [ "pairing", "rand_core 0.6.4", "serde", - "subtle 2.5.0", + "subtle 2.6.1", "zeroize", ] [[package]] name = "brotli" -version = "3.4.0" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor 2.5.1", +] + +[[package]] +name = "brotli" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", - "brotli-decompressor", + "brotli-decompressor 4.0.1", ] [[package]] @@ -1346,6 +1375,16 @@ dependencies = [ "alloc-stdlib", ] +[[package]] +name = "brotli-decompressor" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + [[package]] name = "bs58" version = "0.4.0" @@ -1354,16 +1393,16 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bson" -version = "2.9.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce21468c1c9c154a85696bb25c20582511438edb6ad67f846ba1378ffdd80222" +checksum = "d8a88e82b9106923b5c4d6edfca9e7db958d4e98a478ec115022e81b9b38e2c8" dependencies = [ "ahash 0.8.11", "base64 0.13.1", "bitvec", "chrono", "hex", - "indexmap 2.2.2", + "indexmap 2.2.6", "js-sys", "once_cell", "rand 0.8.5", @@ -1371,25 +1410,25 @@ dependencies = [ "serde_bytes", "serde_json", "time", - "uuid 1.8.0", + "uuid 1.10.0", ] [[package]] name = "bstr" -version = "1.9.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", - "regex-automata 0.4.5", + "regex-automata 0.4.7", "serde", ] [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byte-tools" @@ -1399,9 +1438,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytecheck" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" +checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" dependencies = [ "bytecheck_derive", "ptr_meta", @@ -1410,20 +1449,20 @@ dependencies = [ [[package]] name = "bytecheck_derive" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" +checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] [[package]] name = "bytemuck" -version = "1.14.1" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed2490600f404f2b94c167e31d3ed1d5f3c225a0f3b80230053b3e0b7b962bd9" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" [[package]] name = "byteorder" @@ -1433,9 +1472,18 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" +dependencies = [ + "serde", +] + +[[package]] +name = "bytesize" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" dependencies = [ "serde", ] @@ -1494,23 +1542,23 @@ checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" dependencies = [ "glib-sys", "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] name = "camino" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" dependencies = [ "serde", ] [[package]] name = "cargo-platform" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceed8ef69d8518a5dda55c07425450b58a4e1946f4951eab6d7191ee86c2443d" +checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" dependencies = [ "serde", ] @@ -1523,7 +1571,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.21", + "semver 1.0.23", "serde", "serde_json", "thiserror", @@ -1550,9 +1598,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "324c74f2155653c90b04f25b2a47a8a631360cb908f92a772695f430c7e31052" dependencies = [ "jobserver", "libc", @@ -1581,7 +1629,7 @@ checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" dependencies = [ "byteorder", "fnv", - "uuid 1.8.0", + "uuid 1.10.0", ] [[package]] @@ -1595,9 +1643,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.6" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6100bc57b6209840798d95cb2775684849d332f7bd788db2a8c8caf7ef82a41a" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ "smallvec", "target-lexicon", @@ -1657,7 +1705,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -1692,7 +1740,7 @@ checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", - "libloading 0.8.1", + "libloading 0.8.4", ] [[package]] @@ -1712,9 +1760,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.18" +version = "4.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" dependencies = [ "clap_builder", "clap_derive", @@ -1722,34 +1770,34 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.18" +version = "4.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.10.0", + "strsim 0.11.1", "terminal_size", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" dependencies = [ - "heck 0.4.1", - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" [[package]] name = "clipboard-win" @@ -1764,9 +1812,9 @@ dependencies = [ [[package]] name = "clipboard-win" -version = "5.3.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" dependencies = [ "error-code 3.2.0", ] @@ -1803,12 +1851,12 @@ dependencies = [ "futures", "futures-enum", "graphql-parser", - "indexmap 2.2.2", + "indexmap 2.2.6", "serde", "smartstring", "static_assertions", - "url", - "uuid 1.8.0", + "url 2.5.2", + "uuid 1.10.0", "void", ] @@ -1819,10 +1867,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a3454e5f4eca82f6945bdb6d534c2839e4a5063c91b724e0345a4096d1dfd1e" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", - "url", + "url 2.5.2", ] [[package]] @@ -1890,7 +1938,7 @@ dependencies = [ "block", "cocoa-foundation", "core-foundation", - "core-graphics", + "core-graphics 0.22.3", "foreign-types 0.3.2", "libc", "objc", @@ -1928,9 +1976,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "colored" @@ -1966,9 +2014,9 @@ dependencies = [ [[package]] name = "combine" -version = "4.6.6" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ "bytes", "memchr", @@ -1976,9 +2024,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -1999,12 +2047,6 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - [[package]] name = "constant_time_eq" version = "0.3.0" @@ -2041,11 +2083,11 @@ checksum = "147be55d677052dabc6b22252d5dd0fd4c29c8c27aa4f2fbef0f94aa003b406f" [[package]] name = "cookie" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd91cf61412820176e137621345ee43b3f4423e589e7ae4e50d601d93e35ef8" +checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" dependencies = [ - "percent-encoding", + "percent-encoding 2.3.1", "time", "version_check", ] @@ -2079,6 +2121,19 @@ dependencies = [ "libc", ] +[[package]] +name = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.5.0", + "libc", +] + [[package]] name = "core-graphics-types" version = "0.1.3" @@ -2105,7 +2160,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80128832c58ea9cbd041d2a759ec449224487b2c1e400453d99d244eead87a8e" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", "cfg-if 1.0.0", "libc", "scopeguard", @@ -2214,11 +2269,26 @@ version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "393bc73c451830ff8dbb3a07f61843d6cb41a084f9996319917c0b291ed785bb" +[[package]] +name = "crc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if 1.0.0", ] @@ -2242,9 +2312,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.11" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -2279,9 +2349,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crossterm" @@ -2308,8 +2378,8 @@ dependencies = [ "bitflags 1.3.2", "crossterm_winapi 0.9.1", "libc", - "mio 0.8.10", - "parking_lot 0.12.1", + "mio 0.8.11", + "parking_lot 0.12.3", "signal-hook", "signal-hook-mio", "winapi 0.3.9", @@ -2359,7 +2429,7 @@ checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" dependencies = [ "generic-array 0.14.7", "rand_core 0.6.4", - "subtle 2.5.0", + "subtle 2.6.1", "zeroize", ] @@ -2371,7 +2441,7 @@ checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array 0.14.7", "rand_core 0.6.4", - "subtle 2.5.0", + "subtle 2.6.1", "zeroize", ] @@ -2403,7 +2473,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ "generic-array 0.14.7", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -2413,7 +2483,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e" dependencies = [ "generic-array 0.14.7", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -2442,8 +2512,8 @@ dependencies = [ "itoa 0.4.8", "matches", "phf 0.8.0", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "smallvec", "syn 1.0.109", ] @@ -2454,18 +2524,18 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ - "quote 1.0.35", - "syn 2.0.48", + "quote", + "syn 2.0.71", ] [[package]] name = "ctor" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" +checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" dependencies = [ - "quote 1.0.35", - "syn 2.0.48", + "quote", + "syn 2.0.71", ] [[package]] @@ -2479,11 +2549,11 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.4.2" +version = "3.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b467862cc8610ca6fc9a1532d7777cee0804e678ab45410897b9396495994a0b" +checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" dependencies = [ - "nix 0.27.1", + "nix 0.28.0", "windows-sys 0.52.0", ] @@ -2496,23 +2566,23 @@ dependencies = [ "byteorder", "digest 0.9.0", "rand_core 0.5.1", - "subtle 2.5.0", + "subtle 2.6.1", "zeroize", ] [[package]] name = "curve25519-dalek" -version = "4.1.1" +version = "4.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if 1.0.0", "cpufeatures", "curve25519-dalek-derive", + "digest 0.10.7", "fiat-crypto", - "platforms", "rustc_version 0.4.0", - "subtle 2.5.0", + "subtle 2.6.1", "zeroize", ] @@ -2522,9 +2592,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] @@ -2533,8 +2603,8 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b28bfe653d79bd16c77f659305b195b82bb5ce0c0eb2a4846b82ddbd77586813" dependencies = [ - "bitflags 2.5.0", - "libloading 0.8.1", + "bitflags 2.6.0", + "libloading 0.8.4", "winapi 0.3.9", ] @@ -2550,12 +2620,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ - "darling_core 0.20.9", - "darling_macro 0.20.9", + "darling_core 0.20.10", + "darling_macro 0.20.10", ] [[package]] @@ -2566,24 +2636,24 @@ checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "strsim 0.10.0", "syn 1.0.109", ] [[package]] name = "darling_core" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "strsim 0.11.1", - "syn 2.0.48", + "syn 2.0.71", ] [[package]] @@ -2593,19 +2663,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ "darling_core 0.14.4", - "quote 1.0.35", + "quote", "syn 1.0.109", ] [[package]] name = "darling_macro" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ - "darling_core 0.20.9", - "quote 1.0.35", - "syn 2.0.48", + "darling_core 0.20.10", + "quote", + "syn 2.0.71", ] [[package]] @@ -2631,10 +2701,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.14.3", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core 0.9.10", +] + +[[package]] +name = "dashmap" +version = "6.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", + "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core 0.9.9", + "parking_lot_core 0.9.10", ] [[package]] @@ -2653,15 +2737,15 @@ dependencies = [ [[package]] name = "dashu-base" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e183fc153511989674ede304b5592c74683393ca09cf20391898c28d6ba04264" +checksum = "c0b80bf6b85aa68c58ffea2ddb040109943049ce3fbdf4385d0380aef08ef289" [[package]] name = "dashu-float" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "875d79e1a61e5ee8b7052581de9cad1293f117ce7934cc62dd86a432e0dc204e" +checksum = "85078445a8dbd2e1bd21f04a816f352db8d333643f0c9b78ca7c3d1df71063e7" dependencies = [ "dashu-base", "dashu-int", @@ -2696,8 +2780,8 @@ dependencies = [ "dashu-int", "dashu-ratio", "paste", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "rustversion", ] @@ -2717,15 +2801,15 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "data-encoding-macro" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20c01c06f5f429efdf2bae21eb67c28b3df3cf85b7dd2d8ef09c0838dac5d33e" +checksum = "f1559b6cba622276d6d63706db152618eeb15b89b3e4041446b05876e352e639" dependencies = [ "data-encoding", "data-encoding-macro-internal", @@ -2733,9 +2817,9 @@ dependencies = [ [[package]] name = "data-encoding-macro-internal" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0047d07f2c89b17dd631c80450d69841a6b5d7fb17278cbc43d7e4cfcf2576f3" +checksum = "332d754c0af53bc87c108fed664d121ecf59207ec4196041f04d6ab9002ad33f" dependencies = [ "data-encoding", "syn 1.0.109", @@ -2765,14 +2849,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" dependencies = [ "serde", - "uuid 1.8.0", + "uuid 1.10.0", ] +[[package]] +name = "deflate64" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83ace6c86376be0b6cdcf3fb41882e81d94b31587573d1cfa9d01cd06bba210d" + [[package]] name = "deno_ast" version = "0.38.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "584547d27786a734536fde7088f8429d355569c39410427be44695c300618408" dependencies = [ "anyhow", "base64 0.21.7", @@ -2780,7 +2868,7 @@ dependencies = [ "deno_terminal", "dprint-swc-ext", "once_cell", - "percent-encoding", + "percent-encoding 2.3.1", "serde", "swc_atoms", "swc_common", @@ -2806,26 +2894,22 @@ dependencies = [ "text_lines", "thiserror", "unicode-width", - "url", + "url 2.5.2", ] [[package]] name = "deno_broadcast_channel" version = "0.148.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc90f73f38d20100c779e6355a478f8c14127262a5a2009af4f5fd5174780d83" dependencies = [ "async-trait", "deno_core", "tokio", - "uuid 1.8.0", + "uuid 1.10.0", ] [[package]] name = "deno_cache" version = "0.86.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643590ee7fd2b58fb0c577213deeeeb31a4bb64c1c53db21646f220e37e5afde" dependencies = [ "async-trait", "deno_core", @@ -2838,20 +2922,16 @@ dependencies = [ [[package]] name = "deno_canvas" version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e98f15c33dd267f84a2591ca02cd3ff15895e755ac4ad0bedd5aee39db37ce" dependencies = [ "deno_core", "deno_webgpu", - "image", + "image 0.24.9", "serde", ] [[package]] name = "deno_console" version = "0.154.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bd1f9b4320510678af1d1cc46911535cf9d7a5af5439f7dc9f245709cc93fa" dependencies = [ "deno_core", ] @@ -2859,13 +2939,11 @@ dependencies = [ [[package]] name = "deno_core" version = "0.283.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f5043f9f636a3fe021e63e41c946499e1706d7565126065c60912fe5c77e54e" dependencies = [ "anyhow", "bincode", - "bit-set", - "bit-vec", + "bit-set 0.6.0", + "bit-vec 0.7.0", "bytes", "cooked-waker", "deno_core_icudata", @@ -2873,8 +2951,8 @@ dependencies = [ "deno_unsync", "futures", "libc", - "memoffset 0.9.0", - "parking_lot 0.12.1", + "memoffset 0.9.1", + "parking_lot 0.12.3", "pin-project", "serde", "serde_json", @@ -2883,7 +2961,7 @@ dependencies = [ "sourcemap", "static_assertions", "tokio", - "url", + "url 2.5.2", "v8", ] @@ -2896,8 +2974,6 @@ checksum = "a13951ea98c0a4c372f162d669193b4c9d991512de9f2381dd161027f34b26b1" [[package]] name = "deno_cron" version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f805dbab676793ac0bfefaefb66c8f7d962c406e113e15187cb03e66134529d" dependencies = [ "anyhow", "async-trait", @@ -2910,8 +2986,6 @@ dependencies = [ [[package]] name = "deno_crypto" version = "0.168.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aba097a3869cf521ada7f5463750b84894939bf09b30b420c07719577ed4f5a" dependencies = [ "aes", "aes-gcm", @@ -2920,7 +2994,7 @@ dependencies = [ "cbc", "const-oid", "ctr", - "curve25519-dalek 4.1.1", + "curve25519-dalek 4.1.3", "deno_core", "deno_web", "elliptic-curve 0.13.8", @@ -2930,7 +3004,7 @@ dependencies = [ "p384", "p521", "rand 0.8.5", - "ring 0.17.7", + "ring 0.17.8", "rsa", "serde", "serde_bytes", @@ -2938,22 +3012,20 @@ dependencies = [ "sha2 0.10.8", "signature 2.2.0", "spki 0.7.3", - "uuid 1.8.0", - "x25519-dalek 2.0.0", + "uuid 1.10.0", + "x25519-dalek 2.0.1", ] [[package]] name = "deno_fetch" version = "0.178.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd6f454cb4cf1ae4e9a762ea9ae1b0c169c1af3c978b7372ab8b642e9681760" dependencies = [ "bytes", "data-url", "deno_core", "deno_tls", "dyn-clone", - "http 0.2.11", + "http 0.2.12", "reqwest", "serde", "serde_json", @@ -2964,8 +3036,6 @@ dependencies = [ [[package]] name = "deno_ffi" version = "0.141.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a3f7da9fd61d9749d53c9ca8c013180277960ecc6daa027f342cdc3a562368a" dependencies = [ "deno_core", "dlopen2", @@ -2982,8 +3052,6 @@ dependencies = [ [[package]] name = "deno_fs" version = "0.64.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629015c161fd64301c7edb7980a949bd0e80c651155742dcc2e977f332bb5432" dependencies = [ "async-trait", "base32", @@ -3002,33 +3070,31 @@ dependencies = [ [[package]] name = "deno_http" version = "0.152.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75561da8e349c74365c600ea42fb0c54238531106ecf3392be716923cc258bad" dependencies = [ "async-compression", "async-trait", "base64 0.21.7", - "brotli", + "brotli 3.5.0", "bytes", "cache_control", "deno_core", "deno_net", "deno_websocket", "flate2", - "http 0.2.11", + "http 0.2.12", "http 1.1.0", "httparse", - "hyper 0.14.28", + "hyper 0.14.30", "hyper 1.1.0", "hyper-util", "itertools 0.10.5", "memmem", "mime", "once_cell", - "percent-encoding", + "percent-encoding 2.3.1", "phf 0.11.2", "pin-project", - "ring 0.17.7", + "ring 0.17.8", "scopeguard", "serde", "smallvec", @@ -3040,8 +3106,6 @@ dependencies = [ [[package]] name = "deno_io" version = "0.64.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f74ca365761111c2d02daf1470a2b43034c0fa0a218bede2251cf18168fba669" dependencies = [ "async-trait", "deno_core", @@ -3050,7 +3114,7 @@ dependencies = [ "log", "once_cell", "os_pipe", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "rand 0.8.5", "tokio", "winapi 0.3.9", @@ -3059,8 +3123,6 @@ dependencies = [ [[package]] name = "deno_kv" version = "0.62.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecfce7848436477ecd41aa53d8b02b24d45ebd92be13cf6d7a68baba178df1a3" dependencies = [ "anyhow", "async-trait", @@ -3081,7 +3143,7 @@ dependencies = [ "rand 0.8.5", "rusqlite", "serde", - "url", + "url 2.5.2", ] [[package]] @@ -3092,14 +3154,12 @@ checksum = "a8978229b82552bf8457a0125aa20863f023619cfc21ebb007b1e571d68fd85b" dependencies = [ "data-url", "serde", - "url", + "url 2.5.2", ] [[package]] name = "deno_napi" version = "0.84.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efba1fbdcec6adb7be3d48d5bad89cc3964c3bdb01234206846efdc428059b3" dependencies = [ "deno_core", "libloading 0.7.4", @@ -3114,22 +3174,20 @@ dependencies = [ "dlopen2", "dlopen2_derive", "once_cell", - "rustls-native-certs", + "rustls-native-certs 0.6.3", "rustls-pemfile 1.0.4", ] [[package]] name = "deno_net" version = "0.146.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f67bd11e26ca503e9804cff329be9144393674d2af99fb3e5be0eb13abb78d7" dependencies = [ "deno_core", "deno_tls", "pin-project", "rustls-tokio-stream", "serde", - "socket2 0.5.5", + "socket2 0.5.7", "tokio", "trust-dns-proto", "trust-dns-resolver", @@ -3138,13 +3196,11 @@ dependencies = [ [[package]] name = "deno_node" version = "0.91.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4832c110becc9393a29eec2b1ff900394911b4f2500bb36db7c2eb843f5770d0" dependencies = [ "aead-gcm-stream", "aes", "async-trait", - "brotli", + "brotli 3.5.0", "bytes", "cbc", "const-oid", @@ -3165,9 +3221,9 @@ dependencies = [ "h2 0.3.26", "hkdf 0.12.4", "home", - "http 0.2.11", + "http 0.2.12", "idna 0.3.0", - "indexmap 2.2.2", + "indexmap 2.2.6", "k256", "lazy-regex", "libc", @@ -3183,12 +3239,12 @@ dependencies = [ "p256 0.13.2", "p384", "path-clean", - "pbkdf2 0.12.2", + "pbkdf2", "pin-project-lite", "rand 0.8.5", "regex", "reqwest", - "ring 0.17.7", + "ring 0.17.8", "ripemd", "rsa", "scrypt", @@ -3200,33 +3256,29 @@ dependencies = [ "simd-json", "spki 0.7.3", "tokio", - "url", + "url 2.5.2", "winapi 0.3.9", "windows-sys 0.48.0", - "x25519-dalek 2.0.0", + "x25519-dalek 2.0.1", "x509-parser", ] [[package]] name = "deno_ops" version = "0.159.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b26cc5277982de16514282447f8674f9048d4f1b2c0d55c088d0a7d3bf6db385" dependencies = [ "proc-macro-rules", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "strum 0.25.0", "strum_macros 0.25.3", - "syn 2.0.48", + "syn 2.0.71", "thiserror", ] [[package]] name = "deno_permissions" version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "973845c6be759b82def170205686a08719fb0770a82a473b8eafc167fd8b1a31" dependencies = [ "deno_core", "deno_terminal", @@ -3242,8 +3294,6 @@ dependencies = [ [[package]] name = "deno_runtime" version = "0.162.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f42a57bd283a794e624d6679576ff3c95ede086882327ab28384e937eaad9a9" dependencies = [ "deno_ast", "deno_broadcast_channel", @@ -3277,7 +3327,7 @@ dependencies = [ "flate2", "http 1.1.0", "http-body-util", - "hyper 0.14.28", + "hyper 0.14.30", "hyper 1.1.0", "hyper-util", "libc", @@ -3287,7 +3337,7 @@ dependencies = [ "notify", "ntapi 0.4.1", "once_cell", - "percent-encoding", + "percent-encoding 2.3.1", "regex", "rustyline 13.0.0", "serde", @@ -3296,7 +3346,7 @@ dependencies = [ "tokio", "tokio-metrics", "twox-hash", - "uuid 1.8.0", + "uuid 1.10.0", "which 4.4.2", "winapi 0.3.9", "windows-sys 0.48.0", @@ -3315,8 +3365,6 @@ dependencies = [ [[package]] name = "deno_tls" version = "0.141.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "580200c3eb2d6c6d2cc1d00faa1a83308df9690d9f6f752e65b35e7893c1676e" dependencies = [ "deno_core", "deno_native_certs", @@ -3326,23 +3374,22 @@ dependencies = [ "rustls-webpki 0.101.7", "serde", "tokio", - "webpki-roots 0.25.3", + "webpki-roots 0.25.4", ] [[package]] name = "deno_unsync" -version = "0.3.2" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30dff7e03584dbae188dae96a0f1876740054809b2ad0cf7c9fc5d361f20e739" +checksum = "c3c8b95582c2023dbb66fccc37421b374026f5915fa507d437cb566904db9a3a" dependencies = [ + "parking_lot 0.12.3", "tokio", ] [[package]] name = "deno_url" version = "0.154.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "130d1a0b2a3d8a3a9dfbdc62382817ea0f6e0331bfd0b031fb200edd557e37a7" dependencies = [ "deno_core", "urlpattern", @@ -3351,8 +3398,6 @@ dependencies = [ [[package]] name = "deno_web" version = "0.185.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "286ba01b1867c6bca0cb8ff0f7679d9f20df19a872ea27a7ffc15916933c980f" dependencies = [ "async-trait", "base64-simd 0.8.0", @@ -3363,14 +3408,12 @@ dependencies = [ "futures", "serde", "tokio", - "uuid 1.8.0", + "uuid 1.10.0", ] [[package]] name = "deno_webgpu" version = "0.121.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d02cc2b6379bafa99b8732df3cf506c4cc5c346228c1b93d524aa54030456ad" dependencies = [ "deno_core", "raw-window-handle 0.6.2", @@ -3383,8 +3426,6 @@ dependencies = [ [[package]] name = "deno_webidl" version = "0.154.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b704d098ccba863c6efcbd4e3f264c1672b22d48137fd3aea8cf1f5640b01e3" dependencies = [ "deno_core", ] @@ -3392,8 +3433,6 @@ dependencies = [ [[package]] name = "deno_websocket" version = "0.159.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47d0f16a56569a38722e380c1c5ec23f435e2a799e30f1ba84f985c3f00cb647" dependencies = [ "bytes", "deno_core", @@ -3414,8 +3453,6 @@ dependencies = [ [[package]] name = "deno_webstorage" version = "0.149.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3efd92e4c15d17359b766deba417f32cee66655d9f26aed793cd19c3766513c1" dependencies = [ "deno_core", "deno_web", @@ -3446,7 +3483,7 @@ dependencies = [ "prost", "prost-build", "serde", - "uuid 1.8.0", + "uuid 1.10.0", ] [[package]] @@ -3470,8 +3507,8 @@ dependencies = [ "serde_json", "tokio", "tokio-util", - "url", - "uuid 1.8.0", + "url 2.5.2", + "uuid 1.10.0", ] [[package]] @@ -3495,7 +3532,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "uuid 1.8.0", + "uuid 1.10.0", "v8_valueserializer", ] @@ -3511,9 +3548,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", "pem-rfc7468", @@ -3534,26 +3571,36 @@ dependencies = [ "rusticata-macros", ] +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + [[package]] name = "derivative" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] [[package]] name = "derive-new" -version = "0.5.9" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535" +checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 1.0.109", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] @@ -3562,9 +3609,18 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "derive_builder" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +dependencies = [ + "derive_builder_macro 0.12.0", ] [[package]] @@ -3573,7 +3629,19 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" dependencies = [ - "derive_builder_macro", + "derive_builder_macro 0.20.0", +] + +[[package]] +name = "derive_builder_core" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" +dependencies = [ + "darling 0.14.4", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] @@ -3582,10 +3650,20 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" dependencies = [ - "darling 0.20.9", - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "darling 0.20.10", + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "derive_builder_macro" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +dependencies = [ + "derive_builder_core 0.12.0", + "syn 1.0.109", ] [[package]] @@ -3594,8 +3672,8 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ - "derive_builder_core", - "syn 2.0.48", + "derive_builder_core 0.20.0", + "syn 2.0.71", ] [[package]] @@ -3604,22 +3682,22 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcdbcee2d9941369faba772587a565f4f534e42cb8d17e5295871de730163b2b" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "rustc_version 0.4.0", - "syn 1.0.109", + "syn 2.0.71", ] [[package]] @@ -3628,8 +3706,8 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "532b4c15dccee12c7044f1fcad956e98410860b22231e44a3b827464797ca7bf" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -3641,9 +3719,9 @@ checksum = "3c877555693c14d2f84191cfd3ad8582790fc52b5e2274b40b59cf5f5cea25c7" [[package]] name = "deunicode" -version = "1.4.3" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6e854126756c496b8c81dec88f9a706b15b875c5849d4097a3854476b9fdf94" +checksum = "339544cc9e2c4dc3fc7149fd630c5f22263a4fdf18a98afd0075784968b5cf00" [[package]] name = "devise" @@ -3662,7 +3740,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8cf4b8dd484ede80fd5c547592c46c3745a617c8af278e2b72bea86b2dfed6" dependencies = [ "devise_core", - "quote 1.0.35", + "quote", ] [[package]] @@ -3671,11 +3749,11 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35b50dba0afdca80b187392b24f2499a88c336d5a8493e4b4ccfb608708be56a" dependencies = [ - "bitflags 2.5.0", - "proc-macro2 1.0.78", + "bitflags 2.6.0", + "proc-macro2", "proc-macro2-diagnostics", - "quote 1.0.35", - "syn 2.0.48", + "quote", + "syn 2.0.71", ] [[package]] @@ -3690,8 +3768,8 @@ dependencies = [ "bs58", "curve25519-dalek 3.2.0", "did_url", - "ed25519-dalek", - "getrandom 0.2.12", + "ed25519-dalek 1.0.1", + "getrandom 0.2.15", "hkdf 0.11.0", "json-patch 0.2.7", "libsecp256k1", @@ -3750,7 +3828,7 @@ dependencies = [ "block-buffer 0.10.4", "const-oid", "crypto-common", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -3832,13 +3910,13 @@ checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] @@ -3847,6 +3925,15 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc9f8914dcb99891bdfee82536bbff8d9aa612b0dbe83872afbc66902bdec0b9" +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.4", +] + [[package]] name = "dlopen2" version = "0.6.1" @@ -3865,9 +3952,9 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] @@ -3882,9 +3969,9 @@ dependencies = [ [[package]] name = "document-features" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5282ad69563b5fc40319526ba27e0e7363d552a896f0297d54f767717f9b95" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" dependencies = [ "litrs", ] @@ -3897,9 +3984,9 @@ checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" [[package]] name = "downcast-rs" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "dprint-swc-ext" @@ -3940,9 +4027,9 @@ checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" [[package]] name = "dtoa-short" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74" +checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87" dependencies = [ "dtoa", ] @@ -3953,10 +4040,10 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e57e12b69e57fad516e01e2b3960f122696fdb13420e1a88ed8e210316f2876" dependencies = [ - "darling 0.20.9", - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "darling 0.20.10", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] @@ -3967,9 +4054,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "dyn-clone" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "dynasm" @@ -3981,8 +4068,8 @@ dependencies = [ "byteorder", "lazy_static", "proc-macro-error", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -4024,7 +4111,7 @@ version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ - "der 0.7.8", + "der 0.7.9", "digest 0.10.7", "elliptic-curve 0.13.8", "rfc6979 0.4.0", @@ -4041,6 +4128,15 @@ dependencies = [ "signature 1.6.4", ] +[[package]] +name = "ed25519" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" +dependencies = [ + "signature 2.2.0", +] + [[package]] name = "ed25519-dalek" version = "1.0.1" @@ -4048,18 +4144,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ "curve25519-dalek 3.2.0", - "ed25519", + "ed25519 1.5.3", "rand 0.7.3", "serde", "sha2 0.9.9", "zeroize", ] +[[package]] +name = "ed25519-dalek" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" +dependencies = [ + "curve25519-dalek 4.1.3", + "ed25519 2.2.3", + "rand_core 0.6.4", + "sha2 0.10.8", + "subtle 2.6.1", +] + [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "elliptic-curve" @@ -4078,7 +4187,7 @@ dependencies = [ "pkcs8 0.9.0", "rand_core 0.6.4", "sec1 0.3.0", - "subtle 2.5.0", + "subtle 2.6.1", "zeroize", ] @@ -4099,22 +4208,22 @@ dependencies = [ "pkcs8 0.10.2", "rand_core 0.6.4", "sec1 0.7.3", - "subtle 2.5.0", + "subtle 2.6.1", "zeroize", ] [[package]] name = "embed-resource" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bde55e389bea6a966bd467ad1ad7da0ae14546a5bc794d16d1e55e7fca44881" +checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d" dependencies = [ "cc", "memchr", "rustc_version 0.4.0", - "toml 0.8.9", + "toml 0.8.14", "vswhom", - "winreg 0.51.0", + "winreg 0.52.0", ] [[package]] @@ -4145,8 +4254,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -4165,8 +4274,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -4185,10 +4294,19 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" dependencies = [ - "darling 0.20.9", - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "darling 0.20.10", + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", ] [[package]] @@ -4204,6 +4322,16 @@ dependencies = [ "termcolor", ] +[[package]] +name = "env_logger" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +dependencies = [ + "env_filter", + "log", +] + [[package]] name = "equivalent" version = "1.0.1" @@ -4217,8 +4345,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22deed3a8124cff5fa835713fa105621e43bbdc46690c3a6b68328a012d350d4" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "rustversion", "syn 1.0.109", "synstructure", @@ -4231,8 +4359,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c34a887c8df3ed90498c1c437ce21f211c8e27672921a8ffa293cb8d6d4caa9e" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "rustversion", "syn 1.0.109", "synstructure", @@ -4251,9 +4379,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -4304,9 +4432,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "4.0.3" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", @@ -4315,11 +4443,11 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 4.0.3", + "event-listener 5.3.1", "pin-project-lite", ] @@ -4372,9 +4500,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fastwebsockets" @@ -4402,7 +4530,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" dependencies = [ "cfg-if 1.0.0", - "rustix 0.38.30", + "rustix 0.38.34", "windows-sys 0.48.0", ] @@ -4413,7 +4541,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947" dependencies = [ "cfg-if 1.0.0", - "rustix 0.38.30", + "rustix 0.38.34", "windows-sys 0.52.0", ] @@ -4434,7 +4562,7 @@ checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" dependencies = [ "bitvec", "rand_core 0.6.4", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -4444,14 +4572,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ "rand_core 0.6.4", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] name = "fiat-crypto" -version = "0.2.5" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "field-offset" @@ -4459,20 +4587,20 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.9.0", + "memoffset 0.9.1", "rustc_version 0.4.0", ] [[package]] name = "figment" -version = "0.10.14" +version = "0.10.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b6e5bc7bd59d60d0d45a6ccab6cf0f4ce28698fb4e81e750ddf229c9b824026" +checksum = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3" dependencies = [ "atomic 0.6.0", "pear", "serde", - "toml 0.8.9", + "toml 0.8.14", "uncased", "version_check", ] @@ -4497,12 +4625,11 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "fixt" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.2" dependencies = [ "holochain_serialized_bytes", "lazy_static", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "paste", "rand 0.8.5", "rand_core 0.6.4", @@ -4513,9 +4640,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -4561,9 +4688,9 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] @@ -4584,14 +4711,14 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ - "percent-encoding", + "percent-encoding 2.3.1", ] [[package]] name = "fqdn" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11629e06e5b6061eed3a00de187f3c9244c1e9755bb9445be1070067bf1ea045" +checksum = "08b1eaa7dfddeab6036292995620bf0435712e619db6d7690605897e76975eb0" [[package]] name = "fragile" @@ -4605,9 +4732,9 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdc9cc75639b041067353b9bce2450d6847e547276c6fbe4487d7407980e07db" dependencies = [ - "proc-macro2 1.0.78", + "proc-macro2", "swc_macros_common", - "syn 2.0.48", + "syn 2.0.71", ] [[package]] @@ -4706,7 +4833,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3422d14de7903a52e9dbc10ae05a7e14445ec61890100e098754e120b2bd7b1e" dependencies = [ "derive_utils", - "quote 1.0.35", + "quote", "syn 1.0.109", ] @@ -4744,11 +4871,11 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.0.1", + "fastrand 2.1.0", "futures-core", "futures-io", "parking", @@ -4761,9 +4888,9 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] @@ -4780,9 +4907,9 @@ checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-timer" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" [[package]] name = "futures-util" @@ -4823,7 +4950,7 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f551fdf23ef80329f754919669147a71c67b6cfe3569cd93b6fabdd62044377" dependencies = [ - "bit-set", + "bit-set 0.5.3", "num-integer", "num-traits", "trilean", @@ -4868,7 +4995,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -4885,7 +5012,7 @@ dependencies = [ "libc", "pango-sys", "pkg-config", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -4899,7 +5026,7 @@ dependencies = [ "gobject-sys", "libc", "pkg-config", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -4911,7 +5038,7 @@ dependencies = [ "gdk-sys", "glib-sys", "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", "x11", ] @@ -4972,12 +5099,12 @@ dependencies = [ [[package]] name = "gethostname" -version = "0.2.3" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" dependencies = [ "libc", - "winapi 0.3.9", + "windows-targets 0.48.5", ] [[package]] @@ -4993,9 +5120,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -5006,11 +5133,11 @@ dependencies = [ [[package]] name = "ghash" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" dependencies = [ - "opaque-debug 0.3.0", + "opaque-debug 0.3.1", "polyval", ] @@ -5043,9 +5170,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "gio" @@ -5073,7 +5200,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", "winapi 0.3.9", ] @@ -5092,9 +5219,9 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] @@ -5136,10 +5263,10 @@ checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a" dependencies = [ "anyhow", "heck 0.4.1", - "proc-macro-crate", + "proc-macro-crate 1.1.3", "proc-macro-error", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -5150,7 +5277,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" dependencies = [ "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -5168,8 +5295,8 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.5", - "regex-syntax 0.8.2", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -5213,7 +5340,7 @@ checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" dependencies = [ "glib-sys", "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -5239,7 +5366,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-alloc-types", ] @@ -5249,7 +5376,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -5258,9 +5385,9 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-descriptor-types", - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -5269,7 +5396,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -5305,7 +5432,7 @@ dependencies = [ "serde", "serde_json", "thiserror", - "uuid 1.8.0", + "uuid 1.10.0", ] [[package]] @@ -5329,8 +5456,8 @@ dependencies = [ "graphql-parser", "heck 0.4.1", "lazy_static", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "serde", "serde_json", "syn 1.0.109", @@ -5343,7 +5470,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d52fc9cde811f44b15ec0692b31e56a3067f6f431c5ace712f286e47c1dacc98" dependencies = [ "graphql_client_codegen", - "proc-macro2 1.0.78", + "proc-macro2", "syn 1.0.109", ] @@ -5355,7 +5482,7 @@ checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" dependencies = [ "ff 0.12.1", "rand_core 0.6.4", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -5366,7 +5493,7 @@ checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff 0.13.0", "rand_core 0.6.4", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -5407,7 +5534,7 @@ dependencies = [ "gobject-sys", "libc", "pango-sys", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -5417,10 +5544,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d" dependencies = [ "anyhow", - "proc-macro-crate", + "proc-macro-crate 1.1.3", "proc-macro-error", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -5444,8 +5571,8 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http 0.2.11", - "indexmap 2.2.2", + "http 0.2.12", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", @@ -5464,20 +5591,26 @@ dependencies = [ "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.2.2", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", "tracing", ] +[[package]] +name = "half" +version = "1.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" + [[package]] name = "halfbrown" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8588661a8607108a5ca69cab034063441a0413a0b041c13618a7dd348021ef6f" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", "serde", ] @@ -5497,7 +5630,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25" dependencies = [ "ahash 0.3.8", - "autocfg 1.1.0", + "autocfg 1.3.0", ] [[package]] @@ -5506,66 +5639,65 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.7", + "ahash 0.7.8", ] [[package]] name = "hashbrown" -version = "0.13.2" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash 0.8.11", + "allocator-api2", ] [[package]] -name = "hashbrown" -version = "0.14.3" +name = "hashlink" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" dependencies = [ - "ahash 0.8.11", - "allocator-api2", + "hashbrown 0.14.5", ] [[package]] -name = "hashlink" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +name = "hc_r2d2_sqlite" +version = "0.24.0" +source = "git+https://github.com/fayeed/r2d2-sqlite.git?rev=6dc52f833d4fbf9a0834a31de8200a29e04b5779#6dc52f833d4fbf9a0834a31de8200a29e04b5779" dependencies = [ - "hashbrown 0.14.3", + "r2d2", + "rusqlite", + "uuid 1.10.0", ] [[package]] name = "hc_seed_bundle" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1524f81cc7a05bfacd666324692d1cd46c9f8dce68aa524a4c8a993449617f6b" +version = "0.2.4" +source = "git+https://github.com/coasys/lair.git?rev=05802500ec58381a440da07985b89539213b1a54#05802500ec58381a440da07985b89539213b1a54" dependencies = [ "futures", "one_err", - "rmp-serde 0.15.5", + "rmp-serde", "rmpv", "serde", "serde_bytes", - "sodoken", + "sodoken 0.0.11", ] [[package]] name = "hc_sleuth" -version = "0.2.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.11" dependencies = [ "aitia", "anyhow", "derive_more", "holochain_state_types", - "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "holochain_trace", "holochain_types", "kitsune_p2p", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "petgraph", "regex", "serde", @@ -5576,10 +5708,9 @@ dependencies = [ [[package]] name = "hdi" -version = "0.4.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.5.0-dev.8" dependencies = [ - "getrandom 0.2.12", + "getrandom 0.2.15", "hdk_derive", "holo_hash", "holochain_integrity_types", @@ -5593,10 +5724,9 @@ dependencies = [ [[package]] name = "hdk" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.9" dependencies = [ - "getrandom 0.2.12", + "getrandom 0.2.15", "hdi", "hdk_derive", "holo_hash", @@ -5612,16 +5742,15 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.8" dependencies = [ "darling 0.14.4", "heck 0.5.0", "holochain_integrity_types", "paste", "proc-macro-error", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -5634,7 +5763,7 @@ dependencies = [ "base64 0.21.7", "bytes", "headers-core", - "http 0.2.11", + "http 0.2.12", "httpdate", "mime", "sha1", @@ -5646,7 +5775,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http 0.2.11", + "http 0.2.12", ] [[package]] @@ -5694,9 +5823,15 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.4" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" [[package]] name = "hex" @@ -5777,8 +5912,7 @@ dependencies = [ [[package]] name = "holo_hash" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.7" dependencies = [ "arbitrary", "base64 0.22.1", @@ -5787,12 +5921,12 @@ dependencies = [ "fixt", "futures", "holochain_serialized_bytes", - "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "holochain_util", "holochain_wasmer_common", - "kitsune_p2p_dht_arc 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_dht_arc", "must_future", "proptest", - "proptest-derive", + "proptest-derive 0.4.0", "rand 0.8.5", "rusqlite", "serde", @@ -5802,8 +5936,7 @@ dependencies = [ [[package]] name = "holochain" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.11" dependencies = [ "aitia", "anyhow", @@ -5822,7 +5955,7 @@ dependencies = [ "fixt", "futures", "get_if_addrs", - "getrandom 0.2.12", + "getrandom 0.2.15", "ghost_actor", "hc_sleuth", "hdk", @@ -5839,9 +5972,9 @@ dependencies = [ "holochain_sqlite", "holochain_state", "holochain_test_wasm_common", - "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "holochain_trace", "holochain_types", - "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "holochain_util", "holochain_wasm_test_utils", "holochain_wasmer_host", "holochain_websocket", @@ -5850,10 +5983,10 @@ dependencies = [ "human-panic", "itertools 0.12.1", "kitsune_p2p", - "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_bin_data", "kitsune_p2p_block", "kitsune_p2p_bootstrap", - "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_types", "lair_keystore", "matches", "mockall", @@ -5862,20 +5995,21 @@ dependencies = [ "once_cell", "one_err", "opentelemetry_api", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "petgraph", "predicates 3.1.0", "rand 0.8.5", "rand-utf8", "rand_chacha 0.3.1", "rusqlite", + "sbd-server", "sd-notify", "serde", "serde_bytes", "serde_json", - "serde_yaml 0.9.31", + "serde_yaml", "shrinkwraprs", - "sodoken", + "sodoken 0.0.11", "structopt", "strum 0.18.0", "subtle-encoding", @@ -5885,24 +6019,22 @@ dependencies = [ "tiny-keccak", "tokio", "tokio-stream", - "toml 0.8.9", + "toml 0.8.14", "tracing", "tracing-futures", "tracing-subscriber 0.3.18", "tx5-go-pion-turn", - "tx5-signal-srv", "unwrap_to", - "url", + "url 1.7.2", "url2", - "uuid 1.8.0", + "uuid 1.10.0", "wasmer", "wasmer-middlewares", ] [[package]] name = "holochain_cascade" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.11" dependencies = [ "async-trait", "fixt", @@ -5913,9 +6045,9 @@ dependencies = [ "holochain_serialized_bytes", "holochain_sqlite", "holochain_state", - "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "holochain_trace", "holochain_types", - "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "holochain_util", "holochain_zome_types", "kitsune_p2p", "mockall", @@ -5927,18 +6059,17 @@ dependencies = [ [[package]] name = "holochain_cli_bundle" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.11" dependencies = [ "anyhow", - "clap 4.4.18", + "clap 4.5.9", "futures", "holochain_serialized_bytes", "holochain_types", - "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "holochain_util", "holochain_wasmer_host", "mr_bundle", - "serde_yaml 0.9.31", + "serde_yaml", "thiserror", "tokio", "tracing", @@ -5947,23 +6078,21 @@ dependencies = [ [[package]] name = "holochain_cli_run_local_services" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.10" dependencies = [ - "clap 4.4.18", + "clap 4.5.9", "futures", - "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "holochain_trace", "if-addrs 0.12.0", "kitsune_p2p_bootstrap", + "sbd-server", "tokio", "tracing", - "tx5-signal-srv", ] [[package]] name = "holochain_conductor_api" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.11" dependencies = [ "derive_more", "holo_hash", @@ -5972,10 +6101,10 @@ dependencies = [ "holochain_state_types", "holochain_types", "holochain_zome_types", - "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", - "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_bin_data", + "kitsune_p2p_types", "serde", - "serde_yaml 0.9.31", + "serde_yaml", "shrinkwraprs", "thiserror", "tracing", @@ -5984,8 +6113,7 @@ dependencies = [ [[package]] name = "holochain_conductor_services" -version = "0.2.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.3.0-dev.11" dependencies = [ "anyhow", "async-trait", @@ -5999,29 +6127,27 @@ dependencies = [ [[package]] name = "holochain_integrity_types" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.8" dependencies = [ "arbitrary", - "derive_builder", + "derive_builder 0.20.0", "holo_hash", "holochain_secure_primitive", "holochain_serialized_bytes", - "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", - "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "holochain_util", + "kitsune_p2p_timestamp", "proptest", - "proptest-derive", + "proptest-derive 0.4.0", "serde", "serde_bytes", - "subtle 2.5.0", + "subtle 2.6.1", "subtle-encoding", "tracing", ] [[package]] name = "holochain_keystore" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.11" dependencies = [ "base64 0.22.1", "derive_more", @@ -6029,18 +6155,18 @@ dependencies = [ "holo_hash", "holochain_secure_primitive", "holochain_serialized_bytes", - "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "holochain_util", "holochain_zome_types", - "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_types", "lair_keystore", "must_future", "nanoid", "one_err", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "serde", "serde_bytes", "shrinkwraprs", - "sodoken", + "sodoken 0.0.11", "thiserror", "tokio", "tracing", @@ -6048,8 +6174,7 @@ dependencies = [ [[package]] name = "holochain_metrics" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.3" dependencies = [ "influxive", "opentelemetry_api", @@ -6058,18 +6183,16 @@ dependencies = [ [[package]] name = "holochain_nonce" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.4" dependencies = [ - "getrandom 0.2.12", + "getrandom 0.2.15", "holochain_secure_primitive", - "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_timestamp", ] [[package]] name = "holochain_p2p" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.11" dependencies = [ "aitia", "async-trait", @@ -6082,11 +6205,11 @@ dependencies = [ "holochain_keystore", "holochain_nonce", "holochain_serialized_bytes", - "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "holochain_trace", "holochain_types", "holochain_zome_types", "kitsune_p2p", - "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_types", "mockall", "rand 0.8.5", "serde", @@ -6099,24 +6222,23 @@ dependencies = [ [[package]] name = "holochain_secure_primitive" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.1" dependencies = [ "paste", "serde", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] name = "holochain_serialized_bytes" -version = "0.0.54" -source = "git+https://github.com/coasys/holochain-serialization.git?rev=6eaa4ea8913bfd977fcc4577e833f4dc18a215f7#6eaa4ea8913bfd977fcc4577e833f4dc18a215f7" +version = "0.0.55" +source = "git+https://github.com/coasys/holochain-serialization.git?rev=f9577913773931ec797261f90968903b1b4e27a8#f9577913773931ec797261f90968903b1b4e27a8" dependencies = [ "arbitrary", "holochain_serialized_bytes_derive", "proptest", - "proptest-derive", - "rmp-serde 1.1.2", + "proptest-derive 0.4.0", + "rmp-serde", "serde", "serde-transcode", "serde_bytes", @@ -6126,43 +6248,42 @@ dependencies = [ [[package]] name = "holochain_serialized_bytes_derive" -version = "0.0.54" -source = "git+https://github.com/coasys/holochain-serialization.git?rev=6eaa4ea8913bfd977fcc4577e833f4dc18a215f7#6eaa4ea8913bfd977fcc4577e833f4dc18a215f7" +version = "0.0.55" +source = "git+https://github.com/coasys/holochain-serialization.git?rev=f9577913773931ec797261f90968903b1b4e27a8#f9577913773931ec797261f90968903b1b4e27a8" dependencies = [ - "quote 1.0.35", + "quote", "syn 1.0.109", ] [[package]] name = "holochain_sqlite" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.11" dependencies = [ "anyhow", "async-trait", "derive_more", - "fallible-iterator 0.2.0", + "fallible-iterator 0.3.0", "futures", - "getrandom 0.2.12", + "getrandom 0.2.15", + "hc_r2d2_sqlite", "holo_hash", "holochain_nonce", "holochain_serialized_bytes", - "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "holochain_util", "holochain_zome_types", - "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", - "kitsune_p2p_dht 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", - "kitsune_p2p_dht_arc 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", - "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", - "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_bin_data", + "kitsune_p2p_dht", + "kitsune_p2p_dht_arc", + "kitsune_p2p_timestamp", + "kitsune_p2p_types", "nanoid", "num_cpus", "once_cell", "opentelemetry_api", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pretty_assertions", "r2d2", - "r2d2_sqlite_neonphog", - "rmp-serde 1.1.2", + "rmp-serde", "rusqlite", "scheduled-thread-pool", "serde", @@ -6177,8 +6298,7 @@ dependencies = [ [[package]] name = "holochain_state" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.11" dependencies = [ "aitia", "async-recursion", @@ -6186,7 +6306,7 @@ dependencies = [ "chrono", "contrafact", "cron", - "fallible-iterator 0.2.0", + "fallible-iterator 0.3.0", "hc_sleuth", "holo_hash", "holochain_keystore", @@ -6200,7 +6320,7 @@ dependencies = [ "kitsune_p2p", "nanoid", "one_err", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "serde", "serde_json", "shrinkwraprs", @@ -6212,8 +6332,7 @@ dependencies = [ [[package]] name = "holochain_state_types" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.8" dependencies = [ "holo_hash", "holochain_integrity_types", @@ -6222,8 +6341,7 @@ dependencies = [ [[package]] name = "holochain_test_wasm_common" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.9" dependencies = [ "hdk", "serde", @@ -6231,26 +6349,7 @@ dependencies = [ [[package]] name = "holochain_trace" -version = "0.3.1-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78532089679f1d3d8bb88cd954f90b04b257ba5231c980633e88df5b60ae95cf" -dependencies = [ - "chrono", - "derive_more", - "inferno", - "once_cell", - "serde_json", - "thiserror", - "tracing", - "tracing-core", - "tracing-serde", - "tracing-subscriber 0.3.18", -] - -[[package]] -name = "holochain_trace" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.3" dependencies = [ "chrono", "derive_more", @@ -6266,8 +6365,7 @@ dependencies = [ [[package]] name = "holochain_types" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.11" dependencies = [ "anyhow", "arbitrary", @@ -6275,30 +6373,30 @@ dependencies = [ "automap", "backtrace", "contrafact", - "derive_builder", + "derive_builder 0.20.0", "derive_more", "fixt", "flate2", "futures", - "getrandom 0.2.12", + "getrandom 0.2.15", "holo_hash", "holochain_keystore", "holochain_nonce", "holochain_serialized_bytes", "holochain_sqlite", - "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", - "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "holochain_trace", + "holochain_util", "holochain_zome_types", "isotest", "itertools 0.12.1", - "kitsune_p2p_dht 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_dht", "mr_bundle", "must_future", "nanoid", "one_err", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "proptest", - "proptest-derive", + "proptest-derive 0.4.0", "rand 0.8.5", "regex", "rusqlite", @@ -6307,7 +6405,7 @@ dependencies = [ "serde_derive", "serde_json", "serde_with", - "serde_yaml 0.9.31", + "serde_yaml", "shrinkwraprs", "strum 0.18.0", "strum_macros 0.18.0", @@ -6319,22 +6417,7 @@ dependencies = [ [[package]] name = "holochain_util" -version = "0.3.1-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6461b88941572dc5c9482874fea97ed7b5cd864bd623d096fa0a940ada98ac88" -dependencies = [ - "cfg-if 1.0.0", - "colored", - "dunce", - "futures", - "once_cell", - "tracing", -] - -[[package]] -name = "holochain_util" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.1" dependencies = [ "backtrace", "cfg-if 1.0.0", @@ -6343,28 +6426,27 @@ dependencies = [ "futures", "once_cell", "rpassword", - "sodoken", + "sodoken 0.0.11", "tokio", "tracing", ] [[package]] name = "holochain_wasm_test_utils" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.11" dependencies = [ "holochain_types", - "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "holochain_util", "strum 0.18.0", "strum_macros 0.18.0", - "toml 0.8.9", + "toml 0.8.14", "walkdir", ] [[package]] name = "holochain_wasmer_common" -version = "0.0.94" -source = "git+https://github.com/coasys/holochain-wasmer.git?rev=52979e943861530bbafc48297b131fdec52c3e21#52979e943861530bbafc48297b131fdec52c3e21" +version = "0.0.95" +source = "git+https://github.com/coasys/holochain-wasmer.git?rev=b2af50855db66095b2503c2c091b79829f684e94#b2af50855db66095b2503c2c091b79829f684e94" dependencies = [ "holochain_serialized_bytes", "serde", @@ -6376,12 +6458,12 @@ dependencies = [ [[package]] name = "holochain_wasmer_guest" -version = "0.0.94" -source = "git+https://github.com/coasys/holochain-wasmer.git?rev=52979e943861530bbafc48297b131fdec52c3e21#52979e943861530bbafc48297b131fdec52c3e21" +version = "0.0.95" +source = "git+https://github.com/coasys/holochain-wasmer.git?rev=b2af50855db66095b2503c2c091b79829f684e94#b2af50855db66095b2503c2c091b79829f684e94" dependencies = [ "holochain_serialized_bytes", "holochain_wasmer_common", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "paste", "serde", "tracing", @@ -6389,15 +6471,15 @@ dependencies = [ [[package]] name = "holochain_wasmer_host" -version = "0.0.94" -source = "git+https://github.com/coasys/holochain-wasmer.git?rev=52979e943861530bbafc48297b131fdec52c3e21#52979e943861530bbafc48297b131fdec52c3e21" +version = "0.0.95" +source = "git+https://github.com/coasys/holochain-wasmer.git?rev=b2af50855db66095b2503c2c091b79829f684e94#b2af50855db66095b2503c2c091b79829f684e94" dependencies = [ "bimap", "bytes", "hex", "holochain_serialized_bytes", "holochain_wasmer_common", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "rand 0.8.5", "serde", "tracing", @@ -6407,8 +6489,7 @@ dependencies = [ [[package]] name = "holochain_websocket" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.11" dependencies = [ "async-trait", "futures", @@ -6423,12 +6504,11 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.9" dependencies = [ "arbitrary", "contrafact", - "derive_builder", + "derive_builder 0.20.0", "derive_more", "fixt", "holo_hash", @@ -6437,21 +6517,21 @@ dependencies = [ "holochain_serialized_bytes", "holochain_wasmer_common", "kitsune_p2p_block", - "kitsune_p2p_dht 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", - "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_dht", + "kitsune_p2p_timestamp", "nanoid", "num_enum 0.7.2", "once_cell", "proptest", - "proptest-derive", + "proptest-derive 0.4.0", "rand 0.8.5", "rusqlite", "serde", "serde_bytes", - "serde_yaml 0.9.31", + "serde_yaml", "shrinkwraprs", "strum 0.18.0", - "subtle 2.5.0", + "subtle 2.6.1", "subtle-encoding", "thiserror", "tracing", @@ -6494,7 +6574,7 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96274be293b8877e61974a607105d09c84caebe9620b47774aa8a6b942042dd4" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", "new_debug_unreachable", "once_cell", "phf 0.11.2", @@ -6511,20 +6591,20 @@ dependencies = [ "log", "mac", "markup5ever", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", - "itoa 1.0.10", + "itoa 1.0.11", ] [[package]] @@ -6535,7 +6615,7 @@ checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", - "itoa 1.0.10", + "itoa 1.0.11", ] [[package]] @@ -6545,15 +6625,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http 0.2.11", + "http 0.2.12", "pin-project-lite", ] [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http 1.1.0", @@ -6561,14 +6641,14 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", - "futures-core", + "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "pin-project-lite", ] @@ -6580,9 +6660,9 @@ checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -6602,8 +6682,8 @@ dependencies = [ "os_info", "serde", "serde_derive", - "toml 0.8.9", - "uuid 1.8.0", + "toml 0.8.14", + "uuid 1.10.0", ] [[package]] @@ -6614,22 +6694,22 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", "h2 0.3.26", - "http 0.2.11", + "http 0.2.12", "http-body 0.4.6", "httparse", "httpdate", - "itoa 1.0.10", + "itoa 1.0.11", "pin-project-lite", - "socket2 0.5.5", + "socket2 0.5.7", "tokio", "tower-service", "tracing", @@ -6647,10 +6727,10 @@ dependencies = [ "futures-util", "h2 0.4.5", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "httparse", "httpdate", - "itoa 1.0.10", + "itoa 1.0.11", "pin-project-lite", "tokio", "want", @@ -6663,8 +6743,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http 0.2.11", - "hyper 0.14.28", + "http 0.2.12", + "hyper 0.14.30", "rustls 0.21.11", "tokio", "tokio-rustls 0.24.1", @@ -6677,7 +6757,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper 0.14.28", + "hyper 0.14.30", "native-tls", "tokio", "tokio-native-tls", @@ -6685,27 +6765,25 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdea9aac0dbe5a9240d68cfd9501e2db94222c6dc06843e06640b9e07f0fdc67" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" dependencies = [ "bytes", - "futures-channel", "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "hyper 1.1.0", "pin-project-lite", - "socket2 0.5.5", + "socket2 0.5.7", "tokio", - "tracing", ] [[package]] name = "iana-time-zone" -version = "0.1.59" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -6740,6 +6818,17 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +[[package]] +name = "idna" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "idna" version = "0.2.3" @@ -6763,9 +6852,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -6817,7 +6906,7 @@ dependencies = [ "globset", "log", "memchr", - "regex-automata 0.4.5", + "regex-automata 0.4.7", "same-file", "walkdir", "winapi-util", @@ -6825,15 +6914,27 @@ dependencies = [ [[package]] name = "image" -version = "0.24.8" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" dependencies = [ "bytemuck", "byteorder", "color_quant", "num-traits", "png", +] + +[[package]] +name = "image" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" +dependencies = [ + "bytemuck", + "byteorder", + "num-traits", + "png", "tiff", ] @@ -6856,8 +6957,8 @@ checksum = "0a0c890c85da4bab7bce4204c707396bbd3c6c8a681716a51c8814cfc2b682df" dependencies = [ "anyhow", "proc-macro-hack", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -6867,19 +6968,19 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", "hashbrown 0.12.3", "serde", ] [[package]] name = "indexmap" -version = "2.2.2" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "serde", ] @@ -6894,19 +6995,19 @@ dependencies = [ [[package]] name = "inferno" -version = "0.11.19" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "321f0f839cd44a4686e9504b0a62b4d69a50b62072144c71c68f5873c167b8d9" +checksum = "7c77a3ae7d4761b9c64d2c030f70746ceb8cfba32dce0325a56792e0a4816c31" dependencies = [ "ahash 0.8.11", - "clap 4.4.18", + "clap 4.5.9", "crossbeam-channel", "crossbeam-utils", - "dashmap 5.5.3", - "env_logger", - "indexmap 2.2.2", + "dashmap 6.0.1", + "env_logger 0.11.3", + "indexmap 2.2.6", "is-terminal", - "itoa 1.0.10", + "itoa 1.0.11", "log", "num-format", "once_cell", @@ -6917,13 +7018,13 @@ dependencies = [ [[package]] name = "influxdb" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77763a6985cbf3f3251fd0725511b6eb81967bfb50763e7a88097ff8e8504fb0" +checksum = "601aa12a5876c044ea2a94a9443d0f086e6fc1f7bb4264bd7120e63c1462d1c8" dependencies = [ "chrono", "futures-util", - "http 0.2.11", + "http 0.2.12", "lazy_static", "regex", "reqwest", @@ -6934,9 +7035,8 @@ dependencies = [ [[package]] name = "influxive" -version = "0.0.2-alpha.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e33972c836e620ade20e7c0c66062c60a90b222ed46f5f872f1a4721967191" +version = "0.0.3-alpha.1" +source = "git+https://github.com/coasys/influxive.git?rev=b9abb5e8ba22273412bf6df7f2fd51f1f76801b9#b9abb5e8ba22273412bf6df7f2fd51f1f76801b9" dependencies = [ "influxive-child-svc", "influxive-otel", @@ -6945,9 +7045,8 @@ dependencies = [ [[package]] name = "influxive-child-svc" -version = "0.0.2-alpha.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0923b25ac29f6e2ac600b0d3762792c4cb86438c3f2c7daa1f6e65e66f7f0d4d" +version = "0.0.3-alpha.1" +source = "git+https://github.com/coasys/influxive.git?rev=b9abb5e8ba22273412bf6df7f2fd51f1f76801b9#b9abb5e8ba22273412bf6df7f2fd51f1f76801b9" dependencies = [ "hex-literal", "influxive-core", @@ -6960,17 +7059,15 @@ dependencies = [ [[package]] name = "influxive-core" -version = "0.0.2-alpha.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5db78961ebb97b6d16ba61a65b38978a67cf7efaa91903c500b4771d1920d00" +version = "0.0.3-alpha.1" +source = "git+https://github.com/coasys/influxive.git?rev=b9abb5e8ba22273412bf6df7f2fd51f1f76801b9#b9abb5e8ba22273412bf6df7f2fd51f1f76801b9" [[package]] name = "influxive-downloader" -version = "0.0.2-alpha.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "264581af3b49d108e76382e301d4228f89a3995e373363b877bb42b1312ebba3" +version = "0.0.3-alpha.1" +source = "git+https://github.com/coasys/influxive.git?rev=b9abb5e8ba22273412bf6df7f2fd51f1f76801b9#b9abb5e8ba22273412bf6df7f2fd51f1f76801b9" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "digest 0.10.7", "dirs 5.0.1", "flate2", @@ -6983,14 +7080,13 @@ dependencies = [ "tar", "tempfile", "tokio", - "zip", + "zip 2.1.3 (git+https://github.com/coasys/zip2.git?rev=a6e30f1d6379e2818814ba9662ad565e43f26afe)", ] [[package]] name = "influxive-otel" -version = "0.0.2-alpha.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "882f4ff61b099d34855841a6ea4d1890a1bd2aad2d07d8aaa63c99059d0f295c" +version = "0.0.3-alpha.1" +source = "git+https://github.com/coasys/influxive.git?rev=b9abb5e8ba22273412bf6df7f2fd51f1f76801b9#b9abb5e8ba22273412bf6df7f2fd51f1f76801b9" dependencies = [ "influxive-core", "opentelemetry_api", @@ -7008,9 +7104,8 @@ dependencies = [ [[package]] name = "influxive-writer" -version = "0.0.2-alpha.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89db32ac1865b814d5f4109635226c1d89189852d88f9ae704c0b51d6d2a8f25" +version = "0.0.3-alpha.1" +source = "git+https://github.com/coasys/influxive.git?rev=b9abb5e8ba22273412bf6df7f2fd51f1f76801b9#b9abb5e8ba22273412bf6df7f2fd51f1f76801b9" dependencies = [ "influxdb", "influxive-core", @@ -7056,9 +7151,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if 1.0.0", ] @@ -7069,7 +7164,7 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18bfda24d3930aa647f90044d5ef87d0c8120f13b86b2d60e8aade66e656e659" dependencies = [ - "bit-set", + "bit-set 0.5.3", "gcollections", "num-integer", "num-traits", @@ -7082,7 +7177,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.4", + "hermit-abi 0.3.9", "libc", "windows-sys 0.48.0", ] @@ -7093,7 +7188,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.5", + "socket2 0.5.7", "widestring", "windows-sys 0.48.0", "winreg 0.50.0", @@ -7112,22 +7207,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59a85abdc13717906baccb5a1e435556ce0df215f242892f721dff62bf25288f" dependencies = [ "Inflector", - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] name = "is-terminal" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ - "hermit-abi 0.3.4", - "rustix 0.38.30", + "hermit-abi 0.3.9", + "libc", "windows-sys 0.52.0", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + [[package]] name = "isotest" version = "0.1.0" @@ -7173,9 +7274,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "javascriptcore-rs" @@ -7207,7 +7308,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" dependencies = [ "cesu8", - "combine 4.6.6", + "combine 4.6.7", "jni-sys", "log", "thiserror", @@ -7222,7 +7323,7 @@ checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" dependencies = [ "cesu8", "cfg-if 1.0.0", - "combine 4.6.6", + "combine 4.6.7", "jni-sys", "log", "thiserror", @@ -7238,9 +7339,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -7268,19 +7369,18 @@ checksum = "eb3fa5a61630976fc4c353c70297f2e93f1930e3ccee574d59d618ccbd5154ce" dependencies = [ "serde", "serde_json", - "treediff 3.0.2", + "treediff", ] [[package]] name = "json-patch" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ff1e1486799e3f64129f8ccad108b38290df9cd7015cd31bed17239f0789d6" +checksum = "ec9ad60d674508f3ca8f380a928cfe7b096bc729c4e2dbfe3852bc45da3ab30b" dependencies = [ "serde", "serde_json", "thiserror", - "treediff 4.0.2", ] [[package]] @@ -7348,7 +7448,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.1", + "libloading 0.8.4", "pkg-config", ] @@ -7360,8 +7460,7 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] name = "kitsune_p2p" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.10" dependencies = [ "arrayref", "base64 0.22.1", @@ -7373,17 +7472,16 @@ dependencies = [ "futures", "ghost_actor", "governor", - "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "holochain_trace", "itertools 0.12.1", - "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_bin_data", "kitsune_p2p_block", "kitsune_p2p_bootstrap_client", "kitsune_p2p_fetch", "kitsune_p2p_mdns", "kitsune_p2p_proxy", - "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", - "kitsune_p2p_transport_quic", - "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_timestamp", + "kitsune_p2p_types", "maplit", "mockall", "must_future", @@ -7391,7 +7489,7 @@ dependencies = [ "num-traits", "once_cell", "opentelemetry_api", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "rand 0.8.5", "serde", "serde_bytes", @@ -7406,32 +7504,16 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" -version = "0.3.1-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0afa937935e8d3eae00cc3b324988ced94d8efa8039550eeb3f0a89e3e181aee" -dependencies = [ - "base64 0.22.1", - "derive_more", - "holochain_util 0.3.1-rc.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kitsune_p2p_dht_arc 0.3.1-rc.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde", - "serde_bytes", - "shrinkwraprs", -] - -[[package]] -name = "kitsune_p2p_bin_data" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.7" dependencies = [ "arbitrary", "base64 0.22.1", "derive_more", "fixt", - "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", - "kitsune_p2p_dht_arc 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "holochain_util", + "kitsune_p2p_dht_arc", "proptest", - "proptest-derive", + "proptest-derive 0.4.0", "serde", "serde_bytes", "shrinkwraprs", @@ -7439,24 +7521,22 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.7" dependencies = [ - "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", - "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_bin_data", + "kitsune_p2p_timestamp", "serde", ] [[package]] name = "kitsune_p2p_bootstrap" -version = "0.2.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.3.0-dev.9" dependencies = [ - "clap 4.4.18", + "clap 4.5.9", "futures", - "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", - "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", - "parking_lot 0.12.1", + "kitsune_p2p_bin_data", + "kitsune_p2p_types", + "parking_lot 0.12.3", "rand 0.8.5", "reqwest", "serde", @@ -7468,12 +7548,11 @@ dependencies = [ [[package]] name = "kitsune_p2p_bootstrap_client" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.9" dependencies = [ - "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_bin_data", "kitsune_p2p_bootstrap", - "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_types", "reqwest", "serde", "serde_bytes", @@ -7482,40 +7561,19 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht" -version = "0.3.1-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ff93b9d045ebd77781d8b61835f55112b898dc36c61d72557f58792489bee8" -dependencies = [ - "derivative", - "derive_more", - "futures", - "kitsune_p2p_dht_arc 0.3.1-rc.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kitsune_p2p_timestamp 0.3.1-rc.0 (registry+https://github.com/rust-lang/crates.io-index)", - "must_future", - "num-traits", - "rand 0.8.5", - "serde", - "statrs", - "thiserror", - "tracing", -] - -[[package]] -name = "kitsune_p2p_dht" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.7" dependencies = [ "arbitrary", "colored", "derivative", "derive_more", "futures", - "kitsune_p2p_dht_arc 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", - "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_dht_arc", + "kitsune_p2p_timestamp", "must_future", "num-traits", "proptest", - "proptest-derive", + "proptest-derive 0.5.0", "rand 0.8.5", "serde", "statrs", @@ -7525,45 +7583,29 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" -version = "0.3.1-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e06db37fa121dfa22ebde3271db5d385cd496ed03d915ad37104cceb87a22ca" -dependencies = [ - "derive_more", - "gcollections", - "intervallum", - "kitsune_p2p_timestamp 0.3.1-rc.0 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits", - "serde", -] - -[[package]] -name = "kitsune_p2p_dht_arc" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.7" dependencies = [ "arbitrary", "derive_more", "gcollections", "intervallum", - "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "kitsune_p2p_timestamp", "num-traits", "proptest", - "proptest-derive", + "proptest-derive 0.5.0", "rusqlite", "serde", ] [[package]] name = "kitsune_p2p_fetch" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.8" dependencies = [ "backon", "derive_more", - "indexmap 2.2.2", - "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", - "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "indexmap 2.2.6", + "kitsune_p2p_timestamp", + "kitsune_p2p_types", "serde", "tokio", "tracing", @@ -7571,8 +7613,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_mdns" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.2" dependencies = [ "base64 0.22.1", "err-derive 0.3.1", @@ -7585,15 +7626,13 @@ dependencies = [ [[package]] name = "kitsune_p2p_proxy" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.8" dependencies = [ "base64 0.22.1", "derive_more", "futures", - "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", - "kitsune_p2p_transport_quic", - "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "holochain_trace", + "kitsune_p2p_types", "serde", "serde_bytes", "structopt", @@ -7602,79 +7641,21 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" -version = "0.3.1-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1dcdf3cae376a56ab109908d72b9b678e95920c087e7b255c505c84cdb9787" -dependencies = [ - "chrono", - "serde", -] - -[[package]] -name = "kitsune_p2p_timestamp" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.2" dependencies = [ "arbitrary", "chrono", "once_cell", "proptest", - "proptest-derive", + "proptest-derive 0.5.0", "rand 0.8.5", "rusqlite", "serde", ] -[[package]] -name = "kitsune_p2p_transport_quic" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" -dependencies = [ - "blake2b_simd", - "futures", - "if-addrs 0.12.0", - "kitsune_p2p_types 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", - "quinn", - "rustls 0.20.9", - "tokio", - "webpki", -] - -[[package]] -name = "kitsune_p2p_types" -version = "0.3.1-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14901c550c67abdb22fc271730bc3b026bbaa6fd089fee89302e7101a7cfce37" -dependencies = [ - "base64 0.22.1", - "derive_more", - "futures", - "ghost_actor", - "holochain_trace 0.3.1-rc.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kitsune_p2p_bin_data 0.3.1-rc.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kitsune_p2p_dht 0.3.1-rc.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kitsune_p2p_dht_arc 0.3.1-rc.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kitsune_p2p_timestamp 0.3.1-rc.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lair_keystore_api", - "once_cell", - "parking_lot 0.12.1", - "paste", - "rmp-serde 1.1.2", - "rustls 0.20.9", - "serde", - "serde_bytes", - "serde_json", - "sysinfo 0.30.12", - "thiserror", - "tokio", - "url", - "url2", -] - [[package]] name = "kitsune_p2p_types" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.8" dependencies = [ "arbitrary", "base64 0.22.1", @@ -7682,27 +7663,27 @@ dependencies = [ "fixt", "futures", "ghost_actor", - "holochain_trace 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", - "kitsune_p2p_bin_data 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", - "kitsune_p2p_dht 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", - "kitsune_p2p_dht_arc 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", - "kitsune_p2p_timestamp 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "holochain_trace", + "kitsune_p2p_bin_data", + "kitsune_p2p_dht", + "kitsune_p2p_dht_arc", + "kitsune_p2p_timestamp", "lair_keystore_api", "mockall", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "paste", "proptest", - "proptest-derive", - "rmp-serde 1.1.2", + "proptest-derive 0.4.0", + "rmp-serde", "rustls 0.20.9", "serde", "serde_bytes", "serde_json", - "sysinfo 0.30.12", + "sysinfo 0.30.13", "thiserror", "tokio", - "url", + "url 1.7.2", "url2", ] @@ -7750,9 +7731,8 @@ dependencies = [ [[package]] name = "lair_keystore" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56689c6c7f318e5909c9de1d7eac7f2d383370341632ab845c2da24b5b6bb7aa" +version = "0.4.5" +source = "git+https://github.com/coasys/lair.git?rev=05802500ec58381a440da07985b89539213b1a54#05802500ec58381a440da07985b89539213b1a54" dependencies = [ "lair_keystore_api", "pretty_assertions", @@ -7760,32 +7740,31 @@ dependencies = [ "rusqlite", "sqlformat", "structopt", - "sysinfo 0.28.4", + "sysinfo 0.30.13", "tracing-subscriber 0.3.18", ] [[package]] name = "lair_keystore_api" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa27af83a127b28c06d7c175dfc34d762fb66ea36d6ac2110d93a55d0e058dd5" +version = "0.4.5" +source = "git+https://github.com/coasys/lair.git?rev=05802500ec58381a440da07985b89539213b1a54#05802500ec58381a440da07985b89539213b1a54" dependencies = [ - "base64 0.13.1", + "base64 0.22.1", "dunce", "hc_seed_bundle", "lru", "nanoid", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "rcgen", "serde", "serde_json", - "serde_yaml 0.9.31", + "serde_yaml", "time", "tokio", - "toml 0.7.8", + "toml 0.8.14", "tracing", - "url", + "url 2.5.2", "winapi 0.3.9", "zeroize", ] @@ -7807,19 +7786,19 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44bcd58e6c97a7fcbaffcdc95728b393b8d98933bfadad49ed4097845b57ef0b" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "regex", - "syn 2.0.48", + "syn 2.0.71", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ - "spin 0.5.2", + "spin 0.9.8", ] [[package]] @@ -7947,9 +7926,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libdbus-sys" @@ -7981,9 +7960,9 @@ dependencies = [ [[package]] name = "libflate" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7d5654ae1795afc7ff76f4365c2c8791b0feb18e8996a96adad8ffd7c3b2bf" +checksum = "45d9dfdc14ea4ef0900c1cddbc8dcd553fbaacd8a4a282cf4018ae9dd04fb21e" dependencies = [ "adler32", "core2", @@ -7994,12 +7973,12 @@ dependencies = [ [[package]] name = "libflate_lz77" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be5f52fb8c451576ec6b79d3f4deb327398bc05bbdbd99021a6e77a4c855d524" +checksum = "e6e0d73b369f386f1c44abd9c570d5318f55ccde816ff4b562fa452e5182863d" dependencies = [ "core2", - "hashbrown 0.13.2", + "hashbrown 0.14.5", "rle-decode-fast", ] @@ -8015,12 +7994,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.1" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if 1.0.0", - "windows-sys 0.48.0", + "windows-targets 0.52.6", ] [[package]] @@ -8051,13 +8030,12 @@ dependencies = [ [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", - "redox_syscall 0.4.1", ] [[package]] @@ -8087,7 +8065,7 @@ checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451" dependencies = [ "crunchy", "digest 0.9.0", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -8110,9 +8088,9 @@ dependencies = [ [[package]] name = "libsodium-sys-stable" -version = "1.20.4" +version = "1.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1d164bc6f9139c5f95efb4f0be931b2bd5a9edf7e4e3c945d26b95ab8fa669b" +checksum = "ad52c454200cd0178a04ef7642a240a7e81b4d8c59f0865eb98c477daf7d3b84" dependencies = [ "cc", "libc", @@ -8122,14 +8100,13 @@ dependencies = [ "tar", "ureq", "vcpkg", - "zip", + "zip 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "libsqlite3-sys" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +version = "0.29.0" +source = "git+https://github.com/coasys/rusqlite.git?rev=12ec1330bd4b46411ab9895364da4a3e172d0fbb#12ec1330bd4b46411ab9895364da4a3e172d0fbb" dependencies = [ "cc", "openssl-sys", @@ -8139,24 +8116,15 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.15" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6" +checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" dependencies = [ "cc", "pkg-config", "vcpkg", ] -[[package]] -name = "line-wrap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] - [[package]] name = "linked-hash-map" version = "0.5.6" @@ -8171,9 +8139,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "litrs" @@ -8196,19 +8164,25 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", "scopeguard", ] +[[package]] +name = "lockfree-object-pool" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" + [[package]] name = "log" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" dependencies = [ "serde", "value-bag", @@ -8222,9 +8196,9 @@ checksum = "a94d21414c1f4a51209ad204c1776a3d0765002c76c6abcb602a6f09f1e881c7" [[package]] name = "log4rs" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d36ca1786d9e79b8193a68d480a0907b612f109537115c6ff655a3a1967533fd" +checksum = "0816135ae15bd0391cf284eab37e6e3ee0a6ee63d2ceeb659862bd8d0a984ca6" dependencies = [ "anyhow", "arc-swap", @@ -8235,11 +8209,13 @@ dependencies = [ "libc", "log", "log-mdc", - "parking_lot 0.12.1", + "once_cell", + "parking_lot 0.12.3", + "rand 0.8.5", "serde", "serde-value", "serde_json", - "serde_yaml 0.8.26", + "serde_yaml", "thiserror", "thread-id", "typemap-ors", @@ -8263,11 +8239,11 @@ dependencies = [ [[package]] name = "lru" -version = "0.10.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" dependencies = [ - "hashbrown 0.13.2", + "hashbrown 0.14.5", ] [[package]] @@ -8279,6 +8255,16 @@ dependencies = [ "linked-hash-map", ] +[[package]] +name = "lzma-rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" +dependencies = [ + "byteorder", + "crc", +] + [[package]] name = "mac" version = "0.1.1" @@ -8307,6 +8293,15 @@ dependencies = [ "libc", ] +[[package]] +name = "mach2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" +dependencies = [ + "libc", +] + [[package]] name = "malloc_buf" version = "0.0.6" @@ -8384,7 +8379,7 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", "rawpointer", ] @@ -8425,9 +8420,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -8459,7 +8454,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", ] [[package]] @@ -8468,16 +8463,16 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", ] [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", ] [[package]] @@ -8486,7 +8481,7 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5637e166ea14be6063a3f8ba5ccb9a4159df7d8f6d61c02fc3d480b1f90dcfcb" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block", "core-graphics-types", "foreign-types 0.5.0", @@ -8503,9 +8498,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", @@ -8525,9 +8520,9 @@ checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", @@ -8548,9 +8543,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", @@ -8595,8 +8590,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb" dependencies = [ "cfg-if 1.0.0", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -8608,21 +8603,20 @@ checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" [[package]] name = "mr_bundle" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.4" dependencies = [ "arbitrary", "derive_more", "flate2", "futures", - "holochain_util 0.3.1-rc.0 (git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a)", + "holochain_util", "proptest", - "proptest-derive", + "proptest-derive 0.4.0", "reqwest", - "rmp-serde 1.1.2", + "rmp-serde", "serde", "serde_bytes", - "serde_yaml 0.9.31", + "serde_yaml", "test-strategy", "thiserror", ] @@ -8636,12 +8630,29 @@ dependencies = [ "bytes", "encoding_rs", "futures-util", - "http 0.2.11", + "http 0.2.12", "httparse", "log", "memchr", "mime", "spin 0.9.8", + "version_check", +] + +[[package]] +name = "multer" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83e87776546dc87511aa5ee218730c92b666d7264ab6ed41f9d215af9cd5224b" +dependencies = [ + "bytes", + "encoding_rs", + "futures-util", + "http 1.1.0", + "httparse", + "memchr", + "mime", + "spin 0.9.8", "tokio", "tokio-util", "version_check", @@ -8681,10 +8692,10 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d6d4752e6230d8ef7adf7bd5d8c4b1f6561c1014c5ba9a37445ccefe18aa1db" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.1.3", "proc-macro-error", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", "synstructure", ] @@ -8715,11 +8726,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e536ae46fcab0876853bd4a632ede5df4b1c2527a58f6c5a4150fe86be858231" dependencies = [ "arrayvec 0.7.4", - "bit-set", - "bitflags 2.5.0", + "bit-set 0.5.3", + "bitflags 2.6.0", "codespan-reporting", "hexf-parse", - "indexmap 2.2.2", + "indexmap 2.2.6", "log", "num-traits", "rustc-hash", @@ -8727,7 +8738,7 @@ dependencies = [ "spirv", "termcolor", "thiserror", - "unicode-xid 0.2.4", + "unicode-xid", ] [[package]] @@ -8754,8 +8765,8 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01fcc0b8149b4632adc89ac3b7b31a12fb6099a0317a4eb2ebff574ef7de7218" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -8770,11 +8781,10 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -8846,9 +8856,9 @@ dependencies = [ [[package]] name = "new_debug_unreachable" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] name = "nibble_vec" @@ -8872,25 +8882,13 @@ dependencies = [ "memoffset 0.6.5", ] -[[package]] -name = "nix" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" -dependencies = [ - "bitflags 1.3.2", - "cfg-if 1.0.0", - "libc", - "memoffset 0.6.5", -] - [[package]] name = "nix" version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", "bitflags 1.3.2", "cfg-if 1.0.0", "libc", @@ -8916,8 +8914,20 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", + "cfg-if 1.0.0", + "libc", +] + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.6.0", "cfg-if 1.0.0", + "cfg_aliases", "libc", ] @@ -8981,7 +8991,7 @@ dependencies = [ "inotify", "kqueue", "libc", - "mio 0.8.10", + "mio 0.8.11", "walkdir", "winapi 0.3.9", ] @@ -9027,9 +9037,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ "num-bigint", "num-complex", @@ -9041,11 +9051,10 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg 1.1.0", "num-integer", "num-traits", "rand 0.8.5", @@ -9072,13 +9081,19 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-format" version = "0.4.4" @@ -9086,26 +9101,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" dependencies = [ "arrayvec 0.7.4", - "itoa 1.0.10", + "itoa 1.0.11", ] [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg 1.1.0", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", "num-integer", "num-traits", ] @@ -9127,11 +9141,10 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg 1.1.0", "num-bigint", "num-integer", "num-traits", @@ -9139,11 +9152,11 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", "libm", ] @@ -9153,7 +9166,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.4", + "hermit-abi 0.3.9", "libc", ] @@ -9181,9 +9194,9 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ - "proc-macro-crate", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro-crate 1.1.3", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -9193,10 +9206,10 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate", - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] @@ -9220,6 +9233,105 @@ dependencies = [ "objc_id", ] +[[package]] +name = "objc-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" +dependencies = [ + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-app-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.6.0", + "block2", + "libc", + "objc2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-encode" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.6.0", + "block2", + "libc", + "objc2", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + [[package]] name = "objc_exception" version = "0.1.2" @@ -9240,9 +9352,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] @@ -9304,9 +9416,9 @@ checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" [[package]] name = "opaque-debug" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "open" @@ -9340,11 +9452,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.63" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if 1.0.0", "foreign-types 0.3.2", "libc", @@ -9359,9 +9471,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] @@ -9372,18 +9484,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.2.2+3.2.1" +version = "300.3.1+3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bbfad0063610ac26ee79f7484739e2b07555a75c42453b89263830b5c8103bc" +checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.99" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -9425,13 +9537,13 @@ dependencies = [ [[package]] name = "os_info" -version = "3.7.0" +version = "3.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" +checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" dependencies = [ "log", "serde", - "winapi 0.3.9", + "windows-sys 0.52.0", ] [[package]] @@ -9462,8 +9574,8 @@ checksum = "5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7" dependencies = [ "Inflector", "proc-macro-error", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -9577,7 +9689,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -9599,12 +9711,12 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", - "parking_lot_core 0.9.9", + "parking_lot_core 0.9.10", ] [[package]] @@ -9623,26 +9735,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.4.1", + "redox_syscall 0.5.3", "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core 0.6.4", - "subtle 2.5.0", + "windows-targets 0.52.6", ] [[package]] @@ -9653,14 +9754,14 @@ checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" dependencies = [ "base64ct", "rand_core 0.6.4", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "path-clean" @@ -9674,18 +9775,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" -[[package]] -name = "pbkdf2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest 0.10.7", - "hmac 0.12.1", - "password-hash 0.4.2", - "sha2 0.10.8", -] - [[package]] name = "pbkdf2" version = "0.12.2" @@ -9698,25 +9787,25 @@ dependencies = [ [[package]] name = "pear" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ccca0f6c17acc81df8e242ed473ec144cbf5c98037e69aa6d144780aad103c8" +checksum = "bdeeaa00ce488657faba8ebf44ab9361f9365a97bd39ffb8a60663f57ff4b467" dependencies = [ "inlinable_string", "pear_codegen", - "yansi 1.0.0-rc.1", + "yansi 1.0.1", ] [[package]] name = "pear_codegen" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e22670e8eb757cff11d6c199ca7b987f352f0346e0be4dd23869ec72cb53c77" +checksum = "4bab5b985dc082b345f812b7df84e1bef27e7207b39e448439ba8bd69c93f147" dependencies = [ - "proc-macro2 1.0.78", + "proc-macro2", "proc-macro2-diagnostics", - "quote 1.0.35", - "syn 2.0.48", + "quote", + "syn 2.0.71", ] [[package]] @@ -9737,6 +9826,12 @@ dependencies = [ "base64ct", ] +[[package]] +name = "percent-encoding" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" + [[package]] name = "percent-encoding" version = "2.3.1" @@ -9745,9 +9840,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" +checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" dependencies = [ "memchr", "thiserror", @@ -9756,9 +9851,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" +checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" dependencies = [ "pest", "pest_generator", @@ -9766,22 +9861,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" +checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] name = "pest_meta" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" +checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" dependencies = [ "once_cell", "pest", @@ -9790,12 +9885,12 @@ dependencies = [ [[package]] name = "petgraph" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.2.2", + "indexmap 2.2.6", "quickcheck", ] @@ -9909,8 +10004,8 @@ dependencies = [ "phf_generator 0.8.0", "phf_shared 0.8.0", "proc-macro-hack", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -9923,8 +10018,8 @@ dependencies = [ "phf_generator 0.9.1", "phf_shared 0.9.0", "proc-macro-hack", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -9936,9 +10031,9 @@ checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ "phf_generator 0.11.2", "phf_shared 0.11.2", - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] @@ -9979,29 +10074,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -10011,12 +10106,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand 2.1.0", "futures-io", ] @@ -10026,7 +10121,7 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" dependencies = [ - "der 0.7.8", + "der 0.7.9", "pkcs8 0.10.2", "spki 0.7.3", ] @@ -10047,41 +10142,34 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ - "der 0.7.8", + "der 0.7.9", "spki 0.7.3", ] [[package]] name = "pkg-config" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" - -[[package]] -name = "platforms" -version = "3.3.0" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" -version = "1.5.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a4a0cfc5fb21a09dc6af4bf834cf10d4a32fccd9e2ea468c4b1751a097487aa" +checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ - "base64 0.21.7", - "indexmap 1.9.3", - "line-wrap", - "quick-xml 0.30.0", + "base64 0.22.1", + "indexmap 2.2.6", + "quick-xml 0.32.0", "serde", "time", ] [[package]] name = "png" -version = "0.17.11" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -10096,7 +10184,7 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", "bitflags 1.3.2", "cfg-if 1.0.0", "concurrent-queue", @@ -10108,14 +10196,15 @@ dependencies = [ [[package]] name = "polling" -version = "3.3.2" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545c980a3880efd47b2e262f6a4bb6daad6555cf3367aa9c4e52895f69537a41" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ "cfg-if 1.0.0", "concurrent-queue", + "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.30", + "rustix 0.38.34", "tracing", "windows-sys 0.52.0", ] @@ -10127,19 +10216,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" dependencies = [ "cpufeatures", - "opaque-debug 0.3.0", + "opaque-debug 0.3.1", "universal-hash", ] [[package]] name = "polyval" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "opaque-debug 0.3.0", + "opaque-debug 0.3.1", "universal-hash", ] @@ -10152,6 +10241,12 @@ dependencies = [ "rand 0.8.5", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -10224,18 +10319,18 @@ version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ - "proc-macro2 1.0.78", + "proc-macro2", "syn 1.0.109", ] [[package]] name = "prettyplease" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ - "proc-macro2 1.0.78", - "syn 2.0.48", + "proc-macro2", + "syn 2.0.71", ] [[package]] @@ -10257,6 +10352,15 @@ dependencies = [ "toml 0.5.11", ] +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -10264,8 +10368,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", "version_check", ] @@ -10276,8 +10380,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "version_check", ] @@ -10294,8 +10398,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07c277e4e643ef00c1233393c673f655e3672cf7eb3ba08a00bdd0ea59139b5f" dependencies = [ "proc-macro-rules-macros", - "proc-macro2 1.0.78", - "syn 2.0.48", + "proc-macro2", + "syn 2.0.71", ] [[package]] @@ -10305,25 +10409,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "207fffb0fe655d1d47f6af98cc2793405e85929bdbc420d685554ff07be27ac7" dependencies = [ "once_cell", - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid 0.1.0", -] - -[[package]] -name = "proc-macro2" -version = "1.0.78" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -10334,11 +10429,11 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", "version_check", - "yansi 1.0.0-rc.1", + "yansi 1.0.1", ] [[package]] @@ -10347,36 +10442,21 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" -[[package]] -name = "prometheus" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" -dependencies = [ - "cfg-if 1.0.0", - "fnv", - "lazy_static", - "memchr", - "parking_lot 0.12.1", - "protobuf", - "thiserror", -] - [[package]] name = "proptest" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" +checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" dependencies = [ - "bit-set", - "bit-vec", - "bitflags 2.5.0", + "bit-set 0.5.3", + "bit-vec 0.6.3", + "bitflags 2.6.0", "lazy_static", "num-traits", "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift 0.3.0", - "regex-syntax 0.8.2", + "regex-syntax 0.8.4", "rusty-fork", "tempfile", "unarray", @@ -10384,13 +10464,24 @@ dependencies = [ [[package]] name = "proptest-derive" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90b46295382dc76166cb7cf2bb4a97952464e4b7ed5a43e6cd34e1fec3349ddc" +checksum = "9cf16337405ca084e9c78985114633b6827711d22b9e6ef6c6c0d665eb3f0b6e" dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "proptest-derive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] @@ -10433,8 +10524,8 @@ checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", "itertools 0.10.5", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -10447,12 +10538,6 @@ dependencies = [ "prost", ] -[[package]] -name = "protobuf" -version = "2.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" - [[package]] name = "psm" version = "0.1.21" @@ -10477,8 +10562,8 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -10517,84 +10602,40 @@ dependencies = [ ] [[package]] -name = "quickcheck" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c35d9c36a562f37eca96e79f66d5fd56eefbc22560dacc4a864cabd2d277456" -dependencies = [ - "rand 0.6.5", - "rand_core 0.4.2", -] - -[[package]] -name = "quinn" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b435e71d9bfa0d8889927231970c51fb89c58fa63bffcab117c9c7a41e5ef8f" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "fxhash", - "quinn-proto", - "quinn-udp", - "rustls 0.20.9", - "thiserror", - "tokio", - "tracing", - "webpki", -] - -[[package]] -name = "quinn-proto" -version = "0.8.4" +name = "quick-xml" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fce546b9688f767a57530652488420d419a8b1f44a478b451c3d1ab6d992a55" +checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" dependencies = [ - "bytes", - "fxhash", - "rand 0.8.5", - "ring 0.16.20", - "rustls 0.20.9", - "rustls-native-certs", - "rustls-pemfile 0.2.1", - "slab", - "thiserror", - "tinyvec", - "tracing", - "webpki", + "memchr", ] [[package]] -name = "quinn-udp" -version = "0.1.4" +name = "quick-xml" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07946277141531aea269befd949ed16b2c85a780ba1043244eda0969e538e54" +checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" dependencies = [ - "futures-util", - "libc", - "quinn-proto", - "socket2 0.4.10", - "tokio", - "tracing", + "memchr", ] [[package]] -name = "quote" -version = "0.6.13" +name = "quickcheck" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" +checksum = "9c35d9c36a562f37eca96e79f66d5fd56eefbc22560dacc4a864cabd2d277456" dependencies = [ - "proc-macro2 0.4.30", + "rand 0.6.5", + "rand_core 0.4.2", ] [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ - "proc-macro2 1.0.78", + "proc-macro2", ] [[package]] @@ -10604,20 +10645,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" dependencies = [ "log", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "scheduled-thread-pool", ] -[[package]] -name = "r2d2_sqlite_neonphog" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d1e95b387a49ce52c5e4994fbe18af7b6cd52510f74c9a243b12abfc207f49c" -dependencies = [ - "r2d2", - "rusqlite", -] - [[package]] name = "radium" version = "0.7.0" @@ -10747,7 +10778,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.12", + "getrandom 0.2.15", ] [[package]] @@ -10875,9 +10906,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.8.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -10933,35 +10964,44 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +dependencies = [ + "bitflags 2.6.0", +] + [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ - "getrandom 0.2.12", + "getrandom 0.2.15", "libredox", "thiserror", ] [[package]] name = "ref-cast" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4846d4c50d1721b1a3bef8af76924eef20d5e723647333798c1b519b3a9473f" +checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc" +checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] @@ -10984,14 +11024,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.5", - "regex-syntax 0.8.2", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -11005,13 +11045,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.4", ] [[package]] @@ -11022,26 +11062,20 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - -[[package]] -name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "region" -version = "3.0.0" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76e189c2369884dce920945e2ddf79b3dff49e071a167dd1817fa9c4c00d512e" +checksum = "e6b6ebd13bc009aef9cd476c1310d49ac354d36e240cf1bd753290f3dc7199a7" dependencies = [ "bitflags 1.3.2", "libc", - "mach", - "winapi 0.3.9", + "mach2", + "windows-sys 0.52.0", ] [[package]] @@ -11059,9 +11093,9 @@ dependencies = [ [[package]] name = "rend" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd" +checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" dependencies = [ "bytecheck", ] @@ -11079,9 +11113,9 @@ dependencies = [ "futures-core", "futures-util", "h2 0.3.26", - "http 0.2.11", + "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.28", + "hyper 0.14.30", "hyper-rustls", "hyper-tls", "ipnet", @@ -11090,7 +11124,7 @@ dependencies = [ "mime", "native-tls", "once_cell", - "percent-encoding", + "percent-encoding 2.3.1", "pin-project-lite", "rustls 0.21.11", "rustls-pemfile 1.0.4", @@ -11103,12 +11137,12 @@ dependencies = [ "tokio-socks", "tokio-util", "tower-service", - "url", + "url 2.5.2", "wasm-bindgen", "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.25.3", + "webpki-roots 0.25.4", "winreg 0.50.0", ] @@ -11140,7 +11174,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ "hmac 0.12.1", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -11169,9 +11203,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.37" +version = "0.8.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +checksum = "ade4539f42266ded9e755c605bdddf546242b2c961b03b06a7375260788a0523" dependencies = [ "bytemuck", ] @@ -11193,16 +11227,17 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", - "getrandom 0.2.12", + "cfg-if 1.0.0", + "getrandom 0.2.15", "libc", "spin 0.9.8", "untrusted 0.9.0", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -11227,9 +11262,9 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.43" +version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527a97cdfef66f65998b5f3b637c26f5a5ec09cc52a3f9932313ac645f4190f5" +checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" dependencies = [ "bitvec", "bytecheck", @@ -11241,17 +11276,17 @@ dependencies = [ "rkyv_derive", "seahash", "tinyvec", - "uuid 1.8.0", + "uuid 1.10.0", ] [[package]] name = "rkyv_derive" -version = "0.7.43" +version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5c462a1328c8e67e4d6dbad1eb0355dd43e8ab432c6e227a43657f16ade5033" +checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -11263,9 +11298,9 @@ checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" [[package]] name = "rmp" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" dependencies = [ "byteorder", "num-traits", @@ -11274,20 +11309,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723ecff9ad04f4ad92fe1c8ca6c20d2196d9286e9c60727c4cb5511629260e9d" -dependencies = [ - "byteorder", - "rmp", - "serde", -] - -[[package]] -name = "rmp-serde" -version = "1.1.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" +checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" dependencies = [ "byteorder", "rmp", @@ -11296,9 +11320,9 @@ dependencies = [ [[package]] name = "rmpv" -version = "1.0.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de8813b3a2f95c5138fe5925bfb8784175d88d6bff059ba8ce090aa891319754" +checksum = "58450723cd9ee93273ce44a20b6ec4efe17f8ed2e3631474387bfdecf18bb2a9" dependencies = [ "num-traits", "rmp", @@ -11308,9 +11332,9 @@ dependencies = [ [[package]] name = "rocket" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e7bb57ccb26670d73b6a47396c83139447b9e7878cab627fdfe9ea8da489150" +checksum = "a516907296a31df7dc04310e7043b61d71954d703b603cc6867a026d7e72d73f" dependencies = [ "async-stream 0.3.5", "async-trait", @@ -11320,12 +11344,12 @@ dependencies = [ "either", "figment", "futures", - "indexmap 2.2.2", + "indexmap 2.2.6", "log", "memchr", - "multer", + "multer 3.1.0", "num_cpus", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project-lite", "rand 0.8.5", "ref-cast", @@ -11340,42 +11364,42 @@ dependencies = [ "tokio-util", "ubyte", "version_check", - "yansi 1.0.0-rc.1", + "yansi 1.0.1", ] [[package]] name = "rocket_codegen" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2238066abf75f21be6cd7dc1a09d5414a671f4246e384e49fe3f8a4936bd04c" +checksum = "575d32d7ec1a9770108c879fc7c47815a80073f96ca07ff9525a94fcede1dd46" dependencies = [ "devise", "glob", - "indexmap 2.2.2", - "proc-macro2 1.0.78", - "quote 1.0.35", + "indexmap 2.2.6", + "proc-macro2", + "quote", "rocket_http", - "syn 2.0.48", - "unicode-xid 0.2.4", + "syn 2.0.71", + "unicode-xid", "version_check", ] [[package]] name = "rocket_http" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a1663694d059fe5f943ea5481363e48050acedd241d46deb2e27f71110389e" +checksum = "e274915a20ee3065f611c044bd63c40757396b6dbc057d6046aec27f14f882b9" dependencies = [ "cookie", "either", "futures", - "http 0.2.11", - "hyper 0.14.28", - "indexmap 2.2.2", + "http 0.2.12", + "hyper 0.14.30", + "indexmap 2.2.6", "log", "memchr", "pear", - "percent-encoding", + "percent-encoding 2.3.1", "pin-project-lite", "ref-cast", "serde", @@ -11394,7 +11418,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64 0.21.7", - "bitflags 2.5.0", + "bitflags 2.6.0", "serde", "serde_derive", ] @@ -11435,7 +11459,7 @@ dependencies = [ "rand_core 0.6.4", "signature 2.2.0", "spki 0.7.3", - "subtle 2.5.0", + "subtle 2.6.1", "zeroize", ] @@ -11452,11 +11476,10 @@ dependencies = [ [[package]] name = "rusqlite" version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" +source = "git+https://github.com/coasys/rusqlite.git?rev=12ec1330bd4b46411ab9895364da4a3e172d0fbb#12ec1330bd4b46411ab9895364da4a3e172d0fbb" dependencies = [ - "bitflags 2.5.0", - "fallible-iterator 0.2.0", + "bitflags 2.6.0", + "fallible-iterator 0.3.0", "fallible-streaming-iterator", "hashlink", "libsqlite3-sys", @@ -11465,9 +11488,9 @@ dependencies = [ [[package]] name = "rust-embed" -version = "8.2.0" +version = "8.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82c0bbc10308ed323529fd3c1dce8badda635aa319a5ff0e6466f33b8101e3f" +checksum = "fa66af4a4fdd5e7ebc276f115e895611a34739a9c1c01028383d612d550953c0" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -11476,22 +11499,22 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "8.2.0" +version = "8.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6227c01b1783cdfee1bcf844eb44594cd16ec71c35305bf1c9fb5aade2735e16" +checksum = "6125dbc8867951125eec87294137f4e9c2c96566e61bf72c45095a7c77761478" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "rust-embed-utils", - "syn 2.0.48", + "syn 2.0.71", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "8.2.0" +version = "8.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cb0a25bfbb2d4b4402179c2cf030387d9990857ce08a32592c6238db9fa8665" +checksum = "2e5347777e9aacb56039b0e1f28785929a8a3b709e87482e7442c72e7c12529d" dependencies = [ "sha2 0.10.8", "walkdir", @@ -11499,9 +11522,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -11524,7 +11547,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.21", + "semver 1.0.23", ] [[package]] @@ -11543,7 +11566,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ "bitflags 1.3.2", - "errno 0.3.8", + "errno 0.3.9", "io-lifetimes", "libc", "linux-raw-sys 0.3.8", @@ -11552,14 +11575,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.30" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", - "errno 0.3.8", + "bitflags 2.6.0", + "errno 0.3.9", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] @@ -11582,23 +11605,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4" dependencies = [ "log", - "ring 0.17.7", + "ring 0.17.8", "rustls-webpki 0.101.7", "sct", ] [[package]] name = "rustls" -version = "0.23.8" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +dependencies = [ + "log", + "ring 0.17.8", + "rustls-pki-types", + "rustls-webpki 0.102.5", + "subtle 2.6.1", + "zeroize", +] + +[[package]] +name = "rustls" +version = "0.23.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79adb16721f56eb2d843e67676896a61ce7a0fa622dc18d3e372477a029d2740" +checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0" dependencies = [ "aws-lc-rs", "log", "once_cell", "rustls-pki-types", - "rustls-webpki 0.102.4", - "subtle 2.5.0", + "rustls-webpki 0.102.5", + "subtle 2.6.1", "zeroize", ] @@ -11615,12 +11652,16 @@ dependencies = [ ] [[package]] -name = "rustls-pemfile" -version = "0.2.1" +name = "rustls-native-certs" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" +checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba" dependencies = [ - "base64 0.13.1", + "openssl-probe", + "rustls-pemfile 2.1.2", + "rustls-pki-types", + "schannel", + "security-framework", ] [[package]] @@ -11656,47 +11697,37 @@ checksum = "fd707225bb670bcd2876886bb571753d1ce03a9cedfa2e629a79984ca9a93cfb" dependencies = [ "futures", "rustls 0.21.11", - "socket2 0.5.5", + "socket2 0.5.7", "tokio", ] -[[package]] -name = "rustls-webpki" -version = "0.100.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6a5fc258f1c1276dfe3016516945546e2d5383911efc0fc4f1cdc5df3a4ae3" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - [[package]] name = "rustls-webpki" version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.7", + "ring 0.17.8", "untrusted 0.9.0", ] [[package]] name = "rustls-webpki" -version = "0.102.4" +version = "0.102.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" dependencies = [ "aws-lc-rs", - "ring 0.17.7", + "ring 0.17.8", "rustls-pki-types", "untrusted 0.9.0", ] [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "rusty-fork" @@ -11739,7 +11770,7 @@ version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "994eca4bca05c87e86e15d90fc7a91d1be64b4482b38cb2d27474568fe7c9db9" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if 1.0.0", "clipboard-win 4.5.0", "fd-lock 3.0.13", @@ -11762,9 +11793,9 @@ version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02a2d683a4ac90aeef5b1013933f6d977bd37d51ff3f4dad829d4931a7e6be86" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if 1.0.0", - "clipboard-win 5.3.1", + "clipboard-win 5.4.0", "fd-lock 4.0.2", "home", "libc", @@ -11780,31 +11811,25 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "ryu-js" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4950d85bc52415f8432144c97c4791bd0c4f7954de32a7270ee9cccd3c22b12b" +checksum = "ad97d4ce1560a5e27cec89519dc8300d1aa6035b099821261c651486a19e44d5" [[package]] name = "safe_arch" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354" +checksum = "c3460605018fdc9612bce72735cba0d27efbcd9904780d44c7e3a9948f96148a" dependencies = [ "bytemuck", ] -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - [[package]] name = "saffron" version = "0.1.0" @@ -11833,6 +11858,58 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "sbd-client" +version = "0.0.5-alpha" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bff8b5e22ff3d13f41b3b8318dcfb5303eb9903399ce82d25bcbf84742a0509" +dependencies = [ + "base64 0.22.1", + "ed25519-dalek 2.1.1", + "futures", + "rand 0.8.5", + "rustls 0.22.4", + "rustls-native-certs 0.7.1", + "tokio", + "tokio-rustls 0.25.0", + "tokio-tungstenite 0.21.0", + "tracing", + "webpki-roots 0.26.3", +] + +[[package]] +name = "sbd-e2e-crypto-client" +version = "0.0.5-alpha" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7f9e9ed5e1e817c0b57cf9625b0a823109267d3bfb06d5feec69e626bde59e8" +dependencies = [ + "sbd-client", + "sodoken 0.0.901-alpha", + "tokio", + "tracing", +] + +[[package]] +name = "sbd-server" +version = "0.0.5-alpha" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39c6ba716e669f658476cf3c0924b8970f23937601e8c5bb8d03f1a7a8b638ea" +dependencies = [ + "anstyle", + "base64 0.22.1", + "bytes", + "clap 4.5.9", + "ed25519-dalek 2.1.1", + "futures", + "rand 0.8.5", + "rustls 0.22.4", + "rustls-pemfile 2.1.2", + "slab", + "tokio", + "tokio-rustls 0.25.0", + "tokio-tungstenite 0.21.0", +] + [[package]] name = "schannel" version = "0.1.23" @@ -11848,7 +11925,32 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" dependencies = [ - "parking_lot 0.12.1", + "parking_lot 0.12.3", +] + +[[package]] +name = "schemars" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" +dependencies = [ + "dyn-clone", + "schemars_derive", + "serde", + "serde_json", + "url 2.5.2", +] + +[[package]] +name = "schemars_derive" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 2.0.71", ] [[package]] @@ -11879,8 +11981,8 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "212164841808ccfccf1b0471d91f8cfe675eeb60dbb96e4ca7a1f37b22570a29" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -11891,7 +11993,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2ae0d3cc44e736916c19ba2297954d4ec711ab1ec8c6c6edfefac76fa4e4b5d" dependencies = [ "base64 0.12.3", - "bit-set", + "bit-set 0.5.3", "bitvec", "blake2 0.8.1", "bytes", @@ -11907,7 +12009,7 @@ dependencies = [ "divrem", "futures", "fxhash", - "getrandom 0.2.12", + "getrandom 0.2.15", "git-version", "hostname 0.3.1", "indexmap 1.9.3", @@ -11921,13 +12023,13 @@ dependencies = [ "num-order", "ordered-float", "phf 0.9.0", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "rand 0.8.5", "ref_thread_local", "regex", "reqwest", - "ring 0.17.7", + "ring 0.17.8", "ripemd160", "roxmltree", "rustyline 12.0.0", @@ -11942,7 +12044,7 @@ dependencies = [ "static_assertions", "strum 0.23.0", "strum_macros 0.23.1", - "syn 2.0.48", + "syn 2.0.71", "to-syn-value", "to-syn-value_derive", "tokio", @@ -11959,27 +12061,27 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" dependencies = [ - "password-hash 0.5.0", - "pbkdf2 0.12.2", + "password-hash", + "pbkdf2", "salsa20", "sha2 0.10.8", ] [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] name = "sd-notify" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "621e3680f3e07db4c9c2c3fb07c6223ab2fab2e54bd3c04c3ae037990f428c32" +checksum = "4646d6f919800cd25c50edb49438a1381e2cd4833c027e75e8897981c50b8b5e" [[package]] name = "seahash" @@ -11997,7 +12099,7 @@ dependencies = [ "der 0.6.1", "generic-array 0.14.7", "pkcs8 0.9.0", - "subtle 2.5.0", + "subtle 2.6.1", "zeroize", ] @@ -12008,10 +12110,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ "base16ct 0.2.0", - "der 0.7.8", + "der 0.7.9", "generic-array 0.14.7", "pkcs8 0.10.2", - "subtle 2.5.0", + "subtle 2.6.1", "zeroize", ] @@ -12037,11 +12139,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -12050,9 +12152,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -12064,7 +12166,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f9da09dc3f4dfdb6374cbffff7a2cffcec316874d4429899eefdc97b3b94dcd" dependencies = [ - "bit-set", + "bit-set 0.5.3", "html5ever", "markup5ever_rcdom", ] @@ -12091,9 +12193,9 @@ dependencies = [ [[package]] name = "self_cell" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" +checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" [[package]] name = "semver" @@ -12115,9 +12217,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] @@ -12139,9 +12241,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] @@ -12189,52 +12291,73 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.14" +version = "0.11.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_cbor" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" dependencies = [ + "half", "serde", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", +] + +[[package]] +name = "serde_derive_internals" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ - "indexmap 2.2.2", - "itoa 1.0.10", + "indexmap 2.2.6", + "itoa 1.0.11", "ryu", "serde", ] [[package]] name = "serde_repr" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -12246,7 +12369,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.10", + "itoa 1.0.11", "ryu", "serde", ] @@ -12254,8 +12377,6 @@ dependencies = [ [[package]] name = "serde_v8" version = "0.192.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7b616df6c4ff5643dd503cbfe119175ebebfd4132512e33de4971f1e91d5739" dependencies = [ "num-bigint", "serde", @@ -12266,15 +12387,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.8.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" +checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" dependencies = [ "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.2.2", + "indexmap 2.2.6", "serde", "serde_derive", "serde_json", @@ -12284,36 +12405,24 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.8.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" +checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" dependencies = [ - "darling 0.20.9", - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "darling 0.20.10", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] name = "serde_yaml" -version = "0.8.26" +version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 1.9.3", - "ryu", - "serde", - "yaml-rust", -] - -[[package]] -name = "serde_yaml" -version = "0.9.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adf8a49373e98a4c5f0ceb5d05aa7c648d75f63774981ed95b7c7443bbd50c6e" -dependencies = [ - "indexmap 2.2.2", - "itoa 1.0.10", + "indexmap 2.2.6", + "itoa 1.0.11", "ryu", "serde", "unsafe-libyaml", @@ -12336,8 +12445,8 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -12383,7 +12492,7 @@ dependencies = [ "cfg-if 1.0.0", "cpufeatures", "digest 0.9.0", - "opaque-debug 0.3.0", + "opaque-debug 0.3.1", ] [[package]] @@ -12463,8 +12572,8 @@ checksum = "e63e6744142336dfb606fe2b068afa2e1cca1ee6a5d8377277a92945d81fa331" dependencies = [ "bitflags 1.3.2", "itertools 0.8.2", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -12486,15 +12595,15 @@ checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" dependencies = [ "libc", "mio 0.7.14", - "mio 0.8.10", + "mio 0.8.11", "signal-hook", ] [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -12553,7 +12662,7 @@ version = "0.13.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "570c430b3d902ea083097e853263ae782dfe40857d93db019a12356c8e8143fa" dependencies = [ - "getrandom 0.2.12", + "getrandom 0.2.15", "halfbrown", "lexical-core 0.8.5", "ref-cast", @@ -12589,9 +12698,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "siphasher" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" dependencies = [ "serde", ] @@ -12602,7 +12711,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", ] [[package]] @@ -12622,9 +12731,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smartstring" @@ -12632,7 +12741,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", "static_assertions", "version_check", ] @@ -12649,12 +12758,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -12668,10 +12777,20 @@ dependencies = [ "num_cpus", "once_cell", "one_err", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "tokio", ] +[[package]] +name = "sodoken" +version = "0.0.901-alpha" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "888b6eb6ff4b987cd894f90d396562c9f332dfa3ab27a00c9cbc798d2f402037" +dependencies = [ + "libc", + "libsodium-sys-stable", +] + [[package]] name = "soup2" version = "0.2.1" @@ -12716,7 +12835,7 @@ dependencies = [ "serde", "serde_json", "unicode-id-start", - "url", + "url 2.5.2", ] [[package]] @@ -12740,7 +12859,7 @@ version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -12760,16 +12879,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", - "der 0.7.8", + "der 0.7.9", ] [[package]] name = "sqlformat" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" +checksum = "f895e3734318cc55f1fe66258926c9b910c124d47520339efecbb6c59cec7c1f" dependencies = [ - "itertools 0.12.1", "nom 7.1.3", "unicode_categories", ] @@ -12828,9 +12946,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "statrs" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d08e5e1748192713cc281da8b16924fb46be7b0c2431854eadc785823e5696e" +checksum = "b35a062dbadac17a42e0fc64c27f419b25d6fae98572eb43c8814c9e873d7721" dependencies = [ "approx", "lazy_static", @@ -12859,7 +12977,7 @@ checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" dependencies = [ "new_debug_unreachable", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "phf_shared 0.10.0", "precomputed-hash", "serde", @@ -12873,8 +12991,8 @@ checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" dependencies = [ "phf_generator 0.10.0", "phf_shared 0.10.0", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", ] [[package]] @@ -12883,10 +13001,10 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05e383308aebc257e7d7920224fa055c632478d92744eca77f99be8fa1545b90" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "swc_macros_common", - "syn 2.0.48", + "syn 2.0.71", ] [[package]] @@ -12909,25 +13027,25 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "structmeta" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ad9e09554f0456d67a69c1584c9798ba733a5b50349a6c0d0948710523922d" +checksum = "2e1575d8d40908d70f6fd05537266b90ae71b15dbbe7a8b7dffa2b759306d329" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "structmeta-derive", - "syn 2.0.48", + "syn 2.0.71", ] [[package]] name = "structmeta-derive" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a60bcaff7397072dca0017d1db428e30d5002e00b6847703e2e42005c95fbe00" +checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] @@ -12949,8 +13067,8 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" dependencies = [ "heck 0.3.3", "proc-macro-error", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -12982,8 +13100,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" dependencies = [ "heck 0.3.3", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -12994,8 +13112,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5bb0dc7ee9c15cea6199cde9a127fa16a4c5819af85395457ad72d68edc85a38" dependencies = [ "heck 0.3.3", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "rustversion", "syn 1.0.109", ] @@ -13007,8 +13125,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "rustversion", "syn 1.0.109", ] @@ -13020,10 +13138,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "rustversion", - "syn 2.0.48", + "syn 2.0.71", ] [[package]] @@ -13044,9 +13162,9 @@ checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "subtle-encoding" @@ -13106,7 +13224,7 @@ dependencies = [ "swc_visit", "tracing", "unicode-width", - "url", + "url 2.5.2", ] [[package]] @@ -13116,7 +13234,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7be1a689e146be1eae53139482cb061dcf0fa01dff296bbe7b96fff92d8e2936" dependencies = [ "anyhow", - "indexmap 2.2.2", + "indexmap 2.2.6", "serde", "serde_json", "swc_cached", @@ -13129,10 +13247,10 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c5f56139042c1a95b54f5ca48baa0e0172d369bcc9d3d473dad1de36bae8399" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "swc_macros_common", - "syn 2.0.48", + "syn 2.0.71", ] [[package]] @@ -13141,7 +13259,7 @@ version = "0.113.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc1690cc0c9ab60b44ac0225ba1e231ac532f7ba1d754df761c6ee607561afae" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "is-macro", "num-bigint", "phf 0.11.2", @@ -13178,10 +13296,10 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "090e409af49c8d1a3c13b3aab1ed09dd4eda982207eb3e63c2ad342f072b49c8" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "swc_macros_common", - "syn 2.0.48", + "syn 2.0.71", ] [[package]] @@ -13227,8 +13345,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eddb95c2bdad1c9c29edf35712e1e0f9b9ddc1cdb5ba2d582fd93468cb075a03" dependencies = [ "better_scoped_tls", - "bitflags 2.5.0", - "indexmap 2.2.2", + "bitflags 2.6.0", + "indexmap 2.2.6", "once_cell", "phf 0.11.2", "rustc-hash", @@ -13263,10 +13381,10 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "500a1dadad1e0e41e417d633b3d6d5de677c9e0d3159b94ba3348436cdb15aab" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "swc_macros_common", - "syn 2.0.48", + "syn 2.0.71", ] [[package]] @@ -13297,7 +13415,7 @@ checksum = "565a76c4ca47ce31d78301c0beab878e4c2cb4f624691254d834ec8c0e236755" dependencies = [ "base64 0.21.7", "dashmap 5.5.3", - "indexmap 2.2.2", + "indexmap 2.2.6", "once_cell", "serde", "sha-1", @@ -13336,7 +13454,7 @@ version = "0.128.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe5242670bc74e0a0b64b9d4912b37be36944517ce0881314162aeb4381272c3" dependencies = [ - "indexmap 2.2.2", + "indexmap 2.2.6", "num_cpus", "once_cell", "rustc-hash", @@ -13368,9 +13486,9 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "695a1d8b461033d32429b5befbf0ad4d7a2c4d6ba9cd5ba4e0645c615839e8e4" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] @@ -13379,9 +13497,9 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91745f3561057493d2da768437c427c0e979dff7396507ae02f16c981c4a8466" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] @@ -13401,21 +13519,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ae9ef18ff8daffa999f729db056d2821cd2f790f3a11e46422d19f46bb193e7" dependencies = [ "Inflector", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "swc_macros_common", - "syn 2.0.48", -] - -[[package]] -name = "syn" -version = "0.15.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid 0.1.0", + "syn 2.0.71", ] [[package]] @@ -13424,19 +13531,19 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.48" +version = "2.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "unicode-ident", ] @@ -13446,17 +13553,17 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", - "unicode-xid 0.2.4", + "unicode-xid", ] [[package]] name = "syntect" -version = "5.1.0" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e02b4b303bf8d08bfeb0445cba5068a3d306b6baece1d5582171a9bf49188f91" +checksum = "874dcfa363995604333cf947ae9f751ca3af4522c60886774c4963943b4746b1" dependencies = [ "bincode", "bitflags 1.3.2", @@ -13465,8 +13572,9 @@ dependencies = [ "once_cell", "onig", "plist", - "regex-syntax 0.7.5", + "regex-syntax 0.8.4", "serde", + "serde_derive", "serde_json", "thiserror", "walkdir", @@ -13486,21 +13594,6 @@ dependencies = [ "windows-sys 0.45.0", ] -[[package]] -name = "sysinfo" -version = "0.28.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c2f3ca6693feb29a89724516f016488e9aafc7f37264f898593ee4b942f31b" -dependencies = [ - "cfg-if 1.0.0", - "core-foundation-sys", - "libc", - "ntapi 0.4.1", - "once_cell", - "rayon", - "winapi 0.3.9", -] - [[package]] name = "sysinfo" version = "0.29.11" @@ -13518,9 +13611,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.30.12" +version = "0.30.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae" +checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" dependencies = [ "cfg-if 1.0.0", "core-foundation-sys", @@ -13546,29 +13639,29 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.2.0" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ - "cfg-expr 0.15.6", - "heck 0.4.1", + "cfg-expr 0.15.8", + "heck 0.5.0", "pkg-config", - "toml 0.8.9", - "version-compare 0.1.1", + "toml 0.8.14", + "version-compare 0.2.0", ] [[package]] name = "tao" -version = "0.16.7" +version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d22205b267a679ca1c590b9f178488d50981fc3e48a1b91641ae31593db875ce" +checksum = "575c856fc21e551074869dcfaad8f706412bd5b803dfa0fbf6881c4ff4bfafab" dependencies = [ "bitflags 1.3.2", "cairo-rs", "cc", "cocoa", "core-foundation", - "core-graphics", + "core-graphics 0.22.3", "crossbeam-channel", "dirs-next", "dispatch", @@ -13581,7 +13674,7 @@ dependencies = [ "glib", "glib-sys", "gtk", - "image", + "image 0.24.9", "instant", "jni 0.20.0", "lazy_static", @@ -13593,14 +13686,14 @@ dependencies = [ "ndk-sys 0.3.0", "objc", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "png", "raw-window-handle 0.5.2", "scopeguard", "serde", "tao-macros", "unicode-segmentation", - "uuid 1.8.0", + "uuid 1.10.0", "windows 0.39.0", "windows-implement", "x11-dl", @@ -13612,8 +13705,8 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec114582505d158b669b136e6851f85840c109819d77c42bb7c0709f727d18c2" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -13625,9 +13718,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" dependencies = [ "filetime", "libc", @@ -13636,9 +13729,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.13" +version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" +checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2" [[package]] name = "task-motel" @@ -13647,16 +13740,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7228e85537ffb5943539a46bf561786323f6112114005ba055e496192a6f8f41" dependencies = [ "futures", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "tokio", "tracing", ] [[package]] name = "tauri" -version = "1.6.1" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f078117725e36d55d29fafcbb4b1e909073807ca328ae8deb8c0b3843aac0fed" +checksum = "336bc661a3f3250853fa83c6e5245449ed1c26dce5dcb28bdee7efedf6278806" dependencies = [ "anyhow", "base64 0.21.7", @@ -13668,11 +13761,12 @@ dependencies = [ "encoding_rs", "flate2", "futures-util", + "getrandom 0.2.15", "glib", "glob", "gtk", - "heck 0.4.1", - "http 0.2.11", + "heck 0.5.0", + "http 0.2.12", "ignore", "indexmap 1.9.3", "minisign-verify", @@ -13683,13 +13777,13 @@ dependencies = [ "open 3.2.0", "os_info", "os_pipe", - "percent-encoding", + "percent-encoding 2.3.1", "rand 0.8.5", "raw-window-handle 0.5.2", "regex", "reqwest", "rfd", - "semver 1.0.21", + "semver 1.0.23", "serde", "serde_json", "serde_repr", @@ -13706,26 +13800,26 @@ dependencies = [ "thiserror", "time", "tokio", - "url", - "uuid 1.8.0", + "url 2.5.2", + "uuid 1.10.0", "webkit2gtk", "webview2-com", "windows 0.39.0", - "zip", + "zip 0.6.6", ] [[package]] name = "tauri-build" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9914a4715e0b75d9f387a285c7e26b5bbfeb1249ad9f842675a82481565c532" +checksum = "b0c6ec7a5c3296330c7818478948b422967ce4649094696c985f61d50076d29c" dependencies = [ "anyhow", "cargo_toml", "dirs-next", - "heck 0.4.1", - "json-patch 1.2.0", - "semver 1.0.21", + "heck 0.5.0", + "json-patch 1.4.0", + "semver 1.0.23", "serde", "serde_json", "tauri-utils", @@ -13735,39 +13829,39 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "1.4.2" +version = "1.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1554c5857f65dbc377cefb6b97c8ac77b1cb2a90d30d3448114d5d6b48a77fc" +checksum = "c1aed706708ff1200ec12de9cfbf2582b5d8ec05f6a7293911091effbd22036b" dependencies = [ "base64 0.21.7", - "brotli", + "brotli 3.5.0", "ico", - "json-patch 1.2.0", + "json-patch 1.4.0", "plist", "png", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "regex", - "semver 1.0.21", + "semver 1.0.23", "serde", "serde_json", "sha2 0.10.8", "tauri-utils", "thiserror", "time", - "uuid 1.8.0", + "uuid 1.10.0", "walkdir", ] [[package]] name = "tauri-macros" -version = "1.4.3" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "277abf361a3a6993ec16bcbb179de0d6518009b851090a01adfea12ac89fa875" +checksum = "b88f831d2973ae4f81a706a0004e67dac87f2e4439973bbe98efbd73825d8ede" dependencies = [ - "heck 0.4.1", - "proc-macro2 1.0.78", - "quote 1.0.35", + "heck 0.5.0", + "proc-macro2", + "quote", "syn 1.0.109", "tauri-codegen", "tauri-utils", @@ -13775,24 +13869,26 @@ dependencies = [ [[package]] name = "tauri-plugin-positioner" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06e0a1f9650fec272f5e4fb2b60863cd9f5dde20ee80e085dd0a99b39b9f8e4" +checksum = "c1c491af3aaa053d6e85d95b516bdaa20ae7c6ebb36cbdae2988dea68f57f27e" dependencies = [ + "log", "serde", "serde_json", "serde_repr", "tauri", + "thiserror", ] [[package]] name = "tauri-runtime" -version = "0.14.2" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2d0652aa2891ff3e9caa2401405257ea29ab8372cce01f186a5825f1bd0e76" +checksum = "3068ed62b63dedc705558f4248c7ecbd5561f0f8050949859ea0db2326f26012" dependencies = [ "gtk", - "http 0.2.11", + "http 0.2.12", "http-range", "rand 0.8.5", "raw-window-handle 0.5.2", @@ -13800,27 +13896,27 @@ dependencies = [ "serde_json", "tauri-utils", "thiserror", - "url", - "uuid 1.8.0", + "url 2.5.2", + "uuid 1.10.0", "webview2-com", "windows 0.39.0", ] [[package]] name = "tauri-runtime-wry" -version = "0.14.5" +version = "0.14.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "067c56fc153b3caf406d7cd6de4486c80d1d66c0f414f39e94cb2f5543f6445f" +checksum = "d4c3db170233096aa30330feadcd895bf9317be97e624458560a20e814db7955" dependencies = [ "arboard", "cocoa", "gtk", - "percent-encoding", + "percent-encoding 2.3.1", "rand 0.8.5", "raw-window-handle 0.5.2", "tauri-runtime", "tauri-utils", - "uuid 1.8.0", + "uuid 1.10.0", "webkit2gtk", "webview2-com", "windows 0.39.0", @@ -13829,30 +13925,30 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "1.5.3" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75ad0bbb31fccd1f4c56275d0a5c3abdf1f59999f72cb4ef8b79b4ed42082a21" +checksum = "2826db448309d382dac14d520f0c0a40839b87b57b977e59cf5f296b3ace6a93" dependencies = [ - "brotli", + "brotli 3.5.0", "ctor", "dunce", "glob", - "heck 0.4.1", + "heck 0.5.0", "html5ever", "infer", - "json-patch 1.2.0", + "json-patch 1.4.0", "kuchikiki", "log", "memchr", "phf 0.11.2", - "proc-macro2 1.0.78", - "quote 1.0.35", - "semver 1.0.21", + "proc-macro2", + "quote", + "semver 1.0.23", "serde", "serde_json", "serde_with", "thiserror", - "url", + "url 2.5.2", "walkdir", "windows-version", ] @@ -13879,14 +13975,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.9.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if 1.0.0", - "fastrand 2.0.1", - "redox_syscall 0.4.1", - "rustix 0.38.30", + "fastrand 2.1.0", + "rustix 0.38.34", "windows-sys 0.52.0", ] @@ -13916,7 +14011,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.38.30", + "rustix 0.38.34", "windows-sys 0.48.0", ] @@ -13945,8 +14040,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58071dc2471840e9f374eeb0f6e405a31bccb3cc5d59bb4598f02cafc274b5c4" dependencies = [ "cargo_metadata", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "serde", "strum_macros 0.24.3", ] @@ -13960,8 +14055,8 @@ dependencies = [ "darling 0.14.4", "if_chain", "lazy_static", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "subprocess", "syn 1.0.109", "test-fuzz-internal", @@ -13985,14 +14080,14 @@ dependencies = [ [[package]] name = "test-strategy" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8361c808554228ad09bfed70f5c823caf8a3450b6881cc3a38eb57e8c08c1d9" +checksum = "2bf41af45e3f54cc184831d629d41d5b2bda8297e29c81add7ae4f362ed5e01b" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "structmeta", - "syn 2.0.48", + "syn 2.0.71", ] [[package]] @@ -14021,22 +14116,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] @@ -14051,9 +14146,9 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if 1.0.0", "once_cell", @@ -14072,11 +14167,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.23" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ - "itoa 1.0.10", + "deranged", + "itoa 1.0.11", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -14084,16 +14182,17 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.10" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -14108,9 +14207,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -14127,7 +14226,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfcc684f2ceaec3b4e8689657c9e0944b07bf5e34563e0bd758c4d42c05c82ed" dependencies = [ - "syn 2.0.48", + "syn 2.0.71", "to-syn-value_derive", ] @@ -14137,39 +14236,39 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dfffda778de8443144ff3b042ddf14e8bc5445f0fd9fe937c3d252535dc9212" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] name = "tokio" -version = "1.36.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", "libc", - "mio 0.8.10", + "mio 0.8.11", "num_cpus", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2 0.5.7", "tokio-macros", "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] @@ -14215,13 +14314,24 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +dependencies = [ + "rustls 0.22.4", + "rustls-pki-types", + "tokio", +] + [[package]] name = "tokio-rustls" version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.8", + "rustls 0.23.11", "rustls-pki-types", "tokio", ] @@ -14240,9 +14350,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -14258,12 +14368,8 @@ checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd" dependencies = [ "futures-util", "log", - "rustls 0.20.9", - "rustls-native-certs", "tokio", - "tokio-rustls 0.23.4", "tungstenite 0.18.0", - "webpki", ] [[package]] @@ -14274,22 +14380,24 @@ checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" dependencies = [ "futures-util", "log", + "rustls 0.22.4", + "rustls-pki-types", "tokio", + "tokio-rustls 0.25.0", "tungstenite 0.21.0", ] [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -14315,21 +14423,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.9" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6a4b9e8023eb94392d3dca65d717c53abc5dad49c07cb65bb8fcd87115fa325" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.21.1", + "toml_edit 0.22.15", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] @@ -14340,11 +14448,11 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.2", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.5.40", ] [[package]] @@ -14353,11 +14461,22 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.2.2", + "indexmap 2.2.6", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1" +dependencies = [ + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.13", ] [[package]] @@ -14397,9 +14516,9 @@ version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] @@ -14500,9 +14619,9 @@ dependencies = [ [[package]] name = "tree_magic_mini" -version = "3.1.4" +version = "3.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ee137597cdb361b55a4746983e4ac1b35ab6024396a419944ad473bb915265" +checksum = "469a727cac55b41448315cc10427c069c618ac59bb6a4480283fcd811749bdc2" dependencies = [ "fnv", "home", @@ -14521,15 +14640,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "treediff" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303" -dependencies = [ - "serde_json", -] - [[package]] name = "trilean" version = "1.1.0" @@ -14538,9 +14648,9 @@ checksum = "683ba5022fe6dbd7133cad150478ccf51bdb6d861515181e5fc6b4323d4fa424" [[package]] name = "triomphe" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b2cb4fbb9995eeb36ac86fadf24031ccd58f99d6b4b2d7b911db70bddb80d90" +checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369" dependencies = [ "serde", "stable_deref_trait", @@ -14569,7 +14679,7 @@ dependencies = [ "tinyvec", "tokio", "tracing", - "url", + "url 2.5.2", ] [[package]] @@ -14583,7 +14693,7 @@ dependencies = [ "ipconfig", "lazy_static", "lru-cache", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "resolv-conf", "serde", "smallvec", @@ -14608,16 +14718,14 @@ dependencies = [ "base64 0.13.1", "byteorder", "bytes", - "http 0.2.11", + "http 0.2.12", "httparse", "log", "rand 0.8.5", - "rustls 0.20.9", "sha1", "thiserror", - "url", + "url 2.5.2", "utf-8", - "webpki", ] [[package]] @@ -14633,9 +14741,11 @@ dependencies = [ "httparse", "log", "rand 0.8.5", + "rustls 0.22.4", + "rustls-pki-types", "sha1", "thiserror", - "url", + "url 2.5.2", "utf-8", ] @@ -14652,37 +14762,42 @@ dependencies = [ [[package]] name = "tx5" -version = "0.0.9-alpha" +version = "0.0.13-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58e2eebc6b3677281091356d4a5dbc0d48ec77b74b3ee39227e94cda1354a679" +checksum = "4f3fa6f0662915bdc6e50ead429b24c42b9aa8d3f8e4f2c3cfc5974203cd31b8" dependencies = [ - "bit_field", - "bytes", - "futures", + "base64 0.22.1", "influxive-otel-atomic-obs", - "once_cell", - "opentelemetry_api", - "parking_lot 0.12.1", - "rand 0.8.5", - "rand-utf8", "serde", - "serde_json", + "tokio", + "tracing", + "tx5-connection", + "tx5-core", + "url 2.5.2", +] + +[[package]] +name = "tx5-connection" +version = "0.0.13-alpha" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4af97cb5c4ef5c2c1c3a02a3b6025d7eacbfff0c7cc69c8ff49682668b7a1281" +dependencies = [ + "bit_field", "tokio", "tracing", "tx5-core", "tx5-go-pion", "tx5-signal", - "url", ] [[package]] name = "tx5-core" -version = "0.0.9-alpha" +version = "0.0.13-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a45e91402a7c17bda8835acb47c7460dc3880dc067235d324401a7359857a75" +checksum = "5dbcda1421f6ffc361133d90d3ad8b9df813c62b3a2b0bd205dfc33205162bdf" dependencies = [ "app_dirs2", - "base64 0.13.1", + "base64 0.22.1", "once_cell", "rand 0.8.5", "serde", @@ -14691,108 +14806,71 @@ dependencies = [ "tempfile", "tokio", "tracing", - "url", + "url 2.5.2", ] [[package]] name = "tx5-go-pion" -version = "0.0.9-alpha" +version = "0.0.13-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5731de2cad3c014ddce4552f32c0b0c68b8682390b7ac57c55cbeddf6c1dbe50" +checksum = "8d18eeb48190fe7f1e2ae7a58802ef3cc8f6a3c8164550bd7a0bb6d9015a537a" dependencies = [ "futures", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "tokio", "tracing", "tx5-go-pion-sys", - "url", + "url 2.5.2", ] [[package]] name = "tx5-go-pion-sys" -version = "0.0.9-alpha" +version = "0.0.13-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f42f441e7c186c5aa846618144d1e041215b7d68ecd747aec1e5478c06fccb" +checksum = "594e080a0c0883f526337ffeed768908a711e5eddddeeec7b65851faf0c3d211" dependencies = [ "Inflector", - "base64 0.13.1", + "base64 0.22.1", "dirs 5.0.1", "libc", - "libloading 0.8.1", - "once_cell", - "ouroboros", - "sha2 0.10.8", - "tracing", - "tx5-core", - "zip", -] - -[[package]] -name = "tx5-go-pion-turn" -version = "0.0.9-alpha" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "393e40552c56e0333a2e2e08090869f2494417c25d0168b8366caf4c9ae52391" -dependencies = [ - "base64 0.13.1", - "dirs 5.0.1", - "dunce", - "if-addrs 0.10.2", - "once_cell", - "sha2 0.10.8", - "tokio", - "tracing", - "tx5-core", - "zip", -] - -[[package]] -name = "tx5-signal" -version = "0.0.9-alpha" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82004d487706b590b75ba858d322473fd11ccc1979f99aa85957554572a92cd5" -dependencies = [ - "futures", - "lair_keystore_api", - "once_cell", - "parking_lot 0.12.1", - "rand 0.8.5", - "rand-utf8", - "rcgen", - "ring 0.16.20", - "rustls 0.20.9", - "rustls-native-certs", - "rustls-pemfile 1.0.4", - "serde_json", + "libloading 0.8.4", + "once_cell", + "ouroboros", "sha2 0.10.8", - "socket2 0.5.5", - "tokio", - "tokio-rustls 0.23.4", - "tokio-tungstenite 0.18.0", "tracing", "tx5-core", - "url", - "webpki-roots 0.23.1", + "zip 0.6.6", ] [[package]] -name = "tx5-signal-srv" -version = "0.0.9-alpha" +name = "tx5-go-pion-turn" +version = "0.0.13-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a24b13f9032042ef2c30647998ba21882dbf411435071b6fe587a2c1e0992b28" +checksum = "d8a35d3a876ab999f2ba39246676061ca1b2c24f0e3f632535c3e68bdc65f666" dependencies = [ - "clap 4.4.18", + "base64 0.22.1", "dirs 5.0.1", - "futures", + "dunce", "if-addrs 0.10.2", "once_cell", - "prometheus", + "sha2 0.10.8", + "tokio", + "tracing", + "tx5-core", + "zip 0.6.6", +] + +[[package]] +name = "tx5-signal" +version = "0.0.13-alpha" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "509f9e2ab94e4513084a34c1f89d23a2935206ed65c5ea14afbb3b286f7af47b" +dependencies = [ "rand 0.8.5", - "sodoken", + "sbd-e2e-crypto-client", "tokio", "tracing", - "tracing-subscriber 0.3.18", "tx5-core", - "warp", ] [[package]] @@ -14923,30 +15001,24 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "unicode-xid" -version = "0.1.0" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode-xid" @@ -14967,7 +15039,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ "crypto-common", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -14990,9 +15062,9 @@ dependencies = [ [[package]] name = "unsafe-libyaml" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "unsigned-varint" @@ -15024,35 +15096,43 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2e7e85a0596447f0f2ac090e16bc4c516c6fe91771fb0c0ccf7fa3dae896b9c" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] [[package]] name = "ureq" -version = "2.9.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97" +checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "log", "once_cell", - "rustls 0.21.11", - "rustls-webpki 0.101.7", - "url", - "webpki-roots 0.25.3", + "url 2.5.2", ] [[package]] name = "url" -version = "2.4.1" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" +dependencies = [ + "idna 0.1.5", + "matches", + "percent-encoding 1.0.1", +] + +[[package]] +name = "url" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", - "idna 0.4.0", - "percent-encoding", + "idna 0.5.0", + "percent-encoding 2.3.1", "serde", ] @@ -15063,7 +15143,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c89cd13f1de9862d363308f5ffdadcd2b64b2a4a812fb296a80b7d3e80011b1e" dependencies = [ "serde", - "url", + "url 2.5.2", ] [[package]] @@ -15082,7 +15162,7 @@ dependencies = [ "regex", "serde", "unic-ucd-ident", - "url", + "url 2.5.2", ] [[package]] @@ -15093,9 +15173,9 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" @@ -15103,16 +15183,17 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.12", + "getrandom 0.2.15", ] [[package]] name = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ - "getrandom 0.2.12", + "getrandom 0.2.15", + "rand 0.8.5", "serde", ] @@ -15122,7 +15203,7 @@ version = "0.92.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "234589219e37a7496cbce73d971586db8369871be2420372c45a579b6a919b15" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "fslock", "gzip-header", "home", @@ -15137,9 +15218,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97599c400fc79925922b58303e98fcb8fa88f573379a08ddb652e72cbd2e70f6" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "encoding_rs", - "indexmap 2.2.2", + "indexmap 2.2.6", "num-bigint", "serde", "thiserror", @@ -15154,9 +15235,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "126e423afe2dd9ac52142e7e9d5ce4135d7e13776c529d27fd6bc49f19e3280b" +checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" [[package]] name = "value-trait" @@ -15166,7 +15247,7 @@ checksum = "dad8db98c1e677797df21ba03fca7d3bf9bec3ca38db930954e4fe6e1ea27eb4" dependencies = [ "float-cmp", "halfbrown", - "itoa 1.0.10", + "itoa 1.0.11", "ryu", ] @@ -15190,9 +15271,9 @@ checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" [[package]] name = "version-compare" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" @@ -15243,15 +15324,15 @@ dependencies = [ [[package]] name = "waker-fn" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -15276,13 +15357,13 @@ dependencies = [ "futures-channel", "futures-util", "headers", - "http 0.2.11", - "hyper 0.14.28", + "http 0.2.12", + "hyper 0.14.30", "log", "mime", "mime_guess", - "multer", - "percent-encoding", + "multer 2.1.0", + "percent-encoding 2.3.1", "pin-project", "rustls-pemfile 1.0.4", "scoped-tls", @@ -15310,6 +15391,12 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + [[package]] name = "wasm-bindgen" version = "0.2.92" @@ -15329,17 +15416,17 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.40" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -15353,7 +15440,7 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ - "quote 1.0.35", + "quote", "wasm-bindgen-macro-support", ] @@ -15363,9 +15450,9 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -15400,9 +15487,9 @@ dependencies = [ [[package]] name = "wasmer" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4014573f108a246858299eb230031e268316fd57207bd2e8afc79b20fc7ce983" +checksum = "6ce4a267a570e121c9375136adefa2c48810273907de9c6817bc19db4d6144bc" dependencies = [ "bytes", "cfg-if 1.0.0", @@ -15429,9 +15516,9 @@ dependencies = [ [[package]] name = "wasmer-compiler" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a77bfe259f08e8ec9e77f8f772ebfb4149f799d1f637231c5a5a6a90c447256" +checksum = "b9c23098e86ef1038155684fe50f0c1079a0e2a2e70f115b789df17e6ba98d20" dependencies = [ "backtrace", "bytes", @@ -15452,13 +15539,14 @@ dependencies = [ "wasmer-vm", "wasmparser", "winapi 0.3.9", + "xxhash-rust", ] [[package]] name = "wasmer-compiler-cranelift" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9280c47ebc754f95357745a38a995dd766f149e16b26e1b7e35741eb23c03d12" +checksum = "95287b79973ad5f485215733ef9f0d4bb951a6b7e655585d2bd3d4a4ba1253c9" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -15473,23 +15561,45 @@ dependencies = [ "wasmer-types", ] +[[package]] +name = "wasmer-config" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a0f70c177b1c5062cfe0f5308c3317751796fef9403c22a0cd7b4cacd4ccd8" +dependencies = [ + "anyhow", + "bytesize", + "derive_builder 0.12.0", + "hex", + "indexmap 2.2.6", + "schemars", + "semver 1.0.23", + "serde", + "serde_cbor", + "serde_json", + "serde_yaml", + "thiserror", + "toml 0.8.14", + "url 2.5.2", +] + [[package]] name = "wasmer-derive" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9352877c4f07fc59146d21b56ae6dc469caf342587f49c81b4fbeafead31972" +checksum = "e48f36aeeecb655f15fdd358bdf6e4cec27df181468fa4226084157e8462bd5e" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] [[package]] name = "wasmer-middlewares" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5c5d574dfd4674fefc3db98748ddb4193c6750f145736555e938c94c505207" +checksum = "667dbe64667a478fd5726111180dd757113f3589a589f831bfe4ae1a256ae77e" dependencies = [ "wasmer", "wasmer-types", @@ -15498,25 +15608,30 @@ dependencies = [ [[package]] name = "wasmer-types" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "749214b6170f2b2fbbfe5b7e7f8d381e64930ac4122f3abceb33cde0292d45d2" +checksum = "83cb97b6b20084757a2a8d548dc0d4179c3fe9e2d711740423a1e6aa3f8b9091" dependencies = [ "bytecheck", "enum-iterator", "enumset", + "getrandom 0.2.15", + "hex", "indexmap 1.9.3", "more-asserts", "rkyv", + "sha2 0.10.8", "target-lexicon", "thiserror", + "webc", + "xxhash-rust", ] [[package]] name = "wasmer-vm" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300215479de0deeb453e95aeb1b9c8ffd9bc7d9bd27c5f9e8a184e54db4d31a9" +checksum = "bc1e19d986844b17b927ec8b0c7f3da6a7a2c2cb3b0f8ca5d4cb1a1f71bfb124" dependencies = [ "backtrace", "cc", @@ -15531,7 +15646,7 @@ dependencies = [ "lazy_static", "libc", "mach", - "memoffset 0.9.0", + "memoffset 0.9.1", "more-asserts", "region", "scopeguard", @@ -15546,9 +15661,9 @@ version = "0.121.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" dependencies = [ - "bitflags 2.5.0", - "indexmap 2.2.2", - "semver 1.0.21", + "bitflags 2.6.0", + "indexmap 2.2.6", + "semver 1.0.23", ] [[package]] @@ -15573,61 +15688,75 @@ dependencies = [ ] [[package]] -name = "wayland-client" -version = "0.29.5" +name = "wayland-backend" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" +checksum = "269c04f203640d0da2092d1b8d89a2d081714ae3ac2f1b53e99f205740517198" dependencies = [ - "bitflags 1.3.2", + "cc", "downcast-rs", - "libc", - "nix 0.24.3", - "wayland-commons", - "wayland-scanner", + "rustix 0.38.34", + "scoped-tls", + "smallvec", "wayland-sys", ] [[package]] -name = "wayland-commons" -version = "0.29.5" +name = "wayland-client" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" +checksum = "08bd0f46c069d3382a36c8666c1b9ccef32b8b04f41667ca1fef06a1adcc2982" dependencies = [ - "nix 0.24.3", - "once_cell", - "smallvec", - "wayland-sys", + "bitflags 2.6.0", + "rustix 0.38.34", + "wayland-backend", + "wayland-scanner", ] [[package]] name = "wayland-protocols" -version = "0.29.5" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" +checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", "wayland-client", - "wayland-commons", + "wayland-protocols", "wayland-scanner", ] [[package]] name = "wayland-scanner" -version = "0.29.5" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" +checksum = "edf466fc49a4feb65a511ca403fec3601494d0dee85dbf37fff6fa0dd4eec3b6" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "xml-rs", + "proc-macro2", + "quick-xml 0.34.0", + "quote", ] [[package]] name = "wayland-sys" -version = "0.29.5" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" +checksum = "4a6754825230fa5b27bafaa28c30b3c9e72c55530581220cef401fa422c0fae7" dependencies = [ + "dlib", + "log", "pkg-config", ] @@ -15643,9 +15772,9 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.12" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b2391658b02c27719fc5a0a73d6e696285138e8b12fba9d4baa70451023c71" +checksum = "db67ae75a9405634f5882791678772c94ff5f16a66535aae186e26aa0841fc8b" dependencies = [ "core-foundation", "home", @@ -15654,10 +15783,39 @@ dependencies = [ "ndk-context", "objc", "raw-window-handle 0.5.2", - "url", + "url 2.5.2", "web-sys", ] +[[package]] +name = "webc" +version = "6.0.0-rc1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1fc686c7b43c9bc630a499f6ae1f0a4c4bd656576a53ae8a147b0cc9bc983ad" +dependencies = [ + "anyhow", + "base64 0.21.7", + "bytes", + "cfg-if 1.0.0", + "document-features", + "flate2", + "indexmap 1.9.3", + "libc", + "once_cell", + "semver 1.0.23", + "serde", + "serde_cbor", + "serde_json", + "sha2 0.10.8", + "shared-buffer", + "tar", + "tempfile", + "thiserror", + "toml 0.7.8", + "url 2.5.2", + "wasmer-config", +] + [[package]] name = "webkit2gtk" version = "0.18.2" @@ -15702,33 +15860,33 @@ dependencies = [ "pango-sys", "pkg-config", "soup2-sys", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] name = "webpki" -version = "0.22.2" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] name = "webpki-roots" -version = "0.23.1" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" -dependencies = [ - "rustls-webpki 0.100.3", -] +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "webpki-roots" -version = "0.25.3" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "webview2-com" @@ -15748,8 +15906,8 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -15776,21 +15934,21 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu-core" -version = "0.20.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac6a86eaa5e763e59c73cf9e97d55fffd4dfda69fd8bda19589fcf851ddfef1f" +checksum = "d50819ab545b867d8a454d1d756b90cd5f15da1f2943334ca314af10583c9d39" dependencies = [ "arrayvec 0.7.4", - "bit-vec", - "bitflags 2.5.0", + "bit-vec 0.6.3", + "bitflags 2.6.0", "cfg_aliases", "codespan-reporting", "document-features", - "indexmap 2.2.2", + "indexmap 2.2.6", "log", "naga", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "profiling", "raw-window-handle 0.6.2", "ron", @@ -15805,15 +15963,15 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.20.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d71c8ae05170583049b65ee562fd839fdc0b3e9ddb84f4e40c9d5f8ea0d4c8c" +checksum = "172e490a87295564f3fcc0f165798d87386f6231b04d4548bca458cbbfd63222" dependencies = [ "android_system_properties", "arrayvec 0.7.4", "ash", - "bit-set", - "bitflags 2.5.0", + "bit-set 0.5.3", + "bitflags 2.6.0", "block", "cfg_aliases", "core-graphics-types", @@ -15825,14 +15983,14 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.1", + "libloading 0.8.4", "log", "metal", "naga", "ndk-sys 0.5.0+25.2.9519653", "objc", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "profiling", "range-alloc", "raw-window-handle 0.6.2", @@ -15851,7 +16009,7 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1353d9a46bff7f955a680577f34c69122628cc2076e1d6f3a9be6ef00ae793ef" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "js-sys", "serde", "web-sys", @@ -15866,7 +16024,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.30", + "rustix 0.38.34", ] [[package]] @@ -15878,25 +16036,26 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.30", + "rustix 0.38.34", "windows-sys 0.48.0", ] [[package]] name = "whoami" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" +checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" dependencies = [ - "wasm-bindgen", + "redox_syscall 0.4.1", + "wasite", "web-sys", ] [[package]] name = "wide" -version = "0.7.15" +version = "0.7.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89beec544f246e679fc25490e3f8e08003bc4bf612068f325120dad4cea02c1c" +checksum = "2caba658a80831539b30698ae9862a72db6697dfdd7151e46920f5f2755c3ce2" dependencies = [ "bytemuck", "safe_arch", @@ -15904,9 +16063,9 @@ dependencies = [ [[package]] name = "widestring" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" [[package]] name = "winapi" @@ -15932,20 +16091,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "winapi-wsapoll" -version = "0.1.1" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi 0.3.9", + "windows-sys 0.52.0", ] [[package]] @@ -16007,7 +16157,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core 0.52.0", - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -16035,7 +16185,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -16119,7 +16269,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -16154,17 +16304,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -16175,11 +16326,11 @@ checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" [[package]] name = "windows-version" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75aa004c988e080ad34aff5739c39d0312f4684699d6d71fc8a198d057b8b9b4" +checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -16196,9 +16347,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -16238,9 +16389,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -16280,9 +16431,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -16322,9 +16479,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -16364,9 +16521,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -16382,9 +16539,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -16424,15 +16581,24 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] [[package]] name = "winnow" -version = "0.5.36" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "818ce546a11a9986bc24f93d0cdf38a8a1a400f1473ea8c82e59f6e0ffab9249" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" dependencies = [ "memchr", ] @@ -16449,9 +16615,9 @@ dependencies = [ [[package]] name = "winreg" -version = "0.51.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ "cfg-if 1.0.0", "windows-sys 0.48.0", @@ -16459,32 +16625,34 @@ dependencies = [ [[package]] name = "wl-clipboard-rs" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "981a303dfbb75d659f6612d05a14b2e363c103d24f676a2d44a00d18507a1ad9" +checksum = "12b41773911497b18ca8553c3daaf8ec9fe9819caf93d451d3055f69de028adb" dependencies = [ "derive-new", "libc", "log", - "nix 0.24.3", + "nix 0.28.0", "os_pipe", "tempfile", "thiserror", "tree_magic_mini", + "wayland-backend", "wayland-client", "wayland-protocols", + "wayland-protocols-wlr", ] [[package]] name = "wry" -version = "0.24.7" +version = "0.24.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ad85d0e067359e409fcb88903c3eac817c392e5d638258abfb3da5ad8ba6fc4" +checksum = "00711278ed357350d44c749c286786ecac644e044e4da410d466212152383b45" dependencies = [ "base64 0.13.1", "block", "cocoa", - "core-graphics", + "core-graphics 0.22.3", "crossbeam-channel", "dunce", "gdk", @@ -16492,7 +16660,7 @@ dependencies = [ "glib", "gtk", "html5ever", - "http 0.2.11", + "http 0.2.12", "kuchikiki", "libc", "log", @@ -16505,7 +16673,7 @@ dependencies = [ "soup2", "tao", "thiserror", - "url", + "url 2.5.2", "webkit2gtk", "webkit2gtk-sys", "webview2-com", @@ -16551,25 +16719,20 @@ dependencies = [ [[package]] name = "x11rb" -version = "0.10.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" dependencies = [ "gethostname", - "nix 0.24.3", - "winapi 0.3.9", - "winapi-wsapoll", + "rustix 0.38.34", "x11rb-protocol", ] [[package]] name = "x11rb-protocol" -version = "0.10.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56b245751c0ac9db0e006dc812031482784e434630205a93c73cfefcaabeac67" -dependencies = [ - "nix 0.24.3", -] +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "x25519-dalek" @@ -16584,11 +16747,11 @@ dependencies = [ [[package]] name = "x25519-dalek" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ - "curve25519-dalek 4.1.1", + "curve25519-dalek 4.1.3", "rand_core 0.6.4", "serde", "zeroize", @@ -16618,8 +16781,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", - "linux-raw-sys 0.4.13", - "rustix 0.38.30", + "linux-raw-sys 0.4.14", + "rustix 0.38.34", ] [[package]] @@ -16630,9 +16793,9 @@ checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" [[package]] name = "xml-rs" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" [[package]] name = "xml5ever" @@ -16660,10 +16823,16 @@ dependencies = [ "aead", "poly1305", "salsa20", - "subtle 2.5.0", + "subtle 2.6.1", "zeroize", ] +[[package]] +name = "xxhash-rust" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63658493314859b4dfdf3fb8c1defd61587839def09582db50b8a4e93afca6bb" + [[package]] name = "yaml-rust" version = "0.4.5" @@ -16681,9 +16850,9 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "yansi" -version = "1.0.0-rc.1" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1367295b8f788d371ce2dbc842c7b709c73ee1364d30351dd300ec2203b12377" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" dependencies = [ "is-terminal", ] @@ -16699,29 +16868,29 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] @@ -16732,9 +16901,9 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2", + "quote", + "syn 2.0.71", ] [[package]] @@ -16743,44 +16912,121 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ - "aes", "byteorder", + "crc32fast", + "crossbeam-utils", + "flate2", +] + +[[package]] +name = "zip" +version = "2.1.3" +dependencies = [ + "aes", + "arbitrary", + "bzip2", + "constant_time_eq", + "crc32fast", + "crossbeam-utils", + "deflate64", + "displaydoc", + "flate2", + "hmac 0.12.1", + "indexmap 2.2.6", + "lzma-rs", + "memchr", + "pbkdf2", + "rand 0.8.5", + "sha1", + "thiserror", + "time", + "zeroize", + "zopfli", + "zstd", +] + +[[package]] +name = "zip" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775a2b471036342aa69bc5a602bc889cb0a06cda00477d0c69566757d5553d39" +dependencies = [ + "arbitrary", + "crc32fast", + "crossbeam-utils", + "displaydoc", + "flate2", + "indexmap 2.2.6", + "memchr", + "thiserror", + "zopfli", +] + +[[package]] +name = "zip" +version = "2.1.3" +source = "git+https://github.com/coasys/zip2.git?rev=a6e30f1d6379e2818814ba9662ad565e43f26afe#a6e30f1d6379e2818814ba9662ad565e43f26afe" +dependencies = [ + "aes", + "arbitrary", "bzip2", - "constant_time_eq 0.1.5", + "constant_time_eq", "crc32fast", "crossbeam-utils", + "deflate64", + "displaydoc", "flate2", "hmac 0.12.1", - "pbkdf2 0.11.0", + "indexmap 2.2.6", + "lzma-rs", + "memchr", + "pbkdf2", + "rand 0.8.5", "sha1", + "thiserror", "time", + "zeroize", + "zopfli", "zstd", ] +[[package]] +name = "zopfli" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" +dependencies = [ + "bumpalo", + "crc32fast", + "lockfree-object-pool", + "log", + "once_cell", + "simd-adler32", +] + [[package]] name = "zstd" -version = "0.11.2+zstd.1.5.2" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +checksum = "fa556e971e7b568dc775c136fc9de8c779b1c2fc3a63defaafadffdbd3181afa" dependencies = [ - "libc", "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" +version = "2.0.12+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +checksum = "0a4e40c320c3cb459d9a9ff6de98cff88f4751ee9275d140e2be94a2b74e4c13" dependencies = [ "cc", "pkg-config", diff --git a/Cargo.toml b/Cargo.toml index 72a2ae131..d7fb4e116 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,4 +9,7 @@ members = [ [patch.crates-io] -notify-rust = { version = "4.6.0", git = "https://github.com/coasys/notify-rust.git" } \ No newline at end of file +notify-rust = { version = "4.6.0", git = "https://github.com/coasys/notify-rust.git" } +# reqwest = { version = "0.11.20", git = "https://github.com/coasys/reqwest.git", rev = "f2c08343e14f784d675ada72bdf4adf32af654e7"} +# reqwest = { version = "0.11.20", path = "../reqwest"} +rusqlite = { version = "0.29", features = ["bundled"], git = "https://github.com/coasys/rusqlite.git", rev = "12ec1330bd4b46411ab9895364da4a3e172d0fbb" } \ No newline at end of file diff --git a/bootstrap-languages/agent-language/adapter.ts b/bootstrap-languages/agent-language/adapter.ts index a200ca99b..5c1e1bd88 100644 --- a/bootstrap-languages/agent-language/adapter.ts +++ b/bootstrap-languages/agent-language/adapter.ts @@ -35,14 +35,14 @@ class Sharing implements PublicSharing { } async createPublic(content: Agent): Promise
{ - + console.log("ppppppp 1", JSON.stringify(content)); if(!content['did'] || !content['perspective'] || !content['perspective'].links) throw "Content must be an Agent object" - + console.log("ppppppp 2"); const agent = content as Agent if(agent.did != this.#agent.did) throw "Can't set Agent Expression for foreign DID - only for self" - + console.log("ppppppp 3"); if(!agent.directMessageLanguage) agent.directMessageLanguage = undefined @@ -52,8 +52,12 @@ class Sharing implements PublicSharing { delete link.status }) + console.log("ppppppp 4", JSON.stringify(agent)); + const expression = this.#agent.createSignedExpression(agent); + console.log("ppppppp 5", JSON.stringify(expression)); + await this.#DNA.call( DNA_NICK, "agent_store", @@ -61,6 +65,8 @@ class Sharing implements PublicSharing { expression ); + console.log("ppppppp 6", agent.did); + return agent.did } } \ No newline at end of file diff --git a/bootstrap-languages/agent-language/hc-dna/Cargo.lock b/bootstrap-languages/agent-language/hc-dna/Cargo.lock index e8ce9b3d4..cd6637a92 100644 --- a/bootstrap-languages/agent-language/hc-dna/Cargo.lock +++ b/bootstrap-languages/agent-language/hc-dna/Cargo.lock @@ -76,6 +76,12 @@ dependencies = [ "libc", ] +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + [[package]] name = "arrayref" version = "0.3.7" @@ -109,6 +115,12 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + [[package]] name = "base64" version = "0.22.1" @@ -222,6 +234,18 @@ name = "bytes" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +dependencies = [ + "serde", +] + +[[package]] +name = "bytesize" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" +dependencies = [ + "serde", +] [[package]] name = "camino" @@ -416,6 +440,15 @@ version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "393bc73c451830ff8dbb3a07f61843d6cb41a084f9996319917c0b291ed785bb" +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + [[package]] name = "crossbeam-deque" version = "0.8.3" @@ -562,6 +595,37 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive_builder" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" +dependencies = [ + "darling 0.14.4", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder_macro" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +dependencies = [ + "derive_builder_core", + "syn 1.0.109", +] + [[package]] name = "derive_more" version = "0.99.17" @@ -585,12 +649,27 @@ dependencies = [ "crypto-common", ] +[[package]] +name = "document-features" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +dependencies = [ + "litrs", +] + [[package]] name = "dunce" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +[[package]] +name = "dyn-clone" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" + [[package]] name = "either" version = "1.9.0" @@ -644,18 +723,65 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "fallible-iterator" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "filetime" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "windows-sys 0.52.0", +] + +[[package]] +name = "flate2" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + [[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + [[package]] name = "funty" version = "2.0.0" @@ -784,13 +910,15 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -810,6 +938,12 @@ version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +[[package]] +name = "half" +version = "1.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" + [[package]] name = "hashbrown" version = "0.12.3" @@ -827,8 +961,7 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hdi" -version = "0.4.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.5.0-dev.8" dependencies = [ "getrandom", "hdk_derive", @@ -844,8 +977,7 @@ dependencies = [ [[package]] name = "hdk" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.9" dependencies = [ "getrandom", "hdi", @@ -863,8 +995,7 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.8" dependencies = [ "darling 0.14.4", "heck 0.5.0", @@ -896,10 +1027,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.7" dependencies = [ - "base64", + "base64 0.22.1", "blake2b_simd", "derive_more", "holochain_serialized_bytes", @@ -913,8 +1043,7 @@ dependencies = [ [[package]] name = "holochain_integrity_types" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.8" dependencies = [ "holo_hash", "holochain_secure_primitive", @@ -929,8 +1058,7 @@ dependencies = [ [[package]] name = "holochain_nonce" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.4" dependencies = [ "getrandom", "holochain_secure_primitive", @@ -939,8 +1067,7 @@ dependencies = [ [[package]] name = "holochain_secure_primitive" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.1" dependencies = [ "paste", "serde", @@ -949,8 +1076,8 @@ dependencies = [ [[package]] name = "holochain_serialized_bytes" -version = "0.0.54" -source = "git+https://github.com/coasys/holochain-serialization.git?rev=6eaa4ea8913bfd977fcc4577e833f4dc18a215f7#6eaa4ea8913bfd977fcc4577e833f4dc18a215f7" +version = "0.0.55" +source = "git+https://github.com/coasys/holochain-serialization.git?rev=f9577913773931ec797261f90968903b1b4e27a8#f9577913773931ec797261f90968903b1b4e27a8" dependencies = [ "holochain_serialized_bytes_derive", "rmp-serde", @@ -963,8 +1090,8 @@ dependencies = [ [[package]] name = "holochain_serialized_bytes_derive" -version = "0.0.54" -source = "git+https://github.com/coasys/holochain-serialization.git?rev=6eaa4ea8913bfd977fcc4577e833f4dc18a215f7#6eaa4ea8913bfd977fcc4577e833f4dc18a215f7" +version = "0.0.55" +source = "git+https://github.com/coasys/holochain-serialization.git?rev=f9577913773931ec797261f90968903b1b4e27a8#f9577913773931ec797261f90968903b1b4e27a8" dependencies = [ "quote", "syn 1.0.109", @@ -972,8 +1099,7 @@ dependencies = [ [[package]] name = "holochain_util" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.1" dependencies = [ "cfg-if", "colored", @@ -985,8 +1111,8 @@ dependencies = [ [[package]] name = "holochain_wasmer_common" -version = "0.0.94" -source = "git+https://github.com/coasys/holochain-wasmer.git?rev=52979e943861530bbafc48297b131fdec52c3e21#52979e943861530bbafc48297b131fdec52c3e21" +version = "0.0.95" +source = "git+https://github.com/coasys/holochain-wasmer.git?rev=b2af50855db66095b2503c2c091b79829f684e94#b2af50855db66095b2503c2c091b79829f684e94" dependencies = [ "holochain_serialized_bytes", "serde", @@ -998,8 +1124,8 @@ dependencies = [ [[package]] name = "holochain_wasmer_guest" -version = "0.0.94" -source = "git+https://github.com/coasys/holochain-wasmer.git?rev=52979e943861530bbafc48297b131fdec52c3e21#52979e943861530bbafc48297b131fdec52c3e21" +version = "0.0.95" +source = "git+https://github.com/coasys/holochain-wasmer.git?rev=b2af50855db66095b2503c2c091b79829f684e94#b2af50855db66095b2503c2c091b79829f684e94" dependencies = [ "holochain_serialized_bytes", "holochain_wasmer_common", @@ -1011,8 +1137,7 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.9" dependencies = [ "derive_more", "holo_hash", @@ -1067,6 +1192,16 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "if_chain" version = "1.0.2" @@ -1081,16 +1216,18 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", + "serde", ] [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.3", + "serde", ] [[package]] @@ -1132,10 +1269,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.7" dependencies = [ - "base64", + "base64 0.22.1", "derive_more", "holochain_util", "kitsune_p2p_dht_arc", @@ -1146,8 +1282,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.7" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -1156,8 +1291,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.7" dependencies = [ "derive_more", "gcollections", @@ -1169,8 +1303,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.2" dependencies = [ "chrono", "serde", @@ -1190,9 +1323,21 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.150" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" [[package]] name = "lock_api" @@ -1330,6 +1475,12 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + [[package]] name = "pest" version = "2.7.5" @@ -1543,9 +1694,9 @@ dependencies = [ [[package]] name = "rmp" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" dependencies = [ "byteorder", "num-traits", @@ -1554,9 +1705,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "1.1.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" +checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" dependencies = [ "byteorder", "rmp", @@ -1578,6 +1729,19 @@ dependencies = [ "semver 1.0.20", ] +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.5.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + [[package]] name = "rustversion" version = "1.0.14" @@ -1599,6 +1763,31 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "schemars" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" +dependencies = [ + "dyn-clone", + "schemars_derive", + "serde", + "serde_json", + "url", +] + +[[package]] +name = "schemars_derive" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 2.0.66", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -1682,6 +1871,16 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_cbor" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" +dependencies = [ + "half", + "serde", +] + [[package]] name = "serde_derive" version = "1.0.203" @@ -1693,16 +1892,49 @@ dependencies = [ "syn 2.0.66", ] +[[package]] +name = "serde_derive_internals" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "serde_json" version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_yaml" +version = "0.9.34+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" +dependencies = [ + "indexmap 2.2.6", "itoa", "ryu", "serde", + "unsafe-libyaml", ] [[package]] @@ -1716,6 +1948,17 @@ dependencies = [ "digest", ] +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + [[package]] name = "shared-buffer" version = "0.1.4" @@ -1835,12 +2078,35 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +[[package]] +name = "tar" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +dependencies = [ + "filetime", + "libc", + "xattr", +] + [[package]] name = "target-lexicon" version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand", + "rustix", + "windows-sys 0.52.0", +] + [[package]] name = "test-fuzz" version = "3.0.4" @@ -1933,6 +2199,65 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +[[package]] +name = "toml" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.15", +] + +[[package]] +name = "toml_datetime" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.2.6", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1" +dependencies = [ + "indexmap 2.2.6", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.13", +] + [[package]] name = "toolchain_find" version = "0.2.0" @@ -1996,18 +2321,39 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + [[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + [[package]] name = "unicode-width" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +[[package]] +name = "unsafe-libyaml" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" + [[package]] name = "unzip-n" version = "0.1.2" @@ -2019,6 +2365,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + [[package]] name = "uuid" version = "1.6.1" @@ -2118,9 +2476,9 @@ dependencies = [ [[package]] name = "wasmer" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4014573f108a246858299eb230031e268316fd57207bd2e8afc79b20fc7ce983" +checksum = "6ce4a267a570e121c9375136adefa2c48810273907de9c6817bc19db4d6144bc" dependencies = [ "bytes", "cfg-if", @@ -2147,9 +2505,9 @@ dependencies = [ [[package]] name = "wasmer-compiler" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a77bfe259f08e8ec9e77f8f772ebfb4149f799d1f637231c5a5a6a90c447256" +checksum = "b9c23098e86ef1038155684fe50f0c1079a0e2a2e70f115b789df17e6ba98d20" dependencies = [ "backtrace", "bytes", @@ -2170,13 +2528,14 @@ dependencies = [ "wasmer-vm", "wasmparser", "winapi", + "xxhash-rust", ] [[package]] name = "wasmer-compiler-cranelift" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9280c47ebc754f95357745a38a995dd766f149e16b26e1b7e35741eb23c03d12" +checksum = "95287b79973ad5f485215733ef9f0d4bb951a6b7e655585d2bd3d4a4ba1253c9" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -2191,11 +2550,33 @@ dependencies = [ "wasmer-types", ] +[[package]] +name = "wasmer-config" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a0f70c177b1c5062cfe0f5308c3317751796fef9403c22a0cd7b4cacd4ccd8" +dependencies = [ + "anyhow", + "bytesize", + "derive_builder", + "hex", + "indexmap 2.2.6", + "schemars", + "semver 1.0.20", + "serde", + "serde_cbor", + "serde_json", + "serde_yaml", + "thiserror", + "toml 0.8.14", + "url", +] + [[package]] name = "wasmer-derive" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9352877c4f07fc59146d21b56ae6dc469caf342587f49c81b4fbeafead31972" +checksum = "e48f36aeeecb655f15fdd358bdf6e4cec27df181468fa4226084157e8462bd5e" dependencies = [ "proc-macro-error", "proc-macro2", @@ -2205,25 +2586,30 @@ dependencies = [ [[package]] name = "wasmer-types" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "749214b6170f2b2fbbfe5b7e7f8d381e64930ac4122f3abceb33cde0292d45d2" +checksum = "83cb97b6b20084757a2a8d548dc0d4179c3fe9e2d711740423a1e6aa3f8b9091" dependencies = [ "bytecheck", "enum-iterator", "enumset", + "getrandom", + "hex", "indexmap 1.9.3", "more-asserts", "rkyv", + "sha2", "target-lexicon", "thiserror", + "webc", + "xxhash-rust", ] [[package]] name = "wasmer-vm" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300215479de0deeb453e95aeb1b9c8ffd9bc7d9bd27c5f9e8a184e54db4d31a9" +checksum = "bc1e19d986844b17b927ec8b0c7f3da6a7a2c2cb3b0f8ca5d4cb1a1f71bfb124" dependencies = [ "backtrace", "cc", @@ -2254,7 +2640,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" dependencies = [ "bitflags 2.5.0", - "indexmap 2.1.0", + "indexmap 2.2.6", "semver 1.0.20", ] @@ -2279,6 +2665,35 @@ dependencies = [ "wast", ] +[[package]] +name = "webc" +version = "6.0.0-rc1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1fc686c7b43c9bc630a499f6ae1f0a4c4bd656576a53ae8a147b0cc9bc983ad" +dependencies = [ + "anyhow", + "base64 0.21.7", + "bytes", + "cfg-if", + "document-features", + "flate2", + "indexmap 1.9.3", + "libc", + "once_cell", + "semver 1.0.20", + "serde", + "serde_cbor", + "serde_json", + "sha2", + "shared-buffer", + "tar", + "tempfile", + "thiserror", + "toml 0.7.8", + "url", + "wasmer-config", +] + [[package]] name = "winapi" version = "0.3.9" @@ -2341,6 +2756,15 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", +] + [[package]] name = "windows-targets" version = "0.48.5" @@ -2492,6 +2916,24 @@ version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +dependencies = [ + "memchr", +] + [[package]] name = "wyz" version = "0.5.1" @@ -2500,3 +2942,20 @@ checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" dependencies = [ "tap", ] + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys", + "rustix", +] + +[[package]] +name = "xxhash-rust" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63658493314859b4dfdf3fb8c1defd61587839def09582db50b8a4e93afca6bb" diff --git a/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/Cargo.toml b/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/Cargo.toml index 4ab576010..3f5cc8cf1 100644 --- a/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/Cargo.toml +++ b/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/Cargo.toml @@ -14,6 +14,8 @@ serde = "1.0.198" chrono = { version = "0.4.38", default-features = false, features = ["clock", "std", "oldtime", "serde"] } thiserror = "1.0.20" -hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } -holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } +# hdk = { version = "0.4.0-dev.9", path = "../../../../../../holochain/crates/hdk" } +# hdk = { version = "0.4.0-dev.9", path = "../../../../../../holochain/crates/hdk" } +hdk = { version = "0.4.0-dev.9", path = "../../../../../../holochain/crates/hdk" } +holo_hash = { version = "0.4.0-dev.7", path = "../../../../../../holochain/crates/holo_hash" } agent_store_integrity = { path = "../agent_store_integrity" } \ No newline at end of file diff --git a/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/src/lib.rs b/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/src/lib.rs index f04b52c42..2e6936ca1 100644 --- a/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/src/lib.rs +++ b/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/src/lib.rs @@ -15,12 +15,18 @@ pub fn create_agent_expression(agent_expression: AgentExpression) -> ExternResul let did = EntryTypes::Did(Did(agent_expression.author.clone())); let did_hash = hash_entry(&did)?; + println!("Creating did entry: {:?}", did); + create_entry(&did)?; + println!("Creating agent expression entry: {:?}", agent_expression); + let agent_expression = EntryTypes::AgentExpression(agent_expression); let agent_expression_hash = hash_entry(&agent_expression)?; create_entry(&agent_expression)?; + println!("Creating link between did and agent expression"); + //Link profile entry to did create_link( did_hash, @@ -29,6 +35,8 @@ pub fn create_agent_expression(agent_expression: AgentExpression) -> ExternResul LinkTag::new("profile"), )?; + println!("Agent expression created"); + Ok(()) } diff --git a/bootstrap-languages/agent-language/hc-dna/zomes/agent_store_integrity/Cargo.toml b/bootstrap-languages/agent-language/hc-dna/zomes/agent_store_integrity/Cargo.toml index c7629aa66..64331cc37 100644 --- a/bootstrap-languages/agent-language/hc-dna/zomes/agent_store_integrity/Cargo.toml +++ b/bootstrap-languages/agent-language/hc-dna/zomes/agent_store_integrity/Cargo.toml @@ -13,5 +13,6 @@ derive_more = "0" serde = "1.0.198" chrono = { version = "0.4.38", default-features = false, features = ["clock", "std", "oldtime", "serde"] } -hdi = { version = "0.4.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } -hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a"} \ No newline at end of file +# hdi = { version = "0.5.0-dev.8", path = "../../../../../../holochain/crates/hdi" } +hdk = { version = "0.4.0-dev.9", path = "../../../../../../holochain/crates/hdk" } +hdi = { version = "0.5.0-dev.8", path = "../../../../../../holochain/crates/hdi" } \ No newline at end of file diff --git a/bootstrap-languages/direct-message-language/hc-dna/Cargo.lock b/bootstrap-languages/direct-message-language/hc-dna/Cargo.lock index 5ca68f659..06fdb0a69 100644 --- a/bootstrap-languages/direct-message-language/hc-dna/Cargo.lock +++ b/bootstrap-languages/direct-message-language/hc-dna/Cargo.lock @@ -52,6 +52,12 @@ dependencies = [ "libc", ] +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + [[package]] name = "arrayref" version = "0.3.7" @@ -85,6 +91,12 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + [[package]] name = "base64" version = "0.22.1" @@ -198,6 +210,18 @@ name = "bytes" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +dependencies = [ + "serde", +] + +[[package]] +name = "bytesize" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" +dependencies = [ + "serde", +] [[package]] name = "camino" @@ -392,6 +416,15 @@ version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "393bc73c451830ff8dbb3a07f61843d6cb41a084f9996319917c0b291ed785bb" +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + [[package]] name = "crossbeam-deque" version = "0.8.3" @@ -538,6 +571,37 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive_builder" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" +dependencies = [ + "darling 0.14.4", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder_macro" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +dependencies = [ + "derive_builder_core", + "syn 1.0.109", +] + [[package]] name = "derive_more" version = "0.99.17" @@ -582,16 +646,31 @@ dependencies = [ "chrono", "derive_more", "hdi", - "holo_hash", + "hdk", "serde", ] +[[package]] +name = "document-features" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +dependencies = [ + "litrs", +] + [[package]] name = "dunce" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +[[package]] +name = "dyn-clone" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" + [[package]] name = "either" version = "1.9.0" @@ -645,18 +724,65 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "fallible-iterator" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "filetime" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "windows-sys 0.52.0", +] + +[[package]] +name = "flate2" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + [[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + [[package]] name = "funty" version = "2.0.0" @@ -785,13 +911,15 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -811,6 +939,12 @@ version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +[[package]] +name = "half" +version = "1.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" + [[package]] name = "hashbrown" version = "0.12.3" @@ -828,8 +962,7 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hdi" -version = "0.4.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.5.0-dev.8" dependencies = [ "getrandom", "hdk_derive", @@ -845,8 +978,7 @@ dependencies = [ [[package]] name = "hdk" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.9" dependencies = [ "getrandom", "hdi", @@ -864,8 +996,7 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.8" dependencies = [ "darling 0.14.4", "heck 0.5.0", @@ -897,10 +1028,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.7" dependencies = [ - "base64", + "base64 0.22.1", "blake2b_simd", "derive_more", "holochain_serialized_bytes", @@ -914,8 +1044,7 @@ dependencies = [ [[package]] name = "holochain_integrity_types" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.8" dependencies = [ "holo_hash", "holochain_secure_primitive", @@ -930,8 +1059,7 @@ dependencies = [ [[package]] name = "holochain_nonce" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.4" dependencies = [ "getrandom", "holochain_secure_primitive", @@ -940,8 +1068,7 @@ dependencies = [ [[package]] name = "holochain_secure_primitive" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.1" dependencies = [ "paste", "serde", @@ -950,8 +1077,8 @@ dependencies = [ [[package]] name = "holochain_serialized_bytes" -version = "0.0.54" -source = "git+https://github.com/coasys/holochain-serialization.git?rev=6eaa4ea8913bfd977fcc4577e833f4dc18a215f7#6eaa4ea8913bfd977fcc4577e833f4dc18a215f7" +version = "0.0.55" +source = "git+https://github.com/coasys/holochain-serialization.git?rev=f9577913773931ec797261f90968903b1b4e27a8#f9577913773931ec797261f90968903b1b4e27a8" dependencies = [ "holochain_serialized_bytes_derive", "rmp-serde", @@ -964,8 +1091,8 @@ dependencies = [ [[package]] name = "holochain_serialized_bytes_derive" -version = "0.0.54" -source = "git+https://github.com/coasys/holochain-serialization.git?rev=6eaa4ea8913bfd977fcc4577e833f4dc18a215f7#6eaa4ea8913bfd977fcc4577e833f4dc18a215f7" +version = "0.0.55" +source = "git+https://github.com/coasys/holochain-serialization.git?rev=f9577913773931ec797261f90968903b1b4e27a8#f9577913773931ec797261f90968903b1b4e27a8" dependencies = [ "quote", "syn 1.0.109", @@ -973,8 +1100,7 @@ dependencies = [ [[package]] name = "holochain_util" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.1" dependencies = [ "cfg-if", "colored", @@ -986,8 +1112,8 @@ dependencies = [ [[package]] name = "holochain_wasmer_common" -version = "0.0.94" -source = "git+https://github.com/coasys/holochain-wasmer.git?rev=52979e943861530bbafc48297b131fdec52c3e21#52979e943861530bbafc48297b131fdec52c3e21" +version = "0.0.95" +source = "git+https://github.com/coasys/holochain-wasmer.git?rev=b2af50855db66095b2503c2c091b79829f684e94#b2af50855db66095b2503c2c091b79829f684e94" dependencies = [ "holochain_serialized_bytes", "serde", @@ -999,8 +1125,8 @@ dependencies = [ [[package]] name = "holochain_wasmer_guest" -version = "0.0.94" -source = "git+https://github.com/coasys/holochain-wasmer.git?rev=52979e943861530bbafc48297b131fdec52c3e21#52979e943861530bbafc48297b131fdec52c3e21" +version = "0.0.95" +source = "git+https://github.com/coasys/holochain-wasmer.git?rev=b2af50855db66095b2503c2c091b79829f684e94#b2af50855db66095b2503c2c091b79829f684e94" dependencies = [ "holochain_serialized_bytes", "holochain_wasmer_common", @@ -1012,8 +1138,7 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.9" dependencies = [ "derive_more", "holo_hash", @@ -1068,6 +1193,16 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "if_chain" version = "1.0.2" @@ -1082,16 +1217,18 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", + "serde", ] [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.3", + "serde", ] [[package]] @@ -1133,10 +1270,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.7" dependencies = [ - "base64", + "base64 0.22.1", "derive_more", "holochain_util", "kitsune_p2p_dht_arc", @@ -1147,8 +1283,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.7" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -1157,8 +1292,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.7" dependencies = [ "derive_more", "gcollections", @@ -1170,8 +1304,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.2" dependencies = [ "chrono", "serde", @@ -1191,9 +1324,21 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.150" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" [[package]] name = "lock_api" @@ -1331,6 +1476,12 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + [[package]] name = "pest" version = "2.7.5" @@ -1544,9 +1695,9 @@ dependencies = [ [[package]] name = "rmp" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" dependencies = [ "byteorder", "num-traits", @@ -1555,9 +1706,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "1.1.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" +checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" dependencies = [ "byteorder", "rmp", @@ -1579,6 +1730,19 @@ dependencies = [ "semver 1.0.20", ] +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.5.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + [[package]] name = "rustversion" version = "1.0.14" @@ -1600,6 +1764,31 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "schemars" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" +dependencies = [ + "dyn-clone", + "schemars_derive", + "serde", + "serde_json", + "url", +] + +[[package]] +name = "schemars_derive" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 2.0.66", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -1683,6 +1872,16 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_cbor" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" +dependencies = [ + "half", + "serde", +] + [[package]] name = "serde_derive" version = "1.0.203" @@ -1694,16 +1893,49 @@ dependencies = [ "syn 2.0.66", ] +[[package]] +name = "serde_derive_internals" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "serde_json" version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_yaml" +version = "0.9.34+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" +dependencies = [ + "indexmap 2.2.6", "itoa", "ryu", "serde", + "unsafe-libyaml", ] [[package]] @@ -1717,6 +1949,17 @@ dependencies = [ "digest", ] +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + [[package]] name = "shared-buffer" version = "0.1.4" @@ -1836,12 +2079,35 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +[[package]] +name = "tar" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +dependencies = [ + "filetime", + "libc", + "xattr", +] + [[package]] name = "target-lexicon" version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand", + "rustix", + "windows-sys 0.52.0", +] + [[package]] name = "test-fuzz" version = "3.0.4" @@ -1934,6 +2200,65 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +[[package]] +name = "toml" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.15", +] + +[[package]] +name = "toml_datetime" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.2.6", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1" +dependencies = [ + "indexmap 2.2.6", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.13", +] + [[package]] name = "toolchain_find" version = "0.2.0" @@ -1997,18 +2322,39 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + [[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + [[package]] name = "unicode-width" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +[[package]] +name = "unsafe-libyaml" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" + [[package]] name = "unzip-n" version = "0.1.2" @@ -2020,6 +2366,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + [[package]] name = "uuid" version = "1.6.1" @@ -2119,9 +2477,9 @@ dependencies = [ [[package]] name = "wasmer" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4014573f108a246858299eb230031e268316fd57207bd2e8afc79b20fc7ce983" +checksum = "6ce4a267a570e121c9375136adefa2c48810273907de9c6817bc19db4d6144bc" dependencies = [ "bytes", "cfg-if", @@ -2148,9 +2506,9 @@ dependencies = [ [[package]] name = "wasmer-compiler" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a77bfe259f08e8ec9e77f8f772ebfb4149f799d1f637231c5a5a6a90c447256" +checksum = "b9c23098e86ef1038155684fe50f0c1079a0e2a2e70f115b789df17e6ba98d20" dependencies = [ "backtrace", "bytes", @@ -2171,13 +2529,14 @@ dependencies = [ "wasmer-vm", "wasmparser", "winapi", + "xxhash-rust", ] [[package]] name = "wasmer-compiler-cranelift" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9280c47ebc754f95357745a38a995dd766f149e16b26e1b7e35741eb23c03d12" +checksum = "95287b79973ad5f485215733ef9f0d4bb951a6b7e655585d2bd3d4a4ba1253c9" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -2192,11 +2551,33 @@ dependencies = [ "wasmer-types", ] +[[package]] +name = "wasmer-config" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a0f70c177b1c5062cfe0f5308c3317751796fef9403c22a0cd7b4cacd4ccd8" +dependencies = [ + "anyhow", + "bytesize", + "derive_builder", + "hex", + "indexmap 2.2.6", + "schemars", + "semver 1.0.20", + "serde", + "serde_cbor", + "serde_json", + "serde_yaml", + "thiserror", + "toml 0.8.14", + "url", +] + [[package]] name = "wasmer-derive" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9352877c4f07fc59146d21b56ae6dc469caf342587f49c81b4fbeafead31972" +checksum = "e48f36aeeecb655f15fdd358bdf6e4cec27df181468fa4226084157e8462bd5e" dependencies = [ "proc-macro-error", "proc-macro2", @@ -2206,25 +2587,30 @@ dependencies = [ [[package]] name = "wasmer-types" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "749214b6170f2b2fbbfe5b7e7f8d381e64930ac4122f3abceb33cde0292d45d2" +checksum = "83cb97b6b20084757a2a8d548dc0d4179c3fe9e2d711740423a1e6aa3f8b9091" dependencies = [ "bytecheck", "enum-iterator", "enumset", + "getrandom", + "hex", "indexmap 1.9.3", "more-asserts", "rkyv", + "sha2", "target-lexicon", "thiserror", + "webc", + "xxhash-rust", ] [[package]] name = "wasmer-vm" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300215479de0deeb453e95aeb1b9c8ffd9bc7d9bd27c5f9e8a184e54db4d31a9" +checksum = "bc1e19d986844b17b927ec8b0c7f3da6a7a2c2cb3b0f8ca5d4cb1a1f71bfb124" dependencies = [ "backtrace", "cc", @@ -2255,7 +2641,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" dependencies = [ "bitflags 2.5.0", - "indexmap 2.1.0", + "indexmap 2.2.6", "semver 1.0.20", ] @@ -2280,6 +2666,35 @@ dependencies = [ "wast", ] +[[package]] +name = "webc" +version = "6.0.0-rc1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1fc686c7b43c9bc630a499f6ae1f0a4c4bd656576a53ae8a147b0cc9bc983ad" +dependencies = [ + "anyhow", + "base64 0.21.7", + "bytes", + "cfg-if", + "document-features", + "flate2", + "indexmap 1.9.3", + "libc", + "once_cell", + "semver 1.0.20", + "serde", + "serde_cbor", + "serde_json", + "sha2", + "shared-buffer", + "tar", + "tempfile", + "thiserror", + "toml 0.7.8", + "url", + "wasmer-config", +] + [[package]] name = "winapi" version = "0.3.9" @@ -2342,6 +2757,15 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", +] + [[package]] name = "windows-targets" version = "0.48.5" @@ -2493,6 +2917,24 @@ version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +dependencies = [ + "memchr", +] + [[package]] name = "wyz" version = "0.5.1" @@ -2501,3 +2943,20 @@ checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" dependencies = [ "tap", ] + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys", + "rustix", +] + +[[package]] +name = "xxhash-rust" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63658493314859b4dfdf3fb8c1defd61587839def09582db50b8a4e93afca6bb" diff --git a/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message-integrity/Cargo.toml b/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message-integrity/Cargo.toml index 718ae630f..97a129298 100644 --- a/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message-integrity/Cargo.toml +++ b/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message-integrity/Cargo.toml @@ -13,5 +13,5 @@ derive_more = "0" serde = "1.0.198" chrono = { version = "0.4.38", default-features = false, features = ["clock", "std", "oldtime", "serde"] } -hdi = { version = "0.4.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } -holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } +hdi = { version = "0.5.0-dev.8", path = "../../../../../../holochain/crates/hdi" } +hdk = { version = "0.4.0-dev.9", path = "../../../../../../holochain/crates/hdk" } diff --git a/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message/Cargo.toml b/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message/Cargo.toml index 3093873cd..7eb88a419 100644 --- a/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message/Cargo.toml +++ b/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message/Cargo.toml @@ -15,7 +15,7 @@ serde_json = "1" chrono = { version = "0.4.38", default-features = false, features = ["clock", "std", "oldtime", "serde"] } hex = "0.4.3" -hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } -holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } +hdk = { version = "0.4.0-dev.9", path = "../../../../../../holochain/crates/hdk" } +holo_hash = { version = "0.4.0-dev.7", path = "../../../../../../holochain/crates/holo_hash" } direct-message-integrity = { path = "../direct-message-integrity" } \ No newline at end of file diff --git a/bootstrap-languages/file-storage/hc-dna/Cargo.lock b/bootstrap-languages/file-storage/hc-dna/Cargo.lock index f6df7b938..8127d63c8 100644 --- a/bootstrap-languages/file-storage/hc-dna/Cargo.lock +++ b/bootstrap-languages/file-storage/hc-dna/Cargo.lock @@ -52,6 +52,12 @@ dependencies = [ "libc", ] +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + [[package]] name = "arrayref" version = "0.3.7" @@ -85,6 +91,12 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + [[package]] name = "base64" version = "0.22.1" @@ -198,6 +210,18 @@ name = "bytes" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +dependencies = [ + "serde", +] + +[[package]] +name = "bytesize" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" +dependencies = [ + "serde", +] [[package]] name = "camino" @@ -392,6 +416,15 @@ version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "393bc73c451830ff8dbb3a07f61843d6cb41a084f9996319917c0b291ed785bb" +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + [[package]] name = "crossbeam-deque" version = "0.8.3" @@ -538,6 +571,37 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive_builder" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" +dependencies = [ + "darling 0.14.4", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder_macro" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +dependencies = [ + "derive_builder_core", + "syn 1.0.109", +] + [[package]] name = "derive_more" version = "0.99.17" @@ -561,12 +625,27 @@ dependencies = [ "crypto-common", ] +[[package]] +name = "document-features" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +dependencies = [ + "litrs", +] + [[package]] name = "dunce" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +[[package]] +name = "dyn-clone" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" + [[package]] name = "either" version = "1.9.0" @@ -620,12 +699,28 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "fallible-iterator" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + [[package]] name = "file_storage" version = "0.1.0" @@ -641,12 +736,43 @@ dependencies = [ "thiserror", ] +[[package]] +name = "filetime" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "windows-sys 0.52.0", +] + +[[package]] +name = "flate2" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + [[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + [[package]] name = "funty" version = "2.0.0" @@ -775,13 +901,15 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -801,6 +929,12 @@ version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +[[package]] +name = "half" +version = "1.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" + [[package]] name = "hashbrown" version = "0.12.3" @@ -818,8 +952,7 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hdi" -version = "0.4.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.5.0-dev.8" dependencies = [ "getrandom", "hdk_derive", @@ -835,8 +968,7 @@ dependencies = [ [[package]] name = "hdk" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.9" dependencies = [ "getrandom", "hdi", @@ -854,8 +986,7 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.8" dependencies = [ "darling 0.14.4", "heck 0.5.0", @@ -887,10 +1018,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.7" dependencies = [ - "base64", + "base64 0.22.1", "blake2b_simd", "derive_more", "holochain_serialized_bytes", @@ -904,8 +1034,7 @@ dependencies = [ [[package]] name = "holochain_integrity_types" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.8" dependencies = [ "holo_hash", "holochain_secure_primitive", @@ -920,8 +1049,7 @@ dependencies = [ [[package]] name = "holochain_nonce" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.4" dependencies = [ "getrandom", "holochain_secure_primitive", @@ -930,8 +1058,7 @@ dependencies = [ [[package]] name = "holochain_secure_primitive" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.1" dependencies = [ "paste", "serde", @@ -940,8 +1067,8 @@ dependencies = [ [[package]] name = "holochain_serialized_bytes" -version = "0.0.54" -source = "git+https://github.com/coasys/holochain-serialization.git?rev=6eaa4ea8913bfd977fcc4577e833f4dc18a215f7#6eaa4ea8913bfd977fcc4577e833f4dc18a215f7" +version = "0.0.55" +source = "git+https://github.com/coasys/holochain-serialization.git?rev=f9577913773931ec797261f90968903b1b4e27a8#f9577913773931ec797261f90968903b1b4e27a8" dependencies = [ "holochain_serialized_bytes_derive", "rmp-serde", @@ -954,8 +1081,8 @@ dependencies = [ [[package]] name = "holochain_serialized_bytes_derive" -version = "0.0.54" -source = "git+https://github.com/coasys/holochain-serialization.git?rev=6eaa4ea8913bfd977fcc4577e833f4dc18a215f7#6eaa4ea8913bfd977fcc4577e833f4dc18a215f7" +version = "0.0.55" +source = "git+https://github.com/coasys/holochain-serialization.git?rev=f9577913773931ec797261f90968903b1b4e27a8#f9577913773931ec797261f90968903b1b4e27a8" dependencies = [ "quote", "syn 1.0.109", @@ -963,8 +1090,7 @@ dependencies = [ [[package]] name = "holochain_util" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.1" dependencies = [ "cfg-if", "colored", @@ -976,8 +1102,8 @@ dependencies = [ [[package]] name = "holochain_wasmer_common" -version = "0.0.94" -source = "git+https://github.com/coasys/holochain-wasmer.git?rev=52979e943861530bbafc48297b131fdec52c3e21#52979e943861530bbafc48297b131fdec52c3e21" +version = "0.0.95" +source = "git+https://github.com/coasys/holochain-wasmer.git?rev=b2af50855db66095b2503c2c091b79829f684e94#b2af50855db66095b2503c2c091b79829f684e94" dependencies = [ "holochain_serialized_bytes", "serde", @@ -989,8 +1115,8 @@ dependencies = [ [[package]] name = "holochain_wasmer_guest" -version = "0.0.94" -source = "git+https://github.com/coasys/holochain-wasmer.git?rev=52979e943861530bbafc48297b131fdec52c3e21#52979e943861530bbafc48297b131fdec52c3e21" +version = "0.0.95" +source = "git+https://github.com/coasys/holochain-wasmer.git?rev=b2af50855db66095b2503c2c091b79829f684e94#b2af50855db66095b2503c2c091b79829f684e94" dependencies = [ "holochain_serialized_bytes", "holochain_wasmer_common", @@ -1002,8 +1128,7 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.9" dependencies = [ "derive_more", "holo_hash", @@ -1058,6 +1183,16 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "if_chain" version = "1.0.2" @@ -1072,16 +1207,18 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", + "serde", ] [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.3", + "serde", ] [[package]] @@ -1135,10 +1272,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.7" dependencies = [ - "base64", + "base64 0.22.1", "derive_more", "holochain_util", "kitsune_p2p_dht_arc", @@ -1149,8 +1285,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.7" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -1159,8 +1294,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.7" dependencies = [ "derive_more", "gcollections", @@ -1172,8 +1306,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.2" dependencies = [ "chrono", "serde", @@ -1193,9 +1326,21 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.150" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" [[package]] name = "lock_api" @@ -1333,6 +1478,12 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + [[package]] name = "pest" version = "2.7.5" @@ -1546,9 +1697,9 @@ dependencies = [ [[package]] name = "rmp" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" dependencies = [ "byteorder", "num-traits", @@ -1557,9 +1708,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "1.1.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" +checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" dependencies = [ "byteorder", "rmp", @@ -1581,6 +1732,19 @@ dependencies = [ "semver 1.0.20", ] +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.5.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + [[package]] name = "rustversion" version = "1.0.14" @@ -1602,6 +1766,31 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "schemars" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" +dependencies = [ + "dyn-clone", + "schemars_derive", + "serde", + "serde_json", + "url", +] + +[[package]] +name = "schemars_derive" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 2.0.66", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -1685,6 +1874,16 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_cbor" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" +dependencies = [ + "half", + "serde", +] + [[package]] name = "serde_derive" version = "1.0.203" @@ -1696,16 +1895,49 @@ dependencies = [ "syn 2.0.66", ] +[[package]] +name = "serde_derive_internals" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "serde_json" version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_yaml" +version = "0.9.34+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" +dependencies = [ + "indexmap 2.2.6", "itoa", "ryu", "serde", + "unsafe-libyaml", ] [[package]] @@ -1849,12 +2081,35 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +[[package]] +name = "tar" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +dependencies = [ + "filetime", + "libc", + "xattr", +] + [[package]] name = "target-lexicon" version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand", + "rustix", + "windows-sys 0.52.0", +] + [[package]] name = "test-fuzz" version = "3.0.4" @@ -1947,6 +2202,65 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +[[package]] +name = "toml" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.15", +] + +[[package]] +name = "toml_datetime" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.2.6", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1" +dependencies = [ + "indexmap 2.2.6", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.13", +] + [[package]] name = "toolchain_find" version = "0.2.0" @@ -2010,18 +2324,39 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + [[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + [[package]] name = "unicode-width" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +[[package]] +name = "unsafe-libyaml" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" + [[package]] name = "unzip-n" version = "0.1.2" @@ -2033,6 +2368,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + [[package]] name = "uuid" version = "1.6.1" @@ -2132,9 +2479,9 @@ dependencies = [ [[package]] name = "wasmer" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4014573f108a246858299eb230031e268316fd57207bd2e8afc79b20fc7ce983" +checksum = "6ce4a267a570e121c9375136adefa2c48810273907de9c6817bc19db4d6144bc" dependencies = [ "bytes", "cfg-if", @@ -2161,9 +2508,9 @@ dependencies = [ [[package]] name = "wasmer-compiler" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a77bfe259f08e8ec9e77f8f772ebfb4149f799d1f637231c5a5a6a90c447256" +checksum = "b9c23098e86ef1038155684fe50f0c1079a0e2a2e70f115b789df17e6ba98d20" dependencies = [ "backtrace", "bytes", @@ -2184,13 +2531,14 @@ dependencies = [ "wasmer-vm", "wasmparser", "winapi", + "xxhash-rust", ] [[package]] name = "wasmer-compiler-cranelift" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9280c47ebc754f95357745a38a995dd766f149e16b26e1b7e35741eb23c03d12" +checksum = "95287b79973ad5f485215733ef9f0d4bb951a6b7e655585d2bd3d4a4ba1253c9" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -2205,11 +2553,33 @@ dependencies = [ "wasmer-types", ] +[[package]] +name = "wasmer-config" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a0f70c177b1c5062cfe0f5308c3317751796fef9403c22a0cd7b4cacd4ccd8" +dependencies = [ + "anyhow", + "bytesize", + "derive_builder", + "hex", + "indexmap 2.2.6", + "schemars", + "semver 1.0.20", + "serde", + "serde_cbor", + "serde_json", + "serde_yaml", + "thiserror", + "toml 0.8.14", + "url", +] + [[package]] name = "wasmer-derive" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9352877c4f07fc59146d21b56ae6dc469caf342587f49c81b4fbeafead31972" +checksum = "e48f36aeeecb655f15fdd358bdf6e4cec27df181468fa4226084157e8462bd5e" dependencies = [ "proc-macro-error", "proc-macro2", @@ -2219,25 +2589,30 @@ dependencies = [ [[package]] name = "wasmer-types" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "749214b6170f2b2fbbfe5b7e7f8d381e64930ac4122f3abceb33cde0292d45d2" +checksum = "83cb97b6b20084757a2a8d548dc0d4179c3fe9e2d711740423a1e6aa3f8b9091" dependencies = [ "bytecheck", "enum-iterator", "enumset", + "getrandom", + "hex", "indexmap 1.9.3", "more-asserts", "rkyv", + "sha2", "target-lexicon", "thiserror", + "webc", + "xxhash-rust", ] [[package]] name = "wasmer-vm" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300215479de0deeb453e95aeb1b9c8ffd9bc7d9bd27c5f9e8a184e54db4d31a9" +checksum = "bc1e19d986844b17b927ec8b0c7f3da6a7a2c2cb3b0f8ca5d4cb1a1f71bfb124" dependencies = [ "backtrace", "cc", @@ -2268,7 +2643,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" dependencies = [ "bitflags 2.5.0", - "indexmap 2.1.0", + "indexmap 2.2.6", "semver 1.0.20", ] @@ -2293,6 +2668,35 @@ dependencies = [ "wast", ] +[[package]] +name = "webc" +version = "6.0.0-rc1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1fc686c7b43c9bc630a499f6ae1f0a4c4bd656576a53ae8a147b0cc9bc983ad" +dependencies = [ + "anyhow", + "base64 0.21.7", + "bytes", + "cfg-if", + "document-features", + "flate2", + "indexmap 1.9.3", + "libc", + "once_cell", + "semver 1.0.20", + "serde", + "serde_cbor", + "serde_json", + "sha2", + "shared-buffer", + "tar", + "tempfile", + "thiserror", + "toml 0.7.8", + "url", + "wasmer-config", +] + [[package]] name = "winapi" version = "0.3.9" @@ -2355,6 +2759,15 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", +] + [[package]] name = "windows-targets" version = "0.48.5" @@ -2506,6 +2919,24 @@ version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +dependencies = [ + "memchr", +] + [[package]] name = "wyz" version = "0.5.1" @@ -2514,3 +2945,20 @@ checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" dependencies = [ "tap", ] + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys", + "rustix", +] + +[[package]] +name = "xxhash-rust" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63658493314859b4dfdf3fb8c1defd61587839def09582db50b8a4e93afca6bb" diff --git a/bootstrap-languages/file-storage/hc-dna/zomes/file_storage/Cargo.toml b/bootstrap-languages/file-storage/hc-dna/zomes/file_storage/Cargo.toml index bd3721751..60039e1d7 100644 --- a/bootstrap-languages/file-storage/hc-dna/zomes/file_storage/Cargo.toml +++ b/bootstrap-languages/file-storage/hc-dna/zomes/file_storage/Cargo.toml @@ -17,5 +17,5 @@ chrono = { version = "0.4.38", default-features = false, features = ["clock", "s thiserror = "1.0.20" integrity = { path = "../integrity" } sha2 = "0.10.5" -hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } -holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } \ No newline at end of file +hdk = { version = "0.4.0-dev.9", path = "../../../../../../holochain/crates/hdk" } +holo_hash = { version = "0.4.0-dev.7", path = "../../../../../../holochain/crates/holo_hash" } \ No newline at end of file diff --git a/bootstrap-languages/file-storage/hc-dna/zomes/integrity/Cargo.toml b/bootstrap-languages/file-storage/hc-dna/zomes/integrity/Cargo.toml index 038b40cc2..2ee40f379 100644 --- a/bootstrap-languages/file-storage/hc-dna/zomes/integrity/Cargo.toml +++ b/bootstrap-languages/file-storage/hc-dna/zomes/integrity/Cargo.toml @@ -13,6 +13,6 @@ name = "integrity" derive_more = "0" serde = "1.0.198" chrono = { version = "0.4.38", default-features = false, features = ["clock", "std", "oldtime", "serde"] } -holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } -hdi = { version = "0.4.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } -hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } +hdk = { version = "0.4.0-dev.9", path = "../../../../../../holochain/crates/hdk" } +hdi = { version = "0.5.0-dev.8", path = "../../../../../../holochain/crates/hdi" } +holo_hash = { version = "0.4.0-dev.7", path = "../../../../../../holochain/crates/holo_hash" } diff --git a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/Cargo.lock b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/Cargo.lock index e9a79a743..a1b02b693 100644 --- a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/Cargo.lock +++ b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/Cargo.lock @@ -52,6 +52,12 @@ dependencies = [ "libc", ] +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + [[package]] name = "arrayref" version = "0.3.7" @@ -85,6 +91,12 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + [[package]] name = "base64" version = "0.22.1" @@ -198,6 +210,18 @@ name = "bytes" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +dependencies = [ + "serde", +] + +[[package]] +name = "bytesize" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" +dependencies = [ + "serde", +] [[package]] name = "camino" @@ -392,6 +416,15 @@ version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "393bc73c451830ff8dbb3a07f61843d6cb41a084f9996319917c0b291ed785bb" +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + [[package]] name = "crossbeam-deque" version = "0.8.3" @@ -538,6 +571,37 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive_builder" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" +dependencies = [ + "darling 0.14.4", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder_macro" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +dependencies = [ + "derive_builder_core", + "syn 1.0.109", +] + [[package]] name = "derive_more" version = "0.99.17" @@ -561,6 +625,15 @@ dependencies = [ "crypto-common", ] +[[package]] +name = "document-features" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +dependencies = [ + "litrs", +] + [[package]] name = "dot-generator" version = "0.1.0" @@ -591,6 +664,12 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +[[package]] +name = "dyn-clone" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" + [[package]] name = "either" version = "1.9.0" @@ -666,18 +745,49 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +[[package]] +name = "filetime" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "windows-sys 0.52.0", +] + [[package]] name = "fixedbitset" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" +[[package]] +name = "flate2" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + [[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + [[package]] name = "funty" version = "2.0.0" @@ -806,13 +916,15 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -848,6 +960,12 @@ dependencies = [ "tempfile", ] +[[package]] +name = "half" +version = "1.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" + [[package]] name = "hashbrown" version = "0.12.3" @@ -865,8 +983,7 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hdi" -version = "0.4.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.5.0-dev.8" dependencies = [ "getrandom", "hdk_derive", @@ -882,8 +999,7 @@ dependencies = [ [[package]] name = "hdk" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.9" dependencies = [ "getrandom", "hdi", @@ -901,8 +1017,7 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.8" dependencies = [ "darling 0.14.4", "heck 0.5.0", @@ -934,10 +1049,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.7" dependencies = [ - "base64", + "base64 0.22.1", "blake2b_simd", "derive_more", "holochain_serialized_bytes", @@ -951,8 +1065,7 @@ dependencies = [ [[package]] name = "holochain_integrity_types" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.8" dependencies = [ "holo_hash", "holochain_secure_primitive", @@ -967,8 +1080,7 @@ dependencies = [ [[package]] name = "holochain_nonce" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.4" dependencies = [ "getrandom", "holochain_secure_primitive", @@ -977,8 +1089,7 @@ dependencies = [ [[package]] name = "holochain_secure_primitive" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.1" dependencies = [ "paste", "serde", @@ -987,8 +1098,8 @@ dependencies = [ [[package]] name = "holochain_serialized_bytes" -version = "0.0.54" -source = "git+https://github.com/coasys/holochain-serialization.git?rev=6eaa4ea8913bfd977fcc4577e833f4dc18a215f7#6eaa4ea8913bfd977fcc4577e833f4dc18a215f7" +version = "0.0.55" +source = "git+https://github.com/coasys/holochain-serialization.git?rev=f9577913773931ec797261f90968903b1b4e27a8#f9577913773931ec797261f90968903b1b4e27a8" dependencies = [ "holochain_serialized_bytes_derive", "rmp-serde", @@ -1001,8 +1112,8 @@ dependencies = [ [[package]] name = "holochain_serialized_bytes_derive" -version = "0.0.54" -source = "git+https://github.com/coasys/holochain-serialization.git?rev=6eaa4ea8913bfd977fcc4577e833f4dc18a215f7#6eaa4ea8913bfd977fcc4577e833f4dc18a215f7" +version = "0.0.55" +source = "git+https://github.com/coasys/holochain-serialization.git?rev=f9577913773931ec797261f90968903b1b4e27a8#f9577913773931ec797261f90968903b1b4e27a8" dependencies = [ "quote", "syn 1.0.109", @@ -1010,8 +1121,7 @@ dependencies = [ [[package]] name = "holochain_util" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.1" dependencies = [ "cfg-if", "colored", @@ -1023,8 +1133,8 @@ dependencies = [ [[package]] name = "holochain_wasmer_common" -version = "0.0.94" -source = "git+https://github.com/coasys/holochain-wasmer.git?rev=52979e943861530bbafc48297b131fdec52c3e21#52979e943861530bbafc48297b131fdec52c3e21" +version = "0.0.95" +source = "git+https://github.com/coasys/holochain-wasmer.git?rev=b2af50855db66095b2503c2c091b79829f684e94#b2af50855db66095b2503c2c091b79829f684e94" dependencies = [ "holochain_serialized_bytes", "serde", @@ -1036,8 +1146,8 @@ dependencies = [ [[package]] name = "holochain_wasmer_guest" -version = "0.0.94" -source = "git+https://github.com/coasys/holochain-wasmer.git?rev=52979e943861530bbafc48297b131fdec52c3e21#52979e943861530bbafc48297b131fdec52c3e21" +version = "0.0.95" +source = "git+https://github.com/coasys/holochain-wasmer.git?rev=b2af50855db66095b2503c2c091b79829f684e94#b2af50855db66095b2503c2c091b79829f684e94" dependencies = [ "holochain_serialized_bytes", "holochain_wasmer_common", @@ -1049,8 +1159,7 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.9" dependencies = [ "derive_more", "holo_hash", @@ -1105,6 +1214,16 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "if_chain" version = "1.0.2" @@ -1119,16 +1238,18 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", + "serde", ] [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.3", + "serde", ] [[package]] @@ -1201,10 +1322,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.7" dependencies = [ - "base64", + "base64 0.22.1", "derive_more", "holochain_util", "kitsune_p2p_dht_arc", @@ -1215,8 +1335,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.7" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -1225,8 +1344,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.7" dependencies = [ "derive_more", "gcollections", @@ -1238,8 +1356,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.2" dependencies = [ "chrono", "serde", @@ -1259,9 +1376,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.150" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "linux-raw-sys" @@ -1269,6 +1386,12 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" + [[package]] name = "lock_api" version = "0.4.11" @@ -1411,6 +1534,12 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + [[package]] name = "perspective_diff_sync" version = "0.0.1" @@ -1495,7 +1624,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.1.0", + "indexmap 2.2.6", ] [[package]] @@ -1736,9 +1865,9 @@ dependencies = [ [[package]] name = "rmp" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" dependencies = [ "byteorder", "num-traits", @@ -1747,9 +1876,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "1.1.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" +checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" dependencies = [ "byteorder", "rmp", @@ -1773,9 +1902,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.26" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.4.1", "errno", @@ -1805,6 +1934,31 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "schemars" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" +dependencies = [ + "dyn-clone", + "schemars_derive", + "serde", + "serde_json", + "url", +] + +[[package]] +name = "schemars_derive" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 2.0.66", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -1888,6 +2042,16 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_cbor" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" +dependencies = [ + "half", + "serde", +] + [[package]] name = "serde_derive" version = "1.0.203" @@ -1899,16 +2063,49 @@ dependencies = [ "syn 2.0.66", ] +[[package]] +name = "serde_derive_internals" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "serde_json" version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_yaml" +version = "0.9.34+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" +dependencies = [ + "indexmap 2.2.6", "itoa", "ryu", "serde", + "unsafe-libyaml", ] [[package]] @@ -2052,6 +2249,17 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +[[package]] +name = "tar" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +dependencies = [ + "filetime", + "libc", + "xattr", +] + [[package]] name = "target-lexicon" version = "0.12.12" @@ -2163,6 +2371,65 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +[[package]] +name = "toml" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.15", +] + +[[package]] +name = "toml_datetime" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.2.6", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1" +dependencies = [ + "indexmap 2.2.6", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.13", +] + [[package]] name = "toolchain_find" version = "0.2.0" @@ -2226,18 +2493,39 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + [[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + [[package]] name = "unicode-width" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +[[package]] +name = "unsafe-libyaml" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" + [[package]] name = "unzip-n" version = "0.1.2" @@ -2249,6 +2537,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + [[package]] name = "uuid" version = "1.6.1" @@ -2348,9 +2648,9 @@ dependencies = [ [[package]] name = "wasmer" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4014573f108a246858299eb230031e268316fd57207bd2e8afc79b20fc7ce983" +checksum = "6ce4a267a570e121c9375136adefa2c48810273907de9c6817bc19db4d6144bc" dependencies = [ "bytes", "cfg-if", @@ -2377,9 +2677,9 @@ dependencies = [ [[package]] name = "wasmer-compiler" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a77bfe259f08e8ec9e77f8f772ebfb4149f799d1f637231c5a5a6a90c447256" +checksum = "b9c23098e86ef1038155684fe50f0c1079a0e2a2e70f115b789df17e6ba98d20" dependencies = [ "backtrace", "bytes", @@ -2400,13 +2700,14 @@ dependencies = [ "wasmer-vm", "wasmparser", "winapi", + "xxhash-rust", ] [[package]] name = "wasmer-compiler-cranelift" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9280c47ebc754f95357745a38a995dd766f149e16b26e1b7e35741eb23c03d12" +checksum = "95287b79973ad5f485215733ef9f0d4bb951a6b7e655585d2bd3d4a4ba1253c9" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -2421,11 +2722,33 @@ dependencies = [ "wasmer-types", ] +[[package]] +name = "wasmer-config" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a0f70c177b1c5062cfe0f5308c3317751796fef9403c22a0cd7b4cacd4ccd8" +dependencies = [ + "anyhow", + "bytesize", + "derive_builder", + "hex", + "indexmap 2.2.6", + "schemars", + "semver 1.0.20", + "serde", + "serde_cbor", + "serde_json", + "serde_yaml", + "thiserror", + "toml 0.8.14", + "url", +] + [[package]] name = "wasmer-derive" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9352877c4f07fc59146d21b56ae6dc469caf342587f49c81b4fbeafead31972" +checksum = "e48f36aeeecb655f15fdd358bdf6e4cec27df181468fa4226084157e8462bd5e" dependencies = [ "proc-macro-error", "proc-macro2", @@ -2435,25 +2758,30 @@ dependencies = [ [[package]] name = "wasmer-types" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "749214b6170f2b2fbbfe5b7e7f8d381e64930ac4122f3abceb33cde0292d45d2" +checksum = "83cb97b6b20084757a2a8d548dc0d4179c3fe9e2d711740423a1e6aa3f8b9091" dependencies = [ "bytecheck", "enum-iterator", "enumset", + "getrandom", + "hex", "indexmap 1.9.3", "more-asserts", "rkyv", + "sha2", "target-lexicon", "thiserror", + "webc", + "xxhash-rust", ] [[package]] name = "wasmer-vm" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300215479de0deeb453e95aeb1b9c8ffd9bc7d9bd27c5f9e8a184e54db4d31a9" +checksum = "bc1e19d986844b17b927ec8b0c7f3da6a7a2c2cb3b0f8ca5d4cb1a1f71bfb124" dependencies = [ "backtrace", "cc", @@ -2484,7 +2812,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" dependencies = [ "bitflags 2.4.1", - "indexmap 2.1.0", + "indexmap 2.2.6", "semver 1.0.20", ] @@ -2509,6 +2837,35 @@ dependencies = [ "wast", ] +[[package]] +name = "webc" +version = "6.0.0-rc1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1fc686c7b43c9bc630a499f6ae1f0a4c4bd656576a53ae8a147b0cc9bc983ad" +dependencies = [ + "anyhow", + "base64 0.21.7", + "bytes", + "cfg-if", + "document-features", + "flate2", + "indexmap 1.9.3", + "libc", + "once_cell", + "semver 1.0.20", + "serde", + "serde_cbor", + "serde_json", + "sha2", + "shared-buffer", + "tar", + "tempfile", + "thiserror", + "toml 0.7.8", + "url", + "wasmer-config", +] + [[package]] name = "winapi" version = "0.3.9" @@ -2724,6 +3081,24 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +dependencies = [ + "memchr", +] + [[package]] name = "wyz" version = "0.5.1" @@ -2732,3 +3107,20 @@ checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" dependencies = [ "tap", ] + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys", + "rustix", +] + +[[package]] +name = "xxhash-rust" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63658493314859b4dfdf3fb8c1defd61587839def09582db50b8a4e93afca6bb" diff --git a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync/Cargo.toml b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync/Cargo.toml index 91dc04a03..1b331d3f8 100644 --- a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync/Cargo.toml +++ b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync/Cargo.toml @@ -21,8 +21,8 @@ dot-structures = "0.1.0" itertools = "0.10.3" perspective_diff_sync_integrity = { path = "../perspective_diff_sync_integrity" } sha2 = "0.10.5" -hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } -holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } +hdk = { version = "0.4.0-dev.9", path = "../../../../../../holochain/crates/hdk" } +holo_hash = { version = "0.4.0-dev.7", path = "../../../../../../holochain/crates/holo_hash" } [features] test = [] \ No newline at end of file diff --git a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml index 47a18749a..d79b6bd5e 100644 --- a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml +++ b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml @@ -13,6 +13,6 @@ derive_more = "0" serde = "1.0.198" chrono = { version = "0.4.38", default-features = false, features = ["clock", "std", "oldtime", "serde"] } -holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } -hdi = { version = "0.4.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } -hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } \ No newline at end of file +hdk = { version = "0.4.0-dev.9", path = "../../../../../../holochain/crates/hdk" } +hdi = { version = "0.5.0-dev.8", path = "../../../../../../holochain/crates/hdi" } +holo_hash = { version = "0.4.0-dev.7", path = "../../../../../../holochain/crates/holo_hash" } \ No newline at end of file diff --git a/bootstrap-languages/p-diff-sync/hc-dna/Cargo.lock b/bootstrap-languages/p-diff-sync/hc-dna/Cargo.lock index e9a79a743..a1b02b693 100644 --- a/bootstrap-languages/p-diff-sync/hc-dna/Cargo.lock +++ b/bootstrap-languages/p-diff-sync/hc-dna/Cargo.lock @@ -52,6 +52,12 @@ dependencies = [ "libc", ] +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + [[package]] name = "arrayref" version = "0.3.7" @@ -85,6 +91,12 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + [[package]] name = "base64" version = "0.22.1" @@ -198,6 +210,18 @@ name = "bytes" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +dependencies = [ + "serde", +] + +[[package]] +name = "bytesize" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" +dependencies = [ + "serde", +] [[package]] name = "camino" @@ -392,6 +416,15 @@ version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "393bc73c451830ff8dbb3a07f61843d6cb41a084f9996319917c0b291ed785bb" +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + [[package]] name = "crossbeam-deque" version = "0.8.3" @@ -538,6 +571,37 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive_builder" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" +dependencies = [ + "darling 0.14.4", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder_macro" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +dependencies = [ + "derive_builder_core", + "syn 1.0.109", +] + [[package]] name = "derive_more" version = "0.99.17" @@ -561,6 +625,15 @@ dependencies = [ "crypto-common", ] +[[package]] +name = "document-features" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +dependencies = [ + "litrs", +] + [[package]] name = "dot-generator" version = "0.1.0" @@ -591,6 +664,12 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +[[package]] +name = "dyn-clone" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" + [[package]] name = "either" version = "1.9.0" @@ -666,18 +745,49 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +[[package]] +name = "filetime" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "windows-sys 0.52.0", +] + [[package]] name = "fixedbitset" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" +[[package]] +name = "flate2" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + [[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + [[package]] name = "funty" version = "2.0.0" @@ -806,13 +916,15 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -848,6 +960,12 @@ dependencies = [ "tempfile", ] +[[package]] +name = "half" +version = "1.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" + [[package]] name = "hashbrown" version = "0.12.3" @@ -865,8 +983,7 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hdi" -version = "0.4.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.5.0-dev.8" dependencies = [ "getrandom", "hdk_derive", @@ -882,8 +999,7 @@ dependencies = [ [[package]] name = "hdk" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.9" dependencies = [ "getrandom", "hdi", @@ -901,8 +1017,7 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.8" dependencies = [ "darling 0.14.4", "heck 0.5.0", @@ -934,10 +1049,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.7" dependencies = [ - "base64", + "base64 0.22.1", "blake2b_simd", "derive_more", "holochain_serialized_bytes", @@ -951,8 +1065,7 @@ dependencies = [ [[package]] name = "holochain_integrity_types" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.8" dependencies = [ "holo_hash", "holochain_secure_primitive", @@ -967,8 +1080,7 @@ dependencies = [ [[package]] name = "holochain_nonce" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.4" dependencies = [ "getrandom", "holochain_secure_primitive", @@ -977,8 +1089,7 @@ dependencies = [ [[package]] name = "holochain_secure_primitive" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.1" dependencies = [ "paste", "serde", @@ -987,8 +1098,8 @@ dependencies = [ [[package]] name = "holochain_serialized_bytes" -version = "0.0.54" -source = "git+https://github.com/coasys/holochain-serialization.git?rev=6eaa4ea8913bfd977fcc4577e833f4dc18a215f7#6eaa4ea8913bfd977fcc4577e833f4dc18a215f7" +version = "0.0.55" +source = "git+https://github.com/coasys/holochain-serialization.git?rev=f9577913773931ec797261f90968903b1b4e27a8#f9577913773931ec797261f90968903b1b4e27a8" dependencies = [ "holochain_serialized_bytes_derive", "rmp-serde", @@ -1001,8 +1112,8 @@ dependencies = [ [[package]] name = "holochain_serialized_bytes_derive" -version = "0.0.54" -source = "git+https://github.com/coasys/holochain-serialization.git?rev=6eaa4ea8913bfd977fcc4577e833f4dc18a215f7#6eaa4ea8913bfd977fcc4577e833f4dc18a215f7" +version = "0.0.55" +source = "git+https://github.com/coasys/holochain-serialization.git?rev=f9577913773931ec797261f90968903b1b4e27a8#f9577913773931ec797261f90968903b1b4e27a8" dependencies = [ "quote", "syn 1.0.109", @@ -1010,8 +1121,7 @@ dependencies = [ [[package]] name = "holochain_util" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.1" dependencies = [ "cfg-if", "colored", @@ -1023,8 +1133,8 @@ dependencies = [ [[package]] name = "holochain_wasmer_common" -version = "0.0.94" -source = "git+https://github.com/coasys/holochain-wasmer.git?rev=52979e943861530bbafc48297b131fdec52c3e21#52979e943861530bbafc48297b131fdec52c3e21" +version = "0.0.95" +source = "git+https://github.com/coasys/holochain-wasmer.git?rev=b2af50855db66095b2503c2c091b79829f684e94#b2af50855db66095b2503c2c091b79829f684e94" dependencies = [ "holochain_serialized_bytes", "serde", @@ -1036,8 +1146,8 @@ dependencies = [ [[package]] name = "holochain_wasmer_guest" -version = "0.0.94" -source = "git+https://github.com/coasys/holochain-wasmer.git?rev=52979e943861530bbafc48297b131fdec52c3e21#52979e943861530bbafc48297b131fdec52c3e21" +version = "0.0.95" +source = "git+https://github.com/coasys/holochain-wasmer.git?rev=b2af50855db66095b2503c2c091b79829f684e94#b2af50855db66095b2503c2c091b79829f684e94" dependencies = [ "holochain_serialized_bytes", "holochain_wasmer_common", @@ -1049,8 +1159,7 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.9" dependencies = [ "derive_more", "holo_hash", @@ -1105,6 +1214,16 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "if_chain" version = "1.0.2" @@ -1119,16 +1238,18 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", + "serde", ] [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.3", + "serde", ] [[package]] @@ -1201,10 +1322,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.7" dependencies = [ - "base64", + "base64 0.22.1", "derive_more", "holochain_util", "kitsune_p2p_dht_arc", @@ -1215,8 +1335,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.7" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -1225,8 +1344,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.7" dependencies = [ "derive_more", "gcollections", @@ -1238,8 +1356,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" -version = "0.3.1-rc.0" -source = "git+https://github.com/coasys/holochain.git?rev=ed4809715172f80433f8c517bbbad0b6f510838a#ed4809715172f80433f8c517bbbad0b6f510838a" +version = "0.4.0-dev.2" dependencies = [ "chrono", "serde", @@ -1259,9 +1376,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.150" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "linux-raw-sys" @@ -1269,6 +1386,12 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" + [[package]] name = "lock_api" version = "0.4.11" @@ -1411,6 +1534,12 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + [[package]] name = "perspective_diff_sync" version = "0.0.1" @@ -1495,7 +1624,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.1.0", + "indexmap 2.2.6", ] [[package]] @@ -1736,9 +1865,9 @@ dependencies = [ [[package]] name = "rmp" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" dependencies = [ "byteorder", "num-traits", @@ -1747,9 +1876,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "1.1.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" +checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" dependencies = [ "byteorder", "rmp", @@ -1773,9 +1902,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.26" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.4.1", "errno", @@ -1805,6 +1934,31 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "schemars" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" +dependencies = [ + "dyn-clone", + "schemars_derive", + "serde", + "serde_json", + "url", +] + +[[package]] +name = "schemars_derive" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 2.0.66", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -1888,6 +2042,16 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_cbor" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" +dependencies = [ + "half", + "serde", +] + [[package]] name = "serde_derive" version = "1.0.203" @@ -1899,16 +2063,49 @@ dependencies = [ "syn 2.0.66", ] +[[package]] +name = "serde_derive_internals" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "serde_json" version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_yaml" +version = "0.9.34+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" +dependencies = [ + "indexmap 2.2.6", "itoa", "ryu", "serde", + "unsafe-libyaml", ] [[package]] @@ -2052,6 +2249,17 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +[[package]] +name = "tar" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +dependencies = [ + "filetime", + "libc", + "xattr", +] + [[package]] name = "target-lexicon" version = "0.12.12" @@ -2163,6 +2371,65 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +[[package]] +name = "toml" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.15", +] + +[[package]] +name = "toml_datetime" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.2.6", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1" +dependencies = [ + "indexmap 2.2.6", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.13", +] + [[package]] name = "toolchain_find" version = "0.2.0" @@ -2226,18 +2493,39 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + [[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + [[package]] name = "unicode-width" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +[[package]] +name = "unsafe-libyaml" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" + [[package]] name = "unzip-n" version = "0.1.2" @@ -2249,6 +2537,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + [[package]] name = "uuid" version = "1.6.1" @@ -2348,9 +2648,9 @@ dependencies = [ [[package]] name = "wasmer" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4014573f108a246858299eb230031e268316fd57207bd2e8afc79b20fc7ce983" +checksum = "6ce4a267a570e121c9375136adefa2c48810273907de9c6817bc19db4d6144bc" dependencies = [ "bytes", "cfg-if", @@ -2377,9 +2677,9 @@ dependencies = [ [[package]] name = "wasmer-compiler" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a77bfe259f08e8ec9e77f8f772ebfb4149f799d1f637231c5a5a6a90c447256" +checksum = "b9c23098e86ef1038155684fe50f0c1079a0e2a2e70f115b789df17e6ba98d20" dependencies = [ "backtrace", "bytes", @@ -2400,13 +2700,14 @@ dependencies = [ "wasmer-vm", "wasmparser", "winapi", + "xxhash-rust", ] [[package]] name = "wasmer-compiler-cranelift" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9280c47ebc754f95357745a38a995dd766f149e16b26e1b7e35741eb23c03d12" +checksum = "95287b79973ad5f485215733ef9f0d4bb951a6b7e655585d2bd3d4a4ba1253c9" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -2421,11 +2722,33 @@ dependencies = [ "wasmer-types", ] +[[package]] +name = "wasmer-config" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a0f70c177b1c5062cfe0f5308c3317751796fef9403c22a0cd7b4cacd4ccd8" +dependencies = [ + "anyhow", + "bytesize", + "derive_builder", + "hex", + "indexmap 2.2.6", + "schemars", + "semver 1.0.20", + "serde", + "serde_cbor", + "serde_json", + "serde_yaml", + "thiserror", + "toml 0.8.14", + "url", +] + [[package]] name = "wasmer-derive" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9352877c4f07fc59146d21b56ae6dc469caf342587f49c81b4fbeafead31972" +checksum = "e48f36aeeecb655f15fdd358bdf6e4cec27df181468fa4226084157e8462bd5e" dependencies = [ "proc-macro-error", "proc-macro2", @@ -2435,25 +2758,30 @@ dependencies = [ [[package]] name = "wasmer-types" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "749214b6170f2b2fbbfe5b7e7f8d381e64930ac4122f3abceb33cde0292d45d2" +checksum = "83cb97b6b20084757a2a8d548dc0d4179c3fe9e2d711740423a1e6aa3f8b9091" dependencies = [ "bytecheck", "enum-iterator", "enumset", + "getrandom", + "hex", "indexmap 1.9.3", "more-asserts", "rkyv", + "sha2", "target-lexicon", "thiserror", + "webc", + "xxhash-rust", ] [[package]] name = "wasmer-vm" -version = "4.2.8" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300215479de0deeb453e95aeb1b9c8ffd9bc7d9bd27c5f9e8a184e54db4d31a9" +checksum = "bc1e19d986844b17b927ec8b0c7f3da6a7a2c2cb3b0f8ca5d4cb1a1f71bfb124" dependencies = [ "backtrace", "cc", @@ -2484,7 +2812,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" dependencies = [ "bitflags 2.4.1", - "indexmap 2.1.0", + "indexmap 2.2.6", "semver 1.0.20", ] @@ -2509,6 +2837,35 @@ dependencies = [ "wast", ] +[[package]] +name = "webc" +version = "6.0.0-rc1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1fc686c7b43c9bc630a499f6ae1f0a4c4bd656576a53ae8a147b0cc9bc983ad" +dependencies = [ + "anyhow", + "base64 0.21.7", + "bytes", + "cfg-if", + "document-features", + "flate2", + "indexmap 1.9.3", + "libc", + "once_cell", + "semver 1.0.20", + "serde", + "serde_cbor", + "serde_json", + "sha2", + "shared-buffer", + "tar", + "tempfile", + "thiserror", + "toml 0.7.8", + "url", + "wasmer-config", +] + [[package]] name = "winapi" version = "0.3.9" @@ -2724,6 +3081,24 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +dependencies = [ + "memchr", +] + [[package]] name = "wyz" version = "0.5.1" @@ -2732,3 +3107,20 @@ checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" dependencies = [ "tap", ] + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys", + "rustix", +] + +[[package]] +name = "xxhash-rust" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63658493314859b4dfdf3fb8c1defd61587839def09582db50b8a4e93afca6bb" diff --git a/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync/Cargo.toml b/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync/Cargo.toml index 91dc04a03..1b331d3f8 100644 --- a/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync/Cargo.toml +++ b/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync/Cargo.toml @@ -21,8 +21,8 @@ dot-structures = "0.1.0" itertools = "0.10.3" perspective_diff_sync_integrity = { path = "../perspective_diff_sync_integrity" } sha2 = "0.10.5" -hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } -holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } +hdk = { version = "0.4.0-dev.9", path = "../../../../../../holochain/crates/hdk" } +holo_hash = { version = "0.4.0-dev.7", path = "../../../../../../holochain/crates/holo_hash" } [features] test = [] \ No newline at end of file diff --git a/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml b/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml index 47a18749a..d79b6bd5e 100644 --- a/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml +++ b/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml @@ -13,6 +13,6 @@ derive_more = "0" serde = "1.0.198" chrono = { version = "0.4.38", default-features = false, features = ["clock", "std", "oldtime", "serde"] } -holo_hash = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } -hdi = { version = "0.4.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } -hdk = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } \ No newline at end of file +hdk = { version = "0.4.0-dev.9", path = "../../../../../../holochain/crates/hdk" } +hdi = { version = "0.5.0-dev.8", path = "../../../../../../holochain/crates/hdi" } +holo_hash = { version = "0.4.0-dev.7", path = "../../../../../../holochain/crates/holo_hash" } \ No newline at end of file diff --git a/cli/Cargo.toml b/cli/Cargo.toml index e8c131f64..6d87f2312 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -44,4 +44,4 @@ syntect = "5.0" ctrlc = "3.4.0" #holochain_kitsune_p2p = "0.3.0-beta-dev.37" -kitsune_p2p_types = { version = "0.3.1-rc.0" } +kitsune_p2p_types = { version = "0.4.0-dev.8", path = "../../holochain/crates/kitsune_p2p/types" } diff --git a/executor/src/core/graphQL-interface/GraphQL.ts b/executor/src/core/graphQL-interface/GraphQL.ts index af922f6d5..9a2ac96fc 100644 --- a/executor/src/core/graphQL-interface/GraphQL.ts +++ b/executor/src/core/graphQL-interface/GraphQL.ts @@ -20,7 +20,7 @@ export function createResolvers(core: Ad4mCore, config: OuterConfig) { throw Error("Agent language does not have an expression adapter") } const expr = await agentLanguage.get(did); - if (expr != null) { + if (expr != null && Object.keys(expr).length > 0){ tagExpressionSignatureStatus(expr); for(const link of expr.data.perspective.links) { tagExpressionSignatureStatus(link) @@ -38,7 +38,11 @@ export function createResolvers(core: Ad4mCore, config: OuterConfig) { const url = args.url.toString(); const ref = parseExprUrl(url) const expression = await core.languageController.getExpression(ref); - if(expression) { + console.log("GQL| expression:", JSON.stringify(expression)); + if (expression && Object.keys(expression).length === 0) { + return null; + } else if(expression) { + console.log("GQL| expression 1:", JSON.stringify(expression)); expression.ref = ref expression.url = url expression.data = JSON.stringify(expression.data) @@ -75,7 +79,9 @@ export function createResolvers(core: Ad4mCore, config: OuterConfig) { const results = await Promise.all(expressionPromises); return await Promise.all(results.map(async (expression: Expression|null, index) => { - if(expression) { + if (expression && Object.keys(expression).length === 0) { + return null; + } else if(expression && Object.keys(expression).length > 0) { expression.ref = parseExprUrl(urls[index]); expression.url = urls[index]; expression.data = JSON.stringify(expression.data); diff --git a/rust-executor/Cargo.toml b/rust-executor/Cargo.toml index 6f9f1c5b1..bc1f33d08 100644 --- a/rust-executor/Cargo.toml +++ b/rust-executor/Cargo.toml @@ -30,10 +30,10 @@ path = "src/main.rs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -deno_core = "0.283.0" -deno_runtime = "0.162.0" +url = { version = "2.4.1", features = ["expose_internals"] } +deno_core = {version = "0.283.0", path = "../../deno_core/core"} +deno_runtime = {version = "0.162.0", path = "../../deno/runtime"} tokio = { version = "1.25.0", features = ["full"] } -url = "2.3.1" futures = "0.3.28" tokio-stream = { version = "0.1.12", features = ["sync"] } lazy_static = "1.4.0" @@ -55,7 +55,7 @@ fs_extra = "1.3.0" os_info = "3.7.0" semver = "1.0.17" did-key = "0.2.1" -zip = "0.6.4" +zip = {version = "2.1", path = "../../zip2"} multibase = "0.9.1" multihash = { version = "0.18.0", features = ["sha2"] } cid = "0.10.1" @@ -79,11 +79,21 @@ webbrowser = "0.8.12" # holochain_types = { version = "0.3.1-rc.0" } # holochain_cli_run_local_services = { version = "0.3.1-rc.0" } # kitsune_p2p_types = { version = "0.3.1-rc.0" } -holochain = { version = "0.3.1-rc.0", features = ["test_utils", "default"], git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } -holochain_cli_bundle = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } -holochain_types = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } -holochain_cli_run_local_services = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } -kitsune_p2p_types = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } +# holochain = { version = "0.4.0-dev.11", features = ["test_utils", "default"], git = "https://github.com/coasys/holochain.git", rev = "f5c2ca0e7021e12520f57ec15d383c7708fc4a92" } +# holochain_cli_bundle = { version = "0.4.0-dev.11", git = "https://github.com/coasys/holochain.git", rev = "f5c2ca0e7021e12520f57ec15d383c7708fc4a92" } +# holochain_types = { version = "0.4.0-dev.11", git = "https://github.com/coasys/holochain.git", rev = "f5c2ca0e7021e12520f57ec15d383c7708fc4a92" } +# holochain_cli_run_local_services = { version = "0.4.0-dev.10", git = "https://github.com/coasys/holochain.git", rev = "f5c2ca0e7021e12520f57ec15d383c7708fc4a92" } +# kitsune_p2p_types = { version = "0.4.0-dev.8", git = "https://github.com/coasys/holochain.git", rev = "f5c2ca0e7021e12520f57ec15d383c7708fc4a92" } +holochain = { version = "0.4.0-dev.11", features = ["test_utils", "default"], path = "../../holochain/crates/holochain" } +holochain_cli_bundle = { version = "0.4.0-dev.11", path = "../../holochain/crates/hc_bundle" } +holochain_types = { version = "0.4.0-dev.11", path = "../../holochain/crates/holochain_types" } +holochain_cli_run_local_services = { version = "0.4.0-dev.10", path = "../../holochain/crates/hc_run_local_services" } +kitsune_p2p_types = { version = "0.4.0-dev.8", path = "../../holochain/crates/kitsune_p2p/types" } +# holochain = { version = "0.3.1-rc.0", features = ["test_utils", "default"], git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } +# holochain_cli_bundle = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } +# holochain_types = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } +# holochain_cli_run_local_services = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } +# kitsune_p2p_types = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } scryer-prolog = { version = "0.9.4" } # scryer-prolog = { path = "../../scryer-prolog", features = ["multi_thread"] } diff --git a/rust-executor/src/holochain_service/mod.rs b/rust-executor/src/holochain_service/mod.rs index a6924df8b..532280b5c 100644 --- a/rust-executor/src/holochain_service/mod.rs +++ b/rust-executor/src/holochain_service/mod.rs @@ -382,12 +382,14 @@ impl HolochainService { // dev - wss://signal.holotest.net // our - ws://207.148.16.17:42697 signal_url: local_config.proxy_url, + webrtc_config: None }]; } else { kitsune_config.transport_pool = vec![ TransportConfig::Mem {}, TransportConfig::WebRTC { signal_url: local_config.proxy_url, + webrtc_config: None }, ]; } From 54132c42429f1e3b16db1a12733d9e79f23e9269 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Wed, 24 Jul 2024 16:02:19 +0530 Subject: [PATCH 34/37] chore: Update dependencies for HolochainService and Rust executor --- Cargo.lock | 75 +++++++++++++------ .../hc-dna/zomes/agent_store/Cargo.toml | 8 +- .../zomes/agent_store_integrity/Cargo.toml | 6 +- .../zomes/direct-message-integrity/Cargo.toml | 4 +- .../hc-dna/zomes/direct-message/Cargo.toml | 4 +- .../hc-dna/zomes/file_storage/Cargo.toml | 4 +- .../hc-dna/zomes/integrity/Cargo.toml | 6 +- .../zomes/perspective_diff_sync/Cargo.toml | 4 +- .../Cargo.toml | 6 +- .../zomes/perspective_diff_sync/Cargo.toml | 4 +- .../Cargo.toml | 6 +- cli/Cargo.toml | 3 +- rust-executor/Cargo.toml | 25 +++---- 13 files changed, 91 insertions(+), 64 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2bbf0796c..67d1d2a3c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -279,6 +279,7 @@ dependencies = [ [[package]] name = "aitia" version = "0.3.0-dev.3" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "anyhow", "derive_more", @@ -4626,6 +4627,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "fixt" version = "0.4.0-dev.2" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "holochain_serialized_bytes", "lazy_static", @@ -5688,6 +5690,7 @@ dependencies = [ [[package]] name = "hc_sleuth" version = "0.4.0-dev.11" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "aitia", "anyhow", @@ -5709,6 +5712,7 @@ dependencies = [ [[package]] name = "hdi" version = "0.5.0-dev.8" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "getrandom 0.2.15", "hdk_derive", @@ -5725,6 +5729,7 @@ dependencies = [ [[package]] name = "hdk" version = "0.4.0-dev.9" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "getrandom 0.2.15", "hdi", @@ -5743,6 +5748,7 @@ dependencies = [ [[package]] name = "hdk_derive" version = "0.4.0-dev.8" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "darling 0.14.4", "heck 0.5.0", @@ -5913,6 +5919,7 @@ dependencies = [ [[package]] name = "holo_hash" version = "0.4.0-dev.7" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "arbitrary", "base64 0.22.1", @@ -5926,7 +5933,7 @@ dependencies = [ "kitsune_p2p_dht_arc", "must_future", "proptest", - "proptest-derive 0.4.0", + "proptest-derive", "rand 0.8.5", "rusqlite", "serde", @@ -5937,6 +5944,7 @@ dependencies = [ [[package]] name = "holochain" version = "0.4.0-dev.11" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "aitia", "anyhow", @@ -6035,6 +6043,7 @@ dependencies = [ [[package]] name = "holochain_cascade" version = "0.4.0-dev.11" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "async-trait", "fixt", @@ -6060,6 +6069,7 @@ dependencies = [ [[package]] name = "holochain_cli_bundle" version = "0.4.0-dev.11" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "anyhow", "clap 4.5.9", @@ -6079,6 +6089,7 @@ dependencies = [ [[package]] name = "holochain_cli_run_local_services" version = "0.4.0-dev.10" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "clap 4.5.9", "futures", @@ -6093,6 +6104,7 @@ dependencies = [ [[package]] name = "holochain_conductor_api" version = "0.4.0-dev.11" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "derive_more", "holo_hash", @@ -6114,6 +6126,7 @@ dependencies = [ [[package]] name = "holochain_conductor_services" version = "0.3.0-dev.11" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "anyhow", "async-trait", @@ -6128,6 +6141,7 @@ dependencies = [ [[package]] name = "holochain_integrity_types" version = "0.4.0-dev.8" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "arbitrary", "derive_builder 0.20.0", @@ -6137,7 +6151,7 @@ dependencies = [ "holochain_util", "kitsune_p2p_timestamp", "proptest", - "proptest-derive 0.4.0", + "proptest-derive", "serde", "serde_bytes", "subtle 2.6.1", @@ -6148,6 +6162,7 @@ dependencies = [ [[package]] name = "holochain_keystore" version = "0.4.0-dev.11" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "base64 0.22.1", "derive_more", @@ -6175,6 +6190,7 @@ dependencies = [ [[package]] name = "holochain_metrics" version = "0.4.0-dev.3" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "influxive", "opentelemetry_api", @@ -6184,6 +6200,7 @@ dependencies = [ [[package]] name = "holochain_nonce" version = "0.4.0-dev.4" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "getrandom 0.2.15", "holochain_secure_primitive", @@ -6193,6 +6210,7 @@ dependencies = [ [[package]] name = "holochain_p2p" version = "0.4.0-dev.11" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "aitia", "async-trait", @@ -6223,6 +6241,7 @@ dependencies = [ [[package]] name = "holochain_secure_primitive" version = "0.4.0-dev.1" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "paste", "serde", @@ -6237,7 +6256,7 @@ dependencies = [ "arbitrary", "holochain_serialized_bytes_derive", "proptest", - "proptest-derive 0.4.0", + "proptest-derive", "rmp-serde", "serde", "serde-transcode", @@ -6258,6 +6277,7 @@ dependencies = [ [[package]] name = "holochain_sqlite" version = "0.4.0-dev.11" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "anyhow", "async-trait", @@ -6299,6 +6319,7 @@ dependencies = [ [[package]] name = "holochain_state" version = "0.4.0-dev.11" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "aitia", "async-recursion", @@ -6333,6 +6354,7 @@ dependencies = [ [[package]] name = "holochain_state_types" version = "0.4.0-dev.8" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "holo_hash", "holochain_integrity_types", @@ -6342,6 +6364,7 @@ dependencies = [ [[package]] name = "holochain_test_wasm_common" version = "0.4.0-dev.9" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "hdk", "serde", @@ -6350,6 +6373,7 @@ dependencies = [ [[package]] name = "holochain_trace" version = "0.4.0-dev.3" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "chrono", "derive_more", @@ -6366,6 +6390,7 @@ dependencies = [ [[package]] name = "holochain_types" version = "0.4.0-dev.11" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "anyhow", "arbitrary", @@ -6396,7 +6421,7 @@ dependencies = [ "one_err", "parking_lot 0.12.3", "proptest", - "proptest-derive 0.4.0", + "proptest-derive", "rand 0.8.5", "regex", "rusqlite", @@ -6418,6 +6443,7 @@ dependencies = [ [[package]] name = "holochain_util" version = "0.4.0-dev.1" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "backtrace", "cfg-if 1.0.0", @@ -6434,6 +6460,7 @@ dependencies = [ [[package]] name = "holochain_wasm_test_utils" version = "0.4.0-dev.11" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "holochain_types", "holochain_util", @@ -6490,6 +6517,7 @@ dependencies = [ [[package]] name = "holochain_websocket" version = "0.4.0-dev.11" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "async-trait", "futures", @@ -6505,6 +6533,7 @@ dependencies = [ [[package]] name = "holochain_zome_types" version = "0.4.0-dev.9" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "arbitrary", "contrafact", @@ -6523,7 +6552,7 @@ dependencies = [ "num_enum 0.7.2", "once_cell", "proptest", - "proptest-derive 0.4.0", + "proptest-derive", "rand 0.8.5", "rusqlite", "serde", @@ -7461,6 +7490,7 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] name = "kitsune_p2p" version = "0.4.0-dev.10" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "arrayref", "base64 0.22.1", @@ -7505,6 +7535,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" version = "0.4.0-dev.7" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "arbitrary", "base64 0.22.1", @@ -7513,7 +7544,7 @@ dependencies = [ "holochain_util", "kitsune_p2p_dht_arc", "proptest", - "proptest-derive 0.4.0", + "proptest-derive", "serde", "serde_bytes", "shrinkwraprs", @@ -7522,6 +7553,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" version = "0.4.0-dev.7" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -7531,6 +7563,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_bootstrap" version = "0.3.0-dev.9" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "clap 4.5.9", "futures", @@ -7549,6 +7582,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_bootstrap_client" version = "0.4.0-dev.9" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_bootstrap", @@ -7562,6 +7596,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht" version = "0.4.0-dev.7" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "arbitrary", "colored", @@ -7573,7 +7608,7 @@ dependencies = [ "must_future", "num-traits", "proptest", - "proptest-derive 0.5.0", + "proptest-derive", "rand 0.8.5", "serde", "statrs", @@ -7584,6 +7619,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" version = "0.4.0-dev.7" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "arbitrary", "derive_more", @@ -7592,7 +7628,7 @@ dependencies = [ "kitsune_p2p_timestamp", "num-traits", "proptest", - "proptest-derive 0.5.0", + "proptest-derive", "rusqlite", "serde", ] @@ -7600,6 +7636,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_fetch" version = "0.4.0-dev.8" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "backon", "derive_more", @@ -7614,6 +7651,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_mdns" version = "0.4.0-dev.2" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "base64 0.22.1", "err-derive 0.3.1", @@ -7627,6 +7665,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_proxy" version = "0.4.0-dev.8" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "base64 0.22.1", "derive_more", @@ -7642,12 +7681,13 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" version = "0.4.0-dev.2" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "arbitrary", "chrono", "once_cell", "proptest", - "proptest-derive 0.5.0", + "proptest-derive", "rand 0.8.5", "rusqlite", "serde", @@ -7656,6 +7696,7 @@ dependencies = [ [[package]] name = "kitsune_p2p_types" version = "0.4.0-dev.8" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "arbitrary", "base64 0.22.1", @@ -7674,7 +7715,7 @@ dependencies = [ "parking_lot 0.12.3", "paste", "proptest", - "proptest-derive 0.4.0", + "proptest-derive", "rmp-serde", "rustls 0.20.9", "serde", @@ -8604,6 +8645,7 @@ checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" [[package]] name = "mr_bundle" version = "0.4.0-dev.4" +source = "git+https://github.com/coasys/holochain?rev=60b035888f15b9989e2852f6399f692fb73f5a7e#60b035888f15b9989e2852f6399f692fb73f5a7e" dependencies = [ "arbitrary", "derive_more", @@ -8611,7 +8653,7 @@ dependencies = [ "futures", "holochain_util", "proptest", - "proptest-derive 0.4.0", + "proptest-derive", "reqwest", "rmp-serde", "serde", @@ -10473,17 +10515,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "proptest-derive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.71", -] - [[package]] name = "prost" version = "0.11.9" diff --git a/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/Cargo.toml b/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/Cargo.toml index 3f5cc8cf1..ec384d340 100644 --- a/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/Cargo.toml +++ b/bootstrap-languages/agent-language/hc-dna/zomes/agent_store/Cargo.toml @@ -14,8 +14,8 @@ serde = "1.0.198" chrono = { version = "0.4.38", default-features = false, features = ["clock", "std", "oldtime", "serde"] } thiserror = "1.0.20" -# hdk = { version = "0.4.0-dev.9", path = "../../../../../../holochain/crates/hdk" } -# hdk = { version = "0.4.0-dev.9", path = "../../../../../../holochain/crates/hdk" } -hdk = { version = "0.4.0-dev.9", path = "../../../../../../holochain/crates/hdk" } -holo_hash = { version = "0.4.0-dev.7", path = "../../../../../../holochain/crates/holo_hash" } +# hdk = { version = "0.4.0-dev.9", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e" } +# hdk = { version = "0.4.0-dev.9", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e" } +hdk = { version = "0.4.0-dev.9", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e" } +holo_hash = { version = "0.4.0-dev.7", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e"} agent_store_integrity = { path = "../agent_store_integrity" } \ No newline at end of file diff --git a/bootstrap-languages/agent-language/hc-dna/zomes/agent_store_integrity/Cargo.toml b/bootstrap-languages/agent-language/hc-dna/zomes/agent_store_integrity/Cargo.toml index 64331cc37..cb43b813e 100644 --- a/bootstrap-languages/agent-language/hc-dna/zomes/agent_store_integrity/Cargo.toml +++ b/bootstrap-languages/agent-language/hc-dna/zomes/agent_store_integrity/Cargo.toml @@ -13,6 +13,6 @@ derive_more = "0" serde = "1.0.198" chrono = { version = "0.4.38", default-features = false, features = ["clock", "std", "oldtime", "serde"] } -# hdi = { version = "0.5.0-dev.8", path = "../../../../../../holochain/crates/hdi" } -hdk = { version = "0.4.0-dev.9", path = "../../../../../../holochain/crates/hdk" } -hdi = { version = "0.5.0-dev.8", path = "../../../../../../holochain/crates/hdi" } \ No newline at end of file +# hdi = { version = "0.5.0-dev.8", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e" } +hdk = { version = "0.4.0-dev.9", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e" } +hdi = { version = "0.5.0-dev.8", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e" } \ No newline at end of file diff --git a/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message-integrity/Cargo.toml b/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message-integrity/Cargo.toml index 97a129298..4ca7155a4 100644 --- a/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message-integrity/Cargo.toml +++ b/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message-integrity/Cargo.toml @@ -13,5 +13,5 @@ derive_more = "0" serde = "1.0.198" chrono = { version = "0.4.38", default-features = false, features = ["clock", "std", "oldtime", "serde"] } -hdi = { version = "0.5.0-dev.8", path = "../../../../../../holochain/crates/hdi" } -hdk = { version = "0.4.0-dev.9", path = "../../../../../../holochain/crates/hdk" } +hdi = { version = "0.5.0-dev.8", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e" } +hdk = { version = "0.4.0-dev.9", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e" } diff --git a/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message/Cargo.toml b/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message/Cargo.toml index 7eb88a419..6203b7b95 100644 --- a/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message/Cargo.toml +++ b/bootstrap-languages/direct-message-language/hc-dna/zomes/direct-message/Cargo.toml @@ -15,7 +15,7 @@ serde_json = "1" chrono = { version = "0.4.38", default-features = false, features = ["clock", "std", "oldtime", "serde"] } hex = "0.4.3" -hdk = { version = "0.4.0-dev.9", path = "../../../../../../holochain/crates/hdk" } -holo_hash = { version = "0.4.0-dev.7", path = "../../../../../../holochain/crates/holo_hash" } +hdk = { version = "0.4.0-dev.9", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e" } +holo_hash = { version = "0.4.0-dev.7", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e"} direct-message-integrity = { path = "../direct-message-integrity" } \ No newline at end of file diff --git a/bootstrap-languages/file-storage/hc-dna/zomes/file_storage/Cargo.toml b/bootstrap-languages/file-storage/hc-dna/zomes/file_storage/Cargo.toml index 60039e1d7..a0d1d1de1 100644 --- a/bootstrap-languages/file-storage/hc-dna/zomes/file_storage/Cargo.toml +++ b/bootstrap-languages/file-storage/hc-dna/zomes/file_storage/Cargo.toml @@ -17,5 +17,5 @@ chrono = { version = "0.4.38", default-features = false, features = ["clock", "s thiserror = "1.0.20" integrity = { path = "../integrity" } sha2 = "0.10.5" -hdk = { version = "0.4.0-dev.9", path = "../../../../../../holochain/crates/hdk" } -holo_hash = { version = "0.4.0-dev.7", path = "../../../../../../holochain/crates/holo_hash" } \ No newline at end of file +hdk = { version = "0.4.0-dev.9", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e" } +holo_hash = { version = "0.4.0-dev.7", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e"} \ No newline at end of file diff --git a/bootstrap-languages/file-storage/hc-dna/zomes/integrity/Cargo.toml b/bootstrap-languages/file-storage/hc-dna/zomes/integrity/Cargo.toml index 2ee40f379..5e9cbcdfb 100644 --- a/bootstrap-languages/file-storage/hc-dna/zomes/integrity/Cargo.toml +++ b/bootstrap-languages/file-storage/hc-dna/zomes/integrity/Cargo.toml @@ -13,6 +13,6 @@ name = "integrity" derive_more = "0" serde = "1.0.198" chrono = { version = "0.4.38", default-features = false, features = ["clock", "std", "oldtime", "serde"] } -hdk = { version = "0.4.0-dev.9", path = "../../../../../../holochain/crates/hdk" } -hdi = { version = "0.5.0-dev.8", path = "../../../../../../holochain/crates/hdi" } -holo_hash = { version = "0.4.0-dev.7", path = "../../../../../../holochain/crates/holo_hash" } +hdk = { version = "0.4.0-dev.9", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e" } +hdi = { version = "0.5.0-dev.8", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e" } +holo_hash = { version = "0.4.0-dev.7", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e"} diff --git a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync/Cargo.toml b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync/Cargo.toml index 1b331d3f8..b65590cf8 100644 --- a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync/Cargo.toml +++ b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync/Cargo.toml @@ -21,8 +21,8 @@ dot-structures = "0.1.0" itertools = "0.10.3" perspective_diff_sync_integrity = { path = "../perspective_diff_sync_integrity" } sha2 = "0.10.5" -hdk = { version = "0.4.0-dev.9", path = "../../../../../../holochain/crates/hdk" } -holo_hash = { version = "0.4.0-dev.7", path = "../../../../../../holochain/crates/holo_hash" } +hdk = { version = "0.4.0-dev.9", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e" } +holo_hash = { version = "0.4.0-dev.7", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e"} [features] test = [] \ No newline at end of file diff --git a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml index d79b6bd5e..5c716566b 100644 --- a/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml +++ b/bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml @@ -13,6 +13,6 @@ derive_more = "0" serde = "1.0.198" chrono = { version = "0.4.38", default-features = false, features = ["clock", "std", "oldtime", "serde"] } -hdk = { version = "0.4.0-dev.9", path = "../../../../../../holochain/crates/hdk" } -hdi = { version = "0.5.0-dev.8", path = "../../../../../../holochain/crates/hdi" } -holo_hash = { version = "0.4.0-dev.7", path = "../../../../../../holochain/crates/holo_hash" } \ No newline at end of file +hdk = { version = "0.4.0-dev.9", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e" } +hdi = { version = "0.5.0-dev.8", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e" } +holo_hash = { version = "0.4.0-dev.7", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e"} \ No newline at end of file diff --git a/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync/Cargo.toml b/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync/Cargo.toml index 1b331d3f8..b65590cf8 100644 --- a/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync/Cargo.toml +++ b/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync/Cargo.toml @@ -21,8 +21,8 @@ dot-structures = "0.1.0" itertools = "0.10.3" perspective_diff_sync_integrity = { path = "../perspective_diff_sync_integrity" } sha2 = "0.10.5" -hdk = { version = "0.4.0-dev.9", path = "../../../../../../holochain/crates/hdk" } -holo_hash = { version = "0.4.0-dev.7", path = "../../../../../../holochain/crates/holo_hash" } +hdk = { version = "0.4.0-dev.9", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e" } +holo_hash = { version = "0.4.0-dev.7", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e"} [features] test = [] \ No newline at end of file diff --git a/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml b/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml index d79b6bd5e..5c716566b 100644 --- a/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml +++ b/bootstrap-languages/p-diff-sync/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml @@ -13,6 +13,6 @@ derive_more = "0" serde = "1.0.198" chrono = { version = "0.4.38", default-features = false, features = ["clock", "std", "oldtime", "serde"] } -hdk = { version = "0.4.0-dev.9", path = "../../../../../../holochain/crates/hdk" } -hdi = { version = "0.5.0-dev.8", path = "../../../../../../holochain/crates/hdi" } -holo_hash = { version = "0.4.0-dev.7", path = "../../../../../../holochain/crates/holo_hash" } \ No newline at end of file +hdk = { version = "0.4.0-dev.9", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e" } +hdi = { version = "0.5.0-dev.8", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e" } +holo_hash = { version = "0.4.0-dev.7", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e"} \ No newline at end of file diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 6d87f2312..b70d3d870 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -44,4 +44,5 @@ syntect = "5.0" ctrlc = "3.4.0" #holochain_kitsune_p2p = "0.3.0-beta-dev.37" -kitsune_p2p_types = { version = "0.4.0-dev.8", path = "../../holochain/crates/kitsune_p2p/types" } +# kitsune_p2p_types = { version = "0.4.0-dev.8", path = "../../holochain/crates/kitsune_p2p/types" } +kitsune_p2p_types = { version = "0.4.0-dev.8", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e"} diff --git a/rust-executor/Cargo.toml b/rust-executor/Cargo.toml index bc1f33d08..13e80818a 100644 --- a/rust-executor/Cargo.toml +++ b/rust-executor/Cargo.toml @@ -74,26 +74,21 @@ jsonwebtoken = "8.3.0" webbrowser = "0.8.12" -# holochain = { version = "0.3.1-rc.0", features = ["test_utils", "default"] } -# holochain_cli_bundle = { version = "0.3.1-rc.0" } -# holochain_types = { version = "0.3.1-rc.0" } -# holochain_cli_run_local_services = { version = "0.3.1-rc.0" } -# kitsune_p2p_types = { version = "0.3.1-rc.0" } # holochain = { version = "0.4.0-dev.11", features = ["test_utils", "default"], git = "https://github.com/coasys/holochain.git", rev = "f5c2ca0e7021e12520f57ec15d383c7708fc4a92" } # holochain_cli_bundle = { version = "0.4.0-dev.11", git = "https://github.com/coasys/holochain.git", rev = "f5c2ca0e7021e12520f57ec15d383c7708fc4a92" } # holochain_types = { version = "0.4.0-dev.11", git = "https://github.com/coasys/holochain.git", rev = "f5c2ca0e7021e12520f57ec15d383c7708fc4a92" } # holochain_cli_run_local_services = { version = "0.4.0-dev.10", git = "https://github.com/coasys/holochain.git", rev = "f5c2ca0e7021e12520f57ec15d383c7708fc4a92" } # kitsune_p2p_types = { version = "0.4.0-dev.8", git = "https://github.com/coasys/holochain.git", rev = "f5c2ca0e7021e12520f57ec15d383c7708fc4a92" } -holochain = { version = "0.4.0-dev.11", features = ["test_utils", "default"], path = "../../holochain/crates/holochain" } -holochain_cli_bundle = { version = "0.4.0-dev.11", path = "../../holochain/crates/hc_bundle" } -holochain_types = { version = "0.4.0-dev.11", path = "../../holochain/crates/holochain_types" } -holochain_cli_run_local_services = { version = "0.4.0-dev.10", path = "../../holochain/crates/hc_run_local_services" } -kitsune_p2p_types = { version = "0.4.0-dev.8", path = "../../holochain/crates/kitsune_p2p/types" } -# holochain = { version = "0.3.1-rc.0", features = ["test_utils", "default"], git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } -# holochain_cli_bundle = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } -# holochain_types = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } -# holochain_cli_run_local_services = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } -# kitsune_p2p_types = { version = "0.3.1-rc.0", git = "https://github.com/coasys/holochain.git", rev = "ed4809715172f80433f8c517bbbad0b6f510838a" } +# holochain = { version = "0.4.0-dev.11", features = ["test_utils", "default"], path = "../../holochain/crates/holochain" } +# holochain_cli_bundle = { version = "0.4.0-dev.11", path = "../../holochain/crates/hc_bundle" } +# holochain_types = { version = "0.4.0-dev.11", path = "../../holochain/crates/holochain_types" } +# holochain_cli_run_local_services = { version = "0.4.0-dev.10", path = "../../holochain/crates/hc_run_local_services" } +# kitsune_p2p_types = { version = "0.4.0-dev.8", path = "../../holochain/crates/kitsune_p2p/types" } +holochain = { version = "0.4.0-dev.11", features = ["test_utils", "default"], git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e"} +holochain_cli_bundle = { version = "0.4.0-dev.11", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e" } +holochain_types = { version = "0.4.0-dev.11", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e" } +holochain_cli_run_local_services = { version = "0.4.0-dev.10", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e" } +kitsune_p2p_types = { version = "0.4.0-dev.8", git = "https://github.com/coasys/holochain", rev = "60b035888f15b9989e2852f6399f692fb73f5a7e"} scryer-prolog = { version = "0.9.4" } # scryer-prolog = { path = "../../scryer-prolog", features = ["multi_thread"] } From 14fe094cee6ea9b635eb4446cfccc03945841af4 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Wed, 24 Jul 2024 16:12:21 +0530 Subject: [PATCH 35/37] chore: Update dependencies for HolochainService and Rust executor --- Cargo.lock | 30 ++++++++++++------------------ rust-executor/Cargo.toml | 6 +++--- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 67d1d2a3c..b6bf3dde7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1127,15 +1127,6 @@ dependencies = [ "bit-vec 0.6.3", ] -[[package]] -name = "bit-set" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" -dependencies = [ - "bit-vec 0.7.0", -] - [[package]] name = "bit-vec" version = "0.6.3" @@ -2940,11 +2931,12 @@ dependencies = [ [[package]] name = "deno_core" version = "0.283.0" +source = "git+https://github.com/coasys/deno_core.git?rev=b2bb94e32c2e94b18279cd1b36e4c198b183c826#b2bb94e32c2e94b18279cd1b36e4c198b183c826" dependencies = [ "anyhow", "bincode", - "bit-set 0.6.0", - "bit-vec 0.7.0", + "bit-set", + "bit-vec 0.6.3", "bytes", "cooked-waker", "deno_core_icudata", @@ -3267,6 +3259,7 @@ dependencies = [ [[package]] name = "deno_ops" version = "0.159.0" +source = "git+https://github.com/coasys/deno_core.git?rev=b2bb94e32c2e94b18279cd1b36e4c198b183c826#b2bb94e32c2e94b18279cd1b36e4c198b183c826" dependencies = [ "proc-macro-rules", "proc-macro2", @@ -4952,7 +4945,7 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f551fdf23ef80329f754919669147a71c67b6cfe3569cd93b6fabdd62044377" dependencies = [ - "bit-set 0.5.3", + "bit-set", "num-integer", "num-traits", "trilean", @@ -7193,7 +7186,7 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18bfda24d3930aa647f90044d5ef87d0c8120f13b86b2d60e8aade66e656e659" dependencies = [ - "bit-set 0.5.3", + "bit-set", "gcollections", "num-integer", "num-traits", @@ -8768,7 +8761,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e536ae46fcab0876853bd4a632ede5df4b1c2527a58f6c5a4150fe86be858231" dependencies = [ "arrayvec 0.7.4", - "bit-set 0.5.3", + "bit-set", "bitflags 2.6.0", "codespan-reporting", "hexf-parse", @@ -10490,7 +10483,7 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" dependencies = [ - "bit-set 0.5.3", + "bit-set", "bit-vec 0.6.3", "bitflags 2.6.0", "lazy_static", @@ -12024,7 +12017,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2ae0d3cc44e736916c19ba2297954d4ec711ab1ec8c6c6edfefac76fa4e4b5d" dependencies = [ "base64 0.12.3", - "bit-set 0.5.3", + "bit-set", "bitvec", "blake2 0.8.1", "bytes", @@ -12197,7 +12190,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f9da09dc3f4dfdb6374cbffff7a2cffcec316874d4429899eefdc97b3b94dcd" dependencies = [ - "bit-set 0.5.3", + "bit-set", "html5ever", "markup5ever_rcdom", ] @@ -12408,6 +12401,7 @@ dependencies = [ [[package]] name = "serde_v8" version = "0.192.0" +source = "git+https://github.com/coasys/deno_core.git?rev=b2bb94e32c2e94b18279cd1b36e4c198b183c826#b2bb94e32c2e94b18279cd1b36e4c198b183c826" dependencies = [ "num-bigint", "serde", @@ -16001,7 +15995,7 @@ dependencies = [ "android_system_properties", "arrayvec 0.7.4", "ash", - "bit-set 0.5.3", + "bit-set", "bitflags 2.6.0", "block", "cfg_aliases", diff --git a/rust-executor/Cargo.toml b/rust-executor/Cargo.toml index 13e80818a..109b01d7f 100644 --- a/rust-executor/Cargo.toml +++ b/rust-executor/Cargo.toml @@ -31,8 +31,8 @@ path = "src/main.rs" [dependencies] url = { version = "2.4.1", features = ["expose_internals"] } -deno_core = {version = "0.283.0", path = "../../deno_core/core"} -deno_runtime = {version = "0.162.0", path = "../../deno/runtime"} +deno_core = {version = "0.283.0", git = "https://github.com/coasys/deno_core.git", rev = "b2bb94e32c2e94b18279cd1b36e4c198b183c826" } +deno_runtime = {version = "0.162.0", git = "https://github.com/coasys/deno.git", rev = "f339804dd995a04eaacb467b6dcf9a04b21a7b81"} tokio = { version = "1.25.0", features = ["full"] } futures = "0.3.28" tokio-stream = { version = "0.1.12", features = ["sync"] } @@ -55,7 +55,7 @@ fs_extra = "1.3.0" os_info = "3.7.0" semver = "1.0.17" did-key = "0.2.1" -zip = {version = "2.1", path = "../../zip2"} +zip = {version = "2.1", git = "https://github.com/coasys/zip.git", rev = "b2bb94e32c2e94b18279cd1b36e4c198b183c826"} multibase = "0.9.1" multihash = { version = "0.18.0", features = ["sha2"] } cid = "0.10.1" From f055e96e822f82c40ded503640af2ef0524581d5 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Wed, 24 Jul 2024 16:26:10 +0530 Subject: [PATCH 36/37] chore: Update zip dependency to use new repository URL --- rust-executor/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-executor/Cargo.toml b/rust-executor/Cargo.toml index 109b01d7f..5b4193648 100644 --- a/rust-executor/Cargo.toml +++ b/rust-executor/Cargo.toml @@ -55,7 +55,7 @@ fs_extra = "1.3.0" os_info = "3.7.0" semver = "1.0.17" did-key = "0.2.1" -zip = {version = "2.1", git = "https://github.com/coasys/zip.git", rev = "b2bb94e32c2e94b18279cd1b36e4c198b183c826"} +zip = {version = "2.1", git = "https://github.com/coasys/zip2.git", rev = "a6e30f1d6379e2818814ba9662ad565e43f26afe"} multibase = "0.9.1" multihash = { version = "0.18.0", features = ["sha2"] } cid = "0.10.1" From 2e86ba4d0812de2bbe5f91bcfea05c2756782af1 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Wed, 24 Jul 2024 16:57:51 +0530 Subject: [PATCH 37/37] chore: Update deno_runtime dependency to latest version --- Cargo.lock | 55 ++++++++++++++++++++-------------------- rust-executor/Cargo.toml | 2 +- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b6bf3dde7..22f09c198 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -122,7 +122,7 @@ dependencies = [ "uuid 1.10.0", "warp", "webbrowser", - "zip 2.1.3", + "zip 2.1.3 (git+https://github.com/coasys/zip2.git?rev=a6e30f1d6379e2818814ba9662ad565e43f26afe)", ] [[package]] @@ -2853,6 +2853,8 @@ checksum = "83ace6c86376be0b6cdcf3fb41882e81d94b31587573d1cfa9d01cd06bba210d" [[package]] name = "deno_ast" version = "0.38.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "584547d27786a734536fde7088f8429d355569c39410427be44695c300618408" dependencies = [ "anyhow", "base64 0.21.7", @@ -2892,6 +2894,7 @@ dependencies = [ [[package]] name = "deno_broadcast_channel" version = "0.148.0" +source = "git+https://github.com/coasys/deno.git?rev=67f33167d1643bd4bcc14bfc40d2316c76be848a#67f33167d1643bd4bcc14bfc40d2316c76be848a" dependencies = [ "async-trait", "deno_core", @@ -2902,6 +2905,7 @@ dependencies = [ [[package]] name = "deno_cache" version = "0.86.0" +source = "git+https://github.com/coasys/deno.git?rev=67f33167d1643bd4bcc14bfc40d2316c76be848a#67f33167d1643bd4bcc14bfc40d2316c76be848a" dependencies = [ "async-trait", "deno_core", @@ -2914,6 +2918,7 @@ dependencies = [ [[package]] name = "deno_canvas" version = "0.23.0" +source = "git+https://github.com/coasys/deno.git?rev=67f33167d1643bd4bcc14bfc40d2316c76be848a#67f33167d1643bd4bcc14bfc40d2316c76be848a" dependencies = [ "deno_core", "deno_webgpu", @@ -2924,6 +2929,7 @@ dependencies = [ [[package]] name = "deno_console" version = "0.154.0" +source = "git+https://github.com/coasys/deno.git?rev=67f33167d1643bd4bcc14bfc40d2316c76be848a#67f33167d1643bd4bcc14bfc40d2316c76be848a" dependencies = [ "deno_core", ] @@ -2967,6 +2973,7 @@ checksum = "a13951ea98c0a4c372f162d669193b4c9d991512de9f2381dd161027f34b26b1" [[package]] name = "deno_cron" version = "0.34.0" +source = "git+https://github.com/coasys/deno.git?rev=67f33167d1643bd4bcc14bfc40d2316c76be848a#67f33167d1643bd4bcc14bfc40d2316c76be848a" dependencies = [ "anyhow", "async-trait", @@ -2979,6 +2986,7 @@ dependencies = [ [[package]] name = "deno_crypto" version = "0.168.0" +source = "git+https://github.com/coasys/deno.git?rev=67f33167d1643bd4bcc14bfc40d2316c76be848a#67f33167d1643bd4bcc14bfc40d2316c76be848a" dependencies = [ "aes", "aes-gcm", @@ -3012,6 +3020,7 @@ dependencies = [ [[package]] name = "deno_fetch" version = "0.178.0" +source = "git+https://github.com/coasys/deno.git?rev=67f33167d1643bd4bcc14bfc40d2316c76be848a#67f33167d1643bd4bcc14bfc40d2316c76be848a" dependencies = [ "bytes", "data-url", @@ -3029,6 +3038,7 @@ dependencies = [ [[package]] name = "deno_ffi" version = "0.141.0" +source = "git+https://github.com/coasys/deno.git?rev=67f33167d1643bd4bcc14bfc40d2316c76be848a#67f33167d1643bd4bcc14bfc40d2316c76be848a" dependencies = [ "deno_core", "dlopen2", @@ -3045,6 +3055,7 @@ dependencies = [ [[package]] name = "deno_fs" version = "0.64.0" +source = "git+https://github.com/coasys/deno.git?rev=67f33167d1643bd4bcc14bfc40d2316c76be848a#67f33167d1643bd4bcc14bfc40d2316c76be848a" dependencies = [ "async-trait", "base32", @@ -3063,6 +3074,7 @@ dependencies = [ [[package]] name = "deno_http" version = "0.152.0" +source = "git+https://github.com/coasys/deno.git?rev=67f33167d1643bd4bcc14bfc40d2316c76be848a#67f33167d1643bd4bcc14bfc40d2316c76be848a" dependencies = [ "async-compression", "async-trait", @@ -3099,6 +3111,7 @@ dependencies = [ [[package]] name = "deno_io" version = "0.64.0" +source = "git+https://github.com/coasys/deno.git?rev=67f33167d1643bd4bcc14bfc40d2316c76be848a#67f33167d1643bd4bcc14bfc40d2316c76be848a" dependencies = [ "async-trait", "deno_core", @@ -3116,6 +3129,7 @@ dependencies = [ [[package]] name = "deno_kv" version = "0.62.0" +source = "git+https://github.com/coasys/deno.git?rev=67f33167d1643bd4bcc14bfc40d2316c76be848a#67f33167d1643bd4bcc14bfc40d2316c76be848a" dependencies = [ "anyhow", "async-trait", @@ -3153,6 +3167,7 @@ dependencies = [ [[package]] name = "deno_napi" version = "0.84.0" +source = "git+https://github.com/coasys/deno.git?rev=67f33167d1643bd4bcc14bfc40d2316c76be848a#67f33167d1643bd4bcc14bfc40d2316c76be848a" dependencies = [ "deno_core", "libloading 0.7.4", @@ -3174,6 +3189,7 @@ dependencies = [ [[package]] name = "deno_net" version = "0.146.0" +source = "git+https://github.com/coasys/deno.git?rev=67f33167d1643bd4bcc14bfc40d2316c76be848a#67f33167d1643bd4bcc14bfc40d2316c76be848a" dependencies = [ "deno_core", "deno_tls", @@ -3189,6 +3205,7 @@ dependencies = [ [[package]] name = "deno_node" version = "0.91.0" +source = "git+https://github.com/coasys/deno.git?rev=67f33167d1643bd4bcc14bfc40d2316c76be848a#67f33167d1643bd4bcc14bfc40d2316c76be848a" dependencies = [ "aead-gcm-stream", "aes", @@ -3273,6 +3290,7 @@ dependencies = [ [[package]] name = "deno_permissions" version = "0.14.0" +source = "git+https://github.com/coasys/deno.git?rev=67f33167d1643bd4bcc14bfc40d2316c76be848a#67f33167d1643bd4bcc14bfc40d2316c76be848a" dependencies = [ "deno_core", "deno_terminal", @@ -3288,6 +3306,7 @@ dependencies = [ [[package]] name = "deno_runtime" version = "0.162.0" +source = "git+https://github.com/coasys/deno.git?rev=67f33167d1643bd4bcc14bfc40d2316c76be848a#67f33167d1643bd4bcc14bfc40d2316c76be848a" dependencies = [ "deno_ast", "deno_broadcast_channel", @@ -3359,6 +3378,7 @@ dependencies = [ [[package]] name = "deno_tls" version = "0.141.0" +source = "git+https://github.com/coasys/deno.git?rev=67f33167d1643bd4bcc14bfc40d2316c76be848a#67f33167d1643bd4bcc14bfc40d2316c76be848a" dependencies = [ "deno_core", "deno_native_certs", @@ -3384,6 +3404,7 @@ dependencies = [ [[package]] name = "deno_url" version = "0.154.0" +source = "git+https://github.com/coasys/deno.git?rev=67f33167d1643bd4bcc14bfc40d2316c76be848a#67f33167d1643bd4bcc14bfc40d2316c76be848a" dependencies = [ "deno_core", "urlpattern", @@ -3392,6 +3413,7 @@ dependencies = [ [[package]] name = "deno_web" version = "0.185.0" +source = "git+https://github.com/coasys/deno.git?rev=67f33167d1643bd4bcc14bfc40d2316c76be848a#67f33167d1643bd4bcc14bfc40d2316c76be848a" dependencies = [ "async-trait", "base64-simd 0.8.0", @@ -3408,6 +3430,7 @@ dependencies = [ [[package]] name = "deno_webgpu" version = "0.121.0" +source = "git+https://github.com/coasys/deno.git?rev=67f33167d1643bd4bcc14bfc40d2316c76be848a#67f33167d1643bd4bcc14bfc40d2316c76be848a" dependencies = [ "deno_core", "raw-window-handle 0.6.2", @@ -3420,6 +3443,7 @@ dependencies = [ [[package]] name = "deno_webidl" version = "0.154.0" +source = "git+https://github.com/coasys/deno.git?rev=67f33167d1643bd4bcc14bfc40d2316c76be848a#67f33167d1643bd4bcc14bfc40d2316c76be848a" dependencies = [ "deno_core", ] @@ -3427,6 +3451,7 @@ dependencies = [ [[package]] name = "deno_websocket" version = "0.159.0" +source = "git+https://github.com/coasys/deno.git?rev=67f33167d1643bd4bcc14bfc40d2316c76be848a#67f33167d1643bd4bcc14bfc40d2316c76be848a" dependencies = [ "bytes", "deno_core", @@ -3447,6 +3472,7 @@ dependencies = [ [[package]] name = "deno_webstorage" version = "0.149.0" +source = "git+https://github.com/coasys/deno.git?rev=67f33167d1643bd4bcc14bfc40d2316c76be848a#67f33167d1643bd4bcc14bfc40d2316c76be848a" dependencies = [ "deno_core", "deno_web", @@ -16943,33 +16969,6 @@ dependencies = [ "flate2", ] -[[package]] -name = "zip" -version = "2.1.3" -dependencies = [ - "aes", - "arbitrary", - "bzip2", - "constant_time_eq", - "crc32fast", - "crossbeam-utils", - "deflate64", - "displaydoc", - "flate2", - "hmac 0.12.1", - "indexmap 2.2.6", - "lzma-rs", - "memchr", - "pbkdf2", - "rand 0.8.5", - "sha1", - "thiserror", - "time", - "zeroize", - "zopfli", - "zstd", -] - [[package]] name = "zip" version = "2.1.3" diff --git a/rust-executor/Cargo.toml b/rust-executor/Cargo.toml index 5b4193648..f65349a95 100644 --- a/rust-executor/Cargo.toml +++ b/rust-executor/Cargo.toml @@ -32,7 +32,7 @@ path = "src/main.rs" [dependencies] url = { version = "2.4.1", features = ["expose_internals"] } deno_core = {version = "0.283.0", git = "https://github.com/coasys/deno_core.git", rev = "b2bb94e32c2e94b18279cd1b36e4c198b183c826" } -deno_runtime = {version = "0.162.0", git = "https://github.com/coasys/deno.git", rev = "f339804dd995a04eaacb467b6dcf9a04b21a7b81"} +deno_runtime = {version = "0.162.0", git = "https://github.com/coasys/deno.git", rev = "67f33167d1643bd4bcc14bfc40d2316c76be848a"} tokio = { version = "1.25.0", features = ["full"] } futures = "0.3.28" tokio-stream = { version = "0.1.12", features = ["sync"] }