From 47ccae57766a2d28afc6d38e3f74e9a533865870 Mon Sep 17 00:00:00 2001 From: "guillem.cordoba" Date: Mon, 7 Oct 2024 16:46:16 +0200 Subject: [PATCH] Merge WIP --- Cargo.toml | 4 +- flake.lock | 176 +++++++++++++++++++++++-------------------- flake.nix | 2 +- package.json | 2 +- src-tauri/Cargo.toml | 8 +- 5 files changed, 102 insertions(+), 90 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e0ab700f..d7f2e965 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,8 +15,8 @@ members = ["dnas/*/zomes/coordinator/*", "dnas/*/zomes/integrity/*", "src-tauri" resolver = "2" [workspace.dependencies] -hdi = "0.4.1" -hdk = "0.3.1" +hdi = "0.5.0-rc" +hdk = "0.4.0-rc" serde = "1.0" [workspace.dependencies.file_storage] diff --git a/flake.lock b/flake.lock index a1348807..e7c15bb0 100644 --- a/flake.lock +++ b/flake.lock @@ -4,10 +4,7 @@ "inputs": { "devshell": "devshell", "flake-utils": "flake-utils_2", - "nixpkgs": [ - "p2p-shipyard", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1720988234, @@ -19,8 +16,8 @@ }, "original": { "owner": "tadfisher", - "ref": "stable", "repo": "android-nixpkgs", + "rev": "4aeeeec599210e54aee0ac31d4fcb512f87351a0", "type": "github" } }, @@ -41,11 +38,11 @@ }, "crane_2": { "locked": { - "lastModified": 1725125250, - "narHash": "sha256-CB20rDD5eHikF6mMTTJdwPP1qvyoiyyw1RDUzwIaIF8=", + "lastModified": 1727235847, + "narHash": "sha256-MoEot8izwkfGm1h5ak8hS2bu59mLmKeevlP/OvFLCzM=", "owner": "ipetkov", "repo": "crane", - "rev": "96fd12c7100e9e05fa1a0a5bd108525600ce282f", + "rev": "08f45b5a2e01cf34ca6081188c6d16aa35581b09", "type": "github" }, "original": { @@ -56,11 +53,11 @@ }, "crane_3": { "locked": { - "lastModified": 1725125250, - "narHash": "sha256-CB20rDD5eHikF6mMTTJdwPP1qvyoiyyw1RDUzwIaIF8=", + "lastModified": 1727235847, + "narHash": "sha256-MoEot8izwkfGm1h5ak8hS2bu59mLmKeevlP/OvFLCzM=", "owner": "ipetkov", "repo": "crane", - "rev": "96fd12c7100e9e05fa1a0a5bd108525600ce282f", + "rev": "08f45b5a2e01cf34ca6081188c6d16aa35581b09", "type": "github" }, "original": { @@ -115,11 +112,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1725234343, - "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", + "lastModified": 1726153070, + "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", + "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "type": "github" }, "original": { @@ -133,11 +130,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1725234343, - "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", + "lastModified": 1726153070, + "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", + "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "type": "github" }, "original": { @@ -206,15 +203,16 @@ ] }, "locked": { - "lastModified": 1726667762, - "narHash": "sha256-wFFgvhVnOg/fXFJhnuPvFMD9NVsmPFiEgEHe5Y6q+fU=", + "lastModified": 1727780004, + "narHash": "sha256-QLgHmaSGg0+3YXvvne9ILPCEVHw04da/vvWxjG3Fq0o=", "owner": "holochain-open-dev", "repo": "infrastructure", - "rev": "0eb9281d47c8d1432048919817da8d9226214f26", + "rev": "dd9e69c0a8363f0393b36428ceac1d05808043b9", "type": "github" }, "original": { "owner": "holochain-open-dev", + "ref": "next", "repo": "infrastructure", "type": "github" } @@ -239,16 +237,16 @@ "hc-launch_2": { "flake": false, "locked": { - "lastModified": 1717431387, - "narHash": "sha256-+VvWwBmxcgePV1L6kU2mSkg3emMiMgpdQnCqvQJkRPk=", + "lastModified": 1726473709, + "narHash": "sha256-WjuSEtK9odQsrAIbS7TxQEYPyjYgJheMZmVj7Aentyg=", "owner": "holochain", "repo": "hc-launch", - "rev": "9d9cab5e6b57e1c278113921ff203e515c8bbd2e", + "rev": "c6fb9cf6d4b8e548c960527a8fc88d2ead051394", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.3", + "ref": "holochain-weekly", "repo": "hc-launch", "type": "github" } @@ -256,16 +254,16 @@ "hc-launch_3": { "flake": false, "locked": { - "lastModified": 1717431387, - "narHash": "sha256-+VvWwBmxcgePV1L6kU2mSkg3emMiMgpdQnCqvQJkRPk=", + "lastModified": 1726473709, + "narHash": "sha256-WjuSEtK9odQsrAIbS7TxQEYPyjYgJheMZmVj7Aentyg=", "owner": "holochain", "repo": "hc-launch", - "rev": "9d9cab5e6b57e1c278113921ff203e515c8bbd2e", + "rev": "c6fb9cf6d4b8e548c960527a8fc88d2ead051394", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.3", + "ref": "holochain-weekly", "repo": "hc-launch", "type": "github" } @@ -273,11 +271,11 @@ "hc-scaffold": { "flake": false, "locked": { - "lastModified": 1724073530, - "narHash": "sha256-PUM8otA5F5s8ZHxhjupn7R+RZAjh2rueYIFwu3UkK44=", + "lastModified": 1727691892, + "narHash": "sha256-8dMLmpYp19wZhxlR1uiSeR23nGAOhHnyiZ/5CPwOoAg=", "owner": "holochain", "repo": "scaffolding", - "rev": "8a6d1dab0f1668c2781a46d93a5ad638fcf25598", + "rev": "d0290b88ac08e6811d57acb3294a177d107d2528", "type": "github" }, "original": { @@ -290,16 +288,16 @@ "hc-scaffold_2": { "flake": false, "locked": { - "lastModified": 1724073530, - "narHash": "sha256-PUM8otA5F5s8ZHxhjupn7R+RZAjh2rueYIFwu3UkK44=", + "lastModified": 1725629251, + "narHash": "sha256-23TjhOgXdLOX05yGDK8ZVTZxovbFiGz2Mu+H45YLpAA=", "owner": "holochain", "repo": "scaffolding", - "rev": "8a6d1dab0f1668c2781a46d93a5ad638fcf25598", + "rev": "d415a38e686faf38c91689e176b62a93bd51b188", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.3", + "ref": "holochain-weekly", "repo": "scaffolding", "type": "github" } @@ -307,16 +305,16 @@ "hc-scaffold_3": { "flake": false, "locked": { - "lastModified": 1724073530, - "narHash": "sha256-PUM8otA5F5s8ZHxhjupn7R+RZAjh2rueYIFwu3UkK44=", + "lastModified": 1727375207, + "narHash": "sha256-wGS+cOhvakLWscqPI0LaBZVZ3ryORV3YDvL+bfhI+WA=", "owner": "holochain", "repo": "scaffolding", - "rev": "8a6d1dab0f1668c2781a46d93a5ad638fcf25598", + "rev": "b218f253a124b6e7b5be0600c3aab7a57344f0f2", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.3", + "ref": "holochain-weekly", "repo": "scaffolding", "type": "github" } @@ -341,16 +339,16 @@ "holochain_2": { "flake": false, "locked": { - "lastModified": 1722347117, - "narHash": "sha256-Jv4DxaVtdbO+fOD4woFoepCCOtRN/HF94xJSwViz3ck=", + "lastModified": 1727226305, + "narHash": "sha256-a4zt59D7LRnhkryusxyDGCmBxB2GOmEJDCOTLab1gY0=", "owner": "holochain", "repo": "holochain", - "rev": "97d86050b177829b623461970db5c3b64fbd74c1", + "rev": "b42fb1ba3c439a7fe561cc627c5d53280fd2a83b", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.3.2", + "ref": "holochain-0.4.0-dev.26", "repo": "holochain", "type": "github" } @@ -358,16 +356,16 @@ "holochain_3": { "flake": false, "locked": { - "lastModified": 1722347117, - "narHash": "sha256-Jv4DxaVtdbO+fOD4woFoepCCOtRN/HF94xJSwViz3ck=", + "lastModified": 1727830716, + "narHash": "sha256-6PTQ3nbofxqiynVKj3X4tTvdW56Mow/SUs2V+2hiQhQ=", "owner": "holochain", "repo": "holochain", - "rev": "97d86050b177829b623461970db5c3b64fbd74c1", + "rev": "b09c4846ebf4653becceef3cde1833a935b391de", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.3.2", + "ref": "holochain-0.4.0-dev.28", "repo": "holochain", "type": "github" } @@ -384,11 +382,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1725293701, - "narHash": "sha256-dwb1tzr7kO8u5LllGqJiIaKe2btsKaMHX1gecgtwruM=", + "lastModified": 1727888522, + "narHash": "sha256-v7xvwPMeIUkYnPuMG+uypRu259t1HoSYBY+1zaq8jHs=", "owner": "holochain", "repo": "holonix", - "rev": "fb9e3c067052cf628d1b22a1802f016eaf1d3e3e", + "rev": "9d3c4cf95e0224a953de9a290d055e494113e42b", "type": "github" }, "original": { @@ -406,20 +404,19 @@ "hc-scaffold": "hc-scaffold_2", "holochain": "holochain_2", "lair-keystore": "lair-keystore_2", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1725293701, - "narHash": "sha256-dwb1tzr7kO8u5LllGqJiIaKe2btsKaMHX1gecgtwruM=", + "lastModified": 1727258034, + "narHash": "sha256-hjO4HXA/42iorkeM0T+T+qDrFG2Edu0+tROQ5ji/npY=", "owner": "holochain", "repo": "holonix", - "rev": "fb9e3c067052cf628d1b22a1802f016eaf1d3e3e", + "rev": "2647d78d7083b5560a9f77df618345a64d4ddb6e", "type": "github" }, "original": { "owner": "holochain", - "ref": "main-0.3", "repo": "holonix", "type": "github" } @@ -432,20 +429,19 @@ "hc-scaffold": "hc-scaffold_3", "holochain": "holochain_3", "lair-keystore": "lair-keystore_3", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1725293701, - "narHash": "sha256-dwb1tzr7kO8u5LllGqJiIaKe2btsKaMHX1gecgtwruM=", + "lastModified": 1727888510, + "narHash": "sha256-fYDFDsru7qct6csTB6NfhK8HLSubjeGEyH9vuvR7WeI=", "owner": "holochain", "repo": "holonix", - "rev": "fb9e3c067052cf628d1b22a1802f016eaf1d3e3e", + "rev": "9832cd6b14f2aa5eb08cf87c83c8e68247221d91", "type": "github" }, "original": { "owner": "holochain", - "ref": "main-0.3", "repo": "holonix", "type": "github" } @@ -470,16 +466,16 @@ "lair-keystore_2": { "flake": false, "locked": { - "lastModified": 1717684904, - "narHash": "sha256-vcXt67Tl1qwVUkx8CBevdQocqZXUEeoXjaYw86ljsYo=", + "lastModified": 1726865440, + "narHash": "sha256-+ARQs+Sfmh8QXMyjjHjm6Ib8Ag86Jm2vnyB6l3zTCgA=", "owner": "holochain", "repo": "lair", - "rev": "6a84ed490fc7074d107e38bbb4a8d707e9b8e066", + "rev": "9f306efed597765b70da704e1739ecc67f2510e0", "type": "github" }, "original": { "owner": "holochain", - "ref": "lair_keystore-v0.4.5", + "ref": "lair_keystore-v0.5.2", "repo": "lair", "type": "github" } @@ -487,16 +483,16 @@ "lair-keystore_3": { "flake": false, "locked": { - "lastModified": 1717684904, - "narHash": "sha256-vcXt67Tl1qwVUkx8CBevdQocqZXUEeoXjaYw86ljsYo=", + "lastModified": 1726865440, + "narHash": "sha256-+ARQs+Sfmh8QXMyjjHjm6Ib8Ag86Jm2vnyB6l3zTCgA=", "owner": "holochain", "repo": "lair", - "rev": "6a84ed490fc7074d107e38bbb4a8d707e9b8e066", + "rev": "9f306efed597765b70da704e1739ecc67f2510e0", "type": "github" }, "original": { "owner": "holochain", - "ref": "lair_keystore-v0.4.5", + "ref": "lair_keystore-v0.5.2", "repo": "lair", "type": "github" } @@ -554,6 +550,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1720768451, + "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1717179513, "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", @@ -569,7 +581,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1717179513, "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", @@ -608,27 +620,27 @@ "webkitgtknixpkgs": "webkitgtknixpkgs" }, "locked": { - "lastModified": 1726677940, - "narHash": "sha256-44o9uQ05Vbb+LaF60Z9aiq7OmMLXOd0B4eFOZQn0ouk=", + "lastModified": 1728309769, + "narHash": "sha256-l/BVuMUuXfmOtCkE7KnJ3Jgg8SSF+jO2kNnFJSL++TE=", "owner": "darksoil-studio", "repo": "p2p-shipyard", - "rev": "235da338b58c4a79b5d593518d61757039d627af", + "rev": "22592058c6d34dab2a2f3422ebc05498b84670ff", "type": "github" }, "original": { "owner": "darksoil-studio", - "ref": "develop", + "ref": "next", "repo": "p2p-shipyard", "type": "github" } }, "pnpmnixpkgs": { "locked": { - "lastModified": 1726447378, - "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", + "lastModified": 1727540905, + "narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1", + "rev": "fbca5e745367ae7632731639de5c21f29c8744ed", "type": "github" }, "original": { @@ -683,11 +695,11 @@ ] }, "locked": { - "lastModified": 1725243956, - "narHash": "sha256-0A5ZP8uDCyBdYUzayZfy6JFdTefP79oZVAjyqA/yuSI=", + "lastModified": 1727231386, + "narHash": "sha256-XLloPtQHKk/Tdt8t8zIb+JhmunlH3YB9Jz8RTlQ3N/4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a10c8092d5f82622be79ed4dd12289f72011f850", + "rev": "b5f76c3b09a8194889f5328a480fbea1a9115518", "type": "github" }, "original": { @@ -705,11 +717,11 @@ ] }, "locked": { - "lastModified": 1725243956, - "narHash": "sha256-0A5ZP8uDCyBdYUzayZfy6JFdTefP79oZVAjyqA/yuSI=", + "lastModified": 1727231386, + "narHash": "sha256-XLloPtQHKk/Tdt8t8zIb+JhmunlH3YB9Jz8RTlQ3N/4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a10c8092d5f82622be79ed4dd12289f72011f850", + "rev": "b5f76c3b09a8194889f5328a480fbea1a9115518", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9d1919de..61560ae7 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Template for Holochain app development"; inputs = { - p2p-shipyard = { url = "github:darksoil-studio/p2p-shipyard/develop"; }; + p2p-shipyard = { url = "github:darksoil-studio/p2p-shipyard/next"; }; holonix.url = "github:holochain/holonix/main-0.3"; nixpkgs.follows = "holonix/nixpkgs"; diff --git a/package.json b/package.json index 8bc5f969..e10d268d 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "typescript": "^5.4.4" }, "dependencies": { - "@tauri-apps/plugin-shell": "^2.0.0-rc.1", + "@tauri-apps/plugin-shell": "^2.0.0", "dompurify": "^3.1.6", "lodash-es": "^4.17.21", "svelte-gestures": "^5.0.4", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index f09352d4..65f878d5 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -20,10 +20,10 @@ tauri-build = { version = "2.0.0", default-features = false , features = [] } [dependencies] tauri = { version = "2.0.0", features = [] } tauri-plugin-holochain = { git = "https://github.com/darksoil-studio/p2p-shipyard", branch = "next" } -holochain_types = { version = "0.3.2" } -lair_keystore = { version = "0.4.0" } +holochain_types = { version = "0.4.0-rc" } +lair_keystore = { version = "0.5.2" } -holochain_client = { version = "0.5.0" } +holochain_client = { version = "0.6.0-dev.9" } log = "0.4" tauri-plugin-log = "2.0.0" @@ -36,4 +36,4 @@ tempdir = "0.3.7" anyhow = "1" tauri-plugin-shell = "2.0.0-rc" serde_json = "1" -holochain = { git ="https://github.com/holochain/holochain",branch="develop-0.3" } +holochain = { git ="https://github.com/holochain/holochain",branch="develop" }