@holochain/client 0.18.0-dev.6 → 0.18.0-dev.9

package/lib/api/zome-call-signing.d.ts

@@ -1,6 +1,7 @@
 import { type KeyPair } from "libsodium-wrappers";
 import type { CapSecret } from "../hdk/capabilities.js";
-import type { AgentPubKey, CellId } from "../types.js";
+import type { CellId } from "../types.js";
+import { AgentPubKey } from "../types.js";
 /**
  * @public
  */
@@ -33,13 +34,14 @@ export declare const setSigningCredentials: (cellId: CellId, credentials: Signin
 /**
  * Generates a key pair for signing zome calls.
  *
- * @param agentPubKey - The agent pub key to take 4 last bytes (= DHT location)
- * from (optional).
  * @returns The signing key pair and an agent pub key based on the public key.
  *
  * @public
  */
-export declare const generateSigningKeyPair: (agentPubKey?: AgentPubKey) => Promise<[KeyPair, AgentPubKey]>;
+export declare const generateSigningKeyPair: () => Promise<[
+    KeyPair,
+    AgentPubKey
+]>;
 /**
  * @public
  */

package/lib/api/zome-call-signing.js

@@ -1,4 +1,5 @@
 import _sodium from "libsodium-wrappers";
+import { AgentPubKey } from "../types.js";
 import { encodeHashToBase64 } from "../utils/base64.js";
 const signingCredentials = new Map();
 /**
@@ -27,18 +28,15 @@ export const setSigningCredentials = (cellId, credentials) => {
 /**
  * Generates a key pair for signing zome calls.
  *
- * @param agentPubKey - The agent pub key to take 4 last bytes (= DHT location)
- * from (optional).
  * @returns The signing key pair and an agent pub key based on the public key.
  *
  * @public
  */
-export const generateSigningKeyPair = async (agentPubKey) => {
+export const generateSigningKeyPair = async () => {
     await _sodium.ready;
     const sodium = _sodium;
     const keyPair = sodium.crypto_sign_keypair();
-    const locationBytes = agentPubKey ? agentPubKey.subarray(35) : [0, 0, 0, 0];
-    const signingKey = new Uint8Array([132, 32, 36].concat(...keyPair.publicKey).concat(...locationBytes));
+    const signingKey = new AgentPubKey(keyPair.publicKey);
     return [keyPair, signingKey];
 };
 /**

package/lib/hdk/link.d.ts

@@ -1,8 +1,4 @@
-import { ActionHash, AgentPubKey, EntryHash, ExternalHash, Timestamp } from "../types.js";
-/**
- * @public
- */
-export type AnyLinkableHash = EntryHash | ActionHash | ExternalHash;
+import { ActionHash, AgentPubKey, Timestamp, AnyLinkableHash } from "../types.js";
 /**
  * An internal zome index within the DNA, from 0 to 255.
  *

package/lib/types.d.ts

@@ -1,35 +1,8 @@
+import { HoloHash, AgentPubKey, DnaHash, WasmHash, EntryHash, ActionHash, AnyDhtHash, AnyLinkableHash, ExternalHash } from "@spartan-hc/holo-hash";
 /**
  * @public
  */
-export type HoloHash = Uint8Array;
-/**
- * @public
- */
-export type AgentPubKey = HoloHash;
-/**
- * @public
- */
-export type DnaHash = HoloHash;
-/**
- * @public
- */
-export type WasmHash = HoloHash;
-/**
- * @public
- */
-export type EntryHash = HoloHash;
-/**
- * @public
- */
-export type ActionHash = HoloHash;
-/**
- * @public
- */
-export type AnyDhtHash = HoloHash;
-/**
- * @public
- */
-export type ExternalHash = HoloHash;
+export { HoloHash, AgentPubKey, DnaHash, WasmHash, EntryHash, ActionHash, AnyDhtHash, AnyLinkableHash, ExternalHash, };
 /**
  * @public
  */

package/lib/types.js

@@ -1 +1,5 @@
-export {};
+import { HoloHash, AgentPubKey, DnaHash, WasmHash, EntryHash, ActionHash, AnyDhtHash, AnyLinkableHash, ExternalHash, } from "@spartan-hc/holo-hash";
+/**
+ * @public
+ */
+export { HoloHash, AgentPubKey, DnaHash, WasmHash, EntryHash, ActionHash, AnyDhtHash, AnyLinkableHash, ExternalHash, };

package/lib/utils/base64.d.ts

@@ -1,4 +1,5 @@
-import { HoloHash, HoloHashB64 } from "../types.js";
+import { HoloHashB64 } from "../types.js";
+import { HoloHash } from "@spartan-hc/holo-hash";
 /**
  * Decodes a Base64 encoded string to a byte array hash.
  *
@@ -7,7 +8,7 @@ import { HoloHash, HoloHashB64 } from "../types.js";
  *
  * @public
  */
-export declare function decodeHashFromBase64(hash: HoloHashB64): HoloHash;
+export declare function decodeHashFromBase64(hash: string): HoloHash;
 /**
  * Encode a byte array hash to a Base64 string.
  *
@@ -16,4 +17,4 @@ export declare function decodeHashFromBase64(hash: HoloHashB64): HoloHash;
  *
  * @public
  */
-export declare function encodeHashToBase64(hash: HoloHash): HoloHashB64;
+export declare function encodeHashToBase64(hash: Uint8Array): HoloHashB64;

package/lib/utils/base64.js

@@ -1,4 +1,4 @@
-import { Base64 } from "js-base64";
+import { HoloHash } from "@spartan-hc/holo-hash";
 /**
  * Decodes a Base64 encoded string to a byte array hash.
  *
@@ -8,7 +8,7 @@ import { Base64 } from "js-base64";
  * @public
  */
 export function decodeHashFromBase64(hash) {
-    return Base64.toUint8Array(hash.slice(1));
+    return new HoloHash(hash);
 }
 /**
  * Encode a byte array hash to a Base64 string.
@@ -19,5 +19,5 @@ export function decodeHashFromBase64(hash) {
  * @public
  */
 export function encodeHashToBase64(hash) {
-    return `u${Base64.fromUint8Array(hash, true)}`;
+    return String(new HoloHash(hash));
 }

package/lib/utils/fake-hash.d.ts

@@ -5,7 +5,7 @@ import { DnaHash, ActionHash, AgentPubKey, EntryHash } from "../types.js";
  * From https://github.com/holochain/holochain/blob/develop/crates/holo_hash/src/hash_type/primitive.rs
  *
  * @param coreByte - Optionally specify a byte to repeat for all core 32 bytes. If undefined will generate random core 32 bytes.
- * @returns An {@link EntryHash}.
+ * @returns An instance of EntryHash.
  *
  * @public
  */
@@ -14,7 +14,7 @@ export declare function fakeEntryHash(coreByte?: number | undefined): Promise<En
  * Generate a valid agent key of a non-existing agent.
  *
  * @param coreByte - Optionally specify a byte to repeat for all core 32 bytes. If undefined will generate random core 32 bytes.
- * @returns An {@link AgentPubKey}.
+ * @returns An instance ofAgentPubKey.
  *
  * @public
  */
@@ -23,7 +23,7 @@ export declare function fakeAgentPubKey(coreByte?: number | undefined): Promise<
  * Generate a valid hash of a non-existing action.
  *
  * @param coreByte - Optionally specify a byte to repeat for all core 32 bytes. If undefined will generate random core 32 bytes.
- * @returns An {@link ActionHash}.
+ * @returns An instance of ActionHash.
  *
  * @public
  */
@@ -32,7 +32,7 @@ export declare function fakeActionHash(coreByte?: number | undefined): Promise<A
  * Generate a valid hash of a non-existing DNA.
  *
  * @param coreByte - Optionally specify a byte to repeat for all core 32 bytes. If undefined will generate random core 32 bytes.
- * @returns A {@link DnaHash}.
+ * @returns A instance of DnaHash.
  *
  * @public
  */

package/lib/utils/fake-hash.js

@@ -1,60 +1,57 @@
 import { range } from "lodash-es";
 import { randomByteArray } from "../api/zome-call-signing.js";
-import { dhtLocationFrom32 } from "./hash-parts.js";
-async function fakeValidHash(prefix, coreByte) {
-    let core;
-    if (coreByte === undefined) {
-        core = await randomByteArray(32);
-    }
-    else {
-        core = Uint8Array.from(range(0, 32).map(() => coreByte));
-    }
-    const checksum = dhtLocationFrom32(core);
-    return new Uint8Array([...prefix, ...core, ...Array.from(checksum)]);
-}
+import { DnaHash, ActionHash, AgentPubKey, EntryHash } from "../types.js";
 /**
  * Generate a valid hash of a non-existing entry.
  *
  * From https://github.com/holochain/holochain/blob/develop/crates/holo_hash/src/hash_type/primitive.rs
  *
  * @param coreByte - Optionally specify a byte to repeat for all core 32 bytes. If undefined will generate random core 32 bytes.
- * @returns An {@link EntryHash}.
+ * @returns An instance of EntryHash.
  *
  * @public
  */
 export async function fakeEntryHash(coreByte = undefined) {
-    return fakeValidHash([0x84, 0x21, 0x24], coreByte);
+    return new EntryHash(coreByte
+        ? Uint8Array.from(range(0, 32).map(() => coreByte))
+        : await randomByteArray(32));
 }
 /**
  * Generate a valid agent key of a non-existing agent.
  *
  * @param coreByte - Optionally specify a byte to repeat for all core 32 bytes. If undefined will generate random core 32 bytes.
- * @returns An {@link AgentPubKey}.
+ * @returns An instance ofAgentPubKey.
  *
  * @public
  */
 export async function fakeAgentPubKey(coreByte = undefined) {
-    return fakeValidHash([0x84, 0x20, 0x24], coreByte);
+    return new AgentPubKey(coreByte
+        ? Uint8Array.from(range(0, 32).map(() => coreByte))
+        : await randomByteArray(32));
 }
 /**
  * Generate a valid hash of a non-existing action.
  *
  * @param coreByte - Optionally specify a byte to repeat for all core 32 bytes. If undefined will generate random core 32 bytes.
- * @returns An {@link ActionHash}.
+ * @returns An instance of ActionHash.
  *
  * @public
  */
 export async function fakeActionHash(coreByte = undefined) {
-    return fakeValidHash([0x84, 0x29, 0x24], coreByte);
+    return new ActionHash(coreByte
+        ? Uint8Array.from(range(0, 32).map(() => coreByte))
+        : await randomByteArray(32));
 }
 /**
  * Generate a valid hash of a non-existing DNA.
  *
  * @param coreByte - Optionally specify a byte to repeat for all core 32 bytes. If undefined will generate random core 32 bytes.
- * @returns A {@link DnaHash}.
+ * @returns A instance of DnaHash.
  *
  * @public
  */
 export async function fakeDnaHash(coreByte = undefined) {
-    return fakeValidHash([0x84, 0x2d, 0x24], coreByte);
+    return new DnaHash(coreByte
+        ? Uint8Array.from(range(0, 32).map(() => coreByte))
+        : await randomByteArray(32));
 }

package/lib/utils/hash-parts.d.ts

@@ -1,4 +1,4 @@
-import { ActionHash, AgentPubKey, EntryHash } from "../types.js";
+import { HoloHash } from "../types.js";
 /**
  * Hash type labels and their 3 byte values (forming the first 3 bytes of hash).
  *
@@ -23,7 +23,7 @@ export declare const HASH_TYPE_PREFIX: {
  *
  * @public
  */
-export declare function sliceHashType(hash: AgentPubKey | EntryHash | ActionHash): Uint8Array;
+export declare function sliceHashType(hash: HoloHash | Uint8Array): Uint8Array;
 /**
  * Get core hash from a Holochain hash (32 bytes).
  *
@@ -34,7 +34,7 @@ export declare function sliceHashType(hash: AgentPubKey | EntryHash | ActionHash
  *
  * @public
  */
-export declare function sliceCore32(hash: AgentPubKey | EntryHash | ActionHash): Uint8Array;
+export declare function sliceCore32(hash: HoloHash | Uint8Array): Uint8Array;
 /**
  * Get DHT location (last 4 bytes) from a hash.
  *
@@ -45,7 +45,7 @@ export declare function sliceCore32(hash: AgentPubKey | EntryHash | ActionHash):
  *
  * @public
  */
-export declare function sliceDhtLocation(hash: AgentPubKey | EntryHash | ActionHash): Uint8Array;
+export declare function sliceDhtLocation(hash: HoloHash | Uint8Array): Uint8Array;
 /**
  * Generate DHT location (last 4 bytes) from a core hash (middle 32 bytes).
  *
@@ -68,4 +68,4 @@ export declare function dhtLocationFrom32(hashCore: Uint8Array): Uint8Array;
  *
  * @public
  */
-export declare function hashFrom32AndType(hashCore: AgentPubKey | EntryHash | ActionHash, hashType: "Agent" | "Entry" | "Dna" | "Action" | "External"): Uint8Array;
+export declare function hashFrom32AndType(hashCore: Uint8Array, hashType: "Agent" | "Entry" | "Dna" | "Action" | "External"): Uint8Array;

package/lib/utils/hash-parts.js

@@ -1,4 +1,5 @@
 import blake2b from "@bitgo/blake2b";
+import { HoloHash } from "../types.js";
 const HASH_TYPE_START = 0;
 const HASH_TYPE_BYTE_LENGTH = 3;
 const CORE_HASH_BYTE_LENGTH = 32;
@@ -28,7 +29,9 @@ export const HASH_TYPE_PREFIX = {
  * @public
  */
 export function sliceHashType(hash) {
-    return Uint8Array.from(hash.slice(0, 3));
+    if (!(hash instanceof HoloHash))
+        hash = new HoloHash(hash);
+    return hash.getPrefix();
 }
 /**
  * Get core hash from a Holochain hash (32 bytes).
@@ -41,9 +44,11 @@ export function sliceHashType(hash) {
  * @public
  */
 export function sliceCore32(hash) {
+    if (!(hash instanceof HoloHash))
+        hash = new HoloHash(hash);
     const start = HASH_TYPE_START + HASH_TYPE_BYTE_LENGTH;
     const end = start + CORE_HASH_BYTE_LENGTH;
-    return Uint8Array.from(hash.slice(start, end));
+    return hash.bytes(start, end);
 }
 /**
  * Get DHT location (last 4 bytes) from a hash.
@@ -56,9 +61,11 @@ export function sliceCore32(hash) {
  * @public
  */
 export function sliceDhtLocation(hash) {
+    if (hash instanceof Uint8Array)
+        hash = new HoloHash(hash);
     const start = HASH_TYPE_START + HASH_TYPE_BYTE_LENGTH + CORE_HASH_BYTE_LENGTH;
     const end = start + DHT_LOCATION_BYTE_LENGTH;
-    return Uint8Array.from(hash.slice(start, end));
+    return hash.bytes(start, end);
 }
 /**
  * Generate DHT location (last 4 bytes) from a core hash (middle 32 bytes).
@@ -94,9 +101,5 @@ export function dhtLocationFrom32(hashCore) {
  * @public
  */
 export function hashFrom32AndType(hashCore, hashType) {
-    return Uint8Array.from([
-        ...HASH_TYPE_PREFIX[hashType],
-        ...hashCore,
-        ...dhtLocationFrom32(hashCore),
-    ]);
+    return new HoloHash(hashCore).toType(hashType === "Agent" ? "AgentPubKey" : hashType + "Hash");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@holochain/client",
-  "version": "0.18.0-dev.6",
+  "version": "0.18.0-dev.9",
   "description": "A JavaScript client for the Holochain Conductor API",
   "author": "Holochain Foundation <info@holochain.org> (https://holochain.org)",
   "license": "CAL-1.0",
@@ -45,6 +45,7 @@
     "@bitgo/blake2b": "^3.2.4",
     "@holochain/serialization": "^0.1.0-beta-rc.3",
     "@msgpack/msgpack": "^2.8.0",
+    "@spartan-hc/holo-hash": "^0.7.0",
     "emittery": "^1.0.1",
     "isomorphic-ws": "^5.0.0",
     "js-base64": "^3.7.5",