From c0c3a477836c44cd1cf2eceb73f696637fab7e9a Mon Sep 17 00:00:00 2001 From: Guillem Cordoba Date: Fri, 17 Jun 2022 13:48:03 +0200 Subject: [PATCH] Upgraded to 143 and new devhub --- .github/workflows/release.yaml | 12 + .github/workflows/test.yaml | 4 + Cargo.lock | 366 ++++++++++++++++-- crates/holochain_manager/Cargo.toml | 8 +- crates/holochain_manager/src/versions/mod.rs | 19 +- .../src/versions/v0_0_143.rs | 67 ++++ package.json | 2 +- src-tauri/src/launcher/default_apps.rs | 2 +- src-tauri/tauri.conf.json | 1 + 9 files changed, 435 insertions(+), 46 deletions(-) create mode 100644 crates/holochain_manager/src/versions/v0_0_143.rs diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8b29017a..75c4136d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -66,6 +66,10 @@ jobs: $HcPath = Get-Command holochain | Select-Object -ExpandProperty Definition Copy-Item $HcPath -Destination src-tauri/bins/holochain-v0.0.141-x86_64-pc-windows-msvc.exe + cargo install --locked --git https://github.com/guillemcordoba/holochain.git --rev fbe4de6d9ab7837a27cd63cf88b625b0caa60d23 holochain + $HcPath = Get-Command holochain | Select-Object -ExpandProperty Definition + Copy-Item $HcPath -Destination src-tauri/bins/holochain-v0.0.143-x86_64-pc-windows-msvc.exe + # NEW_VERSION: install new holochain version and copy its binary to the tauri path - name: download caddy (MacOS only) @@ -108,6 +112,10 @@ jobs: HOLOCHAIN_PATH=$(which holochain) cp $HOLOCHAIN_PATH src-tauri/bins/holochain-v0.0.141-x86_64-apple-darwin + cargo install --locked --git https://github.com/guillemcordoba/holochain.git --rev fbe4de6d9ab7837a27cd63cf88b625b0caa60d23 holochain + HOLOCHAIN_PATH=$(which holochain) + cp $HOLOCHAIN_PATH src-tauri/bins/holochain-v0.0.143-x86_64-apple-darwin + # NEW_VERSION: install new holochain version and copy its binary to the tauri path - name: install dependencies (ubuntu only) @@ -160,6 +168,10 @@ jobs: HOLOCHAIN_PATH=$(which holochain) cp $HOLOCHAIN_PATH src-tauri/bins/holochain-v0.0.141-x86_64-unknown-linux-gnu + cargo install --locked --git https://github.com/guillemcordoba/holochain.git --rev fbe4de6d9ab7837a27cd63cf88b625b0caa60d23 holochain + HOLOCHAIN_PATH=$(which holochain) + cp $HOLOCHAIN_PATH src-tauri/bins/holochain-v0.0.143-x86_64-unknown-linux-gnu + # NEW_VERSION: install new holochain version and copy its binary to the tauri path - name: build the app diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 1e97ef1d..3efd5c43 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -68,6 +68,10 @@ jobs: HOLOCHAIN_PATH=$(which holochain) cp $HOLOCHAIN_PATH src-tauri/bins/holochain-v0.0.141-x86_64-unknown-linux-gnu + cargo install --locked --git https://github.com/guillemcordoba/holochain.git --rev fbe4de6d9ab7837a27cd63cf88b625b0caa60d23 holochain + HOLOCHAIN_PATH=$(which holochain) + cp $HOLOCHAIN_PATH src-tauri/bins/holochain-v0.0.143-x86_64-unknown-linux-gnu + # NEW_VERSION: install new holochain version and copy its binary to the tauri path - name: install app dependencies and build it diff --git a/Cargo.lock b/Cargo.lock index 53e420a2..65def0c5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2501,6 +2501,28 @@ dependencies = [ "thiserror", ] +[[package]] +name = "holo_hash" +version = "0.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a26d28040245acbfc9b4960926cb7c07a2788f8713e6ef1b28e01bd5d1e2734" +dependencies = [ + "arbitrary", + "base64", + "blake2b_simd 0.5.11", + "derive_more", + "fixt 0.0.11", + "futures", + "holochain_serialized_bytes", + "kitsune_p2p_dht_arc 0.0.11 (registry+https://github.com/rust-lang/crates.io-index)", + "must_future", + "rand 0.7.3", + "rusqlite", + "serde", + "serde_bytes", + "thiserror", +] + [[package]] name = "holochain-launcher" version = "0.4.8" @@ -2534,12 +2556,12 @@ dependencies = [ [[package]] name = "holochain_client" version = "0.0.1" -source = "git+https://github.com/holochain/holochain-client-rust?rev=d647cc6c759e404df70cb497950b676e3498ca9b#d647cc6c759e404df70cb497950b676e3498ca9b" +source = "git+https://github.com/holochain/holochain-client-rust?rev=e60444287e4c52af6ac480055130222057a79853#e60444287e4c52af6ac480055130222057a79853" dependencies = [ "again", "anyhow", - "holochain_conductor_api 0.0.39", - "holochain_types 0.0.37", + "holochain_conductor_api 0.0.43", + "holochain_types 0.0.41", "holochain_websocket", "serde", "url", @@ -2685,6 +2707,30 @@ dependencies = [ "url2", ] +[[package]] +name = "holochain_conductor_api" +version = "0.0.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c7ffaaa134403751231808a508b843bdb00289008b1ce679009a2e19dbe80a9" +dependencies = [ + "derive_more", + "directories 2.0.2", + "holo_hash 0.0.27", + "holochain_p2p 0.0.41", + "holochain_serialized_bytes", + "holochain_state 0.0.43", + "holochain_types 0.0.41", + "holochain_zome_types 0.0.35", + "kitsune_p2p 0.0.35", + "serde", + "serde_derive", + "serde_yaml", + "structopt", + "thiserror", + "tracing", + "url2", +] + [[package]] name = "holochain_integrity_types" version = "0.0.3" @@ -2732,6 +2778,22 @@ dependencies = [ "tracing", ] +[[package]] +name = "holochain_integrity_types" +version = "0.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0ecc9e05ed493a30298d5d05fb65fbc3d14f211aabaa466388368f78490405f" +dependencies = [ + "arbitrary", + "holo_hash 0.0.27", + "holochain_serialized_bytes", + "kitsune_p2p_timestamp 0.0.9", + "serde", + "serde_bytes", + "subtle", + "tracing", +] + [[package]] name = "holochain_keystore" version = "0.0.27" @@ -2872,6 +2934,30 @@ dependencies = [ "tracing", ] +[[package]] +name = "holochain_keystore" +version = "0.0.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "847ac23c509ae6e0b374daa0b623e8eb1c4cbbe971c06fd05806db45fbc10d42" +dependencies = [ + "base64", + "ghost_actor 0.3.0-alpha.4", + "holo_hash 0.0.27", + "holochain_serialized_bytes", + "holochain_sqlite 0.0.40", + "holochain_zome_types 0.0.35", + "kitsune_p2p_types 0.0.24", + "lair_keystore_client", + "nanoid 0.4.0", + "one_err", + "serde", + "serde_bytes", + "sodoken", + "thiserror", + "tokio", + "tracing", +] + [[package]] name = "holochain_manager" version = "0.1.0" @@ -2886,21 +2972,24 @@ dependencies = [ "holochain_conductor_api 0.0.36", "holochain_conductor_api 0.0.39", "holochain_conductor_api 0.0.41", + "holochain_conductor_api 0.0.43", "holochain_p2p 0.0.27", "holochain_p2p 0.0.31", "holochain_p2p 0.0.32", "holochain_p2p 0.0.35", "holochain_p2p 0.0.37", "holochain_p2p 0.0.39", + "holochain_p2p 0.0.41", "holochain_types 0.0.27", "holochain_types 0.0.31", "holochain_types 0.0.32", "holochain_types 0.0.35", "holochain_types 0.0.37", "holochain_types 0.0.39", + "holochain_types 0.0.41", "lair_keystore_manager", "log", - "mr_bundle 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)", + "mr_bundle 0.0.12", "portpicker", "serde", "serde-enum-str", @@ -3080,6 +3169,35 @@ dependencies = [ "tokio-stream", ] +[[package]] +name = "holochain_p2p" +version = "0.0.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd5ebad37fdd166261896576a08b10525eb407fe022f2ed13592b007dae5af82" +dependencies = [ + "async-trait", + "fixt 0.0.11", + "futures", + "ghost_actor 0.3.0-alpha.4", + "holo_hash 0.0.27", + "holochain_keystore 0.0.41", + "holochain_serialized_bytes", + "holochain_types 0.0.41", + "holochain_util 0.0.10", + "holochain_zome_types 0.0.35", + "kitsune_p2p 0.0.35", + "kitsune_p2p_types 0.0.24", + "mockall", + "observability", + "rand 0.7.3", + "serde", + "serde_bytes", + "serde_json", + "thiserror", + "tokio", + "tokio-stream", +] + [[package]] name = "holochain_serialized_bytes" version = "0.0.51" @@ -3396,6 +3514,55 @@ dependencies = [ "tracing-futures", ] +[[package]] +name = "holochain_sqlite" +version = "0.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af9b8f102214d3beb529e8011dc5fce49d7dd54fbc5def5dfd346bf68953eec8" +dependencies = [ + "anyhow", + "async-trait", + "byteorder", + "cfg-if 0.1.10", + "chashmap", + "chrono", + "derive_more", + "either", + "failure", + "fallible-iterator", + "fixt 0.0.11", + "futures", + "holo_hash 0.0.27", + "holochain_serialized_bytes", + "holochain_util 0.0.10", + "holochain_zome_types 0.0.35", + "kitsune_p2p 0.0.35", + "lazy_static", + "must_future", + "nanoid 0.3.0", + "num_cpus", + "once_cell", + "page_size", + "parking_lot 0.10.2", + "pretty_assertions", + "r2d2", + "r2d2_sqlite_neonphog", + "rand 0.7.3", + "rmp-serde", + "rusqlite", + "scheduled-thread-pool", + "serde", + "serde_derive", + "serde_json", + "shrinkwraprs", + "sqlformat", + "tempfile", + "thiserror", + "tokio", + "tracing", + "tracing-futures", +] + [[package]] name = "holochain_state" version = "0.0.27" @@ -3626,6 +3793,45 @@ dependencies = [ "tracing-futures", ] +[[package]] +name = "holochain_state" +version = "0.0.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31d41dce0f8ab7ab15e2f7ab582084d53fff115b4fb5736db11eacfd66e1dd51" +dependencies = [ + "async-recursion", + "base64", + "byteorder", + "chrono", + "contrafact", + "cron", + "derive_more", + "either", + "fallible-iterator", + "futures", + "holo_hash 0.0.27", + "holochain_keystore 0.0.41", + "holochain_p2p 0.0.41", + "holochain_serialized_bytes", + "holochain_sqlite 0.0.40", + "holochain_types 0.0.41", + "holochain_util 0.0.10", + "holochain_zome_types 0.0.35", + "kitsune_p2p 0.0.35", + "mockall", + "nanoid 0.3.0", + "one_err", + "parking_lot 0.10.2", + "serde", + "serde_json", + "shrinkwraprs", + "tempfile", + "thiserror", + "tokio", + "tracing", + "tracing-futures", +] + [[package]] name = "holochain_types" version = "0.0.27" @@ -3928,26 +4134,62 @@ dependencies = [ ] [[package]] -name = "holochain_util" -version = "0.0.7" -source = "git+https://github.com/guillemcordoba/holochain?rev=a60f227e75d510a2afc1914fdcedd6ebf754ea29#a60f227e75d510a2afc1914fdcedd6ebf754ea29" +name = "holochain_types" +version = "0.0.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4daad99eca9cbe16c1a3e858703bedbf7b3905488dd10129b810416b138a508" dependencies = [ + "anyhow", + "arbitrary", + "async-trait", + "automap", "backtrace", + "base64", "cfg-if 0.1.10", + "chrono", + "contrafact", + "derive_builder", "derive_more", - "dunce", + "either", + "fixt 0.0.11", + "flate2", "futures", - "num_cpus", - "once_cell", + "holo_hash 0.0.27", + "holochain_keystore 0.0.41", + "holochain_serialized_bytes", + "holochain_sqlite 0.0.40", + "holochain_util 0.0.10", + "holochain_zome_types 0.0.35", + "itertools 0.10.3", + "lazy_static", + "mockall", + "mr_bundle 0.0.12", + "must_future", + "nanoid 0.3.0", + "observability", + "parking_lot 0.10.2", + "rand 0.7.3", + "regex", + "rusqlite", + "serde", + "serde_bytes", + "serde_derive", + "serde_yaml", + "shrinkwraprs", + "strum 0.18.0", + "strum_macros 0.18.0", + "tempfile", + "thiserror", "tokio", + "tracing", ] [[package]] name = "holochain_util" -version = "0.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc012cbf805d0b2999b63b8c3348c46fe9be48fa5cb967144bcbd809d542ab0" +version = "0.0.7" +source = "git+https://github.com/guillemcordoba/holochain?rev=a60f227e75d510a2afc1914fdcedd6ebf754ea29#a60f227e75d510a2afc1914fdcedd6ebf754ea29" dependencies = [ + "backtrace", "cfg-if 0.1.10", "derive_more", "dunce", @@ -3959,9 +4201,9 @@ dependencies = [ [[package]] name = "holochain_util" -version = "0.0.9" +version = "0.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c20b2a8f4937b1232605b1c2c13160638ab5cceaae5d7c4ac2d0a850cdfaa" +checksum = "fbc012cbf805d0b2999b63b8c3348c46fe9be48fa5cb967144bcbd809d542ab0" dependencies = [ "cfg-if 0.1.10", "derive_more", @@ -4064,9 +4306,9 @@ dependencies = [ [[package]] name = "holochain_websocket" -version = "0.0.37" +version = "0.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aebd6848b5868ff5f6752fb3689abe65914edf0ec743a686f92059c87781fe96" +checksum = "3d7fe88f7a36e9d0352eb54f9156629c0a6da4c0ae4f05e4f183ce613ec3f282" dependencies = [ "futures", "ghost_actor 0.4.0-alpha.5", @@ -4275,6 +4517,38 @@ dependencies = [ "tracing", ] +[[package]] +name = "holochain_zome_types" +version = "0.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "015444f90fdef25867210eb8b672089eb6a567c25156c20ddc1c0a9277b5a0e0" +dependencies = [ + "arbitrary", + "contrafact", + "derive_builder", + "fixt 0.0.11", + "holo_hash 0.0.27", + "holochain_integrity_types 0.0.7", + "holochain_serialized_bytes", + "holochain_wasmer_common", + "kitsune_p2p_timestamp 0.0.9", + "nanoid 0.3.0", + "num_enum", + "once_cell", + "paste", + "rand 0.7.3", + "rusqlite", + "serde", + "serde_bytes", + "serde_yaml", + "shrinkwraprs", + "strum 0.18.0", + "subtle", + "subtle-encoding", + "thiserror", + "tracing", +] + [[package]] name = "hostname" version = "0.3.1" @@ -4864,6 +5138,44 @@ dependencies = [ "url2", ] +[[package]] +name = "kitsune_p2p" +version = "0.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89515967745471b44aaf0c2714b96e7cebf66e21fcffd1c5e1a126f55d4705e1" +dependencies = [ + "arbitrary", + "arrayref", + "base64", + "bloomfilter", + "derive_more", + "fixt 0.0.11", + "futures", + "ghost_actor 0.3.0-alpha.4", + "governor", + "itertools 0.10.3", + "kitsune_p2p_mdns 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "kitsune_p2p_proxy 0.0.24", + "kitsune_p2p_timestamp 0.0.9", + "kitsune_p2p_transport_quic 0.0.24", + "kitsune_p2p_types 0.0.24", + "must_future", + "num-traits", + "observability", + "once_cell", + "parking_lot 0.11.2", + "rand 0.7.3", + "reqwest", + "serde", + "serde_bytes", + "serde_json", + "shrinkwraprs", + "thiserror", + "tokio", + "tokio-stream", + "url2", +] + [[package]] name = "kitsune_p2p_dht_arc" version = "0.0.9" @@ -6041,26 +6353,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "mr_bundle" -version = "0.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0629cc22550461c9d3ec998c10082ba433b3bc620eb71933f41681217613c8" -dependencies = [ - "bytes", - "derive_more", - "either", - "flate2", - "futures", - "holochain_util 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)", - "reqwest", - "rmp-serde", - "serde", - "serde_bytes", - "serde_derive", - "thiserror", -] - [[package]] name = "mr_bundle" version = "0.0.9" diff --git a/crates/holochain_manager/Cargo.toml b/crates/holochain_manager/Cargo.toml index ce110cce..a77775e6 100644 --- a/crates/holochain_manager/Cargo.toml +++ b/crates/holochain_manager/Cargo.toml @@ -6,7 +6,7 @@ version = "0.1.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -holochain_client = {package = "holochain_client", git = "https://github.com/holochain/holochain-client-rust", rev = "d647cc6c759e404df70cb497950b676e3498ca9b"} +holochain_client = {package = "holochain_client", git = "https://github.com/holochain/holochain-client-rust", rev = "e60444287e4c52af6ac480055130222057a79853"} holochain_conductor_api_0_0_127 = {git = "https://github.com/guillemcordoba/holochain", package = "holochain_conductor_api", rev = "a60f227e75d510a2afc1914fdcedd6ebf754ea29"} holochain_p2p_0_0_127 = {git = "https://github.com/guillemcordoba/holochain", package = "holochain_p2p", rev = "a60f227e75d510a2afc1914fdcedd6ebf754ea29"} @@ -34,7 +34,11 @@ holochain_conductor_api_0_0_141 = {package = "holochain_conductor_api", version holochain_p2p_0_0_141 = {package = "holochain_p2p", version = "0.0.39"} holochain_types_0_0_141 = {package = "holochain_types", version = "0.0.39"} -mr_bundle_0_0_9 = {package = "mr_bundle", version = "0.0.9"} +holochain_conductor_api_0_0_143 = {package = "holochain_conductor_api", version = "0.0.43"} +holochain_p2p_0_0_143 = {package = "holochain_p2p", version = "0.0.41"} +holochain_types_0_0_143 = {package = "holochain_types", version = "0.0.41"} + +mr_bundle = {package = "mr_bundle", version = "0.0.12"} lair_keystore_manager = {path = "../lair_keystore_manager"} diff --git a/crates/holochain_manager/src/versions/mod.rs b/crates/holochain_manager/src/versions/mod.rs index 2a999da6..e269c1a6 100644 --- a/crates/holochain_manager/src/versions/mod.rs +++ b/crates/holochain_manager/src/versions/mod.rs @@ -4,11 +4,11 @@ use std::path::PathBuf; use url2::Url2; // NEW_VERSION: Upgrade these two crates so that they refer to the latest version of them -pub use holochain_conductor_api_0_0_141 as holochain_conductor_api_latest; -pub use holochain_types_0_0_141 as holochain_types_latest; +pub use holochain_conductor_api_0_0_143 as holochain_conductor_api_latest; +pub use holochain_types_0_0_143 as holochain_types_latest; use lair_keystore_manager::versions::LairKeystoreVersion; -pub use mr_bundle_0_0_9 as mr_bundle_latest; +pub use mr_bundle as mr_bundle_latest; mod common; pub mod version_manager; @@ -23,6 +23,7 @@ pub mod v0_0_132; pub mod v0_0_136; pub mod v0_0_139; pub mod v0_0_141; +pub mod v0_0_143; use v0_0_127::HolochainV0_0_127; use v0_0_131::HolochainV0_0_131; @@ -30,6 +31,7 @@ use v0_0_132::HolochainV0_0_132; use v0_0_136::HolochainV0_0_136; use v0_0_139::HolochainV0_0_139; use v0_0_141::HolochainV0_0_141; +use v0_0_143::HolochainV0_0_143; // NEW_VERSION: Add the new HDK version to this enum (if there is a new HDK version) #[derive(Copy, Clone, Debug, PartialEq, Hash, Eq, Deserialize_enum_str, Serialize_enum_str)] @@ -46,6 +48,8 @@ pub enum HdkVersion { V0_0_132, #[serde(rename = "0.0.134")] V0_0_134, + #[serde(rename = "0.0.136")] + V0_0_136, } // NEW_VERSION: Add the new Holochain version to this enum @@ -63,6 +67,8 @@ pub enum HolochainVersion { V0_0_139, #[serde(rename = "0.0.141")] V0_0_141, + #[serde(rename = "0.0.143")] + V0_0_143, } impl Into for HolochainVersion { @@ -75,12 +81,12 @@ impl HolochainVersion { // Will be run by default when the launcher starts and is the version where the DevHub is installed // Not necessarily the newest one pub fn default() -> HolochainVersion { - HolochainVersion::V0_0_139 + HolochainVersion::V0_0_143 } // Will be the config with the the custom binary is run, when present pub fn latest() -> HolochainVersion { - HolochainVersion::V0_0_141 + HolochainVersion::V0_0_143 } pub fn supported_versions() -> Vec { @@ -92,6 +98,7 @@ impl HolochainVersion { HolochainVersion::V0_0_136, HolochainVersion::V0_0_139, HolochainVersion::V0_0_141, + HolochainVersion::V0_0_143, ]; } @@ -105,6 +112,7 @@ impl HolochainVersion { HolochainVersion::V0_0_136 => HolochainVersionManager::HolochainV0_0_136(HolochainV0_0_136), HolochainVersion::V0_0_139 => HolochainVersionManager::HolochainV0_0_139(HolochainV0_0_139), HolochainVersion::V0_0_141 => HolochainVersionManager::HolochainV0_0_141(HolochainV0_0_141), + HolochainVersion::V0_0_143 => HolochainVersionManager::HolochainV0_0_143(HolochainV0_0_143), } } } @@ -118,4 +126,5 @@ pub enum HolochainVersionManager { HolochainV0_0_136, HolochainV0_0_139, HolochainV0_0_141, + HolochainV0_0_143, } diff --git a/crates/holochain_manager/src/versions/v0_0_143.rs b/crates/holochain_manager/src/versions/v0_0_143.rs new file mode 100644 index 00000000..4ad0d120 --- /dev/null +++ b/crates/holochain_manager/src/versions/v0_0_143.rs @@ -0,0 +1,67 @@ +use std::{path::PathBuf, sync::Arc}; +use url2::Url2; + +// NEW_VERSION: Import the exact same types but from the new crates +use holochain_conductor_api_0_0_143::{ + conductor::{ConductorConfig, KeystoreConfig}, + AdminInterfaceConfig, InterfaceDriver, +}; +use holochain_p2p_0_0_143::kitsune_p2p::{KitsuneP2pConfig, ProxyConfig, TransportConfig, dependencies::kitsune_p2p_types::config::tuning_params_struct::KitsuneP2pTuningParams}; + +use super::{version_manager::VersionManager, HdkVersion, common::{proxy_url, boostrap_service}}; + +pub struct HolochainV0_0_143; + +impl VersionManager for HolochainV0_0_143 { + // NEW_VERSION: Careful! Indicate here which HDK version comes bundled with this Holochain version + fn hdk_version(&self) -> HdkVersion { + HdkVersion::V0_0_136 + } + + // NEW_VERSION: Duplicate and change whatever config is necessary to change + fn initial_config( + &self, + admin_port: u16, + conductor_environment_path: PathBuf, + keystore_connection_url: Url2, + ) -> String { + let mut network_config = KitsuneP2pConfig::default(); + network_config.bootstrap_service = Some(boostrap_service()); + + let mut tuning_params = KitsuneP2pTuningParams::default(); + + tuning_params.gossip_outbound_target_mbps = 1.5; + tuning_params.gossip_inbound_target_mbps = 1.5; + tuning_params.gossip_historic_outbound_target_mbps = 0.4; + tuning_params.gossip_historic_inbound_target_mbps = 0.4; + + network_config.tuning_params = Arc::new(tuning_params); + + network_config.transport_pool.push(TransportConfig::Proxy { + sub_transport: Box::new(TransportConfig::Quic { + bind_to: None, + override_host: None, + override_port: None, + }), + proxy_config: ProxyConfig::RemoteProxyClient { + proxy_url: proxy_url(), + }, + }); + + let config = ConductorConfig { + environment_path: conductor_environment_path.into(), + dpki: None, + keystore: KeystoreConfig::LairServer { + connection_url: keystore_connection_url, + }, + admin_interfaces: Some(vec![AdminInterfaceConfig { + driver: InterfaceDriver::Websocket { port: admin_port }, + }]), + network: Some(network_config), + db_sync_strategy: Default::default(), + }; + + serde_yaml::to_string(&config).expect("Could not convert conductor config to string") + } + +} diff --git a/package.json b/package.json index a2b5f79e..19535163 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "test:unit": "vue-cli-service test:unit", "lint": "vue-cli-service lint", "tauri": "tauri", - "prepare": "curl -L --output DevHub.webhapp https://github.com/holochain/devhub-gui/releases/download/v0.6.1/DevHub.webhapp" + "prepare": "curl -L --output DevHub.webhapp https://github.com/holochain/devhub-gui/releases/download/v0.7.0/DevHub.webhapp" }, "dependencies": { "@holochain-open-dev/utils": "^0.0.9", diff --git a/src-tauri/src/launcher/default_apps.rs b/src-tauri/src/launcher/default_apps.rs index 35a46480..c29630e7 100644 --- a/src-tauri/src/launcher/default_apps.rs +++ b/src-tauri/src/launcher/default_apps.rs @@ -13,7 +13,7 @@ pub async fn install_default_apps_if_necessary(manager: &mut WebAppManager) -> R let version: String = manager.holochain_manager.version.into(); let uid = if cfg!(debug_assertions) { - Some(format!("dev")) + None } else { None }; diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index c625da19..c3886843 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -33,6 +33,7 @@ "bins/holochain-v0.0.136", "bins/holochain-v0.0.139", "bins/holochain-v0.0.141", + "bins/holochain-v0.0.143", "bins/lair-keystore", "bins/caddy" ],