@calimero-network/mero-js 22.5.0 → 22.6.0

package/dist/index.d.ts

@@ -19,6 +19,8 @@ export * from "./cloud/index.js";
 export * from "./sealed/index.js";
 export * from "./relay/index.js";
 export { signWarrant, intentHash, signCreationWarrant, parseCreationWarrant, creationInitHash, signGovernanceWarrant, parseGovernanceWarrant, governanceOpHash, memberAddedOp, memberRemovedOp, memberLeftOp, memberRoleSetOp, groupCreatedOp, groupReparentedOp, groupDeletedOp, } from "./warrant/index.js";
+export { signerFromSecret, signerFromCryptoKey } from "./signer/index.js";
+export type { Signer } from "./signer/index.js";
 export { generateAccountRoot, accountRootFromPhrase, accountRootFromSecret, signAccountLink, signAccountLogin, } from "./account/index.js";
 export type { AccountRoot, RecoverableAccountRoot, AccountLinkInput, AccountLoginInput, } from "./account/index.js";
 export { signDeviceCert, mintDeviceId, deviceCertPayload, accountForRoot, } from "./device-cert/index.js";

package/dist/index.js

@@ -28,6 +28,9 @@ export * from "./sealed/index.js";
 export * from "./relay/index.js";
 // Warrant signing — mint the author's consent for a relay to run one intent
 export { signWarrant, intentHash, signCreationWarrant, parseCreationWarrant, creationInitHash, signGovernanceWarrant, parseGovernanceWarrant, governanceOpHash, memberAddedOp, memberRemovedOp, memberLeftOp, memberRoleSetOp, groupCreatedOp, groupReparentedOp, groupDeletedOp, } from "./warrant/index.js";
+// Who signs — a key's capability, separated from its material, so a
+// non-extractable key can be used wherever a hex secret could.
+export { signerFromSecret, signerFromCryptoKey } from "./signer/index.js";
 // Account roots — mint one with a recovery phrase, or prove you hold one
 export { generateAccountRoot, accountRootFromPhrase, accountRootFromSecret, signAccountLink, signAccountLogin, } from "./account/index.js";
 export { signDeviceCert, mintDeviceId, deviceCertPayload, accountForRoot, } from "./device-cert/index.js";

package/dist/index.mjs

@@ -6449,6 +6449,117 @@ var LocalStorageTokenStore = class {
   }
 };
 
+// src/signer/signer.ts
+var PKCS8_ED25519_PREFIX2 = new Uint8Array([
+  48,
+  46,
+  2,
+  1,
+  0,
+  48,
+  5,
+  6,
+  3,
+  43,
+  101,
+  112,
+  4,
+  34,
+  4,
+  32
+]);
+function unsupported(cause) {
+  const detail = cause instanceof Error ? `: ${cause.message}` : "";
+  return new Error(
+    "this runtime has no WebCrypto Ed25519, so nothing can be signed here. Node 18.4+, Safari 17+, Firefox 129+ and Chrome 137+ have it" + detail
+  );
+}
+async function signerFromSecret(secret, label2 = "secret") {
+  const seed = fromHex(secret, label2, 32);
+  const pkcs8 = concat(PKCS8_ED25519_PREFIX2, seed);
+  let privateKey;
+  let publicKey;
+  try {
+    const exportable = await crypto.subtle.importKey(
+      "pkcs8",
+      pkcs8,
+      { name: "Ed25519" },
+      true,
+      ["sign"]
+    );
+    const jwk = await crypto.subtle.exportKey("jwk", exportable);
+    publicKey = hex(
+      Uint8Array.from(
+        atob(jwk.x.replace(/-/g, "+").replace(/_/g, "/")),
+        (c) => c.charCodeAt(0)
+      )
+    );
+    privateKey = await crypto.subtle.importKey(
+      "pkcs8",
+      pkcs8,
+      { name: "Ed25519" },
+      false,
+      ["sign"]
+    );
+  } catch (cause) {
+    throw unsupported(cause);
+  }
+  return fromKeyAndPublic(privateKey, publicKey);
+}
+async function signerFromCryptoKey(privateKey, publicKey) {
+  if (privateKey.type !== "private") {
+    throw new Error(
+      `signerFromCryptoKey needs the private half of the pair, got a ${privateKey.type} key`
+    );
+  }
+  if (!privateKey.usages.includes("sign")) {
+    throw new Error(
+      "this CryptoKey cannot sign: generate it with usages ['sign', 'verify']"
+    );
+  }
+  let publicHex;
+  if (typeof publicKey === "string") {
+    fromHex(publicKey, "publicKey", 32);
+    publicHex = publicKey.trim().toLowerCase();
+  } else {
+    try {
+      publicHex = hex(
+        new Uint8Array(await crypto.subtle.exportKey("raw", publicKey))
+      );
+    } catch (cause) {
+      const detail = cause instanceof Error ? `: ${cause.message}` : "";
+      throw new Error(
+        "could not read the public half of this key pair; pass the public key as 64 hex instead" + detail
+      );
+    }
+  }
+  return fromKeyAndPublic(privateKey, publicHex);
+}
+function fromKeyAndPublic(privateKey, publicKey) {
+  return {
+    publicKey,
+    async sign(payload) {
+      try {
+        return new Uint8Array(
+          await crypto.subtle.sign({ name: "Ed25519" }, privateKey, payload)
+        );
+      } catch (cause) {
+        throw unsupported(cause);
+      }
+    }
+  };
+}
+async function resolveSigner(secret, signer, label2) {
+  if (signer && secret !== void 0) {
+    throw new Error(
+      `pass either ${label2} or signer, not both \u2014 they may name different keys`
+    );
+  }
+  if (signer) return signer;
+  if (secret !== void 0) return signerFromSecret(secret, label2);
+  throw new Error(`${label2} or signer is required`);
+}
+
 // src/warrant/warrant.ts
 var SIGN_DOMAIN2 = new TextEncoder().encode("calimero.warrant.v2");
 var INTENT_DOMAIN = new TextEncoder().encode("calimero.warrant.intent.v1");
