@calimero-network/mero-js 13.4.0 → 15.0.0

package/dist/warrant/warrant.d.ts

@@ -24,13 +24,12 @@
 /** What a warrant authorises. */
 export interface WarrantInput {
     /**
-     * The context, base58 — the same string every other method here takes.
+     * The context, hex — the same string every other method here takes.
      *
-     * Base58 while the two accounts below are hex, because that is how the node
-     * spells them: `ContextId` and `PublicKey` are base58, `AccountId` and
-     * `DeviceId` are hex. Mixing them up produces a valid-looking value that only
-     * fails against real data, so this module decodes each by its own rule rather
-     * than accepting "32 bytes, somehow".
+     * Hex like everything else on this interface. It was base58 while the node
+     * spelled `ContextId` and `PublicKey` that way and `AccountId` and `DeviceId`
+     * in hex; that split is gone, so this module no longer needs a rule per field
+     * and no longer needs a base58 decoder to enforce one.
      */
     context: string;
     /** The author's account, hex — whose consent this is. */

package/dist/warrant/warrant.js

@@ -28,7 +28,6 @@ const PKCS8_ED25519_PREFIX = new Uint8Array([
     0x30, 0x2e, 0x02, 0x01, 0x00, 0x30, 0x05, 0x06, 0x03, 0x2b, 0x65, 0x70, 0x04,
     0x22, 0x04, 0x20,
 ]);
-const B58 = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
 function hex(bytes) {
     return Array.from(bytes, (b) => b.toString(16).padStart(2, '0')).join('');
 }
@@ -46,58 +45,6 @@ function fromHex(value, label, expectedBytes) {
     }
     return bytes;
 }
-/**
- * Decode base58 to exactly 32 bytes.
- *
- * Hand-rolled rather than pulled in: it is fifteen lines, and a dependency here
- * would be this package's first.
- */
-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`);
-    }
-    // Round-trip, because decoding alone accepts too much. Hex digits are mostly
-    // valid base58 characters, so a context handed over in hex by mistake can
-    // decode to a real-looking 32 bytes instead of failing — `'11'.repeat(32)`
-    // decodes to all zeros. Re-encoding catches it: the canonical form of those
-    // bytes is 32 '1's, not 64.
-    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;
-}
-/** Encode 32 bytes as base58, for the canonical check above. */
-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);
@@ -159,7 +106,7 @@ async function importSigningKey(secretHex) {
  * was signed.
  */
 export async function signWarrant(input) {
-    const context = fromBase58(input.context, 'context');
+    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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@calimero-network/mero-js",
-  "version": "13.4.0",
+  "version": "15.0.0",
   "description": "Pure JavaScript SDK for Calimero",
   "type": "module",
   "exports": {

package/dist/account/index.d.ts

@@ -1,43 +0,0 @@
-/**
- * Account id encoding.
- *
- * Core names the same account in two encodings, and the split is deliberate:
- * the admin API serves and requires **64 hex characters**, while contract data
- * (`sender`, `get_profiles`, anything stamped by `env::account_id()`) carries
- * **base58**. They are rendered differently on purpose, so that handing one
- * where the other is expected fails loudly instead of resolving to the wrong
- * principal.
- *
- * The cost is that any client reading a member from the admin API and
- * comparing it against a message sender is comparing two spellings of the same
- * value. A raw `===` silently never matches, and passing a contract-sourced id
- * to an admin route answers `400 Invalid account format: expected 64 hex
- * characters (32 bytes)`. Both failure modes are quiet enough to ship.
- *
- * These helpers canonicalise at that boundary. They convert accounts and
- * nothing else: a device key, an alias or any other value is returned
- * unchanged, because converting is this module's job and destroying what it
- * cannot convert is not.
- */
-/**
- * Canonicalise an account id to hex — the form every admin route expects.
- *
- * Returns the input unchanged if it is not a 32-byte account, so a device key
- * or an alias survives a call to this function intact.
- */
-export declare function toAccountHex(id: string | null | undefined): string;
-/**
- * Canonicalise an account id to base58 — the form the contract stamps on
- * `sender` and keys `get_profiles` by.
- *
- * Returns the input unchanged if it is not a 32-byte account.
- */
-export declare function toAccountBase58(id: string | null | undefined): string;
-/**
- * True when both ids name the same account, whichever encoding each is in.
- *
- * This is the comparison to reach for when checking a contract-sourced
- * `sender` against an admin-sourced member id. Two ids that are not accounts
- * compare false rather than accidentally matching as raw strings.
- */
-export declare function sameAccount(a: string | null | undefined, b: string | null | undefined): boolean;

package/dist/account/index.js

@@ -1,139 +0,0 @@
-/**
- * Account id encoding.
- *
- * Core names the same account in two encodings, and the split is deliberate:
- * the admin API serves and requires **64 hex characters**, while contract data
- * (`sender`, `get_profiles`, anything stamped by `env::account_id()`) carries
- * **base58**. They are rendered differently on purpose, so that handing one
- * where the other is expected fails loudly instead of resolving to the wrong
- * principal.
- *
- * The cost is that any client reading a member from the admin API and
- * comparing it against a message sender is comparing two spellings of the same
- * value. A raw `===` silently never matches, and passing a contract-sourced id
- * to an admin route answers `400 Invalid account format: expected 64 hex
- * characters (32 bytes)`. Both failure modes are quiet enough to ship.
- *
- * These helpers canonicalise at that boundary. They convert accounts and
- * nothing else: a device key, an alias or any other value is returned
- * unchanged, because converting is this module's job and destroying what it
- * cannot convert is not.
- */
-const BASE58_ALPHABET = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
-/** A 32-byte account rendered as 64 hex characters. */
-const HEX_ACCOUNT = /^[0-9a-f]{64}$/i;
-/** Bytes → base58. Leading zero bytes become leading '1's, as in bitcoin base58. */
-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;
-}
-/** base58 → bytes. Returns null when the input is not valid base58. */
-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 & 0xff;
-            carry >>= 8;
-        }
-        while (carry > 0) {
-            bytes.push(carry & 0xff);
-            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(hex) {
-    const bytes = new Uint8Array(hex.length / 2);
-    for (let i = 0; i < bytes.length; i++) {
-        bytes[i] = parseInt(hex.slice(i * 2, i * 2 + 2), 16);
-    }
-    return bytes;
-}
-/**
- * Canonicalise an account id to hex — the form every admin route expects.
- *
- * Returns the input unchanged if it is not a 32-byte account, so a device key
- * or an alias survives a call to this function intact.
- */
-export 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);
-}
-/**
- * Canonicalise an account id to base58 — the form the contract stamps on
- * `sender` and keys `get_profiles` by.
- *
- * Returns the input unchanged if it is not a 32-byte account.
- */
-export function toAccountBase58(id) {
-    const trimmed = (id ?? '').trim();
-    if (!trimmed)
-        return '';
-    if (!HEX_ACCOUNT.test(trimmed))
-        return trimmed;
-    return encodeBase58(fromHex(trimmed));
-}
-/**
- * True when both ids name the same account, whichever encoding each is in.
- *
- * This is the comparison to reach for when checking a contract-sourced
- * `sender` against an admin-sourced member id. Two ids that are not accounts
- * compare false rather than accidentally matching as raw strings.
- */
-export function sameAccount(a, b) {
-    const left = toAccountHex(a);
-    const right = toAccountHex(b);
-    return HEX_ACCOUNT.test(left) && left === right;
-}