@calimero-network/mero-js 13.4.0 → 15.0.0

package/dist/index.d.ts

@@ -5,7 +5,6 @@ export * from './auth-api/index.js';
 export * from './admin-api/index.js';
 export { parseAuthCallback, buildAuthLoginUrl } from './auth/index.js';
 export type { AuthCallbackResult, AuthLoginOptions } from './auth/index.js';
-export { toAccountHex, toAccountBase58, sameAccount, } from './account/index.js';
 export { MemoryTokenStore, LocalStorageTokenStore } from './token-store/index.js';
 export type { TokenStore } from './token-store/index.js';
 export { RpcClient, RpcError } from './rpc/index.js';

package/dist/index.js

@@ -10,8 +10,6 @@ export * from './auth-api/index.js';
 export * from './admin-api/index.js';
 // Auth utilities
 export { parseAuthCallback, buildAuthLoginUrl } from './auth/index.js';
-// Account id encoding (hex on the admin API, base58 in contract data)
-export { toAccountHex, toAccountBase58, sameAccount, } from './account/index.js';
 // Token store
 export { MemoryTokenStore, LocalStorageTokenStore } from './token-store/index.js';
 // RPC client

package/dist/index.mjs

@@ -1226,14 +1226,16 @@ var AdminApiClient = class {
   }
   /**
    * `identity` is the member's ACCOUNT (64 hex), as returned by
-   * {@link listGroupMembers} — not the bs58 signing key that added them.
+   * {@link listGroupMembers} — not the signing key that added them. Both are
+   * 64 hex, so nothing but the source tells them apart.
    */
   async updateMemberRole(groupId, identity, request) {
     await this.httpClient.put(`/admin-api/groups/${groupId}/members/${identity}/role`, request);
   }
   /**
    * `identity` is the member's ACCOUNT (64 hex), as returned by
-   * {@link listGroupMembers} — not the bs58 signing key that added them.
+   * {@link listGroupMembers} — not the signing key that added them. Both are
+   * 64 hex, so nothing but the source tells them apart.
    */
   async getMemberCapabilities(groupId, identity) {
     return unwrap(
@@ -1244,7 +1246,8 @@ var AdminApiClient = class {
   }
   /**
    * `identity` is the member's ACCOUNT (64 hex), as returned by
-   * {@link listGroupMembers} — not the bs58 signing key that added them.
+   * {@link listGroupMembers} — not the signing key that added them. Both are
+   * 64 hex, so nothing but the source tells them apart.
    */
   async setMemberCapabilities(groupId, identity, request) {
     await this.httpClient.put(`/admin-api/groups/${groupId}/members/${identity}/capabilities`, request);
@@ -1277,7 +1280,8 @@ var AdminApiClient = class {
   }
   /**
    * `identity` is the member's ACCOUNT (64 hex), as returned by
-   * {@link listGroupMembers} — not the bs58 signing key that added them.
+   * {@link listGroupMembers} — not the signing key that added them. Both are
+   * 64 hex, so nothing but the source tells them apart.
    */
   async getMemberMetadata(groupId, identity) {
     const response = await this.httpClient.get(
@@ -1431,7 +1435,8 @@ var AdminApiClient = class {
    * /admin-api/groups/:group_id/members/:identity/auto-follow).
    *
    * `identity` is the member's ACCOUNT (64 hex), as returned by
-   * {@link listGroupMembers} — not the bs58 signing key that added them.
+   * {@link listGroupMembers} — not the signing key that added them. Both are
+   * 64 hex, so nothing but the source tells them apart.
    */
   async setMemberAutoFollow(groupId, identity, request) {
     await this.httpClient.put(`/admin-api/groups/${groupId}/members/${identity}/auto-follow`, request);
@@ -2436,93 +2441,6 @@ function createMeroJs(config) {
   return new MeroJs(config);
 }
 
-// src/account/index.ts
-var BASE58_ALPHABET = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
-var HEX_ACCOUNT = /^[0-9a-f]{64}$/i;
-function encodeBase58(bytes) {
-  if (bytes.length === 0) return "";
-  const digits = [0];
-  for (const byte of bytes) {
-    let carry = byte;
-    for (let i = 0; i < digits.length; i++) {
-      carry += digits[i] << 8;
-      digits[i] = carry % 58;
-      carry = carry / 58 | 0;
-    }
-    while (carry > 0) {
-      digits.push(carry % 58);
-      carry = carry / 58 | 0;
-    }
-  }
-  let out = "";
-  for (const byte of bytes) {
-    if (byte !== 0) break;
-    out += BASE58_ALPHABET[0];
-  }
-  for (let i = digits.length - 1; i >= 0; i--) {
-    out += BASE58_ALPHABET[digits[i]];
-  }
-  return out;
-}
-function decodeBase58(value) {
-  if (value.length === 0) return null;
-  const bytes = [0];
-  for (const char of value) {
-    const index = BASE58_ALPHABET.indexOf(char);
-    if (index < 0) return null;
-    let carry = index;
-    for (let i = 0; i < bytes.length; i++) {
-      carry += bytes[i] * 58;
-      bytes[i] = carry & 255;
-      carry >>= 8;
-    }
-    while (carry > 0) {
-      bytes.push(carry & 255);
-      carry >>= 8;
-    }
-  }
-  let leadingZeros = 0;
-  for (const char of value) {
-    if (char !== BASE58_ALPHABET[0]) break;
-    leadingZeros++;
-  }
-  return Uint8Array.from([
-    ...new Array(leadingZeros).fill(0),
-    ...bytes.reverse()
-  ]);
-}
-function toHex(bytes) {
-  let out = "";
-  for (const byte of bytes) out += byte.toString(16).padStart(2, "0");
-  return out;
-}
-function fromHex(hex2) {
-  const bytes = new Uint8Array(hex2.length / 2);
-  for (let i = 0; i < bytes.length; i++) {
-    bytes[i] = parseInt(hex2.slice(i * 2, i * 2 + 2), 16);
-  }
-  return bytes;
-}
-function toAccountHex(id) {
-  const trimmed = (id ?? "").trim();
-  if (!trimmed) return "";
-  if (HEX_ACCOUNT.test(trimmed)) return trimmed.toLowerCase();
-  const decoded = decodeBase58(trimmed);
-  if (!decoded || decoded.length !== 32) return trimmed;
-  return toHex(decoded);
-}
-function toAccountBase58(id) {
-  const trimmed = (id ?? "").trim();
-  if (!trimmed) return "";
-  if (!HEX_ACCOUNT.test(trimmed)) return trimmed;
-  return encodeBase58(fromHex(trimmed));
-}
-function sameAccount(a, b) {
-  const left = toAccountHex(a);
-  const right = toAccountHex(b);
-  return HEX_ACCOUNT.test(left) && left === right;
-}
-
 // src/token-store/index.ts
 var MemoryTokenStore = class {
   constructor() {
@@ -2625,11 +2543,10 @@ var PKCS8_ED25519_PREFIX = new Uint8Array([
   4,
   32
 ]);
-var B58 = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
 function hex(bytes) {
   return Array.from(bytes, (b) => b.toString(16).padStart(2, "0")).join("");
 }
-function fromHex2(value, label, expectedBytes) {
+function fromHex(value, label, expectedBytes) {
   const clean = value.trim();
   if (!/^[0-9a-fA-F]*$/.test(clean) || clean.length !== expectedBytes * 2) {
     throw new Error(
@@ -2642,47 +2559,6 @@ function fromHex2(value, label, expectedBytes) {
   }
   return bytes;
 }
-function fromBase58(value, label) {
-  const clean = value.trim();
-  let n = 0n;
-  for (const char of clean) {
-    const digit = B58.indexOf(char);
-    if (digit < 0) {
-      throw new Error(`${label} is not base58: unexpected character '${char}'`);
-    }
-    n = n * 58n + BigInt(digit);
-  }
-  const out = new Uint8Array(32);
-  for (let i = 31; i >= 0; i -= 1) {
-    out[i] = Number(n & 0xffn);
-    n >>= 8n;
-  }
-  if (n !== 0n) {
-    throw new Error(`${label} decodes to more than 32 bytes`);
-  }
-  if (toBase58(out) !== clean) {
-    throw new Error(
-      `${label} is not a canonical base58 32-byte id. If you have it in hex, note that ${label} is base58 here while accounts are hex`
-    );
-  }
-  return out;
-}
-function toBase58(bytes) {
-  let n = 0n;
-  for (const byte of bytes) {
-    n = n << 8n | BigInt(byte);
-  }
-  let out = "";
-  while (n > 0n) {
-    out = B58[Number(n % 58n)] + out;
-    n /= 58n;
-  }
-  let leadingZeros = 0;
-  while (leadingZeros < bytes.length && bytes[leadingZeros] === 0) {
-    leadingZeros += 1;
-  }
-  return "1".repeat(leadingZeros) + out;
-}
 function u64le(value) {
   const out = new Uint8Array(8);
   new DataView(out.buffer).setBigUint64(0, BigInt(value), true);
@@ -2711,7 +2587,7 @@ async function intentHash(method, argsJson) {
   return domainHash(INTENT_DOMAIN, [new TextEncoder().encode(method), args]);
 }
 async function importSigningKey(secretHex) {
-  const seed = fromHex2(secretHex, "deviceSecret", 32);
+  const seed = fromHex(secretHex, "deviceSecret", 32);
   const pkcs8 = concat(PKCS8_ED25519_PREFIX, seed);
   try {
     return await crypto.subtle.importKey(
@@ -2729,9 +2605,9 @@ async function importSigningKey(secretHex) {
   }
 }
 async function signWarrant(input) {
-  const context = fromBase58(input.context, "context");
-  const authorAccount = fromHex2(input.authorAccount, "authorAccount", 32);
-  const executor = fromHex2(input.executor, "executor", 32);
+  const context = fromHex(input.context, "context", 32);
+  const authorAccount = fromHex(input.authorAccount, "authorAccount", 32);
+  const executor = fromHex(input.executor, "executor", 32);
   const key = await importSigningKey(input.deviceSecret);
   const publicKey = await derivePublicKey(input.deviceSecret);
   const commitment = await intentHash(input.method, input.argsJson);
@@ -2763,7 +2639,7 @@ async function signWarrant(input) {
   );
 }
 async function derivePublicKey(secretHex) {
-  const seed = fromHex2(secretHex, "deviceSecret", 32);
+  const seed = fromHex(secretHex, "deviceSecret", 32);
   const pkcs8 = concat(PKCS8_ED25519_PREFIX, seed);
   const key = await crypto.subtle.importKey(
     "pkcs8",
@@ -2898,10 +2774,7 @@ export {
   nodeEndpoint,
   parseAuthCallback,
   probeNodeHealth,
-  sameAccount,
   signWarrant,
-  toAccountBase58,
-  toAccountHex,
   withCap,
   withRetry,
   withoutCap