@nmshd/crypto 1.0.9 → 2.0.0

package/dist/exchange/CryptoExchangePrivateKey.js

@@ -8,63 +8,82 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var CryptoExchangePrivateKey_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CryptoExchangePrivateKey = void 0;
 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 CryptoPrivateKey_1 = require("../CryptoPrivateKey");
-const CryptoExchange_1 = require("./CryptoExchange");
+const SodiumWrapper_1 = require("../SodiumWrapper");
+const CryptoExchangePublicKey_1 = require("./CryptoExchangePublicKey");
 const CryptoExchangeValidation_1 = require("./CryptoExchangeValidation");
-let CryptoExchangePrivateKey = CryptoExchangePrivateKey_1 = class CryptoExchangePrivateKey extends CryptoPrivateKey_1.CryptoPrivateKey {
-    constructor(algorithm, privateKey) {
-        CryptoExchangeValidation_1.CryptoExchangeValidation.checkExchangeAlgorithm(algorithm);
-        CryptoExchangeValidation_1.CryptoExchangeValidation.checkExchangePrivateKeyAsBuffer(privateKey, algorithm);
-        super(algorithm, privateKey);
-        this.algorithm = algorithm;
-        this.privateKey = privateKey;
-    }
+let CryptoExchangePrivateKey = class CryptoExchangePrivateKey extends CryptoPrivateKey_1.CryptoPrivateKey {
     toJSON(verbose = true) {
-        const obj = {
+        return {
             prv: this.privateKey.toBase64URL(),
-            alg: this.algorithm
+            alg: this.algorithm,
+            "@type": verbose ? "CryptoExchangePrivateKey" : undefined
         };
-        if (verbose) {
-            obj["@type"] = "CryptoExchangePrivateKey";
-        }
-        return obj;
     }
     clear() {
         this.privateKey.clear();
     }
-    serialize(verbose = true) {
-        return JSON.stringify(this.toJSON(verbose));
-    }
     toBase64(verbose = true) {
         return CoreBuffer_1.CoreBuffer.utf8_base64(this.serialize(verbose));
     }
     async toPublicKey() {
-        return await CryptoExchange_1.CryptoExchange.privateKeyToPublicKey(this);
+        let publicKey;
+        switch (this.algorithm) {
+            case 3 /* ECDH_X25519 */:
+                try {
+                    publicKey = (await SodiumWrapper_1.SodiumWrapper.ready()).crypto_scalarmult_base(this.privateKey.buffer);
+                }
+                catch (e) {
+                    throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.ExchangeKeyGeneration, `${e}`);
+                }
+                break;
+            default:
+                throw new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.NotYetImplemented);
+        }
+        return CryptoExchangePublicKey_1.CryptoExchangePublicKey.from({
+            algorithm: this.algorithm,
+            publicKey: CoreBuffer_1.CoreBuffer.from(publicKey)
+        });
     }
     static from(value) {
-        return new CryptoExchangePrivateKey_1(value.algorithm, CoreBuffer_1.CoreBuffer.from(value.privateKey));
+        return this.fromAny(value);
+    }
+    static preFrom(value) {
+        if (value.alg) {
+            value = {
+                algorithm: value.alg,
+                privateKey: CoreBuffer_1.CoreBuffer.fromBase64URL(value.prv)
+            };
+        }
+        CryptoExchangeValidation_1.CryptoExchangeValidation.checkExchangeAlgorithm(value.algorithm);
+        CryptoExchangeValidation_1.CryptoExchangeValidation.checkExchangePrivateKey(value.privateKey, value.algorithm, "privateKey");
+        return value;
     }
     static fromJSON(value) {
-        CryptoExchangeValidation_1.CryptoExchangeValidation.checkExchangeAlgorithm(value.alg);
-        CryptoExchangeValidation_1.CryptoExchangeValidation.checkExchangePrivateKeyAsNumber(value.prv, value.alg, "privateKey");
-        const buffer = CoreBuffer_1.CoreBuffer.fromBase64URL(value.prv);
-        return new CryptoExchangePrivateKey_1(value.alg, buffer);
+        return this.fromAny(value);
     }
     static fromBase64(value) {
         return this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
     }
-    static deserialize(value) {
-        return this.fromJSON(JSON.parse(value));
-    }
 };
-CryptoExchangePrivateKey = CryptoExchangePrivateKey_1 = __decorate([
-    (0, ts_serval_1.type)("CryptoExchangePrivateKey"),
-    __metadata("design:paramtypes", [Number, CoreBuffer_1.CoreBuffer])
+__decorate([
+    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.serialize)(),
+    __metadata("design:type", Number)
+], CryptoExchangePrivateKey.prototype, "algorithm", void 0);
+__decorate([
+    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.serialize)(),
+    __metadata("design:type", CoreBuffer_1.CoreBuffer)
+], CryptoExchangePrivateKey.prototype, "privateKey", void 0);
+CryptoExchangePrivateKey = __decorate([
+    (0, ts_serval_1.type)("CryptoExchangePrivateKey")
 ], CryptoExchangePrivateKey);
 exports.CryptoExchangePrivateKey = CryptoExchangePrivateKey;
 //# sourceMappingURL=CryptoExchangePrivateKey.js.map

package/dist/exchange/CryptoExchangePrivateKey.js.map

