@requestnetwork/utils 0.28.0 → 0.28.1-next.709

package/dist/crypto/ec-utils.js

@@ -1,26 +1,10 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const eth_crypto_1 = require("eth-crypto");
-/**
- * Function to manage Elliptic-curve cryptography
- */
-exports.default = {
-    decrypt,
-    encrypt,
-    getAddressFromPrivateKey,
-    getAddressFromPublicKey,
-    recover,
-    sign,
-};
+exports.ecSign = exports.ecRecover = exports.getAddressFromPublicKey = exports.getAddressFromPrivateKey = exports.ecEncrypt = exports.ecDecrypt = void 0;
+const tslib_1 = require("tslib");
+const secp256k1_1 = require("secp256k1");
+const ethers_1 = require("ethers");
+const eccrypto_1 = require("@toruslabs/eccrypto");
 /**
  * Function to derive the address from an EC private key
  *
@@ -30,17 +14,21 @@ exports.default = {
  */
 function getAddressFromPrivateKey(privateKey) {
     try {
-        const publicKey = eth_crypto_1.default.publicKeyByPrivateKey(privateKey);
-        return eth_crypto_1.default.publicKey.toAddress(publicKey);
+        if (!privateKey.match(/^0x/)) {
+            privateKey = `0x` + privateKey;
+        }
+        return ethers_1.ethers.utils.computeAddress(ethers_1.ethers.utils.hexlify(privateKey));
     }
     catch (e) {
         if (e.message === 'private key length is invalid' ||
-            e.message === 'Expected private key to be an Uint8Array with length 32') {
+            e.message === 'Expected private key to be an Uint8Array with length 32' ||
+            e.code === 'INVALID_ARGUMENT') {
             throw new Error('The private key must be a string representing 32 bytes');
         }
         throw e;
     }
 }
+exports.getAddressFromPrivateKey = getAddressFromPrivateKey;
 /**
  * Function to derive the address from an EC public key
  *
@@ -50,35 +38,40 @@ function getAddressFromPrivateKey(privateKey) {
  */
 function getAddressFromPublicKey(publicKey) {
     try {
-        return eth_crypto_1.default.publicKey.toAddress(publicKey);
+        return ethers_1.ethers.utils.computeAddress(compressPublicKey(publicKey));
     }
     catch (e) {
         if (e.message === 'public key length is invalid' ||
-            e.message === 'Expected public key to be an Uint8Array with length [33, 65]') {
+            e.message === 'Expected public key to be an Uint8Array with length [33, 65]' ||
+            e.code === 'INVALID_ARGUMENT') {
             throw new Error('The public key must be a string representing 64 bytes');
         }
         throw e;
     }
 }
+exports.getAddressFromPublicKey = getAddressFromPublicKey;
 /**
- * Function sign data with ECDSA
+ * Function ecSigndata with ECDSA
  *
  * @param data the data to sign
  *
  * @returns the signature
  */
