zapo-js 0.1.1 → 0.2.0

package/dist/crypto/math/mod.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GROUP_L = exports.FIELD_P = void 0;
 exports.mod = mod;
 exports.modGroup = modGroup;
 exports.modInv = modInv;
 const constants_1 = require("../math/constants");
-Object.defineProperty(exports, "FIELD_P", { enumerable: true, get: function () { return constants_1.FIELD_P; } });
-Object.defineProperty(exports, "GROUP_L", { enumerable: true, get: function () { return constants_1.GROUP_L; } });
+const fe_1 = require("../math/fe");
 function mod(value, modulus = constants_1.FIELD_P) {
     const remainder = value % modulus;
     return remainder >= 0n ? remainder : remainder + modulus;
@@ -18,8 +16,17 @@ function modInv(value, modulus = constants_1.FIELD_P) {
     if (value === 0n) {
         throw new Error('field inversion by zero');
     }
+    if (modulus === constants_1.FIELD_P) {
+        return fieldInv(value);
+    }
     return modPow(value, modulus - 2n, modulus);
 }
+function fieldInv(x) {
+    const a = (0, fe_1.feFromBigInt)(mod(x));
+    const out = (0, fe_1.fe)();
+    (0, fe_1.feInv)(out, a);
+    return (0, fe_1.feToBigInt)(out);
+}
 function modPow(base, exponent, modulus) {
     if (modulus <= 0n) {
         throw new Error('modulus must be positive');

package/dist/esm/appstate/WaAppStateCrypto.js

@@ -1,19 +1,18 @@
 import { APP_STATE_DERIVED_INDEX_KEY_END, APP_STATE_DERIVED_KEY_LENGTH, APP_STATE_DERIVED_PATCH_MAC_KEY_END, APP_STATE_DERIVED_SNAPSHOT_MAC_KEY_END, APP_STATE_DERIVED_VALUE_ENCRYPTION_KEY_END, APP_STATE_DERIVED_VALUE_MAC_KEY_END, APP_STATE_EMPTY_LT_HASH, APP_STATE_IV_LENGTH, APP_STATE_MAC_OCTET_LENGTH, APP_STATE_POINT_SIZE, APP_STATE_VALUE_MAC_LENGTH } from './constants.js';
-import { toNetworkOrder64 } from './utils.js';
 import { hkdf } from '../crypto/core/hkdf.js';
 import { aesCbcDecrypt, aesCbcEncrypt, hmacSign, importAesCbcKey, importHmacKey, importHmacSha512Key } from '../crypto/core/primitives.js';
 import { randomBytesAsync } from '../crypto/core/random.js';
 import { proto } from '../proto.js';
 import { WA_APP_STATE_KDF_INFO } from '../protocol/constants.js';
-import { bytesToBase64 } from '../util/base64.js';
-import { concatBytes, EMPTY_BYTES, TEXT_DECODER, TEXT_ENCODER, uint8Equal } from '../util/bytes.js';
+import { bytesToBase64 } from '../util/bytes.js';
+import { concatBytes, EMPTY_BYTES, intToBytes, TEXT_DECODER, TEXT_ENCODER, uint8Equal } from '../util/bytes.js';
 import { setBoundedMapEntry } from '../util/collections.js';
+import { normalizeNonNegativeInteger } from '../util/primitives.js';
 const DEFAULT_DERIVED_KEYS_CACHE_MAX_SIZE = 256;
 export class WaAppStateCrypto {
     constructor(derivedKeysCacheMaxSize = DEFAULT_DERIVED_KEYS_CACHE_MAX_SIZE) {
         this.derivedKeysCache = new Map();
-        this.derivedKeysCacheMaxSize =
-            this.normalizeDerivedKeysCacheMaxSize(derivedKeysCacheMaxSize);
+        this.derivedKeysCacheMaxSize = normalizeNonNegativeInteger(derivedKeysCacheMaxSize, DEFAULT_DERIVED_KEYS_CACHE_MAX_SIZE);
     }
     clearCache() {
         this.derivedKeysCache.clear();
@@ -107,7 +106,7 @@ export class WaAppStateCrypto {
         const derivedKeys = await this.deriveKeys(keyData);
         const payload = concatBytes([
             ltHash,
-            toNetworkOrder64(version),
+            intToBytes(8, version),
             TEXT_ENCODER.encode(collectionName)
         ]);
         const key = await importHmacKey(derivedKeys.snapshotMacKey);
@@ -118,7 +117,7 @@ export class WaAppStateCrypto {
         const payload = concatBytes([
             snapshotMac,
             ...valueMacs,
-            toNetworkOrder64(version),
+            intToBytes(8, version),
             TEXT_ENCODER.encode(collectionName)
         ]);
         const key = await importHmacKey(derivedKeys.patchMacKey);
@@ -181,13 +180,7 @@ export class WaAppStateCrypto {
         octetLength[octetLength.length - 1] = associatedData.byteLength & 0xff;
         const key = await importHmacSha512Key(valueMacKey);
         const full = await hmacSign(key, concatBytes([associatedData, cipherWithIv, octetLength]));
-        return full.slice(0, APP_STATE_VALUE_MAC_LENGTH);
-    }
-    normalizeDerivedKeysCacheMaxSize(value) {
-        if (!Number.isFinite(value)) {
-            return DEFAULT_DERIVED_KEYS_CACHE_MAX_SIZE;
-        }
-        return Math.max(0, Math.trunc(value));
+        return full.subarray(0, APP_STATE_VALUE_MAC_LENGTH);
     }
     touchDerivedKeysCacheEntry(cacheKey, keys) {
         if (this.derivedKeysCacheMaxSize <= 0) {