@calimero-network/mero-js 13.4.0 → 14.0.0

package/dist/index.js

@@ -10,7 +10,7 @@ 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)
+// Account id encoding (hex everywhere core spells one; an app may re-encode)
 export { toAccountHex, toAccountBase58, sameAccount, } from './account/index.js';
 // Token store
 export { MemoryTokenStore, LocalStorageTokenStore } from './token-store/index.js';

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);
@@ -2625,7 +2630,6 @@ 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("");
 }
@@ -2642,47 +2646,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);
@@ -2729,7 +2692,7 @@ async function importSigningKey(secretHex) {
   }
 }
 async function signWarrant(input) {
-  const context = fromBase58(input.context, "context");
+  const context = fromHex2(input.context, "context", 32);
   const authorAccount = fromHex2(input.authorAccount, "authorAccount", 32);
   const executor = fromHex2(input.executor, "executor", 32);
   const key = await importSigningKey(input.deviceSecret);