-function sign(privateKey, data) {
+function ecSign(privateKey, data) {
     try {
-        return eth_crypto_1.default.sign(privateKey, data);
+        const signingKey = new ethers_1.ethers.utils.SigningKey(privateKey);
+        return ethers_1.ethers.utils.joinSignature(signingKey.signDigest(data));
     }
     catch (e) {
         if (e.message === 'private key length is invalid' ||
-            e.message === 'Expected private key to be an Uint8Array with length 32') {
+            e.message === 'Expected private key to be an Uint8Array with length 32' ||
+            e.code === 'INVALID_ARGUMENT') {
             throw new Error('The private key must be a string representing 32 bytes');
         }
         throw e;
     }
 }
+exports.ecSign = ecSign;
 /**
  * Function to recover address from a signature
  *
@@ -87,18 +80,26 @@ function sign(privateKey, data) {
  *
  * @returns the address
  */
-function recover(signature, data) {
+function ecRecover(signature, data) {
     try {
-        return eth_crypto_1.default.recover(signature, data);
+        signature = signature.replace(/^0x/, '');
+        data = data.replace(/^0x/, '');
+        // split into v-value and sig
+        const sigOnly = signature.substring(0, signature.length - 2); // all but last 2 chars
+        const vValue = signature.slice(-2); // last 2 chars
+        const recoveryNumber = vValue === '1c' ? 1 : 0;
+        return ethers_1.ethers.utils.computeAddress(Buffer.from((0, secp256k1_1.ecdsaRecover)(new Uint8Array(Buffer.from(sigOnly, 'hex')), recoveryNumber, new Uint8Array(Buffer.from(data, 'hex')), false)));
     }
     catch (e) {
         if (e.message === 'signature length is invalid' ||
-            e.message === 'Expected signature to be an Uint8Array with length 64') {
+            e.message === 'Expected signature to be an Uint8Array with length 64' ||
+            e.code === 'INVALID_ARGUMENT') {
             throw new Error('The signature must be a string representing 66 bytes');
         }
         throw e;
     }
 }
+exports.ecRecover = ecRecover;
 /**
  * Function to encrypt data with a public key
  *
@@ -107,13 +108,19 @@ function recover(signature, data) {
  *
  * @returns the encrypted data
  */
-function encrypt(publicKey, data) {
-    return __awaiter(this, void 0, void 0, function* () {
+function ecEncrypt(publicKey, data) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         try {
-            // Encrypts the data with the publicKey, returns the encrypted data with encryption parameters (such as IV..)
-            const encrypted = yield eth_crypto_1.default.encryptWithPublicKey(publicKey, data);
+            // encrypts the data with the publicKey, returns the encrypted data with encryption parameters (such as IV..)
+            const compressed = compressPublicKey(publicKey);
+            const encrypted = yield (0, eccrypto_1.encrypt)(Buffer.from(compressed), Buffer.from(data));
             // Transforms the object with the encrypted data into a smaller string-representation.
-            return eth_crypto_1.default.cipher.stringify(encrypted);
+            return Buffer.concat([
+                encrypted.iv,
+                (0, secp256k1_1.publicKeyConvert)(encrypted.ephemPublicKey),
+                encrypted.mac,
+                encrypted.ciphertext,
+            ]).toString('hex');
         }
         catch (e) {
             if (e.message === 'public key length is invalid' ||
@@ -124,6 +131,7 @@ function encrypt(publicKey, data) {
         }
     });
 }
+exports.ecEncrypt = ecEncrypt;
 /**
  * Function to decrypt data with a public key
  *
@@ -132,10 +140,11 @@ function encrypt(publicKey, data) {
  *
  * @returns the decrypted data
  */
-function decrypt(privateKey, encrypted) {
-    return __awaiter(this, void 0, void 0, function* () {
+function ecDecrypt(privateKey, data) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         try {
-            return yield eth_crypto_1.default.decryptWithPrivateKey(privateKey, eth_crypto_1.default.cipher.parse(encrypted));
+            const buf = yield (0, eccrypto_1.decrypt)(Buffer.from(privateKey.replace(/^0x/, ''), 'hex'), eciesSplit(data));
+            return buf.toString();
         }
         catch (e) {
             if (e.message === 'Bad private key' ||
@@ -145,6 +154,7 @@ function decrypt(privateKey, encrypted) {
             if (e.message === 'public key length is invalid' ||
                 e.message === 'Expected public key to be an Uint8Array with length [33, 65]' ||
                 e.message === 'Bad MAC' ||
+                e.message === 'bad MAC after trying padded' ||
                 e.message === 'the public key could not be parsed or is invalid' ||
                 e.message === 'Public Key could not be parsed') {
                 throw new Error('The encrypted data is not well formatted');
@@ -153,4 +163,30 @@ function decrypt(privateKey, encrypted) {
         }
     });
 }
+exports.ecDecrypt = ecDecrypt;
+/**
+ * Converts a public key to its compressed form.
+ */
+function compressPublicKey(publicKey) {
+    publicKey = publicKey.replace(/^0x/, '');
+    // if there are more bytes than the key itself, it means there is already a prefix
+    if (publicKey.length % 32 === 0) {
+        publicKey = `04${publicKey}`;
+    }
+    return (0, secp256k1_1.publicKeyConvert)(Buffer.from(publicKey, 'hex'));
+}
+/**
+ * Split an encrypted string to ECIES params
+ * inspired from https://github.com/pubkey/eth-crypto/blob/master/src/ecDecrypt-with-private-key.js
+ */
+const eciesSplit = (str) => {
+    const buf = Buffer.from(str, 'hex');
+    const ephemPublicKeyStr = buf.toString('hex', 16, 49);
+    return {
+        iv: Buffer.from(buf.toString('hex', 0, 16), 'hex'),
+        mac: Buffer.from(buf.toString('hex', 49, 81), 'hex'),
+        ciphertext: Buffer.from(buf.toString('hex', 81, buf.length), 'hex'),
+        ephemPublicKey: Buffer.from((0, secp256k1_1.publicKeyConvert)(new Uint8Array(Buffer.from(ephemPublicKeyStr, 'hex')), false)),
+    };
+};
 //# sourceMappingURL=ec-utils.js.map

package/dist/crypto/ec-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"ec-utils.js","sourceRoot":"","sources":["../../src/crypto/ec-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ec-utils.js","sourceRoot":"","sources":["../../src/crypto/ec-utils.ts"],"names":[],"mappings":"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"}

package/dist/crypto.d.ts

@@ -1,31 +1,10 @@
-/// <reference types="node" />
 import { MultiFormatTypes } from '@requestnetwork/types';
-declare const _default: {
-    CryptoWrapper: {
-        decryptWithAes256cbc: (encryptedAndIv: Buffer, key: Buffer) => Promise<Buffer>;
-        decryptWithAes256gcm: (encryptedAndIv: Buffer, key: Buffer) => Promise<Buffer>;
-        encryptWithAes256cbc: (data: Buffer, key: Buffer) => Promise<Buffer>;
-        encryptWithAes256gcm: (data: Buffer, key: Buffer) => Promise<Buffer>;
-        random32Bytes: () => Promise<Buffer>;
-    };
-    EcUtils: {
-        decrypt: (privateKey: string, encrypted: string) => Promise<string>;
-        encrypt: (publicKey: string, data: string) => Promise<string>;
-        getAddressFromPrivateKey: (privateKey: string) => string;
-        getAddressFromPublicKey: (publicKey: string) => string;
-        recover: (signature: string, data: string) => string;
-        sign: (privateKey: string, data: string) => string;
-    };
-    generate32BufferKey: typeof generate32BufferKey;
-    generate8randomBytes: typeof generate8randomBytes;
-    keccak256Hash: typeof keccak256Hash;
-    normalize: typeof normalize;
-    normalizeKeccak256Hash: typeof normalizeKeccak256Hash;
-};
+import { decryptWithAes256cbc, decryptWithAes256gcm, encryptWithAes256cbc, encryptWithAes256gcm, random32Bytes } from './crypto/crypto-wrapper';
+import { ecDecrypt, ecEncrypt, getAddressFromPrivateKey, getAddressFromPublicKey, ecRecover, ecSign } from './crypto/ec-utils';
 /**
  * manages crypto functions
  */
-export default _default;
+export { decryptWithAes256cbc, decryptWithAes256gcm, encryptWithAes256cbc, encryptWithAes256gcm, random32Bytes, ecDecrypt, ecEncrypt, getAddressFromPrivateKey, getAddressFromPublicKey, ecRecover, ecSign, generate32BufferKey, generate8randomBytes, keccak256Hash, last20bytesOfNormalizedKeccak256Hash, normalize, normalizeKeccak256Hash, };
 /**
  * Hashes with the keccak256 algorithm with a normalization before and formats it
  *
@@ -34,14 +13,14 @@ export default _default;
  * @param data The data to hash
  * @returns The hashed data multi-formatted
  */
-declare function normalizeKeccak256Hash(data: any): MultiFormatTypes.HashTypes.IHash;
+declare function normalizeKeccak256Hash(data: unknown): MultiFormatTypes.HashTypes.IHash;
 /**
  * Normalizes data: sorts the object by keys and convert it in string
  *
  * @param data The data to normalize
  * @returns The normalized data
  */
-declare function normalize(data: any): string;
+declare function normalize(data: unknown): string;
 /**
  * Hashes with the keccak256 algorithm
  *
@@ -49,6 +28,15 @@ declare function normalize(data: any): string;
  * @returns The hashed data multi-formatted
  */
 declare function keccak256Hash(data: string): string;
+/**
+ * Hashes with the keccak256 algorithm with a normalization before and formats it
+ *
+ * @notice It will sort the object by keys before hashing
+ *
+ * @param data The data to hash
+ * @returns The hashed data multi-formatted
+ */
+declare function last20bytesOfNormalizedKeccak256Hash(data: unknown): string;
 /**
  * Generates a 32 bytes key in a base64 string
  *

package/dist/crypto.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"crypto.d.ts","sourceRoot":"","sources":["../src/crypto.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;;;;;;;;;;;;;;;;;;;;;;;AAMzD;;GAEG;AACH,wBAQE;AAEF;;;;;;;GAOG;AACH,iBAAS,sBAAsB,CAAC,IAAI,EAAE,GAAG,GAAG,gBAAgB,CAAC,SAAS,CAAC,KAAK,CAK3E;AAED;;;;;GAKG;AACH,iBAAS,SAAS,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM,CAUpC;AAED;;;;;GAKG;AACH,iBAAS,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE3C;AAED;;;;GAIG;AACH,iBAAe,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC,CAEpD;AAGD;;;;;;GAMG;AACH,iBAAe,oBAAoB,IAAI,OAAO,CAAC,MAAM,CAAC,CAGrD"}
+{"version":3,"file":"crypto.d.ts","sourceRoot":"","sources":["../src/crypto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,aAAa,EACd,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,SAAS,EACT,SAAS,EACT,wBAAwB,EACxB,uBAAuB,EACvB,SAAS,EACT,MAAM,EACP,MAAM,mBAAmB,CAAC;AAG3B;;GAEG;AACH,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,aAAa,EACb,SAAS,EACT,SAAS,EACT,wBAAwB,EACxB,uBAAuB,EACvB,SAAS,EACT,MAAM,EACN,mBAAmB,EACnB,oBAAoB,EACpB,aAAa,EACb,oCAAoC,EACpC,SAAS,EACT,sBAAsB,GACvB,CAAC;AAEF;;;;;;;GAOG;AACH,iBAAS,sBAAsB,CAAC,IAAI,EAAE,OAAO,GAAG,gBAAgB,CAAC,SAAS,CAAC,KAAK,CAK/E;AAED;;;;;GAKG;AACH,iBAAS,SAAS,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAUxC;AAED;;;;;GAKG;AACH,iBAAS,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE3C;AAED;;;;;;;GAOG;AACH,iBAAS,oCAAoC,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAInE;AAED;;;;GAIG;AACH,iBAAe,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC,CAEpD;AAED;;;;;;GAMG;AACH,iBAAe,oBAAoB,IAAI,OAAO,CAAC,MAAM,CAAC,CAGrD"}

package/dist/crypto.js

@@ -1,31 +1,23 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeKeccak256Hash = exports.normalize = exports.last20bytesOfNormalizedKeccak256Hash = exports.keccak256Hash = exports.generate8randomBytes = exports.generate32BufferKey = exports.ecSign = exports.ecRecover = exports.getAddressFromPublicKey = exports.getAddressFromPrivateKey = exports.ecEncrypt = exports.ecDecrypt = exports.random32Bytes = exports.encryptWithAes256gcm = exports.encryptWithAes256cbc = exports.decryptWithAes256gcm = exports.decryptWithAes256cbc = void 0;
+const tslib_1 = require("tslib");
 const types_1 = require("@requestnetwork/types");
-const eth_crypto_1 = require("eth-crypto");
+const ethers_1 = require("ethers");
 const crypto_wrapper_1 = require("./crypto/crypto-wrapper");
+Object.defineProperty(exports, "decryptWithAes256cbc", { enumerable: true, get: function () { return crypto_wrapper_1.decryptWithAes256cbc; } });
+Object.defineProperty(exports, "decryptWithAes256gcm", { enumerable: true, get: function () { return crypto_wrapper_1.decryptWithAes256gcm; } });
+Object.defineProperty(exports, "encryptWithAes256cbc", { enumerable: true, get: function () { return crypto_wrapper_1.encryptWithAes256cbc; } });
+Object.defineProperty(exports, "encryptWithAes256gcm", { enumerable: true, get: function () { return crypto_wrapper_1.encryptWithAes256gcm; } });
+Object.defineProperty(exports, "random32Bytes", { enumerable: true, get: function () { return crypto_wrapper_1.random32Bytes; } });
 const ec_utils_1 = require("./crypto/ec-utils");
+Object.defineProperty(exports, "ecDecrypt", { enumerable: true, get: function () { return ec_utils_1.ecDecrypt; } });
+Object.defineProperty(exports, "ecEncrypt", { enumerable: true, get: function () { return ec_utils_1.ecEncrypt; } });
+Object.defineProperty(exports, "getAddressFromPrivateKey", { enumerable: true, get: function () { return ec_utils_1.getAddressFromPrivateKey; } });
+Object.defineProperty(exports, "getAddressFromPublicKey", { enumerable: true, get: function () { return ec_utils_1.getAddressFromPublicKey; } });
+Object.defineProperty(exports, "ecRecover", { enumerable: true, get: function () { return ec_utils_1.ecRecover; } });
+Object.defineProperty(exports, "ecSign", { enumerable: true, get: function () { return ec_utils_1.ecSign; } });
 const utils_1 = require("./utils");
-/**
- * manages crypto functions
- */
-exports.default = {
-    CryptoWrapper: crypto_wrapper_1.default,
-    EcUtils: ec_utils_1.default,
-    generate32BufferKey,
-    generate8randomBytes,
-    keccak256Hash,
-    normalize,
-    normalizeKeccak256Hash,
-};
 /**
  * Hashes with the keccak256 algorithm with a normalization before and formats it
  *
@@ -40,6 +32,7 @@ function normalizeKeccak256Hash(data) {
         value: keccak256Hash(normalize(data)),
     };
 }
+exports.normalizeKeccak256Hash = normalizeKeccak256Hash;
 /**
  * Normalizes data: sorts the object by keys and convert it in string
  *
@@ -51,10 +44,11 @@ function normalize(data) {
         return 'undefined';
     }
     // deeply sort data keys
-    const sortedData = utils_1.default.deepSort(data);
+    const sortedData = (0, utils_1.deepSort)(data);
     // convert to string and lowerCase it, to be case insensitive (e.g: avoid ethereum address casing checksum)
     return JSON.stringify(sortedData).toLowerCase();
 }
+exports.normalize = normalize;
 /**
  * Hashes with the keccak256 algorithm
  *
@@ -62,19 +56,34 @@ function normalize(data) {
  * @returns The hashed data multi-formatted
  */
 function keccak256Hash(data) {
-    return eth_crypto_1.default.hash.keccak256(data);
+    return ethers_1.ethers.utils.keccak256(ethers_1.ethers.utils.toUtf8Bytes(data));
+}
+exports.keccak256Hash = keccak256Hash;
+/**
+ * Hashes with the keccak256 algorithm with a normalization before and formats it
+ *
+ * @notice It will sort the object by keys before hashing
+ *
+ * @param data The data to hash
+ * @returns The hashed data multi-formatted
+ */
+function last20bytesOfNormalizedKeccak256Hash(data) {
+    const hash = keccak256Hash(normalize(data));
+    // eslint-disable-next-line no-magic-numbers
+    return `0x${hash.slice(-40)}`;
 }
+exports.last20bytesOfNormalizedKeccak256Hash = last20bytesOfNormalizedKeccak256Hash;
 /**
  * Generates a 32 bytes key in a base64 string
  *
  * @returns a random buffer of 32 bytes in a base64 string
  */
 function generate32BufferKey() {
-    return __awaiter(this, void 0, void 0, function* () {
-        return (yield crypto_wrapper_1.default.random32Bytes()).toString('base64');
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (yield (0, crypto_wrapper_1.random32Bytes)()).toString('base64');
     });
 }
-// eslint-disable-next-line spellcheck/spell-checker
+exports.generate32BufferKey = generate32BufferKey;
 /**
  * Generate 8 random bytes and return as a hexadecimal string.
  * Used for salt in ETH input data.
@@ -83,9 +92,10 @@ function generate32BufferKey() {
  * @returns a string of 8 random bytes
  */
 function generate8randomBytes() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const random32Bytes = yield crypto_wrapper_1.default.random32Bytes();
-        return random32Bytes.slice(0, 8).toString('hex');
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const random32BytesHex = yield (0, crypto_wrapper_1.random32Bytes)();
+        return random32BytesHex.slice(0, 8).toString('hex');
     });
 }
+exports.generate8randomBytes = generate8randomBytes;
 //# sourceMappingURL=crypto.js.map

package/dist/crypto.js.map

@@ -1 +1 @@
-{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../src/crypto.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,iDAAyD;AACzD,2CAAmC;AACnC,4DAAoD;AACpD,gDAAwC;AACxC,mCAA4B;AAE5B;;GAEG;AACH,kBAAe;IACb,aAAa,EAAb,wBAAa;IACb,OAAO,EAAP,kBAAO;IACP,mBAAmB;IACnB,oBAAoB;IACpB,aAAa;IACb,SAAS;IACT,sBAAsB;CACvB,CAAC;AAEF;;;;;;;GAOG;AACH,SAAS,sBAAsB,CAAC,IAAS;IACvC,OAAO;QACL,IAAI,EAAE,wBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS;QAC/C,KAAK,EAAE,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;KACtC,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAS,SAAS,CAAC,IAAS;IAC1B,IAAI,IAAI,KAAK,SAAS,EAAE;QACtB,OAAO,WAAW,CAAC;KACpB;IAED,wBAAwB;IACxB,MAAM,UAAU,GAAQ,eAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAE7C,2GAA2G;IAC3G,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;AAClD,CAAC;AAED;;;;;GAKG;AACH,SAAS,aAAa,CAAC,IAAY;IACjC,OAAO,oBAAS,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;AACxC,CAAC;AAED;;;;GAIG;AACH,SAAe,mBAAmB;;QAChC,OAAO,CAAC,MAAM,wBAAa,CAAC,aAAa,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAClE,CAAC;CAAA;AAED,oDAAoD;AACpD;;;;;;GAMG;AACH,SAAe,oBAAoB;;QACjC,MAAM,aAAa,GAAG,MAAM,wBAAa,CAAC,aAAa,EAAE,CAAC;QAC1D,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACnD,CAAC;CAAA"}
+{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../src/crypto.ts"],"names":[],"mappings":";;;;AAAA,iDAAyD;AACzD,mCAAgC;AAChC,4DAMiC;AAe/B,qGApBA,qCAAoB,OAoBA;AACpB,qGApBA,qCAAoB,OAoBA;AACpB,qGApBA,qCAAoB,OAoBA;AACpB,qGApBA,qCAAoB,OAoBA;AACpB,8FApBA,8BAAa,OAoBA;AAlBf,gDAO2B;AAYzB,0FAlBA,oBAAS,OAkBA;AACT,0FAlBA,oBAAS,OAkBA;AACT,yGAlBA,mCAAwB,OAkBA;AACxB,wGAlBA,kCAAuB,OAkBA;AACvB,0FAlBA,oBAAS,OAkBA;AACT,uFAlBA,iBAAM,OAkBA;AAhBR,mCAAmC;AAyBnC;;;;;;;GAOG;AACH,SAAS,sBAAsB,CAAC,IAAa;IAC3C,OAAO;QACL,IAAI,EAAE,wBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS;QAC/C,KAAK,EAAE,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;KACtC,CAAC;AACJ,CAAC;AAhBC,wDAAsB;AAkBxB;;;;;GAKG;AACH,SAAS,SAAS,CAAC,IAAa;IAC9B,IAAI,IAAI,KAAK,SAAS,EAAE;QACtB,OAAO,WAAW,CAAC;KACpB;IAED,wBAAwB;IACxB,MAAM,UAAU,GAAG,IAAA,gBAAQ,EAAC,IAAI,CAAC,CAAC;IAElC,2GAA2G;IAC3G,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;AAClD,CAAC;AAnCC,8BAAS;AAqCX;;;;;GAKG;AACH,SAAS,aAAa,CAAC,IAAY;IACjC,OAAO,eAAM,CAAC,KAAK,CAAC,SAAS,CAAC,eAAM,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;AAChE,CAAC;AA/CC,sCAAa;AAiDf;;;;;;;GAOG;AACH,SAAS,oCAAoC,CAAC,IAAa;IACzD,MAAM,IAAI,GAAG,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5C,4CAA4C;IAC5C,OAAO,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;AAChC,CAAC;AA5DC,oFAAoC;AA8DtC;;;;GAIG;AACH,SAAe,mBAAmB;;QAChC,OAAO,CAAC,MAAM,IAAA,8BAAa,GAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACpD,CAAC;CAAA;AAxEC,kDAAmB;AA0ErB;;;;;;GAMG;AACH,SAAe,oBAAoB;;QACjC,MAAM,gBAAgB,GAAG,MAAM,IAAA,8BAAa,GAAE,CAAC;QAC/C,OAAO,gBAAgB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACtD,CAAC;CAAA;AAnFC,oDAAoB"}

package/dist/encryption.d.ts

@@ -1,13 +1,8 @@
 import { EncryptionTypes, IdentityTypes } from '@requestnetwork/types';
-declare const _default: {
-    decrypt: typeof decrypt;
-    encrypt: typeof encrypt;
-    getIdentityFromEncryptionParams: typeof getIdentityFromEncryptionParams;
-};
 /**
  * Functions to manage encryption
  */
-export default _default;
+export { decrypt, encrypt, getIdentityFromEncryptionParams };
 /**
  * Function to get the identity from the encryption parameters
  *

package/dist/encryption.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"encryption.d.ts","sourceRoot":"","sources":["../src/encryption.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;;;;;;AAGvE;;GAEG;AACH,wBAIE;AAEF;;;;;;GAMG;AACH,iBAAS,+BAA+B,CACtC,gBAAgB,EAAE,eAAe,CAAC,qBAAqB,GACtD,aAAa,CAAC,SAAS,CASzB;AAED;;;;;;GAMG;AACH,iBAAe,OAAO,CACpB,IAAI,EAAE,MAAM,EACZ,gBAAgB,EAAE,eAAe,CAAC,qBAAqB,GACtD,OAAO,CAAC,eAAe,CAAC,cAAc,CAAC,CAgCzC;AAED;;;;;;;;GAQG;AACH,iBAAe,OAAO,CACpB,aAAa,EAAE,eAAe,CAAC,cAAc,EAC7C,gBAAgB,EAAE,eAAe,CAAC,qBAAqB,GACtD,OAAO,CAAC,MAAM,CAAC,CAkCjB"}
+{"version":3,"file":"encryption.d.ts","sourceRoot":"","sources":["../src/encryption.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAWvE;;GAEG;AACH,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,+BAA+B,EAAE,CAAC;AAE7D;;;;;;GAMG;AACH,iBAAS,+BAA+B,CACtC,gBAAgB,EAAE,eAAe,CAAC,qBAAqB,GACtD,aAAa,CAAC,SAAS,CASzB;AAED;;;;;;GAMG;AACH,iBAAe,OAAO,CACpB,IAAI,EAAE,MAAM,EACZ,gBAAgB,EAAE,eAAe,CAAC,qBAAqB,GACtD,OAAO,CAAC,eAAe,CAAC,cAAc,CAAC,CAgCzC;AAED;;;;;;;;GAQG;AACH,iBAAe,OAAO,CACpB,aAAa,EAAE,eAAe,CAAC,cAAc,EAC7C,gBAAgB,EAAE,eAAe,CAAC,qBAAqB,GACtD,OAAO,CAAC,MAAM,CAAC,CAkCjB"}

package/dist/encryption.js

@@ -1,24 +1,9 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getIdentityFromEncryptionParams = exports.encrypt = exports.decrypt = void 0;
+const tslib_1 = require("tslib");
 const types_1 = require("@requestnetwork/types");
-const crypto_1 = require("./crypto");
-/**
- * Functions to manage encryption
- */
-exports.default = {
-    decrypt,
-    encrypt,
-    getIdentityFromEncryptionParams,
-};
+const index_1 = require("./index");
 /**
  * Function to get the identity from the encryption parameters
  *
@@ -30,11 +15,12 @@ function getIdentityFromEncryptionParams(encryptionParams) {
     if (encryptionParams.method === types_1.EncryptionTypes.METHOD.ECIES) {
         return {
             type: types_1.IdentityTypes.TYPE.ETHEREUM_ADDRESS,
-            value: crypto_1.default.EcUtils.getAddressFromPublicKey(encryptionParams.key),
+            value: (0, index_1.getAddressFromPublicKey)(encryptionParams.key),
         };
     }
     throw new Error('encryptionParams.method not supported');
 }
+exports.getIdentityFromEncryptionParams = getIdentityFromEncryptionParams;
 /**
  * Encrypts data using encryption parameters
  *
@@ -43,23 +29,23 @@ function getIdentityFromEncryptionParams(encryptionParams) {
  * @returns the encrypted data
  */
 function encrypt(data, encryptionParams) {
-    return __awaiter(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         if (encryptionParams.method === types_1.EncryptionTypes.METHOD.ECIES) {
-            const encryptedData = yield crypto_1.default.EcUtils.encrypt(encryptionParams.key, data);
+            const encryptedData = yield (0, index_1.ecEncrypt)(encryptionParams.key, data);
             return {
                 type: types_1.EncryptionTypes.METHOD.ECIES,
                 value: encryptedData,
             };
         }
         if (encryptionParams.method === types_1.EncryptionTypes.METHOD.AES256_CBC) {
-            const encryptedDataBuffer = yield crypto_1.default.CryptoWrapper.encryptWithAes256cbc(Buffer.from(data, 'utf-8'), Buffer.from(encryptionParams.key, 'base64'));
+            const encryptedDataBuffer = yield (0, index_1.encryptWithAes256cbc)(Buffer.from(data, 'utf-8'), Buffer.from(encryptionParams.key, 'base64'));
             return {
                 type: types_1.EncryptionTypes.METHOD.AES256_CBC,
                 value: encryptedDataBuffer.toString('base64'),
             };
         }
         if (encryptionParams.method === types_1.EncryptionTypes.METHOD.AES256_GCM) {
-            const encryptedDataBuffer = yield crypto_1.default.CryptoWrapper.encryptWithAes256gcm(Buffer.from(data, 'utf-8'), Buffer.from(encryptionParams.key, 'base64'));
+            const encryptedDataBuffer = yield (0, index_1.encryptWithAes256gcm)(Buffer.from(data, 'utf-8'), Buffer.from(encryptionParams.key, 'base64'));
             return {
                 type: types_1.EncryptionTypes.METHOD.AES256_GCM,
                 value: encryptedDataBuffer.toString('base64'),
@@ -68,6 +54,7 @@ function encrypt(data, encryptionParams) {
         throw new Error('encryptionParams.method not supported');
     });
 }
+exports.encrypt = encrypt;
 /**
  * Decrypt data using decryption parameters
  *
@@ -78,18 +65,18 @@ function encrypt(data, encryptionParams) {
  * @returns the decrypted data
  */
 function decrypt(encryptedData, decryptionParams) {
-    return __awaiter(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         if (encryptedData.type === types_1.EncryptionTypes.METHOD.ECIES) {
             if (decryptionParams.method !== types_1.EncryptionTypes.METHOD.ECIES) {
                 throw new Error(`decryptionParams.method should be ${types_1.EncryptionTypes.METHOD.ECIES}`);
             }
-            return crypto_1.default.EcUtils.decrypt(decryptionParams.key, encryptedData.value);
+            return (0, index_1.ecDecrypt)(decryptionParams.key, encryptedData.value);
         }
         if (encryptedData.type === types_1.EncryptionTypes.METHOD.AES256_CBC) {
             if (decryptionParams.method !== types_1.EncryptionTypes.METHOD.AES256_CBC) {
                 throw new Error(`decryptionParams.method should be ${types_1.EncryptionTypes.METHOD.AES256_CBC}`);
             }
-            const dataBuffer = yield crypto_1.default.CryptoWrapper.decryptWithAes256cbc(
+            const dataBuffer = yield (0, index_1.decryptWithAes256cbc)(
             // remove the multi-format padding and decode from the base64 to a buffer
             Buffer.from(encryptedData.value, 'base64'), Buffer.from(decryptionParams.key, 'base64'));
             return dataBuffer.toString();
@@ -98,7 +85,7 @@ function decrypt(encryptedData, decryptionParams) {
             if (decryptionParams.method !== types_1.EncryptionTypes.METHOD.AES256_GCM) {
                 throw new Error(`decryptionParams.method should be ${types_1.EncryptionTypes.METHOD.AES256_GCM}`);
             }
-            const dataBuffer = yield crypto_1.default.CryptoWrapper.decryptWithAes256gcm(
+            const dataBuffer = yield (0, index_1.decryptWithAes256gcm)(
             // remove the multi-format padding and decode from the base64 to a buffer
             Buffer.from(encryptedData.value, 'base64'), Buffer.from(decryptionParams.key, 'base64'));
             return dataBuffer.toString();
@@ -106,4 +93,5 @@ function decrypt(encryptedData, decryptionParams) {
         throw new Error('encryptedData method not supported');
     });
 }
+exports.decrypt = decrypt;
 //# sourceMappingURL=encryption.js.map

package/dist/encryption.js.map

@@ -1 +1 @@
-{"version":3,"file":"encryption.js","sourceRoot":"","sources":["../src/encryption.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"encryption.js","sourceRoot":"","sources":["../src/encryption.ts"],"names":[],"mappings":";;;;AAAA,iDAAuE;AACvE,mCAQiB;AAOjB;;;;;;GAMG;AACH,SAAS,+BAA+B,CACtC,gBAAuD;IAEvD,IAAI,gBAAgB,CAAC,MAAM,KAAK,uBAAe,CAAC,MAAM,CAAC,KAAK,EAAE;QAC5D,OAAO;YACL,IAAI,EAAE,qBAAa,CAAC,IAAI,CAAC,gBAAgB;YACzC,KAAK,EAAE,IAAA,+BAAuB,EAAC,gBAAgB,CAAC,GAAG,CAAC;SACrD,CAAC;KACH;IAED,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;AAC3D,CAAC;AApB0B,0EAA+B;AAsB1D;;;;;;GAMG;AACH,SAAe,OAAO,CACpB,IAAY,EACZ,gBAAuD;;QAEvD,IAAI,gBAAgB,CAAC,MAAM,KAAK,uBAAe,CAAC,MAAM,CAAC,KAAK,EAAE;YAC5D,MAAM,aAAa,GAAG,MAAM,IAAA,iBAAS,EAAC,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAClE,OAAO;gBACL,IAAI,EAAE,uBAAe,CAAC,MAAM,CAAC,KAAK;gBAClC,KAAK,EAAE,aAAa;aACrB,CAAC;SACH;QAED,IAAI,gBAAgB,CAAC,MAAM,KAAK,uBAAe,CAAC,MAAM,CAAC,UAAU,EAAE;YACjE,MAAM,mBAAmB,GAAG,MAAM,IAAA,4BAAoB,EACpD,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,EAC1B,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAC5C,CAAC;YACF,OAAO;gBACL,IAAI,EAAE,uBAAe,CAAC,MAAM,CAAC,UAAU;gBACvC,KAAK,EAAE,mBAAmB,CAAC,QAAQ,CAAC,QAAQ,CAAC;aAC9C,CAAC;SACH;QAED,IAAI,gBAAgB,CAAC,MAAM,KAAK,uBAAe,CAAC,MAAM,CAAC,UAAU,EAAE;YACjE,MAAM,mBAAmB,GAAG,MAAM,IAAA,4BAAoB,EACpD,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,EAC1B,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAC5C,CAAC;YACF,OAAO;gBACL,IAAI,EAAE,uBAAe,CAAC,MAAM,CAAC,UAAU;gBACvC,KAAK,EAAE,mBAAmB,CAAC,QAAQ,CAAC,QAAQ,CAAC;aAC9C,CAAC;SACH;QAED,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;IAC3D,CAAC;CAAA;AAhEiB,0BAAO;AAkEzB;;;;;;;;GAQG;AACH,SAAe,OAAO,CACpB,aAA6C,EAC7C,gBAAuD;;QAEvD,IAAI,aAAa,CAAC,IAAI,KAAK,uBAAe,CAAC,MAAM,CAAC,KAAK,EAAE;YACvD,IAAI,gBAAgB,CAAC,MAAM,KAAK,uBAAe,CAAC,MAAM,CAAC,KAAK,EAAE;gBAC5D,MAAM,IAAI,KAAK,CAAC,qCAAqC,uBAAe,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;aACtF;YACD,OAAO,IAAA,iBAAS,EAAC,gBAAgB,CAAC,GAAG,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;SAC7D;QAED,IAAI,aAAa,CAAC,IAAI,KAAK,uBAAe,CAAC,MAAM,CAAC,UAAU,EAAE;YAC5D,IAAI,gBAAgB,CAAC,MAAM,KAAK,uBAAe,CAAC,MAAM,CAAC,UAAU,EAAE;gBACjE,MAAM,IAAI,KAAK,CAAC,qCAAqC,uBAAe,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;aAC3F;YACD,MAAM,UAAU,GAAG,MAAM,IAAA,4BAAoB;YAC3C,yEAAyE;YACzE,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,QAAQ,CAAC,EAC1C,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAC5C,CAAC;YACF,OAAO,UAAU,CAAC,QAAQ,EAAE,CAAC;SAC9B;QAED,IAAI,aAAa,CAAC,IAAI,KAAK,uBAAe,CAAC,MAAM,CAAC,UAAU,EAAE;YAC5D,IAAI,gBAAgB,CAAC,MAAM,KAAK,uBAAe,CAAC,MAAM,CAAC,UAAU,EAAE;gBACjE,MAAM,IAAI,KAAK,CAAC,qCAAqC,uBAAe,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;aAC3F;YAED,MAAM,UAAU,GAAG,MAAM,IAAA,4BAAoB;YAC3C,yEAAyE;YACzE,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,QAAQ,CAAC,EAC1C,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAC5C,CAAC;YACF,OAAO,UAAU,CAAC,QAAQ,EAAE,CAAC;SAC9B;QAED,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxD,CAAC;CAAA;AAhHQ,0BAAO"}

package/dist/identity.d.ts

@@ -1,14 +1,9 @@
 import { IdentityTypes } from '@requestnetwork/types';
-declare const _default: {
-    areEqual: typeof areEqual;
-    hasError: typeof hasError;
-    normalizeIdentityValue: typeof normalizeIdentityValue;
-    supportedIdentities: IdentityTypes.TYPE[];
-};
+declare const supportedIdentities: IdentityTypes.TYPE[];
 /**
  * Module to manage Request Logic Identity
  */
-export default _default;
+export { areEqualIdentities, identityHasError, normalizeIdentityValue, supportedIdentities };
 /**
  * Checks if two identities are equals
  *
@@ -16,7 +11,7 @@ export default _default;
  * @param IIdentity id2 second identity
  * @returns boolean
  */
-declare function areEqual(id1: IdentityTypes.IIdentity, id2: IdentityTypes.IIdentity): boolean;
+declare function areEqualIdentities(id1?: IdentityTypes.IIdentity, id2?: IdentityTypes.IIdentity): boolean;
 /**
  * Normalizes identity values
  *
@@ -30,5 +25,5 @@ declare function normalizeIdentityValue(value: string): string;
  * @param id identity to check
  * @returns the error or null if valid
  */
-declare function hasError(id: IdentityTypes.IIdentity): string | null;
+declare function identityHasError(id: IdentityTypes.IIdentity): string | null;
 //# sourceMappingURL=identity.d.ts.map

package/dist/identity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"identity.d.ts","sourceRoot":"","sources":["../src/identity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;;;;;;;AAOtD;;GAEG;AACH,wBAKE;AAEF;;;;;;GAMG;AACH,iBAAS,QAAQ,CAAC,GAAG,EAAE,aAAa,CAAC,SAAS,EAAE,GAAG,EAAE,aAAa,CAAC,SAAS,GAAG,OAAO,CAIrF;AAED;;;;;GAKG;AACH,iBAAS,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAErD;AAED;;;;;GAKG;AACH,iBAAS,QAAQ,CAAC,EAAE,EAAE,aAAa,CAAC,SAAS,GAAG,MAAM,GAAG,IAAI,CAQ5D"}
+{"version":3,"file":"identity.d.ts","sourceRoot":"","sources":["../src/identity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,QAAA,MAAM,mBAAmB,EAAE,aAAa,CAAC,IAAI,EAG5C,CAAC;AAEF;;GAEG;AACH,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,CAAC;AAE7F;;;;;;GAMG;AACH,iBAAS,kBAAkB,CAAC,GAAG,CAAC,EAAE,aAAa,CAAC,SAAS,EAAE,GAAG,CAAC,EAAE,aAAa,CAAC,SAAS,GAAG,OAAO,CAOjG;AAED;;;;;GAKG;AACH,iBAAS,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAErD;AAED;;;;;GAKG;AACH,iBAAS,gBAAgB,CAAC,EAAE,EAAE,aAAa,CAAC,SAAS,GAAG,MAAM,GAAG,IAAI,CAQpE"}