Skip to content

Commit add7bf3

Browse files
committed
all working except for something weird with the zome calls
1 parent f4d5e16 commit add7bf3

File tree

18 files changed

+696
-230
lines changed

18 files changed

+696
-230
lines changed

Cargo.lock

+163-159
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

DEVELOPERS.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,15 @@ KEYSTORE_VERSION_NUMBER should be incremented if the version of lair-keystore ch
9696

9797
This project is currently using:
9898

99-
> Holochain Revision: [v0.0.162 July 10, 2022](https://github.com/holochain/holochain/releases/tag/holochain-0.0.150)
100-
>
101-
> Lair Keystore Revision: [v0.2.0 June 20, 2022](https://github.com/holochain/lair/releases/tag/lair_keystore-v0.2.0)
102-
>
103-
> Expects an HAPP built with HDK [v0.0.152](https://docs.rs/hdk/0.0.152/hdk/index.html) and HDI [v0.1.2](https://docs.rs/hdi/0.1.2/hdi/index.html)
104-
>
105-
> https://github.com/Sprillow/holochain-runner/releases/tag/v0.2.0
99+
holochain-runner [v0.3.0](https://github.com/Sprillow/holochain-runner/releases/tag/v0.3.0)
100+
101+
which has an underlying `holochain` version of [0.0.165](https://github.com/holochain/holochain/releases/tag/holochain-0.0.165)
102+
103+
expects an HAPP built with
104+
- HDK [v0.0.154](https://docs.rs/hdk/0.0.154/hdk/index.html)
105+
- HDI [v0.1.3](https://docs.rs/hdi/0.1.3/hdi/index.html)
106106

107-
and electron version 12 [https://www.electronjs.org/](https://www.electronjs.org/)
107+
and [electron 20](https://www.electronjs.org/docs/latest/api/app)
108108

109109
## Technical Overview
110110

default.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
let
2-
holonixRev = "c52d3e13338b96fdbce9d8f9cdbbf4ea551b6bdf";
2+
holonixRev = "8dea7f5e572128fde79cb939ad048531fae2d436";
33

44
holonixPath = builtins.fetchTarball "https://github.com/holochain/holonix/archive/${holonixRev}.tar.gz";
55
holonix = import (holonixPath) {
6-
holochainVersionId = "v0_0_162";
6+
holochainVersionId = "v0_0_165";
77
};
88
nixpkgs = holonix.pkgs;
99
in nixpkgs.mkShell {

electron/package-lock.json

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

electron/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"typescript": "^4.2.4"
4848
},
4949
"dependencies": {
50-
"@lightningrodlabs/electron-holochain": "0.2.0",
50+
"@lightningrodlabs/electron-holochain": "0.3.0",
5151
"electron-log": "^4.3.5",
5252
"electron-notarize": "^1.0.0",
5353
"split": "^1.0.1"

happ/tests/profiles/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ holochain_types = "0.0.26"
2424
rand = "0.7"
2525
strum = "0.18.0"
2626
strum_macros = "0.18.0"
27-
chrono = "0.4.19"
27+
chrono = { version = "=0.4.22", default-features = false, features = ["clock", "std", "oldtime", "serde"] }
2828

2929
[features]
3030
default = ["mock"]

happ/tests/projects/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ holochain_types = "0.0.26"
2424
rand = "0.7"
2525
strum = "0.18.0"
2626
strum_macros = "0.18.0"
27-
chrono = "0.4.19"
27+
chrono = { version = "=0.4.22", default-features = false, features = ["clock", "std", "oldtime", "serde"] }
2828

2929
[features]
3030
default = ["mock"]

happ/workdir/profiles.dna

-6.84 KB
Binary file not shown.

happ/workdir/profiles.happ

-8.31 KB
Binary file not shown.

happ/workdir/projects.dna

-11.4 KB
Binary file not shown.

happ/zomes/profiles/Cargo.toml

+4-5
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@ crate-type = ["cdylib", "rlib"]
88
name = "profiles"
99

1010
[dependencies]
11-
# hdk_crud = { version = "0.5.6", features = ["no_example"] }
12-
hdk_crud = { git = "https://github.com/lightningrodlabs/hdk_crud", branch = "holochain-0.0.162-bump", features = ["no_example"] }
13-
chrono = "0.4.19"
14-
hdk = "0.0.152"
15-
holo_hash = {version = "=0.0.32", features = ["encoding", "fixturators"]}
11+
hdk_crud = { version = "0.7.0", features = ["no_example"] }
12+
hdk = "0.0.154"
13+
holo_hash = {version = "=0.0.33", features = ["encoding", "fixturators"]}
1614
profiles_integrity = { path = "../profiles_integrity" }
15+
chrono = { version = "=0.4.22", default-features = false, features = ["clock", "std", "oldtime", "serde"] }
1716
paste = "*"
1817
serde = "*"
1918
thiserror = "1"

happ/zomes/profiles_integrity/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ crate-type = ["cdylib", "rlib"]
88
name = "profiles_integrity"
99

1010
[dependencies]
11-
hdi = "=0.1.2"
12-
holo_hash = { version = "=0.0.32", features = ["encoding"] }
11+
hdi = "=0.1.3"
12+
holo_hash = { version = "=0.0.33", features = ["encoding"] }
1313
serde = "*"

happ/zomes/projects/Cargo.toml

+4-5
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@ crate-type = ["cdylib", "rlib"]
88
name = "projects"
99

1010
[dependencies]
11-
# hdk_crud = { version = "0.5.6", features = ["no_example"] }
12-
hdk_crud = { git = "https://github.com/lightningrodlabs/hdk_crud", branch = "holochain-0.0.162-bump", features = ["no_example"] }
11+
hdk_crud = { version = "0.7.0", features = ["no_example"] }
12+
hdk = "0.0.154"
13+
holo_hash = {version = "=0.0.33", features = ["encoding"]}
1314
projects_integrity = { path = "../projects_integrity" }
14-
hdk = "0.0.152"
15-
holo_hash = {version = "=0.0.32", features = ["encoding"]}
1615
paste = "*"
1716
# use whatever serde hdk uses
18-
chrono = "0.4.19"
17+
chrono = { version = "=0.4.22", default-features = false, features = ["clock", "std", "oldtime", "serde"] }
1918
serde = "*"
2019
thiserror = "1"
2120

happ/zomes/projects_integrity/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ crate-type = ["cdylib", "rlib"]
88
name = "projects_integrity"
99

1010
[dependencies]
11-
hdi = "=0.1.2"
12-
holo_hash = {version = "=0.0.32", features = ["encoding"]}
11+
hdi = "=0.1.3"
12+
holo_hash = {version = "=0.0.33", features = ["encoding"]}
1313
serde = "*"
1414
thiserror = "1"

scripts/install-hc-tools.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ rustup target install wasm32-unknown-unknown
55

66
# install `hc` cli tool
77
# KEEP THIS IN SYNC
8-
cargo install holochain_cli --version 0.0.57
8+
cargo install holochain_cli --version 0.0.60

0 commit comments

Comments
 (0)