@nmshd/crypto 1.0.8 → 1.0.9

package/dist/CryptoPrivateKey.d.ts

@@ -1,5 +1,5 @@
 import { Encoding, ICoreBuffer } from "./CoreBuffer";
-import { CryptoSerializableAsync } from "./CryptoSerializableAsync";
+import { CryptoSerializable } from "./CryptoSerializable";
 import { CryptoExchangeAlgorithm } from "./exchange/CryptoExchange";
 import { CryptoSignatureAlgorithm } from "./signature/CryptoSignatures";
 export interface ICryptoPrivateKey {
@@ -14,7 +14,7 @@ export interface ICryptoPrivateKeyStatic {
     fromString(value: string, algorithm: CryptoExchangeAlgorithm | CryptoSignatureAlgorithm, encoding: Encoding): Promise<ICryptoPrivateKey>;
     fromNativeKey(key: any, algorithm: CryptoExchangeAlgorithm | CryptoSignatureAlgorithm): Promise<ICryptoPrivateKey>;
 }
-export declare class CryptoPrivateKey extends CryptoSerializableAsync implements ICryptoPrivateKey {
+export declare class CryptoPrivateKey extends CryptoSerializable implements ICryptoPrivateKey {
     readonly algorithm: CryptoExchangeAlgorithm | CryptoSignatureAlgorithm;
     readonly privateKey: ICoreBuffer;
     constructor(algorithm: CryptoExchangeAlgorithm | CryptoSignatureAlgorithm, privateKey: ICoreBuffer);
@@ -22,10 +22,10 @@ export declare class CryptoPrivateKey extends CryptoSerializableAsync implements
     toString(): string;
     toPEM(): string;
     protected static stripPEM(pem: string): string;
-    static deserialize(value: string): Promise<CryptoPrivateKey>;
-    static fromString(value: string, algorithm: CryptoExchangeAlgorithm | CryptoSignatureAlgorithm, encoding?: Encoding): Promise<CryptoPrivateKey>;
-    static fromObject(value: any, algorithm: CryptoExchangeAlgorithm | CryptoSignatureAlgorithm): Promise<CryptoPrivateKey>;
-    static fromPEM(pem: string, algorithm: CryptoExchangeAlgorithm | CryptoSignatureAlgorithm): Promise<CryptoPrivateKey>;
-    static from(value: any): Promise<CryptoPrivateKey>;
-    static fromBase64(value: string): Promise<CryptoPrivateKey>;
+    static deserialize(value: string): CryptoPrivateKey;
+    static fromString(value: string, algorithm: CryptoExchangeAlgorithm | CryptoSignatureAlgorithm, encoding?: Encoding): CryptoPrivateKey;
+    static fromObject(value: any, algorithm: CryptoExchangeAlgorithm | CryptoSignatureAlgorithm): CryptoPrivateKey;
+    static fromPEM(pem: string, algorithm: CryptoExchangeAlgorithm | CryptoSignatureAlgorithm): CryptoPrivateKey;
+    static from(value: any): CryptoPrivateKey;
+    static fromBase64(value: string): CryptoPrivateKey;
 }

package/dist/CryptoPrivateKey.js

@@ -13,8 +13,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CryptoPrivateKey = void 0;
 const ts_serval_1 = require("@js-soft/ts-serval");
 const CoreBuffer_1 = require("./CoreBuffer");
-const CryptoSerializableAsync_1 = require("./CryptoSerializableAsync");
-let CryptoPrivateKey = CryptoPrivateKey_1 = class CryptoPrivateKey extends CryptoSerializableAsync_1.CryptoSerializableAsync {
+const CryptoSerializable_1 = require("./CryptoSerializable");
+let CryptoPrivateKey = CryptoPrivateKey_1 = class CryptoPrivateKey extends CryptoSerializable_1.CryptoSerializable {
     constructor(algorithm, privateKey) {
         super();
         this.algorithm = algorithm;
@@ -42,33 +42,33 @@ let CryptoPrivateKey = CryptoPrivateKey_1 = class CryptoPrivateKey extends Crypt
         pem = pem.replace(/(?:\r\n|\r|\n)/g, "");
         return pem;
     }
-    static async deserialize(value) {
+    static deserialize(value) {
         const obj = JSON.parse(value);
-        return await this.from(obj);
+        return this.from(obj);
     }
     static fromString(value, algorithm, encoding = CoreBuffer_1.Encoding.Base64_UrlSafe_NoPadding) {
         const buffer = CoreBuffer_1.CoreBuffer.fromString(value, encoding);
-        return Promise.resolve(new CryptoPrivateKey_1(algorithm, buffer));
+        return new CryptoPrivateKey_1(algorithm, buffer);
     }
     static fromObject(value, algorithm) {
         const buffer = CoreBuffer_1.CoreBuffer.fromObject(value);
-        return Promise.resolve(new CryptoPrivateKey_1(algorithm, buffer));
+        return new CryptoPrivateKey_1(algorithm, buffer);
     }
-    static async fromPEM(pem, algorithm) {
+    static fromPEM(pem, algorithm) {
         const value = this.stripPEM(pem);
-        return await this.fromString(value, algorithm, CoreBuffer_1.Encoding.Base64);
+        return this.fromString(value, algorithm, CoreBuffer_1.Encoding.Base64);
     }
-    static async from(value) {
+    static from(value) {
         if (!value || !value.publicKey || !value.algorithm) {
             throw new Error("No value, public key or algorithm set");
         }
         if (typeof value.privateKey === "string") {
-            return await this.fromString(value.privateKey, value.algorithm);
+            return this.fromString(value.privateKey, value.algorithm);
         }
-        return await this.fromObject(value.privateKey, value.algorithm);
+        return this.fromObject(value.privateKey, value.algorithm);
     }
-    static async fromBase64(value) {
-        return await this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
+    static fromBase64(value) {
+        return this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
     }
 };
 CryptoPrivateKey = CryptoPrivateKey_1 = __decorate([

package/dist/CryptoPrivateKey.js.map

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

package/dist/CryptoPublicKey.d.ts

@@ -1,5 +1,5 @@
 import { Encoding, ICoreBuffer } from "./CoreBuffer";
-import { CryptoSerializableAsync } from "./CryptoSerializableAsync";
+import { CryptoSerializable } from "./CryptoSerializable";
 import { CryptoExchangeAlgorithm } from "./exchange/CryptoExchange";
 import { CryptoSignatureAlgorithm } from "./signature/CryptoSignatures";
 export interface ICryptoPublicKey {
@@ -15,7 +15,7 @@ export interface ICryptoPublicKeyStatic {
     fromString(value: string, algorithm: CryptoExchangeAlgorithm | CryptoSignatureAlgorithm, encoding: Encoding): Promise<CryptoPublicKey>;
     fromNativeKey(key: any, algorithm: CryptoExchangeAlgorithm | CryptoSignatureAlgorithm): Promise<CryptoPublicKey>;
 }
-export declare class CryptoPublicKey extends CryptoSerializableAsync implements ICryptoPublicKey {
+export declare class CryptoPublicKey extends CryptoSerializable implements ICryptoPublicKey {
     readonly algorithm: CryptoExchangeAlgorithm | CryptoSignatureAlgorithm;
     readonly publicKey: ICoreBuffer;
     constructor(algorithm: CryptoExchangeAlgorithm | CryptoSignatureAlgorithm, publicKey: ICoreBuffer);
@@ -23,10 +23,10 @@ export declare class CryptoPublicKey extends CryptoSerializableAsync implements
     toString(): string;
     toPEM(): string;
     protected static stripPEM(pem: string): string;
-    static fromPEM(pem: string, algorithm: CryptoExchangeAlgorithm | CryptoSignatureAlgorithm): Promise<CryptoPublicKey>;
-    static fromString(value: string, algorithm: CryptoExchangeAlgorithm | CryptoSignatureAlgorithm, encoding?: Encoding): Promise<CryptoPublicKey>;
-    static fromObject(value: any, algorithm: CryptoExchangeAlgorithm | CryptoSignatureAlgorithm): Promise<CryptoPublicKey>;
-    static deserialize(value: string): Promise<CryptoPublicKey>;
-    static from(value: any): Promise<CryptoPublicKey>;
-    static fromBase64(value: string): Promise<CryptoPublicKey>;
+    static fromPEM(pem: string, algorithm: CryptoExchangeAlgorithm | CryptoSignatureAlgorithm): CryptoPublicKey;
+    static fromString(value: string, algorithm: CryptoExchangeAlgorithm | CryptoSignatureAlgorithm, encoding?: Encoding): CryptoPublicKey;
+    static fromObject(value: any, algorithm: CryptoExchangeAlgorithm | CryptoSignatureAlgorithm): CryptoPublicKey;
+    static deserialize(value: string): CryptoPublicKey;
+    static from(value: any): CryptoPublicKey;
+    static fromBase64(value: string): CryptoPublicKey;
 }

package/dist/CryptoPublicKey.js

@@ -13,8 +13,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CryptoPublicKey = void 0;
 const ts_serval_1 = require("@js-soft/ts-serval");
 const CoreBuffer_1 = require("./CoreBuffer");
-const CryptoSerializableAsync_1 = require("./CryptoSerializableAsync");
-let CryptoPublicKey = CryptoPublicKey_1 = class CryptoPublicKey extends CryptoSerializableAsync_1.CryptoSerializableAsync {
+const CryptoSerializable_1 = require("./CryptoSerializable");
+let CryptoPublicKey = CryptoPublicKey_1 = class CryptoPublicKey extends CryptoSerializable_1.CryptoSerializable {
     constructor(algorithm, publicKey) {
         super();
         this.algorithm = algorithm;
@@ -42,33 +42,33 @@ let CryptoPublicKey = CryptoPublicKey_1 = class CryptoPublicKey extends CryptoSe
         pem = pem.replace(/(?:\r\n|\r|\n)/g, "");
         return pem;
     }
-    static async fromPEM(pem, algorithm) {
+    static fromPEM(pem, algorithm) {
         const value = this.stripPEM(pem);
-        return await this.fromString(value, algorithm, CoreBuffer_1.Encoding.Base64);
+        return this.fromString(value, algorithm, CoreBuffer_1.Encoding.Base64);
     }
     static fromString(value, algorithm, encoding = CoreBuffer_1.Encoding.Base64_UrlSafe_NoPadding) {
         const buffer = CoreBuffer_1.CoreBuffer.fromString(value, encoding);
-        return Promise.resolve(new CryptoPublicKey_1(algorithm, buffer));
+        return new CryptoPublicKey_1(algorithm, buffer);
     }
     static fromObject(value, algorithm) {
         const buffer = CoreBuffer_1.CoreBuffer.fromObject(value);
-        return Promise.resolve(new CryptoPublicKey_1(algorithm, buffer));
+        return new CryptoPublicKey_1(algorithm, buffer);
     }
-    static async deserialize(value) {
+    static deserialize(value) {
         const obj = JSON.parse(value);
-        return await this.from(obj);
+        return this.from(obj);
     }
-    static async from(value) {
+    static from(value) {
         if (!value || !value.publicKey || !value.algorithm) {
             throw new Error("No value, public key or algorithm set");
         }
         if (typeof value.privateKey === "string") {
-            return await this.fromString(value.publicKey, value.algorithm);
+            return this.fromString(value.publicKey, value.algorithm);
         }
-        return await this.fromObject(value.publicKey, value.algorithm);
+        return this.fromObject(value.publicKey, value.algorithm);
     }
-    static async fromBase64(value) {
-        return await this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
+    static fromBase64(value) {
+        return this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
     }
 };
 CryptoPublicKey = CryptoPublicKey_1 = __decorate([

package/dist/CryptoPublicKey.js.map

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

package/dist/CryptoSerializable.d.ts

@@ -0,0 +1,5 @@
+import { ISerializable, Serializable } from "@js-soft/ts-serval";
+export declare abstract class CryptoSerializable extends Serializable implements ISerializable {
+    serialize(verbose?: boolean): string;
+    toBase64(verbose?: boolean): string;
+}

package/dist/CryptoSerializable.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CryptoSerializable = void 0;
+const ts_serval_1 = require("@js-soft/ts-serval");
+const CoreBuffer_1 = require("./CoreBuffer");
+class CryptoSerializable extends ts_serval_1.Serializable {
+    serialize(verbose = true) {
+        return JSON.stringify(this.toJSON(verbose));
+    }
+    toBase64(verbose = true) {
+        return CoreBuffer_1.CoreBuffer.utf8_base64(this.serialize(verbose));
+    }
+}
+exports.CryptoSerializable = CryptoSerializable;
+//# sourceMappingURL=CryptoSerializable.js.map

package/dist/CryptoSerializable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CryptoSerializable.js","sourceRoot":"","sources":["../src/CryptoSerializable.ts"],"names":[],"mappings":";;;AAAA,kDAAiE;AACjE,6CAA0C;AAE1C,MAAsB,kBAAmB,SAAQ,wBAAY;IAClD,SAAS,CAAC,OAAO,GAAG,IAAI;QAC3B,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IAChD,CAAC;IAEM,QAAQ,CAAC,OAAO,GAAG,IAAI;QAC1B,OAAO,uBAAU,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3D,CAAC;CACJ;AARD,gDAQC"}

package/dist/SodiumWrapper.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/SodiumWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"SodiumWrapper.js","sourceRoot":"","sources":["../src/SodiumWrapper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,yDAAyD;AACzD,gEAAkD;AAElD,MAAa,aAAa;IAGf,MAAM,KAAK,MAAM;QACpB,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE;YACxB,MAAM,IAAI,KAAK,CAAC,mEAAmE,CAAC,CAAC;SACxF;QAED,OAAO,aAAa,CAAC,OAAO,CAAC;IACjC,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,KAAK;QACrB,IAAI,aAAa,CAAC,OAAO;YAAE,OAAO,aAAa,CAAC,MAAM,CAAC;QACvD,MAAM,MAAM,CAAC,KAAK,CAAC;QACnB,MAAM,IAAI,GAAQ,MAAa,CAAC;QAChC,aAAa,CAAC,OAAO,GAAG,IAAI,CAAC,OAAiB,CAAC;QAC/C,OAAO,aAAa,CAAC,MAAM,CAAC;IAChC,CAAC;CACJ;AAlBD,sCAkBC;AAQD,IAAY,eAKX;AALD,WAAY,eAAe;IACvB,6DAAQ,CAAA;IACR,+EAAiB,CAAA;IACjB,2DAAO,CAAA;IACP,6EAAgB,CAAA;AACpB,CAAC,EALW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAK1B"}
+{"version":3,"file":"SodiumWrapper.js","sourceRoot":"","sources":["../src/SodiumWrapper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAAyD;AACzD,gEAAkD;AAElD,MAAa,aAAa;IAGf,MAAM,KAAK,MAAM;QACpB,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE;YACxB,MAAM,IAAI,KAAK,CAAC,mEAAmE,CAAC,CAAC;SACxF;QAED,OAAO,aAAa,CAAC,OAAO,CAAC;IACjC,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,KAAK;QACrB,IAAI,aAAa,CAAC,OAAO;YAAE,OAAO,aAAa,CAAC,MAAM,CAAC;QACvD,MAAM,MAAM,CAAC,KAAK,CAAC;QACnB,MAAM,IAAI,GAAQ,MAAa,CAAC;QAChC,aAAa,CAAC,OAAO,GAAG,IAAI,CAAC,OAAiB,CAAC;QAC/C,OAAO,aAAa,CAAC,MAAM,CAAC;IAChC,CAAC;CACJ;AAlBD,sCAkBC;AAQD,IAAY,eAKX;AALD,WAAY,eAAe;IACvB,6DAAQ,CAAA;IACR,+EAAiB,CAAA;IACjB,2DAAO,CAAA;IACP,6EAAgB,CAAA;AACpB,CAAC,EALW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAK1B"}

package/dist/buildInformation.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildInformation = void 0;
 const ts_serval_1 = require("@js-soft/ts-serval");
 exports.buildInformation = {
-    version: "1.0.8",
-    build: "10",
-    date: "2022-01-24T16:59:04+00:00",
-    commit: "bc03eafc9935d98a4be1b59707d5162852e53a48",
-    dependencies: {"libsodium-wrappers-sumo":"0.7.9","uuid":"8.3.2"},
+    version: "1.0.9",
+    build: "11",
+    date: "2022-04-08T09:13:42+00:00",
+    commit: "f770c223193bd5f68e610032ab8c2ec1ba193b63",
+    dependencies: {"libsodium-wrappers-sumo":"0.7.10","uuid":"8.3.2"},
     libraries: {
         serval: ts_serval_1.buildInformation
     }

package/dist/encryption/CryptoCipher.d.ts

@@ -1,6 +1,6 @@
 import { ISerializable, ISerialized } from "@js-soft/ts-serval";
 import { CoreBuffer, IClearable, ICoreBuffer } from "../CoreBuffer";
-import { CryptoSerializableAsync } from "../CryptoSerializableAsync";
+import { CryptoSerializable } from "../CryptoSerializable";
 import { CryptoEncryptionAlgorithm } from "./CryptoEncryption";
 export interface ICryptoCipherSerialized extends ISerialized {
     alg: number;
@@ -14,7 +14,7 @@ export interface ICryptoCipher extends ISerializable {
     counter?: number;
     nonce?: ICoreBuffer;
 }
-export declare class CryptoCipher extends CryptoSerializableAsync implements ICryptoCipher, IClearable {
+export declare class CryptoCipher extends CryptoSerializable implements ICryptoCipher, IClearable {
     static MIN_CIPHER_BYTES: number;
     static MAX_CIPHER_BYTES: number;
     readonly algorithm: CryptoEncryptionAlgorithm;
@@ -24,8 +24,8 @@ export declare class CryptoCipher extends CryptoSerializableAsync implements ICr
     constructor(cipher: CoreBuffer, algorithm: CryptoEncryptionAlgorithm, nonce?: CoreBuffer, counter?: number);
     toJSON(verbose?: boolean): ICryptoCipherSerialized;
     clear(): void;
-    static from(value: CryptoCipher | ICryptoCipher): Promise<CryptoCipher>;
-    static fromJSON(value: ICryptoCipherSerialized): Promise<CryptoCipher>;
-    static fromBase64(value: string): Promise<CryptoCipher>;
-    static deserialize(value: string): Promise<CryptoCipher>;
+    static from(value: CryptoCipher | ICryptoCipher): CryptoCipher;
+    static fromJSON(value: ICryptoCipherSerialized): CryptoCipher;
+    static fromBase64(value: string): CryptoCipher;
+    static deserialize(value: string): CryptoCipher;
 }

package/dist/encryption/CryptoCipher.js

@@ -15,9 +15,9 @@ const ts_serval_1 = require("@js-soft/ts-serval");
 const CoreBuffer_1 = require("../CoreBuffer");
 const CryptoError_1 = require("../CryptoError");
 const CryptoErrorCode_1 = require("../CryptoErrorCode");
-const CryptoSerializableAsync_1 = require("../CryptoSerializableAsync");
+const CryptoSerializable_1 = require("../CryptoSerializable");
 const CryptoValidation_1 = require("../CryptoValidation");
-let CryptoCipher = CryptoCipher_1 = class CryptoCipher extends CryptoSerializableAsync_1.CryptoSerializableAsync {
+let CryptoCipher = CryptoCipher_1 = class CryptoCipher extends CryptoSerializable_1.CryptoSerializable {
     constructor(cipher, algorithm, nonce, counter) {
         if (!nonce && typeof counter === "undefined") {
             throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.EncryptionNoNonceNorCounter, "No nonce nor counter property set.");
@@ -61,7 +61,7 @@ let CryptoCipher = CryptoCipher_1 = class CryptoCipher extends CryptoSerializabl
             this.nonce.clear();
     }
     static from(value) {
-        return Promise.resolve(new CryptoCipher_1(CoreBuffer_1.CoreBuffer.from(value.cipher), value.algorithm, CoreBuffer_1.CoreBuffer.from(value.nonce), value.counter));
+        return new CryptoCipher_1(CoreBuffer_1.CoreBuffer.from(value.cipher), value.algorithm, CoreBuffer_1.CoreBuffer.from(value.nonce), value.counter);
     }
     static fromJSON(value) {
         CryptoValidation_1.CryptoValidation.checkObject(value);
@@ -78,14 +78,14 @@ let CryptoCipher = CryptoCipher_1 = class CryptoCipher extends CryptoSerializabl
         }
         CryptoValidation_1.CryptoValidation.checkSerializedBuffer(value.cph, this.MIN_CIPHER_BYTES, this.MAX_CIPHER_BYTES, "cipher");
         const cipherBuffer = CoreBuffer_1.CoreBuffer.fromBase64URL(value.cph);
-        return Promise.resolve(new CryptoCipher_1(cipherBuffer, value.alg, nonceBuffer, counter));
+        return new CryptoCipher_1(cipherBuffer, value.alg, nonceBuffer, counter);
     }
-    static async fromBase64(value) {
-        return await this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
+    static fromBase64(value) {
+        return this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
     }
-    static async deserialize(value) {
+    static deserialize(value) {
         const obj = JSON.parse(value);
-        return await this.fromJSON(obj);
+        return this.fromJSON(obj);
     }
 };
 CryptoCipher.MIN_CIPHER_BYTES = 2;

package/dist/encryption/CryptoCipher.js.map

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

package/dist/encryption/CryptoSecretKey.d.ts

@@ -1,6 +1,6 @@
 import { ISerializable, ISerialized } from "@js-soft/ts-serval";
 import { CoreBuffer, IClearable, ICoreBuffer } from "../CoreBuffer";
-import { CryptoSerializableAsync } from "../CryptoSerializableAsync";
+import { CryptoSerializable } from "../CryptoSerializable";
 import { CryptoEncryptionAlgorithm } from "./CryptoEncryption";
 export interface ICryptoSecretKeySerialized extends ISerialized {
     alg: number;
@@ -10,14 +10,14 @@ export interface ICryptoSecretKey extends ISerializable {
     algorithm: CryptoEncryptionAlgorithm;
     secretKey: ICoreBuffer;
 }
-export declare class CryptoSecretKey extends CryptoSerializableAsync implements ICryptoSecretKey, IClearable {
+export declare class CryptoSecretKey extends CryptoSerializable implements ICryptoSecretKey, IClearable {
     readonly algorithm: CryptoEncryptionAlgorithm;
     readonly secretKey: CoreBuffer;
     constructor(secretKey: CoreBuffer, algorithm?: CryptoEncryptionAlgorithm);
     toJSON(verbose?: boolean): ICryptoSecretKeySerialized;
     clear(): void;
-    static from(value: CryptoSecretKey | ICryptoSecretKey): Promise<CryptoSecretKey>;
-    static fromJSON(value: ICryptoSecretKeySerialized): Promise<CryptoSecretKey>;
-    static fromBase64(value: string): Promise<CryptoSecretKey>;
-    static deserialize(value: string): Promise<CryptoSecretKey>;
+    static from(value: CryptoSecretKey | ICryptoSecretKey): CryptoSecretKey;
+    static fromJSON(value: ICryptoSecretKeySerialized): CryptoSecretKey;
+    static fromBase64(value: string): CryptoSecretKey;
+    static deserialize(value: string): CryptoSecretKey;
 }

package/dist/encryption/CryptoSecretKey.js

@@ -13,9 +13,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CryptoSecretKey = void 0;
 const ts_serval_1 = require("@js-soft/ts-serval");
 const CoreBuffer_1 = require("../CoreBuffer");
-const CryptoSerializableAsync_1 = require("../CryptoSerializableAsync");
+const CryptoSerializable_1 = require("../CryptoSerializable");
 const CryptoValidation_1 = require("../CryptoValidation");
-let CryptoSecretKey = CryptoSecretKey_1 = class CryptoSecretKey extends CryptoSerializableAsync_1.CryptoSerializableAsync {
+let CryptoSecretKey = CryptoSecretKey_1 = class CryptoSecretKey extends CryptoSerializable_1.CryptoSerializable {
     constructor(secretKey, algorithm = 3 /* XCHACHA20_POLY1305 */) {
         CryptoValidation_1.CryptoValidation.checkEncryptionAlgorithm(algorithm);
         CryptoValidation_1.CryptoValidation.checkSecretKeyForAlgorithm(secretKey, algorithm);
@@ -37,13 +37,13 @@ let CryptoSecretKey = CryptoSecretKey_1 = class CryptoSecretKey extends CryptoSe
         this.secretKey.clear();
     }
     static from(value) {
-        return Promise.resolve(new CryptoSecretKey_1(CoreBuffer_1.CoreBuffer.from(value.secretKey), value.algorithm));
+        return new CryptoSecretKey_1(CoreBuffer_1.CoreBuffer.from(value.secretKey), value.algorithm);
     }
-    static async fromJSON(value) {
+    static fromJSON(value) {
         CryptoValidation_1.CryptoValidation.checkEncryptionAlgorithm(value.alg);
         CryptoValidation_1.CryptoValidation.checkSerializedSecretKeyForAlgorithm(value.key, value.alg);
         const buffer = CoreBuffer_1.CoreBuffer.fromBase64URL(value.key);
-        return await this.from({
+        return this.from({
             algorithm: value.alg,
             secretKey: buffer
         });
@@ -51,9 +51,9 @@ let CryptoSecretKey = CryptoSecretKey_1 = class CryptoSecretKey extends CryptoSe
     static fromBase64(value) {
         return this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
     }
-    static async deserialize(value) {
+    static deserialize(value) {
         const obj = JSON.parse(value);
-        return await this.fromJSON(obj);
+        return this.fromJSON(obj);
     }
 };
 CryptoSecretKey = CryptoSecretKey_1 = __decorate([

package/dist/encryption/CryptoSecretKey.js.map

@@ -1 +1 @@
-{"version":3,"file":"CryptoSecretKey.js","sourceRoot":"","sources":["../../src/encryption/CryptoSecretKey.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,kDAAsE;AACtE,8CAAoE;AACpE,wEAAqE;AACrE,0DAAuD;AAcvD,IAAa,eAAe,uBAA5B,MAAa,eAAgB,SAAQ,iDAAuB;IAIxD,YACI,SAAqB,EACrB,sCAAmF;QAEnF,mCAAgB,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;QACrD,mCAAgB,CAAC,0BAA0B,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAElE,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IAEM,MAAM,CAAC,OAAO,GAAG,IAAI;QACxB,MAAM,GAAG,GAA+B;YACpC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE;YACjC,GAAG,EAAE,IAAI,CAAC,SAAS;SACtB,CAAC;QACF,IAAI,OAAO,EAAE;YACT,GAAG,CAAC,OAAO,CAAC,GAAG,iBAAiB,CAAC;SACpC;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,KAAyC;QACxD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,iBAAe,CAAC,uBAAU,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;IACnG,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAiC;QAC1D,mCAAgB,CAAC,wBAAwB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACrD,mCAAgB,CAAC,oCAAoC,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAgC,CAAC,CAAC;QAEzG,MAAM,MAAM,GAAG,uBAAU,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnD,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC;YACnB,SAAS,EAAE,KAAK,CAAC,GAAgC;YACjD,SAAS,EAAE,MAAM;SACpB,CAAC,CAAC;IACP,CAAC;IAEM,MAAM,CAAC,UAAU,CAAC,KAAa;QAClC,OAAO,IAAI,CAAC,WAAW,CAAC,uBAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3D,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,KAAa;QACzC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC9B,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC;CACJ,CAAA;AAvDY,eAAe;IAD3B,IAAA,gBAAI,EAAC,iBAAiB,CAAC;qCAML,uBAAU;GALhB,eAAe,CAuD3B;AAvDY,0CAAe"}
+{"version":3,"file":"CryptoSecretKey.js","sourceRoot":"","sources":["../../src/encryption/CryptoSecretKey.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,kDAAsE;AACtE,8CAAoE;AACpE,8DAA2D;AAC3D,0DAAuD;AAcvD,IAAa,eAAe,uBAA5B,MAAa,eAAgB,SAAQ,uCAAkB;IAInD,YACI,SAAqB,EACrB,sCAAmF;QAEnF,mCAAgB,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;QACrD,mCAAgB,CAAC,0BAA0B,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAElE,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IAEM,MAAM,CAAC,OAAO,GAAG,IAAI;QACxB,MAAM,GAAG,GAA+B;YACpC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE;YACjC,GAAG,EAAE,IAAI,CAAC,SAAS;SACtB,CAAC;QACF,IAAI,OAAO,EAAE;YACT,GAAG,CAAC,OAAO,CAAC,GAAG,iBAAiB,CAAC;SACpC;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,KAAyC;QACxD,OAAO,IAAI,iBAAe,CAAC,uBAAU,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IAClF,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,KAAiC;QACpD,mCAAgB,CAAC,wBAAwB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACrD,mCAAgB,CAAC,oCAAoC,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAgC,CAAC,CAAC;QAEzG,MAAM,MAAM,GAAG,uBAAU,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnD,OAAO,IAAI,CAAC,IAAI,CAAC;YACb,SAAS,EAAE,KAAK,CAAC,GAAgC;YACjD,SAAS,EAAE,MAAM;SACpB,CAAC,CAAC;IACP,CAAC;IAEM,MAAM,CAAC,UAAU,CAAC,KAAa;QAClC,OAAO,IAAI,CAAC,WAAW,CAAC,uBAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3D,CAAC;IAEM,MAAM,CAAC,WAAW,CAAC,KAAa;QACnC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC9B,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;CACJ,CAAA;AAvDY,eAAe;IAD3B,IAAA,gBAAI,EAAC,iBAAiB,CAAC;qCAML,uBAAU;GALhB,eAAe,CAuD3B;AAvDY,0CAAe"}

package/dist/exchange/CryptoExchange.js

@@ -15,7 +15,7 @@ class CryptoExchange {
             case 3 /* ECDH_X25519 */:
                 try {
                     const publicKey = (await SodiumWrapper_1.SodiumWrapper.ready()).crypto_scalarmult_base(privateKey.privateKey.buffer);
-                    return await CryptoExchangePublicKey_1.CryptoExchangePublicKey.from({
+                    return CryptoExchangePublicKey_1.CryptoExchangePublicKey.from({
                         algorithm: privateKey.algorithm,
                         publicKey: CoreBuffer_1.CoreBuffer.from(publicKey)
                     });
@@ -80,7 +80,7 @@ class CryptoExchange {
         catch (e) {
             throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.ExchangeKeyDerivation, `${e}`);
         }
-        const secrets = await CryptoExchangeSecrets_1.CryptoExchangeSecrets.from({
+        const secrets = CryptoExchangeSecrets_1.CryptoExchangeSecrets.from({
             receivingKey: CoreBuffer_1.CoreBuffer.from(sharedKey.sharedRx),
             transmissionKey: CoreBuffer_1.CoreBuffer.from(sharedKey.sharedTx),
             algorithm: algorithm
@@ -111,7 +111,7 @@ class CryptoExchange {
         catch (e) {
             throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.ExchangeKeyDerivation, `${e}`);
         }
-        const secrets = await CryptoExchangeSecrets_1.CryptoExchangeSecrets.from({
+        const secrets = CryptoExchangeSecrets_1.CryptoExchangeSecrets.from({
             receivingKey: CoreBuffer_1.CoreBuffer.from(sharedKey.sharedRx),
             transmissionKey: CoreBuffer_1.CoreBuffer.from(sharedKey.sharedTx),
             algorithm: algorithm

package/dist/exchange/CryptoExchange.js.map

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

package/dist/exchange/CryptoExchangeKeypair.d.ts

@@ -1,24 +1,24 @@
-import { ISerializableAsync, ISerialized } from "@js-soft/ts-serval";
+import { ISerializable, ISerialized } from "@js-soft/ts-serval";
 import { IClearable } from "../CoreBuffer";
-import { CryptoSerializableAsync } from "../CryptoSerializableAsync";
+import { CryptoSerializable } from "../CryptoSerializable";
 import { CryptoExchangePrivateKey, ICryptoExchangePrivateKey, ICryptoExchangePrivateKeySerialized } from "./CryptoExchangePrivateKey";
 import { CryptoExchangePublicKey, ICryptoExchangePublicKey, ICryptoExchangePublicKeySerialized } from "./CryptoExchangePublicKey";
 export interface ICryptoExchangeKeypairSerialized extends ISerialized {
     pub: ICryptoExchangePublicKeySerialized;
     prv: ICryptoExchangePrivateKeySerialized;
 }
-export interface ICryptoExchangeKeypair extends ISerializableAsync {
+export interface ICryptoExchangeKeypair extends ISerializable {
     publicKey: ICryptoExchangePublicKey;
     privateKey: ICryptoExchangePrivateKey;
 }
-export declare class CryptoExchangeKeypair extends CryptoSerializableAsync implements ICryptoExchangeKeypair, IClearable {
+export declare class CryptoExchangeKeypair extends CryptoSerializable implements ICryptoExchangeKeypair, IClearable {
     readonly publicKey: CryptoExchangePublicKey;
     readonly privateKey: CryptoExchangePrivateKey;
     constructor(publicKey: CryptoExchangePublicKey, privateKey: CryptoExchangePrivateKey);
     toJSON(verbose?: boolean): ICryptoExchangeKeypairSerialized;
     clear(): void;
-    static from(value: CryptoExchangeKeypair | ICryptoExchangeKeypair): Promise<CryptoExchangeKeypair>;
-    static fromJSON(value: ICryptoExchangeKeypairSerialized): Promise<CryptoExchangeKeypair>;
-    static fromBase64(value: string): Promise<CryptoExchangeKeypair>;
-    static deserialize(value: string): Promise<CryptoExchangeKeypair>;
+    static from(value: CryptoExchangeKeypair | ICryptoExchangeKeypair): CryptoExchangeKeypair;
+    static fromJSON(value: ICryptoExchangeKeypairSerialized): CryptoExchangeKeypair;
+    static fromBase64(value: string): CryptoExchangeKeypair;
+    static deserialize(value: string): CryptoExchangeKeypair;
 }

package/dist/exchange/CryptoExchangeKeypair.js

@@ -13,11 +13,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CryptoExchangeKeypair = void 0;
 const ts_serval_1 = require("@js-soft/ts-serval");
 const CoreBuffer_1 = require("../CoreBuffer");
-const CryptoSerializableAsync_1 = require("../CryptoSerializableAsync");
+const CryptoSerializable_1 = require("../CryptoSerializable");
 const CryptoExchangePrivateKey_1 = require("./CryptoExchangePrivateKey");
 const CryptoExchangePublicKey_1 = require("./CryptoExchangePublicKey");
 const CryptoExchangeValidation_1 = require("./CryptoExchangeValidation");
-let CryptoExchangeKeypair = CryptoExchangeKeypair_1 = class CryptoExchangeKeypair extends CryptoSerializableAsync_1.CryptoSerializableAsync {
+let CryptoExchangeKeypair = CryptoExchangeKeypair_1 = class CryptoExchangeKeypair extends CryptoSerializable_1.CryptoSerializable {
     constructor(publicKey, privateKey) {
         CryptoExchangeValidation_1.CryptoExchangeValidation.checkExchangeKeypair(privateKey, publicKey);
         super();
@@ -38,26 +38,22 @@ let CryptoExchangeKeypair = CryptoExchangeKeypair_1 = class CryptoExchangeKeypai
         this.publicKey.clear();
         this.privateKey.clear();
     }
-    static async from(value) {
-        const [privateKey, publicKey] = await Promise.all([
-            CryptoExchangePrivateKey_1.CryptoExchangePrivateKey.from(value.privateKey),
-            CryptoExchangePublicKey_1.CryptoExchangePublicKey.from(value.publicKey)
-        ]);
+    static from(value) {
+        const privateKey = CryptoExchangePrivateKey_1.CryptoExchangePrivateKey.from(value.privateKey);
+        const publicKey = CryptoExchangePublicKey_1.CryptoExchangePublicKey.from(value.publicKey);
         return new CryptoExchangeKeypair_1(publicKey, privateKey);
     }
-    static async fromJSON(value) {
-        const [privateKey, publicKey] = await Promise.all([
-            CryptoExchangePrivateKey_1.CryptoExchangePrivateKey.fromJSON(value.prv),
-            CryptoExchangePublicKey_1.CryptoExchangePublicKey.fromJSON(value.pub)
-        ]);
+    static fromJSON(value) {
+        const privateKey = CryptoExchangePrivateKey_1.CryptoExchangePrivateKey.fromJSON(value.prv);
+        const publicKey = CryptoExchangePublicKey_1.CryptoExchangePublicKey.fromJSON(value.pub);
         return new CryptoExchangeKeypair_1(publicKey, privateKey);
     }
-    static async fromBase64(value) {
-        return await this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
+    static fromBase64(value) {
+        return this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
     }
-    static async deserialize(value) {
+    static deserialize(value) {
         const obj = JSON.parse(value);
-        return await this.fromJSON(obj);
+        return this.fromJSON(obj);
     }
 };
 CryptoExchangeKeypair = CryptoExchangeKeypair_1 = __decorate([

package/dist/exchange/CryptoExchangeKeypair.js.map

@@ -1 +1 @@
-{"version":3,"file":"CryptoExchangeKeypair.js","sourceRoot":"","sources":["../../src/exchange/CryptoExchangeKeypair.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,kDAA2E;AAC3E,8CAAuD;AACvD,wEAAqE;AACrE,yEAIoC;AACpC,uEAImC;AACnC,yEAAsE;AAatE,IAAa,qBAAqB,6BAAlC,MAAa,qBAAsB,SAAQ,iDAAuB;IAI9D,YAAmB,SAAkC,EAAE,UAAoC;QACvF,mDAAwB,CAAC,oBAAoB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QAErE,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAEM,MAAM,CAAC,OAAO,GAAG,IAAI;QACxB,MAAM,GAAG,GAAqC;YAC1C,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC;YACjC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC;SACrC,CAAC;QACF,IAAI,OAAO,EAAE;YACT,GAAG,CAAC,OAAO,CAAC,GAAG,uBAAuB,CAAC;SAC1C;QAED,OAAO,GAAG,CAAC;IACf,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QACvB,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAqD;QAC1E,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC9C,mDAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC;YAC/C,iDAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;SAChD,CAAC,CAAC;QAEH,OAAO,IAAI,uBAAqB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAC5D,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAuC;QAChE,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC9C,mDAAwB,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;YAC5C,iDAAuB,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;SAC9C,CAAC,CAAC;QAEH,OAAO,IAAI,uBAAqB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAC5D,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,KAAa;QACxC,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,uBAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IACjE,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,KAAa;QACzC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC9B,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC;CACJ,CAAA;AAxDY,qBAAqB;IADjC,IAAA,gBAAI,EAAC,uBAAuB,CAAC;qCAKI,iDAAuB,EAAc,mDAAwB;GAJlF,qBAAqB,CAwDjC;AAxDY,sDAAqB"}
+{"version":3,"file":"CryptoExchangeKeypair.js","sourceRoot":"","sources":["../../src/exchange/CryptoExchangeKeypair.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,kDAAsE;AACtE,8CAAuD;AACvD,8DAA2D;AAC3D,yEAIoC;AACpC,uEAImC;AACnC,yEAAsE;AAatE,IAAa,qBAAqB,6BAAlC,MAAa,qBAAsB,SAAQ,uCAAkB;IAIzD,YAAmB,SAAkC,EAAE,UAAoC;QACvF,mDAAwB,CAAC,oBAAoB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QAErE,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAEM,MAAM,CAAC,OAAO,GAAG,IAAI;QACxB,MAAM,GAAG,GAAqC;YAC1C,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC;YACjC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC;SACrC,CAAC;QACF,IAAI,OAAO,EAAE;YACT,GAAG,CAAC,OAAO,CAAC,GAAG,uBAAuB,CAAC;SAC1C;QAED,OAAO,GAAG,CAAC;IACf,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QACvB,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,KAAqD;QACpE,MAAM,UAAU,GAAG,mDAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACnE,MAAM,SAAS,GAAG,iDAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAEhE,OAAO,IAAI,uBAAqB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAC5D,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,KAAuC;QAC1D,MAAM,UAAU,GAAG,mDAAwB,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAChE,MAAM,SAAS,GAAG,iDAAuB,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE9D,OAAO,IAAI,uBAAqB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAC5D,CAAC;IAEM,MAAM,CAAC,UAAU,CAAC,KAAa;QAClC,OAAO,IAAI,CAAC,WAAW,CAAC,uBAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3D,CAAC;IAEM,MAAM,CAAC,WAAW,CAAC,KAAa;QACnC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC9B,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;CACJ,CAAA;AApDY,qBAAqB;IADjC,IAAA,gBAAI,EAAC,uBAAuB,CAAC;qCAKI,iDAAuB,EAAc,mDAAwB;GAJlF,qBAAqB,CAoDjC;AApDY,sDAAqB"}