Merge pull request #1 from kaichaosun/bump-hdk

bump hdk to 0.0.115
fluxsocial · Nov 19, 2021 · 8a97c36 · 8a97c36
2 parents afb0670 + 249f2fc
commit 8a97c36
Show file tree

Hide file tree

Showing 7 changed files with 1,589 additions and 73 deletions.
diff --git a/hc-dna/Cargo.lock b/hc-dna/Cargo.lock
diff --git a/hc-dna/default.nix b/hc-dna/default.nix
@@ -1,33 +1,14 @@
-let
-  holonixPath = builtins.fetchTarball {
-    url = "https://github.com/holochain/holonix/archive/2a1c9124f52e18e7829bea62e8cc476572a0bd32.tar.gz";
-    sha256 = "sha256:07q0ykvg3wkg35ax7vap7zfsvpfmi5y48c0dvnkww78690a9gwgj";
-  };
-  holonix = import (holonixPath) {
-    includeHolochainBinaries = true;
-    holochainVersionId = "custom";
-
-    holochainVersion = {
-      rev = "06c82ade3128ccc73b7b24a137d8fad3756927ef";
-      sha256 = "sha256:1fykfqslr7lhbp11wbl7cz5pmygw9wmhlkvvnfn9ig9ddr7nq6sw";
-      cargoSha256 = "sha256:11s50qq7719grgijnw2z2wi27xa918ycjnsmcd5a8c2kvf4al3yw";
-      bins = {
-        holochain = "holochain";
-        hc = "hc";
-        kitsune-p2p-proxy = "kitsune_p2p/proxy";
-      };
+{
+  holonixPath ?  builtins.fetchTarball { url = "https://github.com/holochain/holonix/archive/2f8ca2fa76165e2978112cb693c572f1086c5541.tar.gz"; }
+}:
 
-      lairKeystoreHashes = {
-        sha256 = "0khg5w5fgdp1sg22vqyzsb2ri7znbxiwl7vr2zx6bwn744wy2cyv";
-        cargoSha256 = "sha256:1lm8vrxh7fw7gcir9lq85frfd0rdcca9p7883nikjfbn21ac4sn4";
-      };
-    };
-    holochainOtherDepsNames = ["lair-keystore"];
-  };
+let
+  holonix = import (holonixPath) { };
   nixpkgs = holonix.pkgs;
 in nixpkgs.mkShell {
   inputsFrom = [ holonix.main ];
   buildInputs = with nixpkgs; [
     binaryen
+    nodejs-16_x
   ];
 }
diff --git a/hc-dna/zomes/did-profiles/Cargo.toml b/hc-dna/zomes/did-profiles/Cargo.toml
@@ -18,4 +18,4 @@ hex = "0.4.2"
 bs58 = "0.4.0"
 chrono = {version = "0.4.19", features = ["serde"] }
 
-hdk = "0.0.110"
+hdk = "0.0.115"
diff --git a/hc-dna/zomes/did-profiles/src/profile.rs b/hc-dna/zomes/did-profiles/src/profile.rs
@@ -136,7 +136,7 @@ pub fn add_profile(add_profile: ProfileInput) -> ExternResult<()> {
 }
 
 fn get_latest_link(base: EntryHash, tag: Option<LinkTag>) -> ExternResult<Option<Link>> {
-    let profile_info = get_links(base.into(), tag)?.into_inner();
+    let profile_info = get_links(base.into(), tag)?;
 
     // Find the latest
     let latest_info =