@nmshd/crypto 1.0.8 → 2.0.1

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

@@ -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];
@@ -37,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

@@ -1,6 +1,6 @@
-import { ISerializableAsync, ISerialized } from "@js-soft/ts-serval";
+import { ISerializable, ISerialized } from "@js-soft/ts-serval";
 import { CoreBuffer, IClearable, ICoreBuffer } from "../CoreBuffer";
-import { CryptoSerializableAsync } from "../CryptoSerializableAsync";
+import { CryptoSerializable } from "../CryptoSerializable";
 import { CryptoExchangePublicKey, ICryptoExchangePublicKey, ICryptoExchangePublicKeySerialized } from "../exchange/CryptoExchangePublicKey";
 import { CryptoSignaturePublicKey, ICryptoSignaturePublicKey, ICryptoSignaturePublicKeySerialized } from "../signature/CryptoSignaturePublicKey";
 export interface ICryptoRelationshipPublicRequestSerialized extends ISerialized {
@@ -10,24 +10,23 @@ export interface ICryptoRelationshipPublicRequestSerialized extends ISerialized
     eph: ICryptoExchangePublicKeySerialized;
     nnc: string;
 }
-export interface ICryptoRelationshipPublicRequest extends ISerializableAsync {
+export interface ICryptoRelationshipPublicRequest extends ISerializable {
     id?: string;
     exchangeKey: ICryptoExchangePublicKey;
     signatureKey: ICryptoSignaturePublicKey;
     ephemeralKey: ICryptoExchangePublicKey;
     nonce: ICoreBuffer;
 }
-export declare class CryptoRelationshipPublicRequest extends CryptoSerializableAsync implements ICryptoRelationshipPublicRequest, IClearable {
+export declare class CryptoRelationshipPublicRequest extends CryptoSerializable implements ICryptoRelationshipPublicRequest, IClearable {
     id?: string;
     signatureKey: CryptoSignaturePublicKey;
     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): Promise<CryptoRelationshipPublicRequest>;
-    static fromJSON(value: ICryptoRelationshipPublicRequestSerialized): Promise<CryptoRelationshipPublicRequest>;
-    static fromBase64(value: string): Promise<CryptoRelationshipPublicRequest>;
-    static deserialize(value: string): Promise<CryptoRelationshipPublicRequest>;
+    static from(value: CryptoRelationshipPublicRequest | ICryptoRelationshipPublicRequest): CryptoRelationshipPublicRequest;
+    protected static preFrom(value: any): any;
+    static fromJSON(value: ICryptoRelationshipPublicRequestSerialized): CryptoRelationshipPublicRequest;
+    static fromBase64(value: string): CryptoRelationshipPublicRequest;
 }

package/dist/relationship/CryptoRelationshipPublicRequest.js

@@ -8,33 +8,22 @@ 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 CryptoRelationshipPublicRequest_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CryptoRelationshipPublicRequest = 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 CryptoExchangePublicKey_1 = require("../exchange/CryptoExchangePublicKey");
 const CryptoSignaturePublicKey_1 = require("../signature/CryptoSignaturePublicKey");
-let CryptoRelationshipPublicRequest = CryptoRelationshipPublicRequest_1 = class CryptoRelationshipPublicRequest extends CryptoSerializableAsync_1.CryptoSerializableAsync {
-    constructor(signatureKey, exchangeKey, ephemeralKey, nonce) {
-        super();
-        this.signatureKey = signatureKey;
-        this.exchangeKey = exchangeKey;
-        this.ephemeralKey = ephemeralKey;
-        this.nonce = nonce;
-    }
+let CryptoRelationshipPublicRequest = class CryptoRelationshipPublicRequest extends CryptoSerializable_1.CryptoSerializable {
     toJSON(verbose = true) {
-        const obj = {
+        return {
             exc: this.exchangeKey.toJSON(false),
             sig: this.signatureKey.toJSON(false),
             eph: this.ephemeralKey.toJSON(false),
-            nnc: this.nonce.toBase64URL()
+            nnc: this.nonce.toBase64URL(),
+            "@type": verbose ? "CryptoRelationshipPublicRequest" : undefined
         };
-        if (verbose) {
-            obj["@type"] = "CryptoRelationshipPublicRequest";
-        }
-        return obj;
     }
     clear() {
         this.exchangeKey.clear();
@@ -42,29 +31,25 @@ let CryptoRelationshipPublicRequest = CryptoRelationshipPublicRequest_1 = class
         this.ephemeralKey.clear();
         this.nonce.clear();
     }
-    static async from(value) {
-        const [signatureKey, exchangeKey, ephemeralKey, nonce] = await Promise.all([
-            CryptoSignaturePublicKey_1.CryptoSignaturePublicKey.from(value.signatureKey),
-            CryptoExchangePublicKey_1.CryptoExchangePublicKey.from(value.exchangeKey),
-            CryptoExchangePublicKey_1.CryptoExchangePublicKey.from(value.ephemeralKey),
-            CoreBuffer_1.CoreBuffer.from(value.nonce)
-        ]);
-        return new CryptoRelationshipPublicRequest_1(signatureKey, exchangeKey, ephemeralKey, nonce);
+    static from(value) {
+        return this.fromAny(value);
     }
-    static async fromJSON(value) {
-        const [signatureKey, exchangeKey, ephemeralKey, nonce] = await Promise.all([
-            CryptoSignaturePublicKey_1.CryptoSignaturePublicKey.fromJSON(value.sig),
-            CryptoExchangePublicKey_1.CryptoExchangePublicKey.fromJSON(value.exc),
-            CryptoExchangePublicKey_1.CryptoExchangePublicKey.fromJSON(value.eph),
-            CoreBuffer_1.CoreBuffer.fromBase64URL(value.nnc)
-        ]);
-        return new CryptoRelationshipPublicRequest_1(signatureKey, exchangeKey, ephemeralKey, nonce);
+    static preFrom(value) {
+        if (value.exc) {
+            value = {
+                exchangeKey: value.exc,
+                signatureKey: value.sig,
+                ephemeralKey: value.eph,
+                nonce: value.nnc
+            };
+        }
+        return value;
     }
-    static async fromBase64(value) {
-        return await this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
+    static fromJSON(value) {
+        return this.fromAny(value);
     }
-    static async deserialize(value) {
-        return await this.fromJSON(JSON.parse(value));
+    static fromBase64(value) {
+        return this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
     }
 };
 __decorate([
@@ -92,12 +77,8 @@ __decorate([
     (0, ts_serval_1.serialize)(),
     __metadata("design:type", CoreBuffer_1.CoreBuffer)
 ], CryptoRelationshipPublicRequest.prototype, "nonce", void 0);
-CryptoRelationshipPublicRequest = CryptoRelationshipPublicRequest_1 = __decorate([
-    (0, ts_serval_1.type)("CryptoRelationshipPublicRequest"),
-    __metadata("design:paramtypes", [CryptoSignaturePublicKey_1.CryptoSignaturePublicKey,
-        CryptoExchangePublicKey_1.CryptoExchangePublicKey,
-        CryptoExchangePublicKey_1.CryptoExchangePublicKey,
-        CoreBuffer_1.CoreBuffer])
+CryptoRelationshipPublicRequest = __decorate([
+    (0, ts_serval_1.type)("CryptoRelationshipPublicRequest")
 ], CryptoRelationshipPublicRequest);
 exports.CryptoRelationshipPublicRequest = CryptoRelationshipPublicRequest;
 //# sourceMappingURL=CryptoRelationshipPublicRequest.js.map

package/dist/relationship/CryptoRelationshipPublicRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"CryptoRelationshipPublicRequest.js","sourceRoot":"","sources":["../../src/relationship/CryptoRelationshipPublicRequest.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CryptoRelationshipPublicRequest.js","sourceRoot":"","sources":["../../src/relationship/CryptoRelationshipPublicRequest.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAA2F;AAC3F,8CAAoE;AACpE,8DAA2D;AAC3D,iFAI6C;AAC7C,oFAI+C;AAmB/C,IAAa,+BAA+B,GAA5C,MAAa,+BACT,SAAQ,uCAAkB;IAuBV,MAAM,CAAC,OAAO,GAAG,IAAI;QACjC,OAAO;YACH,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC;YACnC,GAAG,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC;YACpC,GAAG,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC;YACpC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE;YAC7B,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,iCAAiC,CAAC,CAAC,CAAC,SAAS;SACnE,CAAC;IACN,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QAC1B,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QAC1B,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;IAEM,MAAM,CAAC,IAAI,CACd,KAAyE;QAEzE,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,WAAW,EAAE,KAAK,CAAC,GAAG;gBACtB,YAAY,EAAE,KAAK,CAAC,GAAG;gBACvB,YAAY,EAAE,KAAK,CAAC,GAAG;gBACvB,KAAK,EAAE,KAAK,CAAC,GAAG;aACnB,CAAC;SACL;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,KAAiD;QACpE,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAEM,MAAM,CAAC,UAAU,CAAC,KAAa;QAClC,OAAO,IAAI,CAAC,WAAW,CAAC,uBAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3D,CAAC;CACJ,CAAA;AA7DG;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,GAAE;;2DACO;AAInB;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACS,mDAAwB;qEAAC;AAI9C;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACQ,iDAAuB;oEAAC;AAI5C;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACS,iDAAuB;qEAAC;AAI7C;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACE,uBAAU;8DAAC;AAtBhB,+BAA+B;IAD3C,IAAA,gBAAI,EAAC,iCAAiC,CAAC;GAC3B,+BAA+B,CAmE3C;AAnEY,0EAA+B"}

package/dist/relationship/CryptoRelationshipPublicResponse.d.ts

@@ -1,6 +1,6 @@
-import { ISerializableAsync, ISerialized } from "@js-soft/ts-serval";
+import { ISerializable, ISerialized } from "@js-soft/ts-serval";
 import { CoreBuffer, IClearable } from "../CoreBuffer";
-import { CryptoSerializableAsync } from "../CryptoSerializableAsync";
+import { CryptoSerializable } from "../CryptoSerializable";
 import { CryptoExchangePublicKey, ICryptoExchangePublicKey, ICryptoExchangePublicKeySerialized } from "../exchange/CryptoExchangePublicKey";
 import { CryptoSignature } from "../signature/CryptoSignature";
 import { CryptoSignaturePublicKey, ICryptoSignaturePublicKey, ICryptoSignaturePublicKeySerialized } from "../signature/CryptoSignaturePublicKey";
@@ -11,23 +11,22 @@ export interface ICryptoRelationshipPublicResponseSerialized extends ISerialized
     sig: ICryptoSignaturePublicKeySerialized;
     sta: ICryptoPublicStateSerialized;
 }
-export interface ICryptoRelationshipPublicResponse extends ISerializableAsync {
+export interface ICryptoRelationshipPublicResponse extends ISerializable {
     id?: string;
     exchangeKey: ICryptoExchangePublicKey;
     signatureKey: ICryptoSignaturePublicKey;
     state: ICryptoPublicState;
 }
-export declare class CryptoRelationshipPublicResponse extends CryptoSerializableAsync implements ICryptoRelationshipPublicResponse, IClearable {
+export declare class CryptoRelationshipPublicResponse extends CryptoSerializable implements ICryptoRelationshipPublicResponse, IClearable {
     id?: string;
     signatureKey: CryptoSignaturePublicKey;
     exchangeKey: CryptoExchangePublicKey;
     state: CryptoPublicState;
-    constructor(signatureKey: CryptoSignaturePublicKey, exchangeKey: CryptoExchangePublicKey, state: CryptoPublicState);
     toJSON(verbose?: boolean): ICryptoRelationshipPublicResponseSerialized;
     clear(): void;
     verify(content: CoreBuffer, signature: CryptoSignature): Promise<boolean>;
-    static from(value: CryptoRelationshipPublicResponse | ICryptoRelationshipPublicResponse): Promise<CryptoRelationshipPublicResponse>;
-    static fromJSON(value: ICryptoRelationshipPublicResponseSerialized): Promise<CryptoRelationshipPublicResponse>;
-    static fromBase64(value: string): Promise<CryptoRelationshipPublicResponse>;
-    static deserialize(value: string): Promise<CryptoRelationshipPublicResponse>;
+    static from(value: CryptoRelationshipPublicResponse | ICryptoRelationshipPublicResponse): CryptoRelationshipPublicResponse;
+    protected static preFrom(value: any): any;
+    static fromJSON(value: ICryptoRelationshipPublicResponseSerialized): CryptoRelationshipPublicResponse;
+    static fromBase64(value: string): CryptoRelationshipPublicResponse;
 }

package/dist/relationship/CryptoRelationshipPublicResponse.js

@@ -8,33 +8,24 @@ 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 CryptoRelationshipPublicResponse_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CryptoRelationshipPublicResponse = 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 CryptoExchangePublicKey_1 = require("../exchange/CryptoExchangePublicKey");
 const CryptoSignaturePublicKey_1 = require("../signature/CryptoSignaturePublicKey");
 const CryptoSignatures_1 = require("../signature/CryptoSignatures");
 const CryptoPublicState_1 = require("../state/CryptoPublicState");
-let CryptoRelationshipPublicResponse = CryptoRelationshipPublicResponse_1 = class CryptoRelationshipPublicResponse extends CryptoSerializableAsync_1.CryptoSerializableAsync {
-    constructor(signatureKey, exchangeKey, state) {
-        super();
-        this.signatureKey = signatureKey;
-        this.exchangeKey = exchangeKey;
-        this.state = state;
-    }
+let CryptoRelationshipPublicResponse = class CryptoRelationshipPublicResponse extends CryptoSerializable_1.CryptoSerializable {
     toJSON(verbose = true) {
-        const obj = {
+        return {
             exc: this.exchangeKey.toJSON(false),
             sig: this.signatureKey.toJSON(false),
-            sta: this.state.toJSON(false)
+            sta: this.state.toJSON(false),
+            id: this.id,
+            "@type": verbose ? "CryptoRelationshipPublicResponse" : undefined
         };
-        if (verbose) {
-            obj["@type"] = "CryptoRelationshipPublicResponse";
-        }
-        return obj;
     }
     clear() {
         this.exchangeKey.clear();
@@ -44,27 +35,25 @@ let CryptoRelationshipPublicResponse = CryptoRelationshipPublicResponse_1 = clas
     async verify(content, signature) {
         return await CryptoSignatures_1.CryptoSignatures.verify(content, signature, this.signatureKey);
     }
-    static async from(value) {
-        const [signatureKey, exchangeKey, state] = await Promise.all([
-            CryptoSignaturePublicKey_1.CryptoSignaturePublicKey.from(value.signatureKey),
-            CryptoExchangePublicKey_1.CryptoExchangePublicKey.from(value.exchangeKey),
-            CryptoPublicState_1.CryptoPublicState.from(value.state)
-        ]);
-        return new CryptoRelationshipPublicResponse_1(signatureKey, exchangeKey, state);
+    static from(value) {
+        return this.fromAny(value);
     }
-    static async fromJSON(value) {
-        const [signatureKey, exchangeKey, state] = await Promise.all([
-            CryptoSignaturePublicKey_1.CryptoSignaturePublicKey.fromJSON(value.sig),
-            CryptoExchangePublicKey_1.CryptoExchangePublicKey.fromJSON(value.exc),
-            CryptoPublicState_1.CryptoPublicState.fromJSON(value.sta)
-        ]);
-        return new CryptoRelationshipPublicResponse_1(signatureKey, exchangeKey, state);
+    static preFrom(value) {
+        if (value.exc) {
+            value = {
+                exchangeKey: value.exc,
+                signatureKey: value.sig,
+                state: value.sta,
+                id: value.id
+            };
+        }
+        return value;
     }
-    static async fromBase64(value) {
-        return await this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
+    static fromJSON(value) {
+        return this.fromAny(value);
     }
-    static async deserialize(value) {
-        return await this.fromJSON(JSON.parse(value));
+    static fromBase64(value) {
+        return this.deserialize(CoreBuffer_1.CoreBuffer.base64_utf8(value));
     }
 };
 __decorate([
@@ -87,11 +76,8 @@ __decorate([
     (0, ts_serval_1.serialize)(),
     __metadata("design:type", CryptoPublicState_1.CryptoPublicState)
 ], CryptoRelationshipPublicResponse.prototype, "state", void 0);
-CryptoRelationshipPublicResponse = CryptoRelationshipPublicResponse_1 = __decorate([
-    (0, ts_serval_1.type)("CryptoRelationshipPublicResponse"),
-    __metadata("design:paramtypes", [CryptoSignaturePublicKey_1.CryptoSignaturePublicKey,
-        CryptoExchangePublicKey_1.CryptoExchangePublicKey,
-        CryptoPublicState_1.CryptoPublicState])
+CryptoRelationshipPublicResponse = __decorate([
+    (0, ts_serval_1.type)("CryptoRelationshipPublicResponse")
 ], CryptoRelationshipPublicResponse);
 exports.CryptoRelationshipPublicResponse = CryptoRelationshipPublicResponse;
 //# sourceMappingURL=CryptoRelationshipPublicResponse.js.map

package/dist/relationship/CryptoRelationshipPublicResponse.js.map

@@ -1 +1 @@
-{"version":3,"file":"CryptoRelationshipPublicResponse.js","sourceRoot":"","sources":["../../src/relationship/CryptoRelationshipPublicResponse.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CryptoRelationshipPublicResponse.js","sourceRoot":"","sources":["../../src/relationship/CryptoRelationshipPublicResponse.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAA2F;AAC3F,8CAAuD;AACvD,8DAA2D;AAC3D,iFAI6C;AAE7C,oFAI+C;AAC/C,oEAAiE;AACjE,kEAAiH;AAiBjH,IAAa,gCAAgC,GAA7C,MAAa,gCACT,SAAQ,uCAAkB;IAmBV,MAAM,CAAC,OAAO,GAAG,IAAI;QACjC,OAAO;YACH,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC;YACnC,GAAG,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC;YACpC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;YAC7B,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,kCAAkC,CAAC,CAAC,CAAC,SAAS;SACpE,CAAC;IACN,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QAC1B,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,OAAmB,EAAE,SAA0B;QAC/D,OAAO,MAAM,mCAAgB,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAChF,CAAC;IAEM,MAAM,CAAC,IAAI,CACd,KAA2E;QAE3E,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,WAAW,EAAE,KAAK,CAAC,GAAG;gBACtB,YAAY,EAAE,KAAK,CAAC,GAAG;gBACvB,KAAK,EAAE,KAAK,CAAC,GAAG;gBAChB,EAAE,EAAE,KAAK,CAAC,EAAE;aACf,CAAC;SACL;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,KAAkD;QACrE,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAEM,MAAM,CAAC,UAAU,CAAC,KAAa;QAClC,OAAO,IAAI,CAAC,WAAW,CAAC,uBAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3D,CAAC;CACJ,CAAA;AA5DG;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,GAAE;;4DACO;AAInB;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACS,mDAAwB;sEAAC;AAI9C;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACQ,iDAAuB;qEAAC;AAI5C;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACE,qCAAiB;+DAAC;AAlBvB,gCAAgC;IAD5C,IAAA,gBAAI,EAAC,kCAAkC,CAAC;GAC5B,gCAAgC,CAkE5C;AAlEY,4EAAgC"}

package/dist/relationship/CryptoRelationshipRequestSecrets.d.ts

@@ -1,6 +1,6 @@
-import { ISerializableAsync } from "@js-soft/ts-serval";
+import { ISerializable } from "@js-soft/ts-serval";
 import { CoreBuffer, ICoreBuffer } from "../CoreBuffer";
-import { CryptoSerializableAsync } from "../CryptoSerializableAsync";
+import { CryptoSerializable } from "../CryptoSerializable";
 import { CryptoCipher } from "../encryption/CryptoCipher";
 import { CryptoSecretKey, ICryptoSecretKey } from "../encryption/CryptoSecretKey";
 import { CryptoExchangeKeypair, ICryptoExchangeKeypair } from "../exchange/CryptoExchangeKeypair";
@@ -10,7 +10,7 @@ import { CryptoSignature } from "../signature/CryptoSignature";
 import { CryptoSignatureKeypair, ICryptoSignatureKeypair } from "../signature/CryptoSignatureKeypair";
 import { CryptoSignaturePublicKey, ICryptoSignaturePublicKey } from "../signature/CryptoSignaturePublicKey";
 import { CryptoRelationshipPublicRequest } from "./CryptoRelationshipPublicRequest";
-export interface ICryptoRelationshipRequestSecrets extends ISerializableAsync {
+export interface ICryptoRelationshipRequestSecrets extends ISerializable {
     id?: string;
     exchangeKeypair: ICryptoExchangeKeypair;
     signatureKeypair: ICryptoSignatureKeypair;
@@ -20,7 +20,7 @@ export interface ICryptoRelationshipRequestSecrets extends ISerializableAsync {
     secretKey: ICryptoSecretKey;
     nonce: ICoreBuffer;
 }
-export declare class CryptoRelationshipRequestSecrets extends CryptoSerializableAsync implements ICryptoRelationshipRequestSecrets {
+export declare class CryptoRelationshipRequestSecrets extends CryptoSerializable implements ICryptoRelationshipRequestSecrets {
     id?: string;
     exchangeKeypair: CryptoExchangeKeypair;
     ephemeralKeypair: CryptoExchangeKeypair;
@@ -29,13 +29,12 @@ export declare class CryptoRelationshipRequestSecrets extends CryptoSerializable
     peerExchangeKey: CryptoExchangePublicKey;
     secretKey: CryptoSecretKey;
     nonce: CoreBuffer;
-    static from(value: ICryptoRelationshipRequestSecrets): Promise<CryptoRelationshipRequestSecrets>;
-    static deserialize(value: string): Promise<CryptoRelationshipRequestSecrets>;
+    static from(value: ICryptoRelationshipRequestSecrets): CryptoRelationshipRequestSecrets;
     sign(content: CoreBuffer, algorithm?: CryptoHashAlgorithm): Promise<CryptoSignature>;
     verifyOwn(content: CoreBuffer, signature: CryptoSignature): Promise<boolean>;
     verifyPeerIdentity(content: CoreBuffer, signature: CryptoSignature): Promise<boolean>;
     encryptRequest(content: CoreBuffer): Promise<CryptoCipher>;
     decryptRequest(cipher: CryptoCipher): Promise<CoreBuffer>;
-    toPublicRequest(): Promise<CryptoRelationshipPublicRequest>;
+    toPublicRequest(): CryptoRelationshipPublicRequest;
     static fromPeer(peerExchangeKey: CryptoExchangePublicKey, peerIdentityKey: CryptoSignaturePublicKey): Promise<CryptoRelationshipRequestSecrets>;
 }

package/dist/relationship/CryptoRelationshipRequestSecrets.js

@@ -14,7 +14,7 @@ exports.CryptoRelationshipRequestSecrets = void 0;
 const ts_serval_1 = require("@js-soft/ts-serval");
 const CoreBuffer_1 = require("../CoreBuffer");
 const CryptoDerivation_1 = require("../CryptoDerivation");
-const CryptoSerializableAsync_1 = require("../CryptoSerializableAsync");
+const CryptoSerializable_1 = require("../CryptoSerializable");
 const CryptoEncryption_1 = require("../encryption/CryptoEncryption");
 const CryptoSecretKey_1 = require("../encryption/CryptoSecretKey");
 const CryptoExchange_1 = require("../exchange/CryptoExchange");
@@ -25,12 +25,9 @@ const CryptoSignatureKeypair_1 = require("../signature/CryptoSignatureKeypair");
 const CryptoSignaturePublicKey_1 = require("../signature/CryptoSignaturePublicKey");
 const CryptoSignatures_1 = require("../signature/CryptoSignatures");
 const CryptoRelationshipPublicRequest_1 = require("./CryptoRelationshipPublicRequest");
-let CryptoRelationshipRequestSecrets = CryptoRelationshipRequestSecrets_1 = class CryptoRelationshipRequestSecrets extends CryptoSerializableAsync_1.CryptoSerializableAsync {
-    static async from(value) {
-        return (await super.from(value, CryptoRelationshipRequestSecrets_1));
-    }
-    static async deserialize(value) {
-        return (await super.deserialize(value, CryptoRelationshipRequestSecrets_1));
+let CryptoRelationshipRequestSecrets = CryptoRelationshipRequestSecrets_1 = class CryptoRelationshipRequestSecrets extends CryptoSerializable_1.CryptoSerializable {
+    static from(value) {
+        return this.fromAny(value);
     }
     async sign(content, algorithm = 1 /* SHA256 */) {
         return await CryptoSignatures_1.CryptoSignatures.sign(content, this.signatureKeypair.privateKey, algorithm);
@@ -47,8 +44,8 @@ let CryptoRelationshipRequestSecrets = CryptoRelationshipRequestSecrets_1 = clas
     async decryptRequest(cipher) {
         return await CryptoEncryption_1.CryptoEncryption.decrypt(cipher, this.secretKey);
     }
-    async toPublicRequest() {
-        return await CryptoRelationshipPublicRequest_1.CryptoRelationshipPublicRequest.from({
+    toPublicRequest() {
+        return CryptoRelationshipPublicRequest_1.CryptoRelationshipPublicRequest.from({
             id: this.id,
             exchangeKey: this.exchangeKeypair.publicKey,
             signatureKey: this.signatureKeypair.publicKey,
@@ -65,7 +62,7 @@ let CryptoRelationshipRequestSecrets = CryptoRelationshipRequestSecrets_1 = clas
         ]);
         const masterKey = await CryptoExchange_1.CryptoExchange.deriveRequestor(ephemeralKeypair, peerExchangeKey);
         const secretKey = await CryptoDerivation_1.CryptoDerivation.deriveKeyFromBase(masterKey.transmissionKey, 1, "REQTMP01");
-        return await CryptoRelationshipRequestSecrets_1.from({
+        return CryptoRelationshipRequestSecrets_1.from({
             exchangeKeypair: exchangeKeypair,
             ephemeralKeypair: ephemeralKeypair,
             signatureKeypair: signatureKeypair,

package/dist/relationship/CryptoRelationshipRequestSecrets.js.map

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

package/dist/relationship/CryptoRelationshipSecrets.d.ts

@@ -1,6 +1,6 @@
-import { ISerializableAsync } from "@js-soft/ts-serval";
+import { ISerializable } from "@js-soft/ts-serval";
 import { CoreBuffer } from "../CoreBuffer";
-import { CryptoSerializableAsync } from "../CryptoSerializableAsync";
+import { CryptoSerializable } from "../CryptoSerializable";
 import { CryptoCipher } from "../encryption/CryptoCipher";
 import { CryptoSecretKey, ICryptoSecretKey } from "../encryption/CryptoSecretKey";
 import { CryptoExchangeKeypair, ICryptoExchangeKeypair } from "../exchange/CryptoExchangeKeypair";
@@ -16,7 +16,7 @@ import { CryptoRelationshipPublicRequest } from "./CryptoRelationshipPublicReque
 import { CryptoRelationshipPublicResponse } from "./CryptoRelationshipPublicResponse";
 import { CryptoRelationshipRequestSecrets } from "./CryptoRelationshipRequestSecrets";
 import { CryptoRelationshipType } from "./CryptoRelationshipType";
-export interface ICryptoRelationshipSecrets extends ISerializableAsync {
+export interface ICryptoRelationshipSecrets extends ISerializable {
     id?: string;
     type: CryptoRelationshipType;
     exchangeKeypair: ICryptoExchangeKeypair;
@@ -29,7 +29,7 @@ export interface ICryptoRelationshipSecrets extends ISerializableAsync {
     peerIdentityKey?: ICryptoSignaturePublicKey;
     requestSecretKey: ICryptoSecretKey;
 }
-export declare class CryptoRelationshipSecrets extends CryptoSerializableAsync implements ICryptoRelationshipSecrets {
+export declare class CryptoRelationshipSecrets extends CryptoSerializable implements ICryptoRelationshipSecrets {
     id?: string;
     type: CryptoRelationshipType;
     exchangeKeypair: CryptoExchangeKeypair;
@@ -41,8 +41,7 @@ export declare class CryptoRelationshipSecrets extends CryptoSerializableAsync i
     peerTemplateKey: CryptoExchangePublicKey;
     peerIdentityKey?: CryptoSignaturePublicKey;
     requestSecretKey: CryptoSecretKey;
-    static from(value: ICryptoRelationshipSecrets): Promise<CryptoRelationshipSecrets>;
-    static deserialize(value: string): Promise<CryptoRelationshipSecrets>;
+    static from(value: ICryptoRelationshipSecrets): CryptoRelationshipSecrets;
     sign(content: CoreBuffer, algorithm?: CryptoHashAlgorithm): Promise<CryptoSignature>;
     verifyOwn(content: CoreBuffer, signature: CryptoSignature): Promise<boolean>;
     verifyPeer(content: CoreBuffer, signature: CryptoSignature): Promise<boolean>;
@@ -51,7 +50,7 @@ export declare class CryptoRelationshipSecrets extends CryptoSerializableAsync i
     decryptOwn(cipher: CryptoCipher): Promise<CoreBuffer>;
     decryptPeer(cipher: CryptoCipher, omitCounterCheck?: boolean): Promise<CoreBuffer>;
     decryptRequest(cipher: CryptoCipher): Promise<CoreBuffer>;
-    toPublicResponse(): Promise<CryptoRelationshipPublicResponse>;
+    toPublicResponse(): CryptoRelationshipPublicResponse;
     static fromRelationshipResponse(response: CryptoRelationshipPublicResponse, request: CryptoRelationshipRequestSecrets): Promise<CryptoRelationshipSecrets>;
     static fromRelationshipRequest(request: CryptoRelationshipPublicRequest, templateExchangeKeypair: CryptoExchangeKeypair): Promise<CryptoRelationshipSecrets>;
     static fromPeerNonce(peerExchangeKey: CryptoExchangePublicKey, peerTemplateKey: CryptoExchangePublicKey, peerSignatureKey: CryptoSignaturePublicKey, peerGeneratedNonce: CoreBuffer, templateExchangeKeypair: CryptoExchangeKeypair, peerIdentityKey?: CryptoSignaturePublicKey, peerType?: CryptoRelationshipType): Promise<CryptoRelationshipSecrets>;