Update for Holochain v0.4.0-dev.20

holochain · Aug 27, 2024 · da5e326 · da5e326
1 parent fb701de
commit da5e326
Show file tree

Hide file tree

Showing 11 changed files with 104 additions and 69 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,16 +12,14 @@ members = ["crates/holochain_deepkey_dna", "zomes/*"]
 serde = "1"
 rmp-serde = "1"
 serde_bytes = "0.11"
-hc_deepkey_types = { version = "0.8.0-dev.2" }
-hc_deepkey_sdk = { version = "0.7.0-dev.2" }
-holo_hash = { version = "=0.4.0-dev.9", features = ["hashing", "encoding"] }
-holochain_integrity_types = { version = "=0.4.0-dev.10" }
-hdi = { version = "=0.5.0-dev.10" }
-hdk = { version = "=0.4.0-dev.12" }
-whi_hdi_extensions = { version = "0.11" }
-# whi_hdi_extensions = { path = "../whi_hdi_extensions" }
-whi_hdk_extensions = { version = "0.11" }
-# whi_hdk_extensions = { path = "../whi_hdk_extensions" }
+hc_deepkey_types = { version = "0.8.0-dev.3" }
+hc_deepkey_sdk = { version = "0.7.0-dev.3" }
+holo_hash = { version = "=0.4.0-dev.11", features = ["hashing", "encoding"] }
+holochain_integrity_types = { version = "=0.4.0-dev.12" }
+hdi = { version = "=0.5.0-dev.12" }
+hdk = { version = "=0.4.0-dev.14" }
+whi_hdi_extensions = { version = "0.12" }
+whi_hdk_extensions = { version = "0.12" }
 
 [workspace.dependencies.deepkey]
 path = "zomes/deepkey"

diff --git a/flake.nix b/flake.nix
@@ -17,7 +17,7 @@
         devShell = pkgs.mkShell {
             buildInputs = with pkgs; [
               holochain_0-4
-              lair-keystore_0-4-5
+              lair-keystore_0-5
               hc_0-4
 
               rustup

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
     "@noble/hashes": "^1.4.0",
     "@spartan-hc/app-interface-client": "^0.7.2",
     "@spartan-hc/holo-hash": "^0.7.0",
-    "@spartan-hc/holochain-backdrop": "^4.4.1",
+    "@spartan-hc/holochain-backdrop": "^4.5.0",
     "@whi/json": "^0.1.8",
     "@whi/weblogger": "^0.4.0",
     "chai": "^4.3.4",

diff --git a/pkgs.nix b/pkgs.nix
@@ -3,8 +3,8 @@
 import (pkgs.fetchFromGitHub {
   owner = "spartan-holochain-counsel";
   repo = "nix-overlay";
-  rev = "09a503d2a04909df03433b9cf0ec53a8c23699af";
-  sha256 = "sdX6kksfoHRXvvkwktll36nwNI91QERDt4h6X6gZxIM=";
+  rev = "4bf90e85448392512d8bf4dac91fdeb56bc7d610";
+  sha256 = "lxGLA0KMecdt6xRy9SqApDfh9UiQd9OYnwj9xeMLJcQ=";
 }) {
   inherit pkgs;
   inherit system;

diff --git a/zomes/deepkey/src/lib.rs b/zomes/deepkey/src/lib.rs
@@ -6,9 +6,9 @@ pub mod joining_proof;
 pub mod source_of_authority;
 
 // Re-exports
-pub use deepkey_types;
+pub use hc_deepkey_types as deepkey_types;
 
-pub use deepkey_types::*;
+pub use hc_deepkey_types::*;
 pub use error::*;
 pub use joining_proof::*;
 pub use source_of_authority::*;

diff --git a/zomes/deepkey_csr/src/change_rule.rs b/zomes/deepkey_csr/src/change_rule.rs
@@ -1,4 +1,7 @@
-use crate::utils;
+use crate::{
+    utils,
+    deepkey_sdk,
+};
 use deepkey::*;
 use hdk::prelude::*;
 use hdk_extensions::{
@@ -81,7 +84,7 @@ pub fn construct_authority_spec(input: AuthoritySpecInput) -> ExternResult<(Auth
 /// #### Example usage (first update)
 /// ```rust, no_run
 /// use hdk::prelude::*;
-/// use deepkey_sdk::*;
+/// use hc_deepkey_sdk::*;
 ///
 /// use rand::rngs::OsRng;
 /// use ed25519_dalek::SigningKey;
@@ -122,7 +125,7 @@ pub fn construct_authority_spec(input: AuthoritySpecInput) -> ExternResult<(Auth
 /// #### Example usage (second update)
 /// ```rust, no_run
 /// # use hdk::prelude::*;
-/// # use deepkey_sdk::*;
+/// # use hc_deepkey_sdk::*;
 /// # use rand::rngs::OsRng;
 /// # use ed25519_dalek::SigningKey;
 /// use ed25519_dalek::Signer;

diff --git a/zomes/deepkey_csr/src/key_anchor.rs b/zomes/deepkey_csr/src/key_anchor.rs
@@ -1,4 +1,7 @@
-use crate::utils;
+use crate::{
+    utils,
+    deepkey_sdk,
+};
 use deepkey::*;
 use deepkey_sdk::{
     KeyState,