switch to later holochain commit, add allowed_origins logic, use new …

…we-rust-utils
lightningrodlabs · Mar 22, 2024 · 5c9ff7e · 5c9ff7e
1 parent 20282e4
commit 5c9ff7e
Show file tree

Hide file tree

Showing 10 changed files with 72 additions and 40 deletions.
diff --git a/.github/workflows/publish-happ.yaml b/.github/workflows/publish-happ.yaml
@@ -46,7 +46,7 @@ jobs:
           allowUpdates: true
           artifacts: 'workdir/we.happ'
           body: 'See assets below to download and install this version.'
-          name: We happ v${{ steps.version.outputs.APP_VERSION }}-holochain-0.2.5
+          name: We happ v${{ steps.version.outputs.APP_VERSION }}-holochain-0.3.0-beta-dev.42-1ddfd2d
           tag: we-alpha-happ-v${{ steps.version.outputs.APP_VERSION }}
           prerelease: true
           draft: true
diff --git a/cli/README.md b/cli/README.md
@@ -2,7 +2,7 @@
 
 CLI to run We Applets in development mode.
 
-This version is compatible with `@lightningrodlabs/we-applet@0.15.0`.
+This version is compatible with `@lightningrodlabs/we-applet@0.16.0-dev.0`.
 
 ```
 Usage: @lightningrodlabs/we-dev-cli [options]

diff --git a/cli/package.json b/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lightningrodlabs/we-dev-cli",
-  "version": "0.10.5",
+  "version": "0.11.0-dev.0",
   "description": "CLI to run We applets in development mode",
   "license": "CAL-1.0",
   "repository": {
@@ -20,7 +20,7 @@
     "@holochain/client": "^0.17.0-dev.7",
     "@holochain-open-dev/utils": "0.300.0-dev.0",
     "@lightningrodlabs/we-applet": "0.16.0-dev.0",
-    "@lightningrodlabs/we-rust-utils": "0.300.0",
+    "@lightningrodlabs/we-rust-utils": "0.300.1-dev.2",
     "bufferutil": "4.0.8",
     "commander": "11.1.0",
     "electron-context-menu": "3.6.1",

diff --git a/moss.config.json b/moss.config.json
@@ -1,4 +1,4 @@
 {
-  "holochainVersion": "0.3.0-beta-dev.41-c3eec1b",
+  "holochainVersion": "0.3.0-beta-dev.42-1ddfd2d",
   "lairVersion": "0.4.4"
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "org.lightningrodlabs.we-electron-alpha",
-  "version": "0.11.0-alpha.0",
+  "version": "0.11.0",
   "private": true,
   "description": "Moss (Alpha)",
   "main": "./out/main/index.js",
@@ -52,11 +52,11 @@
   "dependencies": {
     "@electron-toolkit/preload": "^2.0.0",
     "@electron-toolkit/utils": "^2.0.0",
-    "@holochain/client": "^0.17.0-dev.7",
+    "@holochain/client": "git+https://github.com/matthme/holochain-client-js.git#63274e6463a42ff1ed49eb242eee31f839c8055e",
     "@holochain-open-dev/utils": "0.300.0-dev.0",
     "@holochain-playground/cli": "^0.1.1",
     "@lightningrodlabs/we-applet": "file:./libs/we-applet",
-    "@lightningrodlabs/we-rust-utils": "^0.300.0",
+    "@lightningrodlabs/we-rust-utils": "^0.300.1-dev.2",
     "bufferutil": "4.0.8",
     "commander": "11.1.0",
     "electron-context-menu": "3.6.1",

diff --git a/src/main/cli/devSetup.ts b/src/main/cli/devSetup.ts
@@ -115,6 +115,9 @@ export async function devSetup(
 
   const appstoreClient = await AppAgentWebsocket.connect(APPSTORE_APP_ID, {
     url: new URL(`ws://127.0.0.1:${holochainManager.appPort}`),
+    wsClientOptions: {
+      origin: 'moss-admin',
+    },
     defaultTimeout: 4000,
   });
   const appstoreCells = await appstoreClient.appInfo();