@@ -1 +1 @@
-{"version":3,"file":"CryptoExchangePrivateKey.js","sourceRoot":"","sources":["../../src/exchange/CryptoExchangePrivateKey.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,kDAAsE;AACtE,8CAAoE;AACpE,0DAAuD;AACvD,qDAA2E;AAE3E,yEAAsE;AAatE,IAAa,wBAAwB,gCAArC,MAAa,wBAAyB,SAAQ,mCAAgB;IAI1D,YAAmB,SAAkC,EAAE,UAAsB;QACzE,mDAAwB,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;QAC3D,mDAAwB,CAAC,+BAA+B,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QAEhF,KAAK,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAE7B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAEM,MAAM,CAAC,OAAO,GAAG,IAAI;QACxB,MAAM,GAAG,GAAwC;YAC7C,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE;YAClC,GAAG,EAAE,IAAI,CAAC,SAAS;SACtB,CAAC;QACF,IAAI,OAAO,EAAE;YACT,GAAG,CAAC,OAAO,CAAC,GAAG,0BAA0B,CAAC;SAC7C;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;IAEM,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;IAEM,KAAK,CAAC,WAAW;QACpB,OAAO,MAAM,+BAAc,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;IAC5D,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,KAA2D;QAC1E,OAAO,IAAI,0BAAwB,CAAC,KAAK,CAAC,SAAS,EAAE,uBAAU,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;IAC5F,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,KAA0C;QAC7D,mDAAwB,CAAC,sBAAsB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3D,mDAAwB,CAAC,+BAA+B,CACpD,KAAK,CAAC,GAAG,EACT,KAAK,CAAC,GAA8B,EACpC,YAAY,CACf,CAAC;QAEF,MAAM,MAAM,GAAG,uBAAU,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnD,OAAO,IAAI,0BAAwB,CAAC,KAAK,CAAC,GAA8B,EAAE,MAAM,CAAC,CAAC;IACtF,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,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IAC5C,CAAC;CACJ,CAAA;AAhEY,wBAAwB;IADpC,IAAA,gBAAI,EAAC,0BAA0B,CAAC;6CAKsC,uBAAU;GAJpE,wBAAwB,CAgEpC;AAhEY,4DAAwB"}
+{"version":3,"file":"CryptoExchangePrivateKey.js","sourceRoot":"","sources":["../../src/exchange/CryptoExchangePrivateKey.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAA2F;AAC3F,8CAAoE;AACpE,gDAA6C;AAC7C,wDAAqD;AACrD,0DAAuD;AACvD,oDAAiD;AAEjD,uEAAoE;AACpE,yEAAsE;AAatE,IAAa,wBAAwB,GAArC,MAAa,wBAAyB,SAAQ,mCAAgB;IAS1C,MAAM,CAAC,OAAO,GAAG,IAAI;QACjC,OAAO;YACH,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE;YAClC,GAAG,EAAE,IAAI,CAAC,SAAS;YACnB,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,SAAS;SAC5D,CAAC;IACN,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;IAEe,QAAQ,CAAC,OAAO,GAAG,IAAI;QACnC,OAAO,uBAAU,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3D,CAAC;IAEM,KAAK,CAAC,WAAW;QACpB,IAAI,SAAqB,CAAC;QAC1B,QAAQ,IAAI,CAAC,SAAS,EAAE;YACpB;gBACI,IAAI;oBACA,SAAS,GAAG,CAAC,MAAM,6BAAa,CAAC,KAAK,EAAE,CAAC,CAAC,sBAAsB,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;iBAC5F;gBAAC,OAAO,CAAC,EAAE;oBACR,MAAM,IAAI,yBAAW,CAAC,iCAAe,CAAC,qBAAqB,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;iBACxE;gBACD,MAAM;YACV;gBACI,MAAM,IAAI,yBAAW,CAAC,iCAAe,CAAC,iBAAiB,CAAC,CAAC;SAChE;QAED,OAAO,iDAAuB,CAAC,IAAI,CAAC;YAChC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,SAAS,EAAE,uBAAU,CAAC,IAAI,CAAC,SAAS,CAAC;SACxC,CAAC,CAAC;IACP,CAAC;IAEM,MAAM,CAAU,IAAI,CAAC,KAA2D;QACnF,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAES,MAAM,CAAU,OAAO,CAAC,KAAU;QACxC,IAAI,KAAK,CAAC,GAAG,EAAE;YACX,KAAK,GAAG;gBACJ,SAAS,EAAE,KAAK,CAAC,GAAG;gBACpB,UAAU,EAAE,uBAAU,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC;aAClD,CAAC;SACL;QAED,mDAAwB,CAAC,sBAAsB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACjE,mDAAwB,CAAC,uBAAuB,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QAElG,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,KAA0C;QAC7D,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAEM,MAAM,CAAU,UAAU,CAAC,KAAa;QAC3C,OAAO,IAAI,CAAC,WAAW,CAAC,uBAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3D,CAAC;CACJ,CAAA;AAnEG;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;;2DACuC;AAInD;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACgB,uBAAU;4DAAC;AAP9B,wBAAwB;IADpC,IAAA,gBAAI,EAAC,0BAA0B,CAAC;GACpB,wBAAwB,CAsEpC;AAtEY,4DAAwB"}

package/dist/exchange/CryptoExchangePublicKey.d.ts

@@ -11,13 +11,12 @@ export interface ICryptoExchangePublicKey {
     publicKey: CoreBuffer;
 }
 export declare class CryptoExchangePublicKey extends CryptoPublicKey implements ICryptoExchangePublicKey, IClearable {
-    readonly algorithm: CryptoExchangeAlgorithm;
-    readonly publicKey: CoreBuffer;
-    constructor(algorithm: CryptoExchangeAlgorithm, publicKey: CoreBuffer);
+    algorithm: CryptoExchangeAlgorithm;
+    publicKey: CoreBuffer;
     toJSON(verbose?: boolean): ICryptoExchangePublicKeySerialized;
     clear(): void;
+    protected static preFrom(value: any): any;
     static from(value: CryptoExchangePublicKey | ICryptoExchangePublicKey): CryptoExchangePublicKey;
     static fromJSON(value: ICryptoExchangePublicKeySerialized): CryptoExchangePublicKey;
     static fromBase64(value: string): CryptoExchangePublicKey;
-    static deserialize(value: string): CryptoExchangePublicKey;
 }

package/dist/exchange/CryptoExchangePublicKey.js

@@ -8,57 +8,56 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var CryptoExchangePublicKey_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CryptoExchangePublicKey = void 0;
 const ts_serval_1 = require("@js-soft/ts-serval");
 const CoreBuffer_1 = require("../CoreBuffer");
 const CryptoPublicKey_1 = require("../CryptoPublicKey");
 const CryptoExchangeValidation_1 = require("./CryptoExchangeValidation");
-let CryptoExchangePublicKey = CryptoExchangePublicKey_1 = class CryptoExchangePublicKey extends CryptoPublicKey_1.CryptoPublicKey {
-    constructor(algorithm, publicKey) {
-        CryptoExchangeValidation_1.CryptoExchangeValidation.checkExchangeAlgorithm(algorithm);
-        CryptoExchangeValidation_1.CryptoExchangeValidation.checkExchangePublicKeyAsBuffer(publicKey, algorithm);
-        super(algorithm, publicKey);
-        this.algorithm = algorithm;
-        this.publicKey = publicKey;
-    }
+let CryptoExchangePublicKey = class CryptoExchangePublicKey extends CryptoPublicKey_1.CryptoPublicKey {
     toJSON(verbose = true) {
-        const obj = {
+        return {
+            "@type": verbose ? "CryptoExchangePublicKey" : undefined,
             pub: this.publicKey.toBase64URL(),
             alg: this.algorithm
         };
-        if (verbose) {
-            obj["@type"] = "CryptoExchangePublicKey";
-        }
-        return obj;
     }
     clear() {
         this.publicKey.clear();
     }
+    static preFrom(value) {
+        if (value.alg) {
+            value = {
+                algorithm: value.alg,
+                publicKey: value.pub
+            };
+        }
+        CryptoExchangeValidation_1.CryptoExchangeValidation.checkExchangeAlgorithm(value.algorithm);
+        CryptoExchangeValidation_1.CryptoExchangeValidation.checkExchangePublicKey(value.publicKey, value.algorithm);
+        return value;
+    }
     static from(value) {
-        return new CryptoExchangePublicKey_1(value.algorithm, value.publicKey);
+        return this.fromAny(value);
     }
     static fromJSON(value) {
-        CryptoExchangeValidation_1.CryptoExchangeValidation.checkExchangeAlgorithm(value.alg);
-        CryptoExchangeValidation_1.CryptoExchangeValidation.checkExchangePrivateKeyAsNumber(value.pub, value.alg, "publicKey");
-        const buffer = CoreBuffer_1.CoreBuffer.fromBase64URL(value.pub);
-        return this.from({
-            algorithm: value.alg,
-            publicKey: buffer
-        });
+        return this.fromAny(value);
     }
     static fromBase64(value) {
         return this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
     }
-    static deserialize(value) {
-        const obj = JSON.parse(value);
-        return this.fromJSON(obj);
-    }
 };
-CryptoExchangePublicKey = CryptoExchangePublicKey_1 = __decorate([
-    (0, ts_serval_1.type)("CryptoExchangePublicKey"),
-    __metadata("design:paramtypes", [Number, CoreBuffer_1.CoreBuffer])
+__decorate([
+    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.serialize)(),
+    __metadata("design:type", Number)
+], CryptoExchangePublicKey.prototype, "algorithm", void 0);
+__decorate([
+    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.serialize)(),
+    __metadata("design:type", CoreBuffer_1.CoreBuffer)
+], CryptoExchangePublicKey.prototype, "publicKey", void 0);
+CryptoExchangePublicKey = __decorate([
+    (0, ts_serval_1.type)("CryptoExchangePublicKey")
 ], CryptoExchangePublicKey);
 exports.CryptoExchangePublicKey = CryptoExchangePublicKey;
 //# sourceMappingURL=CryptoExchangePublicKey.js.map

package/dist/exchange/CryptoExchangePublicKey.js.map

@@ -1 +1 @@
-{"version":3,"file":"CryptoExchangePublicKey.js","sourceRoot":"","sources":["../../src/exchange/CryptoExchangePublicKey.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,kDAAuD;AACvD,8CAAuD;AACvD,wDAAqD;AAErD,yEAAsE;AAatE,IAAa,uBAAuB,+BAApC,MAAa,uBAAwB,SAAQ,iCAAe;IAIxD,YAAmB,SAAkC,EAAE,SAAqB;QACxE,mDAAwB,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;QAC3D,mDAAwB,CAAC,8BAA8B,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAE9E,KAAK,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAE5B,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,GAAuC;YAC5C,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,yBAAyB,CAAC;SAC5C;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,KAAyD;QACxE,OAAO,IAAI,yBAAuB,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IACzE,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,KAAyC;QAC5D,mDAAwB,CAAC,sBAAsB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3D,mDAAwB,CAAC,+BAA+B,CACpD,KAAK,CAAC,GAAG,EACT,KAAK,CAAC,GAA8B,EACpC,WAAW,CACd,CAAC;QAEF,MAAM,MAAM,GAAG,uBAAU,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnD,OAAO,IAAI,CAAC,IAAI,CAAC;YACb,SAAS,EAAE,KAAK,CAAC,GAA8B;YAC/C,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;AAxDY,uBAAuB;IADnC,IAAA,gBAAI,EAAC,yBAAyB,CAAC;6CAKsC,uBAAU;GAJnE,uBAAuB,CAwDnC;AAxDY,0DAAuB"}
+{"version":3,"file":"CryptoExchangePublicKey.js","sourceRoot":"","sources":["../../src/exchange/CryptoExchangePublicKey.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAA4E;AAC5E,8CAAuD;AACvD,wDAAqD;AAErD,yEAAsE;AAatE,IAAa,uBAAuB,GAApC,MAAa,uBAAwB,SAAQ,iCAAe;IASxC,MAAM,CAAC,OAAO,GAAG,IAAI;QACjC,OAAO;YACH,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,SAAS;YACxD,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE;YACjC,GAAG,EAAE,IAAI,CAAC,SAAS;SACtB,CAAC;IACN,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IAES,MAAM,CAAU,OAAO,CAAC,KAAU;QACxC,IAAI,KAAK,CAAC,GAAG,EAAE;YACX,KAAK,GAAG;gBACJ,SAAS,EAAE,KAAK,CAAC,GAAG;gBACpB,SAAS,EAAE,KAAK,CAAC,GAAG;aACvB,CAAC;SACL;QAED,mDAAwB,CAAC,sBAAsB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACjE,mDAAwB,CAAC,sBAAsB,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;QAElF,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,MAAM,CAAU,IAAI,CAAC,KAAyD;QACjF,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,KAAyC;QAC5D,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAEM,MAAM,CAAU,UAAU,CAAC,KAAa;QAC3C,OAAO,IAAI,CAAC,WAAW,CAAC,uBAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3D,CAAC;CACJ,CAAA;AA3CG;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;;0DACuC;AAInD;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACe,uBAAU;0DAAC;AAP7B,uBAAuB;IADnC,IAAA,gBAAI,EAAC,yBAAyB,CAAC;GACnB,uBAAuB,CA8CnC;AA9CY,0DAAuB"}

package/dist/exchange/CryptoExchangeSecrets.d.ts

@@ -13,16 +13,15 @@ export interface ICryptoExchangeSecrets extends ISerializable {
     transmissionKey: ICoreBuffer;
 }
 export declare class CryptoExchangeSecrets extends CryptoSerializable implements ICryptoExchangeSecrets, IClearable {
-    readonly algorithm: CryptoEncryptionAlgorithm;
-    readonly receivingKey: CoreBuffer;
-    readonly transmissionKey: CoreBuffer;
-    constructor(receivingKey: CoreBuffer, transmissionKey: CoreBuffer, algorithm: CryptoEncryptionAlgorithm);
+    algorithm: CryptoEncryptionAlgorithm;
+    receivingKey: CoreBuffer;
+    transmissionKey: CoreBuffer;
     toJSON(verbose?: boolean): ICryptoExchangeSecretsSerialized;
     clear(): void;
     serialize(verbose?: boolean): string;
     toBase64(verbose?: boolean): string;
     static from(value: CryptoExchangeSecrets | ICryptoExchangeSecrets): CryptoExchangeSecrets;
+    static preFrom(value: any): any;
     static fromJSON(value: ICryptoExchangeSecretsSerialized): CryptoExchangeSecrets;
     static fromBase64(value: string): Promise<CryptoExchangeSecrets>;
-    static deserialize(value: string): CryptoExchangeSecrets;
 }

package/dist/exchange/CryptoExchangeSecrets.js

@@ -8,29 +8,19 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var CryptoExchangeSecrets_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CryptoExchangeSecrets = void 0;
 const ts_serval_1 = require("@js-soft/ts-serval");
 const CoreBuffer_1 = require("../CoreBuffer");
 const CryptoSerializable_1 = require("../CryptoSerializable");
-let CryptoExchangeSecrets = CryptoExchangeSecrets_1 = class CryptoExchangeSecrets extends CryptoSerializable_1.CryptoSerializable {
-    constructor(receivingKey, transmissionKey, algorithm) {
-        super();
-        this.receivingKey = receivingKey;
-        this.transmissionKey = transmissionKey;
-        this.algorithm = algorithm;
-    }
+let CryptoExchangeSecrets = class CryptoExchangeSecrets extends CryptoSerializable_1.CryptoSerializable {
     toJSON(verbose = true) {
-        const obj = {
+        return {
             rx: this.receivingKey.toBase64URL(),
             tx: this.transmissionKey.toBase64URL(),
-            alg: this.algorithm
+            alg: this.algorithm,
+            "@type": verbose ? "CryptoExchangeSecrets" : undefined
         };
-        if (verbose) {
-            obj["@type"] = "CryptoExchangeSecrets";
-        }
-        return obj;
     }
     clear() {
         this.receivingKey.clear();
@@ -43,34 +33,42 @@ let CryptoExchangeSecrets = CryptoExchangeSecrets_1 = class CryptoExchangeSecret
         return CoreBuffer_1.CoreBuffer.utf8_base64(this.serialize(verbose));
     }
     static from(value) {
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        if (!value.algorithm || !value.receivingKey || !value.transmissionKey) {
-            throw new Error("No algorithm, receivingKey or transmissionKey property set.");
+        return this.fromAny(value);
+    }
+    static preFrom(value) {
+        if (value.rx) {
+            value = {
+                algorithm: value.alg,
+                receivingKey: value.rx,
+                transmissionKey: value.tx
+            };
         }
-        const receivingKey = CoreBuffer_1.CoreBuffer.from(value.receivingKey);
-        const transmissionKey = CoreBuffer_1.CoreBuffer.from(value.transmissionKey);
-        return new CryptoExchangeSecrets_1(receivingKey, transmissionKey, value.algorithm);
+        return value;
     }
     static fromJSON(value) {
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        if (!value.alg || !value.rx || !value.tx) {
-            throw new Error("No algorithm, receivingKey or transmissionKey property set.");
-        }
-        const receivingKey = CoreBuffer_1.CoreBuffer.fromBase64URL(value.rx);
-        const transmissionKey = CoreBuffer_1.CoreBuffer.fromBase64URL(value.tx);
-        return new CryptoExchangeSecrets_1(receivingKey, transmissionKey, value.alg);
+        return this.fromAny(value);
     }
     static fromBase64(value) {
         return Promise.resolve(this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value)));
     }
-    static deserialize(value) {
-        const obj = JSON.parse(value);
-        return this.fromJSON(obj);
-    }
 };
-CryptoExchangeSecrets = CryptoExchangeSecrets_1 = __decorate([
-    (0, ts_serval_1.type)("CryptoExchangeSecrets"),
-    __metadata("design:paramtypes", [CoreBuffer_1.CoreBuffer, CoreBuffer_1.CoreBuffer, Number])
+__decorate([
+    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.serialize)(),
+    __metadata("design:type", Number)
+], CryptoExchangeSecrets.prototype, "algorithm", void 0);
+__decorate([
+    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.serialize)(),
+    __metadata("design:type", CoreBuffer_1.CoreBuffer)
+], CryptoExchangeSecrets.prototype, "receivingKey", void 0);
+__decorate([
+    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.serialize)(),
+    __metadata("design:type", CoreBuffer_1.CoreBuffer)
+], CryptoExchangeSecrets.prototype, "transmissionKey", void 0);
+CryptoExchangeSecrets = __decorate([
+    (0, ts_serval_1.type)("CryptoExchangeSecrets")
 ], CryptoExchangeSecrets);
 exports.CryptoExchangeSecrets = CryptoExchangeSecrets;
 //# sourceMappingURL=CryptoExchangeSecrets.js.map

package/dist/exchange/CryptoExchangeSecrets.js.map

@@ -1 +1 @@
-{"version":3,"file":"CryptoExchangeSecrets.js","sourceRoot":"","sources":["../../src/exchange/CryptoExchangeSecrets.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CryptoExchangeSecrets.js","sourceRoot":"","sources":["../../src/exchange/CryptoExchangeSecrets.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAA2F;AAC3F,8CAAoE;AACpE,8DAA2D;AAgB3D,IAAa,qBAAqB,GAAlC,MAAa,qBAAsB,SAAQ,uCAAkB;IAazC,MAAM,CAAC,OAAO,GAAG,IAAI;QACjC,OAAO;YACH,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE;YACnC,EAAE,EAAE,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE;YACtC,GAAG,EAAE,IAAI,CAAC,SAAS;YACnB,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,SAAS;SACzD,CAAC;IACN,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QAC1B,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;IACjC,CAAC;IAEe,SAAS,CAAC,OAAO,GAAG,IAAI;QACpC,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IAChD,CAAC;IAEe,QAAQ,CAAC,OAAO,GAAG,IAAI;QACnC,OAAO,uBAAU,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3D,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,KAAqD;QACpE,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAEM,MAAM,CAAU,OAAO,CAAC,KAAU;QACrC,IAAI,KAAK,CAAC,EAAE,EAAE;YACV,KAAK,GAAG;gBACJ,SAAS,EAAE,KAAK,CAAC,GAAG;gBACpB,YAAY,EAAE,KAAK,CAAC,EAAE;gBACtB,eAAe,EAAE,KAAK,CAAC,EAAE;aAC5B,CAAC;SACL;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,KAAuC;QAC1D,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAEM,MAAM,CAAC,UAAU,CAAC,KAAa;QAClC,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,uBAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC5E,CAAC;CACJ,CAAA;AAtDG;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;;wDACgC;AAI5C;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACS,uBAAU;2DAAC;AAIhC;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACY,uBAAU;8DAAC;AAX1B,qBAAqB;IADjC,IAAA,gBAAI,EAAC,uBAAuB,CAAC;GACjB,qBAAqB,CAyDjC;AAzDY,sDAAqB"}

package/dist/exchange/CryptoExchangeValidation.d.ts

@@ -2,19 +2,16 @@ import { CoreBuffer } from "../CoreBuffer";
 import { CryptoError } from "../CryptoError";
 import { CryptoValidation } from "../CryptoValidation";
 import { CryptoExchangeAlgorithm } from "./CryptoExchange";
-import { CryptoExchangePrivateKey } from "./CryptoExchangePrivateKey";
-import { CryptoExchangePublicKey } from "./CryptoExchangePublicKey";
 export declare class CryptoExchangeValidation extends CryptoValidation {
-    static readonly PRIVATE_KEY_MIN_BYTES: number;
-    static readonly PRIVATE_KEY_MAX_BYTES: number;
-    static readonly PUBLIC_KEY_MIN_BYTES: number;
-    static readonly PUBLIC_KEY_MAX_BYTES: number;
+    static readonly PRIVATE_KEY_MIN_BYTES = 20;
+    static readonly PRIVATE_KEY_MAX_BYTES = 40;
+    static readonly PUBLIC_KEY_MIN_BYTES = 20;
+    static readonly PUBLIC_KEY_MAX_BYTES = 40;
     static checkExchangeAlgorithm(algorithm: number, throwError?: boolean): CryptoError | undefined;
-    static checkExchangePrivateKeyAsNumber(privateKey: string, algorithm: CryptoExchangeAlgorithm, propertyName?: string, throwError?: boolean): CryptoError | undefined;
+    static checkExchangePrivateKeyAsString(privateKey: string, algorithm: CryptoExchangeAlgorithm, propertyName?: string, throwError?: boolean): CryptoError | undefined;
     static checkExchangePrivateKeyAsBuffer(privateKey: CoreBuffer, algorithm: CryptoExchangeAlgorithm, propertyName?: string, throwError?: boolean): CryptoError | undefined;
-    static checkExchangePrivateKey(privateKey: CryptoExchangePrivateKey, throwError?: boolean): CryptoError | undefined;
+    static checkExchangePrivateKey(privateKey: string | CoreBuffer, algorithm: CryptoExchangeAlgorithm, propertyName?: string, throwError?: boolean): CryptoError | undefined;
     static checkExchangePublicKeyAsString(publicKey: string, algorithm: CryptoExchangeAlgorithm, propertyName?: string, throwError?: boolean): CryptoError | undefined;
     static checkExchangePublicKeyAsBuffer(publicKey: CoreBuffer, algorithm: CryptoExchangeAlgorithm, propertyName?: string, throwError?: boolean): CryptoError | undefined;
-    static checkExchangePublicKey(publicKey: CryptoExchangePublicKey, throwError?: boolean): CryptoError | undefined;
-    static checkExchangeKeypair(privateKey: CryptoExchangePrivateKey, publicKey: CryptoExchangePublicKey, throwError?: boolean): CryptoError | undefined;
+    static checkExchangePublicKey(publicKey: string | CoreBuffer, algorithm: CryptoExchangeAlgorithm, propertyName?: string, throwError?: boolean): CryptoError | undefined;
 }

package/dist/exchange/CryptoExchangeValidation.js

@@ -4,8 +4,6 @@ exports.CryptoExchangeValidation = void 0;
 const CryptoError_1 = require("../CryptoError");
 const CryptoErrorCode_1 = require("../CryptoErrorCode");
 const CryptoValidation_1 = require("../CryptoValidation");
-const CryptoExchangePrivateKey_1 = require("./CryptoExchangePrivateKey");
-const CryptoExchangePublicKey_1 = require("./CryptoExchangePublicKey");
 class CryptoExchangeValidation extends CryptoValidation_1.CryptoValidation {
     static checkExchangeAlgorithm(algorithm, throwError = true) {
         let error;
@@ -22,20 +20,17 @@ class CryptoExchangeValidation extends CryptoValidation_1.CryptoValidation {
             throw error;
         return error;
     }
-    static checkExchangePrivateKeyAsNumber(privateKey, algorithm, propertyName = "privateKey", throwError = true) {
+    static checkExchangePrivateKeyAsString(privateKey, algorithm, propertyName = "privateKey", throwError = true) {
         return super.checkSerializedBuffer(privateKey, this.PRIVATE_KEY_MIN_BYTES, this.PRIVATE_KEY_MAX_BYTES, propertyName, throwError);
     }
     static checkExchangePrivateKeyAsBuffer(privateKey, algorithm, propertyName = "privateKey", throwError = true) {
         return super.checkBuffer(privateKey, this.PRIVATE_KEY_MIN_BYTES, this.PRIVATE_KEY_MAX_BYTES, propertyName, throwError);
     }
-    static checkExchangePrivateKey(privateKey, throwError = true) {
-        let error;
-        if (!(privateKey instanceof CryptoExchangePrivateKey_1.CryptoExchangePrivateKey)) {
-            error = new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.ExchangeWrongPrivateKey, "PrivateKey is not set or supported.");
+    static checkExchangePrivateKey(privateKey, algorithm, propertyName = "privateKey", throwError = true) {
+        if (typeof privateKey === "string") {
+            return this.checkExchangePrivateKeyAsString(privateKey, algorithm, propertyName, throwError);
         }
-        if (error && throwError)
-            throw error;
-        return error;
+        return this.checkExchangePrivateKeyAsBuffer(privateKey, algorithm, propertyName, throwError);
     }
     static checkExchangePublicKeyAsString(publicKey, algorithm, propertyName = "publicKey", throwError = true) {
         return super.checkSerializedBuffer(publicKey, this.PRIVATE_KEY_MIN_BYTES, this.PRIVATE_KEY_MAX_BYTES, propertyName, throwError);
@@ -43,33 +38,11 @@ class CryptoExchangeValidation extends CryptoValidation_1.CryptoValidation {
     static checkExchangePublicKeyAsBuffer(publicKey, algorithm, propertyName = "publicKey", throwError = true) {
         return super.checkBuffer(publicKey, this.PRIVATE_KEY_MIN_BYTES, this.PRIVATE_KEY_MAX_BYTES, propertyName, throwError);
     }
-    static checkExchangePublicKey(publicKey, throwError = true) {
-        let error;
-        if (!(publicKey instanceof CryptoExchangePublicKey_1.CryptoExchangePublicKey)) {
-            error = new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.ExchangeWrongPublicKey, "PublicKey is not set or supported.");
-        }
-        if (error && throwError)
-            throw error;
-        return error;
-    }
-    static checkExchangeKeypair(privateKey, publicKey, throwError = true) {
-        let error;
-        error = this.checkExchangePublicKey(publicKey);
-        if (error && throwError)
-            throw error;
-        else if (error)
-            return error;
-        error = this.checkExchangePrivateKey(privateKey);
-        if (error && throwError)
-            throw error;
-        else if (error)
-            return error;
-        if (privateKey.algorithm !== publicKey.algorithm) {
-            error = new CryptoError_1.CryptoError(CryptoErrorCode_1.CryptoErrorCode.ExchangeWrongAlgorithm, "Algorithms of private and public key do not match.");
+    static checkExchangePublicKey(publicKey, algorithm, propertyName = "publicKey", throwError = true) {
+        if (typeof publicKey === "string") {
+            return this.checkExchangePublicKeyAsString(publicKey, algorithm, propertyName, throwError);
         }
-        if (error && throwError)
-            throw error;
-        return error;
+        return this.checkExchangePublicKeyAsBuffer(publicKey, algorithm, propertyName, throwError);
     }
 }
 exports.CryptoExchangeValidation = CryptoExchangeValidation;

package/dist/exchange/CryptoExchangeValidation.js.map

@@ -1 +1 @@
-{"version":3,"file":"CryptoExchangeValidation.js","sourceRoot":"","sources":["../../src/exchange/CryptoExchangeValidation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CryptoExchangeValidation.js","sourceRoot":"","sources":["../../src/exchange/CryptoExchangeValidation.ts"],"names":[],"mappings":";;;AACA,gDAA6C;AAC7C,wDAAqD;AACrD,0DAAuD;AAGvD,MAAa,wBAAyB,SAAQ,mCAAgB;IAMnD,MAAM,CAAC,sBAAsB,CAAC,SAAiB,EAAE,UAAU,GAAG,IAAI;QACrE,IAAI,KAAK,CAAC;QACV,QAAQ,SAAS,EAAE;YACf,uBAAuC;YACvC,uBAAuC;YACvC;gBACI,MAAM;YACV;gBACI,KAAK,GAAG,IAAI,yBAAW,CACnB,iCAAe,CAAC,sBAAsB,EACtC,6CAA6C,CAChD,CAAC;gBACF,MAAM;SACb;QACD,IAAI,KAAK,IAAI,UAAU;YAAE,MAAM,KAAK,CAAC;QACrC,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,MAAM,CAAC,+BAA+B,CACzC,UAAkB,EAClB,SAAkC,EAClC,YAAY,GAAG,YAAY,EAC3B,UAAU,GAAG,IAAI;QAEjB,OAAO,KAAK,CAAC,qBAAqB,CAC9B,UAAU,EACV,IAAI,CAAC,qBAAqB,EAC1B,IAAI,CAAC,qBAAqB,EAC1B,YAAY,EACZ,UAAU,CACb,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,+BAA+B,CACzC,UAAsB,EACtB,SAAkC,EAClC,YAAY,GAAG,YAAY,EAC3B,UAAU,GAAG,IAAI;QAEjB,OAAO,KAAK,CAAC,WAAW,CACpB,UAAU,EACV,IAAI,CAAC,qBAAqB,EAC1B,IAAI,CAAC,qBAAqB,EAC1B,YAAY,EACZ,UAAU,CACb,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,uBAAuB,CACjC,UAA+B,EAC/B,SAAkC,EAClC,YAAY,GAAG,YAAY,EAC3B,UAAU,GAAG,IAAI;QAEjB,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;YAChC,OAAO,IAAI,CAAC,+BAA+B,CAAC,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;SAChG;QAED,OAAO,IAAI,CAAC,+BAA+B,CAAC,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;IACjG,CAAC;IAEM,MAAM,CAAC,8BAA8B,CACxC,SAAiB,EACjB,SAAkC,EAClC,YAAY,GAAG,WAAW,EAC1B,UAAU,GAAG,IAAI;QAEjB,OAAO,KAAK,CAAC,qBAAqB,CAC9B,SAAS,EACT,IAAI,CAAC,qBAAqB,EAC1B,IAAI,CAAC,qBAAqB,EAC1B,YAAY,EACZ,UAAU,CACb,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,8BAA8B,CACxC,SAAqB,EACrB,SAAkC,EAClC,YAAY,GAAG,WAAW,EAC1B,UAAU,GAAG,IAAI;QAEjB,OAAO,KAAK,CAAC,WAAW,CACpB,SAAS,EACT,IAAI,CAAC,qBAAqB,EAC1B,IAAI,CAAC,qBAAqB,EAC1B,YAAY,EACZ,UAAU,CACb,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAChC,SAA8B,EAC9B,SAAkC,EAClC,YAAY,GAAG,WAAW,EAC1B,UAAU,GAAG,IAAI;QAEjB,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;YAC/B,OAAO,IAAI,CAAC,8BAA8B,CAAC,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;SAC9F;QAED,OAAO,IAAI,CAAC,8BAA8B,CAAC,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;IAC/F,CAAC;;AA5GL,4DA6GC;AA5G0B,8CAAqB,GAAG,EAAE,CAAC;AAC3B,8CAAqB,GAAG,EAAE,CAAC;AAC3B,6CAAoB,GAAG,EAAE,CAAC;AAC1B,6CAAoB,GAAG,EAAE,CAAC"}

package/dist/index.d.ts

@@ -25,6 +25,7 @@ export * from "./relationship/CryptoRelationshipRequestSecrets";
 export * from "./relationship/CryptoRelationshipSecrets";
 export * from "./relationship/CryptoRelationshipType";
 export * from "./signature/CryptoSignature";
+export * from "./signature/CryptoSignatureAlgorithm";
 export * from "./signature/CryptoSignatureKeypair";
 export * from "./signature/CryptoSignaturePrivateKey";
 export * from "./signature/CryptoSignaturePublicKey";

package/dist/index.js

@@ -41,6 +41,7 @@ __exportStar(require("./relationship/CryptoRelationshipRequestSecrets"), exports
 __exportStar(require("./relationship/CryptoRelationshipSecrets"), exports);
 __exportStar(require("./relationship/CryptoRelationshipType"), exports);
 __exportStar(require("./signature/CryptoSignature"), exports);
+__exportStar(require("./signature/CryptoSignatureAlgorithm"), exports);
 __exportStar(require("./signature/CryptoSignatureKeypair"), exports);
 __exportStar(require("./signature/CryptoSignaturePrivateKey"), exports);
 __exportStar(require("./signature/CryptoSignaturePublicKey"), exports);

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,qDAAmC;AACnC,+CAA6B;AAC7B,qDAAmC;AACnC,gDAA8B;AAC9B,oDAAkC;AAClC,qDAAmC;AACnC,oDAAkC;AAClC,qDAAmC;AACnC,4DAA0C;AAC1C,gEAA8C;AAC9C,+DAA6C;AAC7C,4DAA0C;AAC1C,mEAAiD;AACjD,sEAAoD;AACpD,qEAAmD;AACnD,mEAAiD;AACjD,sEAAoD;AACpD,oDAAkC;AAClC,mEAAiD;AACjD,wDAAsC;AACtC,iFAA+D;AAC/D,kFAAgE;AAChE,kFAAgE;AAChE,2EAAyD;AACzD,wEAAsD;AACtD,8DAA4C;AAC5C,qEAAmD;AACnD,wEAAsD;AACtD,uEAAqD;AACrD,+DAA6C;AAC7C,wEAAsD;AACtD,kDAAgC;AAChC,6DAA2C;AAC3C,oEAAkD;AAClD,qEAAmD;AACnD,4DAA0C;AAC1C,0DAAwC;AACxC,wDAAsC;AACtC,+DAA6C;AAC7C,6DAA2C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,qDAAmC;AACnC,+CAA6B;AAC7B,qDAAmC;AACnC,gDAA8B;AAC9B,oDAAkC;AAClC,qDAAmC;AACnC,oDAAkC;AAClC,qDAAmC;AACnC,4DAA0C;AAC1C,gEAA8C;AAC9C,+DAA6C;AAC7C,4DAA0C;AAC1C,mEAAiD;AACjD,sEAAoD;AACpD,qEAAmD;AACnD,mEAAiD;AACjD,sEAAoD;AACpD,oDAAkC;AAClC,mEAAiD;AACjD,wDAAsC;AACtC,iFAA+D;AAC/D,kFAAgE;AAChE,kFAAgE;AAChE,2EAAyD;AACzD,wEAAsD;AACtD,8DAA4C;AAC5C,uEAAqD;AACrD,qEAAmD;AACnD,wEAAsD;AACtD,uEAAqD;AACrD,+DAA6C;AAC7C,wEAAsD;AACtD,kDAAgC;AAChC,6DAA2C;AAC3C,oEAAkD;AAClD,qEAAmD;AACnD,4DAA0C;AAC1C,0DAAwC;AACxC,wDAAsC;AACtC,+DAA6C;AAC7C,6DAA2C"}

package/dist/relationship/CryptoRelationshipPublicRequest.d.ts

@@ -23,11 +23,10 @@ export declare class CryptoRelationshipPublicRequest extends CryptoSerializable
     exchangeKey: CryptoExchangePublicKey;
     ephemeralKey: CryptoExchangePublicKey;
     nonce: CoreBuffer;
-    constructor(signatureKey: CryptoSignaturePublicKey, exchangeKey: CryptoExchangePublicKey, ephemeralKey: CryptoExchangePublicKey, nonce: CoreBuffer);
     toJSON(verbose?: boolean): ICryptoRelationshipPublicRequestSerialized;
     clear(): void;
     static from(value: CryptoRelationshipPublicRequest | ICryptoRelationshipPublicRequest): CryptoRelationshipPublicRequest;
+    protected static preFrom(value: any): any;
     static fromJSON(value: ICryptoRelationshipPublicRequestSerialized): CryptoRelationshipPublicRequest;
     static fromBase64(value: string): CryptoRelationshipPublicRequest;
-    static deserialize(value: string): CryptoRelationshipPublicRequest;
 }