@@ -6469,8 +6580,8 @@ async function signWarrant(input) {
   );
   const accountHeads = citedHeads(input.accountHeads, "accountHeads");
   const governanceFloor = citedHeads(input.governanceFloor, "governanceFloor");
-  const key = await importSigningKey(input.deviceSecret);
-  const publicKey = await derivePublicKey(input.deviceSecret);
+  const signer = await resolveSigner(input.deviceSecret, input.signer, "deviceSecret");
+  const publicKey = fromHex(signer.publicKey, "signer.publicKey", 32);
   const method = new TextEncoder().encode(input.method);
   const commitment = await intentHash(input.method, input.argsJson);
   const nonce2 = u64le(input.nonce);
@@ -6490,9 +6601,7 @@ async function signWarrant(input) {
     nonce2,
     notAfter
   ]);
-  const signature = new Uint8Array(
-    await crypto.subtle.sign({ name: "Ed25519" }, key, preimage)
-  );
+  const signature = checkedSignature(await signer.sign(preimage));
   return hex(
     concat(
       context,
@@ -6513,6 +6622,13 @@ async function signWarrant(input) {
     )
   );
 }
+function checkedSignature(signature) {
+  if (!(signature instanceof Uint8Array) || signature.length !== 64) {
+    const got = signature instanceof Uint8Array ? `${signature.length} bytes` : typeof signature;
+    throw new Error(`signer returned ${got}, expected a 64-byte Ed25519 signature`);
+  }
+  return signature;
+}
 function citedHeads(heads, label2) {
   const list = heads ?? [];
   if (list.length > MAX_CITED_HEADS) {
@@ -6562,8 +6678,8 @@ async function signCreationWarrant(input) {
   const name = label(input.name, "name");
   const accountHeads = citedHeads(input.accountHeads, "accountHeads");
   const governanceFloor = citedHeads(input.governanceFloor, "governanceFloor");
-  const key = await importSigningKey(input.deviceSecret);
-  const deviceKey = await derivePublicKey(input.deviceSecret);
+  const signer = await resolveSigner(input.deviceSecret, input.signer, "deviceSecret");
+  const deviceKey = fromHex(signer.publicKey, "signer.publicKey", 32);
   const initHash = await creationInitHash(input.initArgs);
   const preimage = await creationWarrantPreimage({
     group,
@@ -6580,9 +6696,7 @@ async function signCreationWarrant(input) {
     nonce: input.nonce,
     notAfter: input.notAfter
   });
-  const signature = new Uint8Array(
-    await crypto.subtle.sign({ name: "Ed25519" }, key, preimage)
-  );
+  const signature = checkedSignature(await signer.sign(preimage));
   const warrant = hex(
     concat(
       group,
@@ -6711,8 +6825,8 @@ async function signGovernanceWarrant(input) {
   const accountHeads = citedHeads(input.accountHeads, "accountHeads");
   const governanceFloor = citedHeads(input.governanceFloor, "governanceFloor");
   const kind = kindByte(input.op.kind);
-  const key = await importSigningKey(input.deviceSecret);
-  const deviceKey = await derivePublicKey(input.deviceSecret);
+  const signer = await resolveSigner(input.deviceSecret, input.signer, "deviceSecret");
+  const deviceKey = fromHex(signer.publicKey, "signer.publicKey", 32);
   const opHash = await governanceOpHash(input.op);
   const preimage = await governanceWarrantPreimage({
     scope,
@@ -6726,9 +6840,7 @@ async function signGovernanceWarrant(input) {
     nonce: input.nonce,
     notAfter: input.notAfter
   });
-  const signature = new Uint8Array(
-    await crypto.subtle.sign({ name: "Ed25519" }, key, preimage)
-  );
+  const signature = checkedSignature(await signer.sign(preimage));
   return hex(
     concat(
       scope,
@@ -6829,6 +6941,14 @@ var RelayClient = class {
     this.fetchImpl = injected ? (input, init) => injected(input, init) : (input, init) => globalThis.fetch(input, init);
     this.timeoutMs = config.timeoutMs ?? 1e4;
   }
+  /**
+   * The author device's signer, built from `deviceSecret` when that is what was
+   * configured. A {@link Signer} and never the secret, so no caller of a
+   * `RelayClient` gains the ability to read key material.
+   */
+  async authorSigner() {
+    return resolveSigner(this.config.deviceSecret, this.config.signer, "deviceSecret");
+  }
   /**
    * Ask the relay what it can do in `contextId`.
    *
@@ -6850,6 +6970,7 @@ var RelayClient = class {
    */
   async execute(contextId, method, argsJson = {}) {
     const executor = this.executorAccount ?? (await this.describe(contextId)).executorAccount;
+    const signer = await this.authorSigner();
     const nonce2 = await this.config.nonces.next();
     const ttl = this.config.ttlSeconds ?? DEFAULT_TTL_SECONDS;
     const warrant = await signWarrant({
@@ -6860,7 +6981,7 @@ var RelayClient = class {
       argsJson,
       nonce: nonce2,
       notAfter: BigInt(Math.floor(Date.now() / 1e3)) + BigInt(ttl),
-      deviceSecret: this.config.deviceSecret
+      signer
     });
     const body = await this.json(
       "POST",
@@ -6924,6 +7045,7 @@ var RelayClient = class {
     }
     const executor = this.checkedExecutor(described.executorAccount);
     const initArgs = input.initArgs ?? {};
+    const signer = await this.authorSigner();
     const nonce2 = await this.config.nonces.next();
     const ttl = this.config.ttlSeconds ?? DEFAULT_TTL_SECONDS;
     const { warrant } = await signCreationWarrant({
@@ -6937,7 +7059,7 @@ var RelayClient = class {
       initArgs,
       nonce: nonce2,
       notAfter: BigInt(Math.floor(Date.now() / 1e3)) + BigInt(ttl),
-      deviceSecret: this.config.deviceSecret
+      signer
     });
     const body = await this.json(
       "POST",
@@ -6987,6 +7109,7 @@ var RelayClient = class {
       );
     }
     const executor = this.checkedExecutor(described.executorAccount);
+    const signer = await this.authorSigner();
     const nonce2 = await this.config.nonces.next();
     const ttl = this.config.ttlSeconds ?? DEFAULT_TTL_SECONDS;
     const warrant = await signGovernanceWarrant({
@@ -6996,7 +7119,7 @@ var RelayClient = class {
       executor,
       nonce: nonce2,
       notAfter: BigInt(Math.floor(Date.now() / 1e3)) + BigInt(ttl),
-      deviceSecret: this.config.deviceSecret
+      signer
     });
     const body = await this.json(
       "POST",
@@ -8490,7 +8613,7 @@ function groupDeletedOp(rootGroupId) {
 }
 
 // src/namespace-op/namespace-op.ts
-var SIGNED_NAMESPACE_OP_SCHEMA_VERSION = 15;
+var SIGNED_NAMESPACE_OP_SCHEMA_VERSION = 16;
 var NAMESPACE_SIGN_DOMAIN = new TextEncoder().encode("calimero.namespace.v1");
 var NAMESPACE_OP_ROOT = 0;
 var ROOT_OP2 = {
@@ -8918,6 +9041,8 @@ export {
   signRequest,
   signRoutingChallenge,
   signWarrant,
+  signerFromCryptoKey,
+  signerFromSecret,
   transportKeyBinding,
   trustSignedRelease,
   trustedMeasurementsFromReleases,