update to holochain 0.1.0

coasys · Feb 1, 2023 · 4a48e99 · 4a48e99
1 parent 7a6ad4b
commit 4a48e99
Show file tree

Hide file tree

Showing 10 changed files with 356 additions and 63 deletions.
diff --git a/hc-dna/Cargo.lock b/hc-dna/Cargo.lock
diff --git a/hc-dna/holochain_version.nix b/hc-dna/holochain_version.nix
@@ -4,8 +4,8 @@
 
 {
     url = "https://github.com/holochain/holochain";
-    rev = "holochain-0.1.0-beta-rc.1";
-    sha256 = "sha256-xp1DTVrhGEc1CZr6LvBFZZhoOUbUPpg3/mWOj4DDXjI=";
+    rev = "holochain-0.1.0";
+    sha256 = "sha256-xp1DTVrhGZc1CZr6LvBFZZhoOUbUPpg3/mWOj4DDXjI=";
     cargoLock = {
         outputHashes = {
         };

diff --git a/hc-dna/nix/sources.json b/hc-dna/nix/sources.json
@@ -5,10 +5,10 @@
         "homepage": "",
         "owner": "holochain",
         "repo": "holonix",
-        "rev": "4519933ad47134c42ab19f2db482abc9672381b4",
-        "sha256": "sha256:13z6f738bz7qqa13i1yyxzy5s8bf42w3zgrc4c1cg04niykpm57w",
+        "rev": "241c1754a37881f51f2f33921a2777b38c34fa24",
+        "sha256": "sha256:0zaa477kyzpsrcc3nk1jznp4gchwm4pk5p37pwkq6mjhiizcxshy",
         "type": "tarball",
-        "url": "https://github.com/holochain/holonix/archive/4519933ad47134c42ab19f2db482abc9672381b4.tar.gz",
+        "url": "https://github.com/holochain/holonix/archive/241c1754a37881f51f2f33921a2777b38c34fa24.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }
diff --git a/hc-dna/zomes/perspective_diff_sync/Cargo.toml b/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 = "0.0.163"
-holo_hash = "0.0.35"
+hdk = "0.1.0"
+holo_hash = "0.1.0"
 
 [features]
 test = []
diff --git a/hc-dna/zomes/perspective_diff_sync/src/lib.rs b/hc-dna/zomes/perspective_diff_sync/src/lib.rs
@@ -28,11 +28,7 @@ pub type Hash = HoloHash<holo_hash::hash_type::Action>;
 
 #[hdk_extern]
 fn init(_: ()) -> ExternResult<InitCallbackResult> {
-    let mut functions: GrantedFunctions = BTreeSet::new();
-    functions.insert((
-        ZomeName::from("perspective_diff_sync"),
-        "recv_remote_signal".into(),
-    ));
+    let functions: GrantedFunctions = GrantedFunctions::All;
 
     create_cap_grant(CapGrantEntry {
         tag: "".into(),

diff --git a/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml b/hc-dna/zomes/perspective_diff_sync_integrity/Cargo.toml
@@ -13,6 +13,6 @@ derive_more = "0"
 serde = "1"
 chrono = { version = "0.4.22", default-features = false, features = ["clock", "std", "oldtime", "serde"] }
 
-holo_hash = "0.0.35"
-hdi = "0.1.10"
-hdk = "0.0.163"
+holo_hash = "0.1.0"
+hdi = "0.2.0"
+hdk = "0.1.0"
diff --git a/hc-dna/zomes/tests/package.json b/hc-dna/zomes/tests/package.json
@@ -16,8 +16,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@holochain/client": "0.11.8",
-    "@holochain/tryorama": "0.10.0",
+    "@holochain/client": "0.12.0",
+    "@holochain/tryorama": "0.11.0",
     "@perspect3vism/ad4m": "^0.1.34",
     "@types/lodash": "^4.14.158",
     "@types/node": "^14.0.14",

diff --git a/hc-dna/zomes/tests/pull.ts b/hc-dna/zomes/tests/pull.ts
@@ -194,7 +194,7 @@ export async function mergeFetch(t) {
     //Connect nodes togther
     await addAllAgentsToAllConductors([aliceConductor, bobConductor]);
     //note; running this test on some machines may require more than 200ms wait
-    await sleep(500)
+    await sleep(1000)
 
     //Alice tries to merge
     let merge_alice = await aliceHapps.cells[0].callZome({

diff --git a/hc-dna/zomes/tests/utils.ts b/hc-dna/zomes/tests/utils.ts
@@ -1,5 +1,4 @@
 import { AgentApp, CallableCell, Conductor } from "@holochain/tryorama";
-import { authorizeSigningCredentials } from "@holochain/client"
 import faker from "faker";
 import { dnas } from './common';
 import { createConductor } from "@holochain/tryorama";
@@ -59,16 +58,6 @@ export async function createConductors(num: number): Promise<{agent_happ: AgentA
                 }
             });
             await conductor.adminWs().enableApp({installed_app_id: app.appId})
-            const sign = await authorizeSigningCredentials(conductor.adminWs(), app.cells[0].cell_id, [
-                ["perspective_diff_sync", "add_active_agent_link"],
-                ["perspective_diff_sync", "latest_revision"],
-                ["perspective_diff_sync", "current_revision"],
-                ["perspective_diff_sync", "pull"],
-                ["perspective_diff_sync", "render"],
-                ["perspective_diff_sync", "commit"],
-                ["perspective_diff_sync", "fast_forward_signal"]
-            ])
-            console.log(sign);
             out.push({
                 agent_happ: app,
                 conductor

diff --git a/hc-dna/zomes/tests/yarn.lock b/hc-dna/zomes/tests/yarn.lock
@@ -46,12 +46,12 @@
   resolved "https://registry.npmjs.org/@graphql-typed-document-node/core/-/core-3.1.1.tgz"
   integrity sha512-NQ17ii0rK1b34VZonlmT2QMJFI70m0TRwbknO/ihlbatXyaktDhN/98vBiUU6kNBPljqGqyIrl2T4nY2RpFANg==
 
-"@holochain/client@0.11.8", "@holochain/client@^0.11.8":
-  version "0.11.8"
-  resolved "https://registry.yarnpkg.com/@holochain/client/-/client-0.11.8.tgz#d4d6fbffae30872a0e137b0204e3caa196d01538"
-  integrity sha512-LoB2W/TLP3HKezrMdJA6Bm7vfI7f/BOol1ohjCYl9pgTqbDEsG48hPWJzfYvSot0sfEMqdKoTdRjIa7DZmxrxQ==
+"@holochain/client@0.12.0":
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/@holochain/client/-/client-0.12.0.tgz#1c9bdc082160badd1439962e8d5f30da6c4089a3"
+  integrity sha512-pvrB6Gdc6488iR3VZXoq5QKzoAPTGi0y69Ktrtgr/IZEvtSSHBqHeMhyEjXCa7iS8b1gXsL/HAvq47rs8mu50A==
   dependencies:
-    "@holochain/serialization" "^0.1.0-beta-rc.2"
+    "@holochain/serialization" "^0.1.0-beta-rc.3"
     "@msgpack/msgpack" "^2.7.2"
     "@tauri-apps/api" "^1.2.0"
     emittery "^1.0.1"
@@ -69,17 +69,31 @@
     cross-fetch "^3.1.4"
     isomorphic-ws "^4.0.1"
 
-"@holochain/serialization@^0.1.0-beta-rc.2":
+"@holochain/client@^0.11.16":
+  version "0.11.16"
+  resolved "https://registry.yarnpkg.com/@holochain/client/-/client-0.11.16.tgz#3b2172cc5b0976d4bed01d067c2cebb28d644e0e"
+  integrity sha512-uX1/mRnNZHc0y88bkGJrfp6/mfh1UGFS+g+wvn+E69spzPQMxAkjo7FmZ6nmZfxPoYCoxKjVJyKmvswPUP1Xfw==
+  dependencies:
+    "@holochain/serialization" "^0.1.0-beta-rc.3"
+    "@msgpack/msgpack" "^2.7.2"
+    "@tauri-apps/api" "^1.2.0"
+    emittery "^1.0.1"
+    isomorphic-ws "^5.0.0"
+    js-base64 "^3.7.3"
+    lodash-es "^4.17.21"
+    tweetnacl "^1.0.3"
+
+"@holochain/serialization@^0.1.0-beta-rc.3":
   version "0.1.0-beta-rc.3"
   resolved "https://registry.yarnpkg.com/@holochain/serialization/-/serialization-0.1.0-beta-rc.3.tgz#787a785fa48e00f2d168c6d4b45a233c4800cccb"
   integrity sha512-DJx4V2KXHVLciyOGjOYKTM/JLBpBEZ3RsPIRCgf7qmwhQdxXvhi2p+oFFRD51yUT5uC1/MzIVeJCl/R60PwFbw==
 
-"@holochain/tryorama@0.10.0":
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/@holochain/tryorama/-/tryorama-0.10.0.tgz#d805b4bee3cf762ab35dfe35e0cdd3aac0366c69"
-  integrity sha512-mlqdSy/q/XUg/+wr/FueXNWnvN9Mdgo06KXDB0Uq49QjwXr5wLhZRGxA/yDzwBJvFnkTvtPxRoIXX7Hxp5Fltg==
+"@holochain/tryorama@0.11.0":
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/@holochain/tryorama/-/tryorama-0.11.0.tgz#55505b19e1d3bc9ca47cf42deabd35df94cab6bb"
+  integrity sha512-P2MNn//UulkYCo64j69HfhMfrWGtDrI/A1QEuEZYPUyW8fNg3iE5wh2ssHnu0siw0WRjB6H/PBdadNZz8hemcw==
   dependencies:
-    "@holochain/client" "^0.11.8"
+    "@holochain/client" "^0.11.16"
     get-port "^6.1.2"
     lodash "^4.17.21"
     uuid "^8.3.2"