@@ -372,6 +375,9 @@ async function joinGroup(
   const groupAppInfo = await installGroup(holochainManager, group.networkSeed);
   const groupWebsocket = await AppAgentWebsocket.connect(groupAppInfo.installed_app_id, {
     url: new URL(`ws://127.0.0.1:${appPort}`),
+    wsClientOptions: {
+      origin: 'moss-admin',
+    },
   });
   const groupCells = await groupWebsocket.appInfo();
   for (const [_role_name, [cell]] of Object.entries(groupCells.cell_info)) {

diff --git a/src/main/holochainManager.ts b/src/main/holochainManager.ts
@@ -66,6 +66,7 @@ export class HolochainManager {
       lairUrl,
       bootstrapUrl,
       signalingUrl,
+      '*',
     );
     console.log('Writing conductor-config.yaml...');
 
@@ -109,6 +110,9 @@ export class HolochainManager {
         if (line.includes('Conductor ready.')) {
           const adminWebsocket = await AdminWebsocket.connect({
             url: new URL(`ws://127.0.0.1:${adminPort}`),
+            wsClientOptions: {
+              origin: 'moss-admin-main',
+            },
           });
           console.log('Connected to admin websocket.');
           const installedApps = await adminWebsocket.listApps({});
@@ -118,7 +122,9 @@ export class HolochainManager {
           if (appInterfaces.length > 0) {
             appPort = appInterfaces[0];
           } else {
-            const attachAppInterfaceResponse = await adminWebsocket.attachAppInterface({});
+            const attachAppInterfaceResponse = await adminWebsocket.attachAppInterface({
+              allowed_origins: '*',
+            });
             console.log('Attached app interface port: ', attachAppInterfaceResponse);
             appPort = attachAppInterfaceResponse.port;
           }

diff --git a/src/renderer/src/applets/applet-store.ts b/src/renderer/src/applets/applet-store.ts
@@ -11,7 +11,7 @@ import { encodeHashToBase64, EntryHash } from '@holochain/client';
 import { BlockType } from '@lightningrodlabs/we-applet';
 
 import { AppletHost } from './applet-host.js';
-import { Applet } from './types.js';
+import { Applet } from '../types.js';
 import {
   appEntryIdFromDistInfo,
   clearAppletNotificationStatus,

diff --git a/src/renderer/src/groups/elements/federate-applet-dialog.ts b/src/renderer/src/groups/elements/federate-applet-dialog.ts
@@ -83,7 +83,12 @@ export class FederateAppletDialog extends LitElement {
       if (!appletStore) throw new Error('Applet not found');
 
       const applet = appletStore.applet;
-      await groupStore.addFederatedApplet(applet);
+      // TODO public key of applet here once applets use their own public key
+      const appletPubKey = groupStore.groupClient.myPubKey;
+      await groupStore.addFederatedApplet({
+        applet,
+        joining_pubkey: appletPubKey,
+      });
 
       // Two way link from one group to the other
       // TODO: what to do when the applet is uninstalled?

diff --git a/yarn.lock b/yarn.lock
@@ -1619,6 +1619,21 @@
     lodash-es "^4.17.21"
     ws "^8.14.2"
 
+"@holochain/client@git+https://github.com/matthme/holochain-client-js.git#63274e6463a42ff1ed49eb242eee31f839c8055e":
+  version "0.17.0-superdev.8"
+  resolved "git+https://github.com/matthme/holochain-client-js.git#63274e6463a42ff1ed49eb242eee31f839c8055e"
+  dependencies:
+    "@bitgo/blake2b" "^3.2.4"
+    "@holochain/serialization" "^0.1.0-beta-rc.3"
+    "@msgpack/msgpack" "^2.8.0"
+    "@tauri-apps/api" "^1.4.0"
+    emittery "^1.0.1"
+    isomorphic-ws "^5.0.0"
+    js-base64 "^3.7.5"
+    libsodium-wrappers "^0.7.13"
+    lodash-es "^4.17.21"
+    ws "^8.14.2"
+
 "@holochain/serialization@^0.1.0-beta-rc.3":
   version "0.1.0-beta-rc.3"
   resolved "https://registry.yarnpkg.com/@holochain/serialization/-/serialization-0.1.0-beta-rc.3.tgz#787a785fa48e00f2d168c6d4b45a233c4800cccb"
@@ -1725,8 +1740,8 @@
     "@holochain-open-dev/stores" "0.300.0-dev.0"
     "@holochain-open-dev/utils" "0.300.0-dev.0"
     "@holochain/client" "^0.17.0-dev.7"
-    "@lightningrodlabs/we-applet" "file:../../../../.cache/yarn/v6/[email protected]dea877a6-8796-4f33-aa9f-e08737662dc7-1710863880358/node_modules/@lightningrodlabs/we-applet"
-    "@lightningrodlabs/we-elements" "file:../../../../.cache/yarn/v6/[email protected]dea877a6-8796-4f33-aa9f-e08737662dc7-1710863880358/node_modules/@lightningrodlabs/we-elements"
+    "@lightningrodlabs/we-applet" "file:../../../../.cache/yarn/v6/[email protected]8808cb41-64c9-4c92-bfe9-0ecb84f7efb7-1711115837601/node_modules/@lightningrodlabs/we-applet"
+    "@lightningrodlabs/we-elements" "file:../../../../.cache/yarn/v6/[email protected]8808cb41-64c9-4c92-bfe9-0ecb84f7efb7-1711115837601/node_modules/@lightningrodlabs/we-elements"
     "@lit/context" "^1.0.1"
     "@lit/localize" "^0.12.0"
     "@material/web" "=1.0.0-pre.9"
@@ -1742,7 +1757,7 @@
     "@holochain/client" "0.16.6"
 
 "@lightningrodlabs/we-applet@file:./libs/we-applet", "@lightningrodlabs/we-applet@file:libs/we-applet":
-  version "0.16.0-alpha.0"
+  version "0.16.0-dev.0"
   dependencies:
     "@holochain/client" "^0.17.0-dev.7"
     "@msgpack/msgpack" "^2.8.0"
@@ -1769,14 +1784,14 @@
     winston "3.11.0"
 
 "@lightningrodlabs/we-elements@file:libs/we-elements":
-  version "0.5.0"
+  version "0.5.0-dev.0"
   dependencies:
     "@holochain-open-dev/elements" "0.300.0-dev.0"
     "@holochain-open-dev/profiles" "0.300.0-dev.0"
     "@holochain-open-dev/stores" "0.300.0-dev.0"
     "@holochain-open-dev/utils" "0.300.0-dev.0"
     "@holochain/client" "^0.17.0-dev.7"
-    "@lightningrodlabs/we-applet" "file:../../../../.cache/yarn/v6/[email protected]bfe7563c-2187-49c3-bad7-01f49fe9c456-1710863880360/node_modules/@lightningrodlabs/we-applet"
+    "@lightningrodlabs/we-applet" "file:../../../../.cache/yarn/v6/[email protected]dev.0-7e65e35c-1e38-4479-9f5c-ac523094871d-1711115837603/node_modules/@lightningrodlabs/we-applet"
     "@lit/context" "^1.0.1"
     "@lit/localize" "^0.12.0"
     "@mdi/js" "^7.2.0"
@@ -1789,40 +1804,40 @@
   resolved "https://registry.yarnpkg.com/@lightningrodlabs/we-rust-utils-darwin-arm64/-/we-rust-utils-darwin-arm64-0.1.4.tgz#9b3b2d3289f52b5461d68aba08c63097a7a97bf0"
   integrity sha512-chyZ24qFB1KhDAI0aKekuHnGfV811wQ6AW96J0jj10hKY9CBH4aedeA/mHjU3Qe5jSj1a4/ZTc6eBxN8BwziCw==
 
-"@lightningrodlabs/[email protected].0":
-  version "0.300.0"
-  resolved "https://registry.yarnpkg.com/@lightningrodlabs/we-rust-utils-darwin-arm64/-/we-rust-utils-darwin-arm64-0.300.0.tgz#84a852c803d06938dca41690b6f817448d3edc93"
-  integrity sha512-z2bVzejwSx+acdW9lljvUzxSKYnnVoxO5Y+b9bh4rivCnCJpZ1GFA6s0cAGfGr/nDs0y2zMfUEdD9lqX157x2g==
+"@lightningrodlabs/[email protected].1-dev.2":
+  version "0.300.1-dev.2"
+  resolved "https://registry.yarnpkg.com/@lightningrodlabs/we-rust-utils-darwin-arm64/-/we-rust-utils-darwin-arm64-0.300.1-dev.2.tgz#54e96e6ca7d6ab7cf01948b6be9f7516d122bb35"
+  integrity sha512-kSWUf5hsHWpSRUI3+g2CCXQenQ18nOXaBf7chGSnIiG8jgQCLOrXlKe1ZuZU6TzoAyd/A75LlBBxD0dETaYQzQ==
 
 "@lightningrodlabs/[email protected]":
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/@lightningrodlabs/we-rust-utils-darwin-x64/-/we-rust-utils-darwin-x64-0.1.4.tgz#a95c9f93e81c74384657bb54ba7269ee88b86ff7"
   integrity sha512-eJz8K8yF0TETMJScdb3PKSe7j2BE9JWzIHTscHW9ZbA9fbqO8TV/7CIzbPXS4DVAOYqKQhGW9w4zGkh88hMACw==
 
-"@lightningrodlabs/[email protected].0":
-  version "0.300.0"
-  resolved "https://registry.yarnpkg.com/@lightningrodlabs/we-rust-utils-darwin-x64/-/we-rust-utils-darwin-x64-0.300.0.tgz#22a6ad9ccab3bb0507619d308cc667ea244016e0"
-  integrity sha512-QkLm2SArwJv0orPjDHDud7MWeYHEdyFUvOZeQlT/KzZg/MEpdpycoaDHlv8fcxVyFq7W6SkGoALtwvJMBYVVwQ==
+"@lightningrodlabs/[email protected].1-dev.2":
+  version "0.300.1-dev.2"
+  resolved "https://registry.yarnpkg.com/@lightningrodlabs/we-rust-utils-darwin-x64/-/we-rust-utils-darwin-x64-0.300.1-dev.2.tgz#802eeecf19cbaf0bdd4c64e5a72cc6a6bfcee1c7"
+  integrity sha512-+X0mO2aOm3vgFYUuFMWbcATNIoxm9i7Gnt3bjtNICaimz2Wr2F/Vm0UJuZCWT8uV31feWEBur2GtMDtbrI08tg==
 
 "@lightningrodlabs/[email protected]":
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/@lightningrodlabs/we-rust-utils-linux-x64-gnu/-/we-rust-utils-linux-x64-gnu-0.1.4.tgz#7e0d88a16035881b5efca68a41bc4d6ef99d97c0"
   integrity sha512-uWMeXr01t168kg5OOvsjkqr0dBfD1asuhlxKFRpzqv+9dOt4X21SDcmpqBma4oaNcz6ecA/WA4hjojgMI2WMVQ==
 
-"@lightningrodlabs/[email protected].0":
-  version "0.300.0"
-  resolved "https://registry.yarnpkg.com/@lightningrodlabs/we-rust-utils-linux-x64-gnu/-/we-rust-utils-linux-x64-gnu-0.300.0.tgz#57de961663f12fa6ae5afe4c85b6cf4233af4f29"
-  integrity sha512-jyLuGAURndRxBxRALrUIj1C1rbpYk2nlTw/iiCkOrEHvJrAs9ngM+QHM1ZMZaCIIVlvqCrqc9bBIlL3+DpUyCQ==
+"@lightningrodlabs/[email protected].1-dev.2":
+  version "0.300.1-dev.2"
+  resolved "https://registry.yarnpkg.com/@lightningrodlabs/we-rust-utils-linux-x64-gnu/-/we-rust-utils-linux-x64-gnu-0.300.1-dev.2.tgz#057d080a163e70a3d22db22e558d822020a6f599"
+  integrity sha512-0G5lADOq+e6dQUToOo5nxBH4lzFS6GWcbDHLLFcSx0XRfLfua3Lefe4U77YzEqU1Lgj1H8sQFxQWtyB1wctB+w==
 
 "@lightningrodlabs/[email protected]":
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/@lightningrodlabs/we-rust-utils-win32-x64-msvc/-/we-rust-utils-win32-x64-msvc-0.1.4.tgz#0fc81c497916e8827eb318c4a62eaf113c3aed2d"
   integrity sha512-hhz5AeGkESEAxXLs42wTaWfdh38m+50ZTcQzGp/NEshCWF93xU4jNkOjGbaBNHjpGG6CyhQJEmkabDxk1G7ZMw==
 
-"@lightningrodlabs/[email protected].0":
-  version "0.300.0"
-  resolved "https://registry.yarnpkg.com/@lightningrodlabs/we-rust-utils-win32-x64-msvc/-/we-rust-utils-win32-x64-msvc-0.300.0.tgz#130972e5b9c742eac39575a8b3de8f8efbfbd74b"
-  integrity sha512-T/aJEstCGYHNSyRGeNy0+OIb8rjx3SO0nPs4mu+ER0Dkbo+fB305TvA3Kpd0jbxFGtuaTtOhmmntyonvja2l7w==
+"@lightningrodlabs/[email protected].1-dev.2":
+  version "0.300.1-dev.2"
+  resolved "https://registry.yarnpkg.com/@lightningrodlabs/we-rust-utils-win32-x64-msvc/-/we-rust-utils-win32-x64-msvc-0.300.1-dev.2.tgz#24ff2a3a3c77981dc3b596ac60229978e31d416e"
+  integrity sha512-Jrh7IyGNt80GB1hxQIoxubPxFiH1yY26I1tzrVul9AOsepjjna+DnNf0FIgxtFCSWG2X7m2gmjENI1cd+OyvUg==
 
 "@lightningrodlabs/we-rust-utils@^0.1.4":
   version "0.1.4"
@@ -1834,15 +1849,15 @@
     "@lightningrodlabs/we-rust-utils-linux-x64-gnu" "0.1.4"
     "@lightningrodlabs/we-rust-utils-win32-x64-msvc" "0.1.4"
 
-"@lightningrodlabs/we-rust-utils@^0.300.0":
-  version "0.300.0"
-  resolved "https://registry.yarnpkg.com/@lightningrodlabs/we-rust-utils/-/we-rust-utils-0.300.0.tgz#a9dea57a8dd8ab6540d3f650395515ef143fffde"
-  integrity sha512-BVzoMZAfQyLqeZBqnXJg+9IT/ri7j6W3ZVqC3fKPK13BvnC6RPavheWje3EjSeLA/gmHQKj15b9sXHo1sQ4P3g==
+"@lightningrodlabs/we-rust-utils@^0.300.1-dev.2":
+  version "0.300.1-dev.2"
+  resolved "https://registry.yarnpkg.com/@lightningrodlabs/we-rust-utils/-/we-rust-utils-0.300.1-dev.2.tgz#8d5e742ae1edbc71833d2a156078684daedaa0ef"
+  integrity sha512-i6x9DI82FsD0RhF0pRFj3+k2NuQL8YICpc9y4LKg3vIRhEDVygzwpVcA5ZTfpGLIHZtzt8Nqv9exYfVHLOhlPQ==
   optionalDependencies:
-    "@lightningrodlabs/we-rust-utils-darwin-arm64" "0.300.0"
-    "@lightningrodlabs/we-rust-utils-darwin-x64" "0.300.0"
-    "@lightningrodlabs/we-rust-utils-linux-x64-gnu" "0.300.0"
-    "@lightningrodlabs/we-rust-utils-win32-x64-msvc" "0.300.0"
+    "@lightningrodlabs/we-rust-utils-darwin-arm64" "0.300.1-dev.2"
+    "@lightningrodlabs/we-rust-utils-darwin-x64" "0.300.1-dev.2"
+    "@lightningrodlabs/we-rust-utils-linux-x64-gnu" "0.300.1-dev.2"
+    "@lightningrodlabs/we-rust-utils-win32-x64-msvc" "0.300.1-dev.2"
 
 "@lion/accordion@^0.9.0":
   version "0.9.0"