@holochain/hc-spin 0.200.2 → 0.200.4

package/dist/preload/index.js

@@ -1,5 +1,8 @@
 "use strict";
 const electron = require("electron");
-electron.contextBridge.exposeInMainWorld("electronAPI", {
+electron.contextBridge.exposeInMainWorld("__HC_ZOME_CALL_SIGNER__", {
   signZomeCall: (zomeCall) => electron.ipcRenderer.invoke("sign-zome-call", zomeCall)
 });
+electron.contextBridge.exposeInMainWorld("electronAPI", {
+  signZomeCall: (zomeCall) => electron.ipcRenderer.invoke("sign-zome-call-legacy", zomeCall)
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@holochain/hc-spin",
-  "version": "0.200.2",
+  "version": "0.200.4",
   "description": "CLI to run Holochain aps during development.",
   "author": "matthme",
   "homepage": "https://developer.holochain.org",
@@ -28,6 +28,7 @@
     "electron-context-menu": "3.6.1",
     "get-port": "7.0.0",
     "@holochain/hc-spin-rust-utils": "0.200.2",
+    "@msgpack/msgpack": "^2.8.0",
     "nanoid": "5.0.4",
     "split": "1.0.1"
   },

package/src/main/index.ts

@@ -6,11 +6,19 @@ import { Command, Option } from 'commander';
 import contextMenu from 'electron-context-menu';
 import split from 'split';
 import * as childProcess from 'child_process';
-import { ZomeCallSigner, ZomeCallUnsignedNapi } from '@holochain/hc-spin-rust-utils';
+import { ZomeCallNapi, ZomeCallSigner, ZomeCallUnsignedNapi } from '@holochain/hc-spin-rust-utils';
 import { createHappWindow } from './windows';
 import getPort from 'get-port';
-import { AgentPubKey, AppWebsocket } from '@holochain/client';
+import {
+  AgentPubKey,
+  AppWebsocket,
+  CallZomeRequest,
+  CallZomeRequestSigned,
+  getNonceExpiration,
+  randomNonce,
+} from '@holochain/client';
 import { validateCliArgs } from './validateArgs';
+import { encode } from '@msgpack/msgpack';
 
 const rustUtils = require('@holochain/hc-spin-rust-utils');
 
@@ -19,7 +27,7 @@ const cli = new Command();
 cli
   .name('hc-spin')
   .description('CLI to run Holochain aps during development.')
-  .version(`0.200.2 (for holochain 0.2.x)`)
+  .version(`0.200.4 (for holochain 0.2.x)`)
   .argument(
     '<path>',
     'Path to .webhapp or .happ file to launch. If a .happ file is passed, either a UI path must be specified via --ui-path or a port pointing to a localhost server via --ui-port',
@@ -91,11 +99,50 @@ contextMenu({
   showInspectElement: true,
 });
 
-const handleSignZomeCall = (e: IpcMainInvokeEvent, zomeCall: ZomeCallUnsignedNapi) => {
+const handleSignZomeCall = async (e: IpcMainInvokeEvent, request: CallZomeRequest) => {
   const windowInfo = WINDOW_INFO_MAP[e.sender.id];
-  if (zomeCall.provenance.toString() !== Array.from(windowInfo.agentPubKey).toString())
+  if (request.provenance.toString() !== Array.from(windowInfo.agentPubKey).toString())
     return Promise.reject('Agent public key unauthorized.');
-  return windowInfo.zomeCallSigner.signZomeCall(zomeCall);
+
+  // console.log("Got zome call request: ", request);
+  const zomeCallUnsignedNapi: ZomeCallUnsignedNapi = {
+    provenance: Array.from(request.provenance),
+    cellId: [Array.from(request.cell_id[0]), Array.from(request.cell_id[1])],
+    zomeName: request.zome_name,
+    fnName: request.fn_name,
+    payload: Array.from(encode(request.payload)),
+    nonce: Array.from(await randomNonce()),
+    expiresAt: getNonceExpiration(),
+  };
+
+  const zomeCallSignedNapi: ZomeCallNapi =
+    await windowInfo.zomeCallSigner.signZomeCall(zomeCallUnsignedNapi);
+
+  const zomeCallSigned: CallZomeRequestSigned = {
+    provenance: Uint8Array.from(zomeCallSignedNapi.provenance),
+    cap_secret: null,
+    cell_id: [
+      Uint8Array.from(zomeCallSignedNapi.cellId[0]),
+      Uint8Array.from(zomeCallSignedNapi.cellId[1]),
+    ],
+    zome_name: zomeCallSignedNapi.zomeName,
+    fn_name: zomeCallSignedNapi.fnName,
+    payload: Uint8Array.from(zomeCallSignedNapi.payload),
+    signature: Uint8Array.from(zomeCallSignedNapi.signature),
+    expires_at: zomeCallSignedNapi.expiresAt,
+    nonce: Uint8Array.from(zomeCallSignedNapi.nonce),
+  };
+
+  return zomeCallSigned;
+};
+
+// https://github.com/holochain/holochain-client-js/issues/221
+const handleSignZomeCallLegacy = async (e: IpcMainInvokeEvent, request: ZomeCallUnsignedNapi) => {
+  const windowInfo = WINDOW_INFO_MAP[e.sender.id];
+  if (request.provenance.toString() !== Array.from(windowInfo.agentPubKey).toString())
+    return Promise.reject('Agent public key unauthorized.');
+
+  return windowInfo.zomeCallSigner.signZomeCall(request);
 };
 
 async function startLocalServices(): Promise<[string, string]> {
@@ -212,6 +259,7 @@ async function spawnSandboxes(
 // Some APIs can only be used after this event occurs.
 app.whenReady().then(async () => {
   ipcMain.handle('sign-zome-call', handleSignZomeCall);
+  ipcMain.handle('sign-zome-call-legacy', handleSignZomeCallLegacy);
 
   let happTargetDir: string | undefined;
   // TODO unpack assets to UI dir if webhapp is passed

package/src/preload/index.ts

@@ -2,7 +2,14 @@
 // https://www.electronjs.org/docs/latest/tutorial/process-model#preload-scripts
 import { contextBridge, ipcRenderer } from 'electron';
 import { ZomeCallUnsignedNapi } from '@holochain/hc-spin-rust-utils';
+import { CallZomeRequestUnsigned } from '@holochain/client';
+
+contextBridge.exposeInMainWorld('__HC_ZOME_CALL_SIGNER__', {
+  signZomeCall: (zomeCall: CallZomeRequestUnsigned) =>
+    ipcRenderer.invoke('sign-zome-call', zomeCall),
+});
 
 contextBridge.exposeInMainWorld('electronAPI', {
-  signZomeCall: (zomeCall: ZomeCallUnsignedNapi) => ipcRenderer.invoke('sign-zome-call', zomeCall),
+  signZomeCall: (zomeCall: ZomeCallUnsignedNapi) =>
+    ipcRenderer.invoke('sign-zome-call-legacy', zomeCall),
 });