Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update for Holochain v0.4.0-dev.20 #32

Merged
merged 2 commits into from
Aug 27, 2024
Merged

Update for Holochain v0.4.0-dev.20 #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb701de
Update for Holochain v0.4.0-dev.18
mjbrisebois Aug 20, 2024
da5e326
Update for Holochain v0.4.0-dev.20
mjbrisebois Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 8 additions & 10 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.11" }
whi_hdi_extensions = { version = "0.10" }
# whi_hdi_extensions = { path = "../whi_hdi_extensions" }
whi_hdk_extensions = { version = "0.10" }
# 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"
Expand Down
2 changes: 1 addition & 1 deletion dnas/deepkey/sdk/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ crate-type = ["cdylib", "rlib"]

[dependencies]
hc_deepkey_types = { version = "0.8.0-dev.2", path = "../types" }
hdk = "=0.4.0-dev.11"
hdk = "=0.4.0-dev.12"
serde = "1"
serde_bytes = "0.11"

Expand Down
2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
55 changes: 41 additions & 14 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions pkgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import (pkgs.fetchFromGitHub {
owner = "spartan-holochain-counsel";
repo = "nix-overlay";
rev = "5bae4a38735d74633c9c089b5c896cb9631a295b";
sha256 = "E/FvMyUgEB5MYL+s46YSiHPOAJiurKZDMQy1oxak6bg=";
rev = "4bf90e85448392512d8bf4dac91fdeb56bc7d610";
sha256 = "lxGLA0KMecdt6xRy9SqApDfh9UiQd9OYnwj9xeMLJcQ=";
}) {
inherit pkgs;
inherit system;
Expand Down
4 changes: 2 additions & 2 deletions zomes/deepkey/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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::*;
Expand Down
9 changes: 6 additions & 3 deletions zomes/deepkey_csr/src/change_rule.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
use crate::utils;
use crate::{
utils,
deepkey_sdk,
};
use deepkey::*;
use hdk::prelude::*;
use hdk_extensions::{
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Loading