tool-db 1.4.5 → 2.0.2

package/dist/types/message.d.ts

@@ -5,25 +5,52 @@ export declare enum VerifyResult {
     InvalidVerification = "InvalidVerification",
     CantOverwrite = "CantOverwrite",
     InvalidTimestamp = "InvalidTimestamp",
-    PubKeyMismatch = "PubKeyMismatch",
+    AddressMismatch = "AddressMismatch",
     NoProofOfWork = "NoProofOfWork",
     InvalidHashNonce = "InvalidHashNonce",
     InvalidSignature = "InvalidSignature",
     Verified = "Verified"
 }
 export interface VerificationData<T = any> {
+    /**
+     * Key/id
+     */
     k: string;
-    p: string;
+    /**
+     * Adress
+     */
+    a: string;
+    /**
+     * Nonce
+     */
     n: number;
+    /**
+     * Hash of JSON.stringify(value) + nonce
+     */
     h: string;
+    /**
+     * Timestamp this was created
+     */
     t: number;
+    /**
+     * Signature
+     */
     s: string;
+    /**
+     * Value
+     */
     v: T;
 }
 export declare type MessageType = "ping" | "pong" | "query" | "queryAck" | "subscribe" | "get" | "put" | "crdtPut" | "crdtGet" | "crdt" | "join" | "servers";
 export interface BaseMessage {
     type: MessageType;
+    /**
+     * Unique random id for the message, to ack back
+     */
     id: string;
+    /**
+     * Who was this message sent to already
+     */
     to: string[];
 }
 export interface JoinMessage extends BaseMessage {
@@ -58,21 +85,20 @@ export interface SubscribeMessage extends BaseMessage {
 }
 export interface GetMessage extends BaseMessage {
     type: "get";
+    /**
+     * key we want to get
+     */
     key: string;
 }
 export interface PutMessage<T = any> extends BaseMessage, VerificationData<T> {
     type: "put";
 }
-export interface CrdtPutMessage extends BaseMessage, VerificationData<string> {
+export interface CrdtPutMessage<T = any> extends BaseMessage, VerificationData<any> {
     type: "crdtPut";
+    crdt: string;
 }
-export interface CrdtGetMessage extends BaseMessage {
+export interface CrdtGetMessage<T = any> extends BaseMessage {
     type: "crdtGet";
     key: string;
 }
-export interface CrdtMessage extends BaseMessage {
-    type: "crdt";
-    key: string;
-    doc: string;
-}
-export declare type ToolDbMessage = JoinMessage | ServersMessage | PingMessage | PongMessage | QueryMessage | QueryAckMessage | SubscribeMessage | GetMessage | PutMessage | CrdtPutMessage | CrdtGetMessage | CrdtMessage;
+export declare type ToolDbMessage = JoinMessage | ServersMessage | PingMessage | PongMessage | QueryMessage | QueryAckMessage | SubscribeMessage | GetMessage | PutMessage | CrdtPutMessage | CrdtGetMessage;

package/dist/types/message.js

@@ -8,7 +8,7 @@ var VerifyResult;
     VerifyResult["InvalidVerification"] = "InvalidVerification";
     VerifyResult["CantOverwrite"] = "CantOverwrite";
     VerifyResult["InvalidTimestamp"] = "InvalidTimestamp";
-    VerifyResult["PubKeyMismatch"] = "PubKeyMismatch";
+    VerifyResult["AddressMismatch"] = "AddressMismatch";
     VerifyResult["NoProofOfWork"] = "NoProofOfWork";
     VerifyResult["InvalidHashNonce"] = "InvalidHashNonce";
     VerifyResult["InvalidSignature"] = "InvalidSignature";

package/dist/types/message.js.map

@@ -1 +1 @@
-{"version":3,"file":"message.js","sourceRoot":"","sources":["../../src/types/message.ts"],"names":[],"mappings":";;;AAEA,IAAY,YAWX;AAXD,WAAY,YAAY;IACtB,qEAAqD,CAAA;IACrD,2CAA2B,CAAA;IAC3B,2DAA2C,CAAA;IAC3C,+CAA+B,CAAA;IAC/B,qDAAqC,CAAA;IACrC,iDAAiC,CAAA;IACjC,+CAA+B,CAAA;IAC/B,qDAAqC,CAAA;IACrC,qDAAqC,CAAA;IACrC,qCAAqB,CAAA;AACvB,CAAC,EAXW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAWvB"}
+{"version":3,"file":"message.js","sourceRoot":"","sources":["../../src/types/message.ts"],"names":[],"mappings":";;;AAGA,IAAY,YAWX;AAXD,WAAY,YAAY;IACtB,qEAAqD,CAAA;IACrD,2CAA2B,CAAA;IAC3B,2DAA2C,CAAA;IAC3C,+CAA+B,CAAA;IAC/B,qDAAqC,CAAA;IACrC,mDAAmC,CAAA;IACnC,+CAA+B,CAAA;IAC/B,qDAAqC,CAAA;IACrC,qDAAqC,CAAA;IACrC,qCAAqB,CAAA;AACvB,CAAC,EAXW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAWvB"}

package/dist/types/tooldb.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+import { Account } from "web3-core";
 import { Server as HTTPServer } from "http";
 import { Server as HTTPSServer } from "https";
 import { ToolDb, ToolDbMessage } from "..";
@@ -13,7 +14,7 @@ export interface Peer {
     timestamp: number;
     host: string;
     port: number;
-    pubkey: string;
+    adress: string;
     sig: string;
 }
 export interface ToolDbStore {
@@ -25,28 +26,73 @@ export interface ToolDbStore {
 export declare type ToolDbStorageAdapter = (dbName?: string) => ToolDbStore;
 export declare type ToolDbMessageHandler = (this: ToolDb, message: ToolDbMessage, remotePeerId: string) => void;
 export interface ToolDbOptions {
+    /**
+     * Database name to use
+     */
     db: string;
+    /**
+     * Show debug console logs
+     */
     debug: boolean;
+    /**
+     * Array of peers to connect to
+     */
     peers: {
         host: string;
         port: number;
     }[];
+    /**
+     * Max number of tries when a connection fails
+     */
     maxRetries: number;
+    /**
+     * How long to wait (max) for a debounced key listener recv
+     */
     triggerDebouce: number;
+    /**
+     * How long to wait between retries
+     */
     wait: number;
+    /**
+     * Port to listen incoming connections (server only)
+     */
     pow: number;
+    /**
+     * Whether we are a server or not
+     */
     server: boolean;
+    /**
+     * A server instance like Express (server only)
+     */
     httpServer: HTTPServer | HTTPSServer | undefined;
+    /**
+     * Our hostname (server only)
+     */
     host: string;
+    /**
+     * Port to listen incoming connections (server only, default is 8080)
+     */
     port: number;
+    /**
+     * Our storage namespace (default is "tooldb")
+     */
     storageName: string;
+    /**
+     * A custom network adapter class
+     */
     networkAdapter: typeof ToolDbNetworkAdapter;
+    /**
+     * A custom storage adapter function
+     */
     storageAdapter: ToolDbStorageAdapter;
-    id: string;
+    /**
+     * The namespace/topic of our app (default is "tool-db-default")
+     */
     topic: string;
-    publicKey: CryptoKey | undefined;
-    privateKey: CryptoKey | undefined;
-    [extra: string]: any;
+    /**
+     * Peer's ETH account (generated at init, random)
+     */
+    peerAccount: Account;
 }
 export interface ParsedKeys {
     skpub: string;
@@ -62,12 +108,8 @@ export declare type GenericObject = {
     [key: string]: any;
 };
 export interface UserRootData {
-    keys: {
-        skpub: string;
-        skpriv: string;
-        ekpub: string;
-        ekpriv: string;
-    };
+    address: string;
+    privateKey: string;
     iv: string;
     pass: string;
 }

package/dist/types/tooldb.js.map

@@ -1 +1 @@
-{"version":3,"file":"tooldb.js","sourceRoot":"","sources":["../../src/types/tooldb.ts"],"names":[],"mappings":";;;AAIA;IACE,8BAAY,EAAU;QACpB,EAAE;IACJ,CAAC;IAEM,oCAAK,GAAZ,UAAa,QAAgB;QAC3B,EAAE;IACJ,CAAC;IAEM,wCAAS,GAAhB,UACE,GAAkB,EAClB,eAAuB,EACvB,OAAe;QADf,gCAAA,EAAA,uBAAuB;QACvB,wBAAA,EAAA,eAAe;QAEf,EAAE;IACJ,CAAC;IAEM,6CAAc,GAArB,UAAsB,QAAgB,EAAE,GAAkB;QACxD,EAAE;IACJ,CAAC;IACH,2BAAC;AAAD,CAAC,AApBD,IAoBC;AApBY,oDAAoB"}
+{"version":3,"file":"tooldb.js","sourceRoot":"","sources":["../../src/types/tooldb.ts"],"names":[],"mappings":";;;AAKA;IACE,8BAAY,EAAU;QACpB,EAAE;IACJ,CAAC;IAEM,oCAAK,GAAZ,UAAa,QAAgB;QAC3B,EAAE;IACJ,CAAC;IAEM,wCAAS,GAAhB,UACE,GAAkB,EAClB,eAAuB,EACvB,OAAe;QADf,gCAAA,EAAA,uBAAuB;QACvB,wBAAA,EAAA,eAAe;QAEf,EAAE;IACJ,CAAC;IAEM,6CAAc,GAArB,UAAsB,QAAgB,EAAE,GAAkB;QACxD,EAAE;IACJ,CAAC;IACH,2BAAC;AAAD,CAAC,AApBD,IAoBC;AApBY,oDAAoB"}

package/dist/utils/crypto/decodeKeyString.d.ts

@@ -1 +1 @@
-export default function decodeKeyString(keydataB64: string): ArrayBuffer;
+export default function decodeKeyString(keyDataHex: string): ArrayBuffer;

package/dist/utils/crypto/decodeKeyString.js

@@ -3,10 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var stringToArrayBuffer_1 = __importDefault(require("../stringToArrayBuffer"));
-function decodeKeyString(keydataB64) {
-    var keydataS = global.atob(keydataB64);
-    var keydata = (0, stringToArrayBuffer_1.default)(keydataS);
+var hexToArrayBuffer_1 = __importDefault(require("../encoding/hexToArrayBuffer"));
+function decodeKeyString(keyDataHex) {
+    var keydata = (0, hexToArrayBuffer_1.default)(keyDataHex);
     return keydata;
 }
 exports.default = decodeKeyString;

package/dist/utils/crypto/decodeKeyString.js.map

@@ -1 +1 @@
-{"version":3,"file":"decodeKeyString.js","sourceRoot":"","sources":["../../../src/utils/crypto/decodeKeyString.ts"],"names":[],"mappings":";;;;;AAAA,+EAAyD;AAEzD,SAAwB,eAAe,CAAC,UAAkB;IACxD,IAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACzC,IAAM,OAAO,GAAG,IAAA,6BAAmB,EAAC,QAAQ,CAAC,CAAC;IAC9C,OAAO,OAAO,CAAC;AACjB,CAAC;AAJD,kCAIC"}
+{"version":3,"file":"decodeKeyString.js","sourceRoot":"","sources":["../../../src/utils/crypto/decodeKeyString.ts"],"names":[],"mappings":";;;;;AAAA,kFAA4D;AAE5D,SAAwB,eAAe,CAAC,UAAkB;IACxD,IAAM,OAAO,GAAG,IAAA,0BAAgB,EAAC,UAAU,CAAC,CAAC;IAC7C,OAAO,OAAO,CAAC;AACjB,CAAC;AAHD,kCAGC"}

package/dist/utils/crypto/decryptData.js

@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var getCrypto_1 = __importDefault(require("../../getCrypto"));
-var arrayBufferToString_1 = __importDefault(require("../arrayBufferToString"));
-var base64ToUint8_1 = __importDefault(require("../base64ToUint8"));
+var arrayBufferToString_1 = __importDefault(require("../encoding/arrayBufferToString"));
+var base64ToUint8_1 = __importDefault(require("../encoding/base64ToUint8"));
 var catchReturn_1 = __importDefault(require("../catchReturn"));
-var stringToArrayBuffer_1 = __importDefault(require("../stringToArrayBuffer"));
+var stringToArrayBuffer_1 = __importDefault(require("../encoding/stringToArrayBuffer"));
 function decryptData(data, privateKey, iv) {
     var crypto = (0, getCrypto_1.default)();
     return crypto.subtle

package/dist/utils/crypto/decryptData.js.map

@@ -1 +1 @@
-{"version":3,"file":"decryptData.js","sourceRoot":"","sources":["../../../src/utils/crypto/decryptData.ts"],"names":[],"mappings":";;;;;AAAA,8DAAwC;AACxC,+EAAyD;AACzD,mEAA6C;AAC7C,+DAAyC;AACzC,+EAAyD;AAEzD,SAAwB,WAAW,CACjC,IAAY,EACZ,UAAqB,EACrB,EAAU;IAEV,IAAM,MAAM,GAAG,IAAA,mBAAS,GAAE,CAAC;IAC3B,OAAO,MAAM,CAAC,MAAM;SACjB,OAAO,CACN;QACE,IAAI,EAAE,SAAS;QACf,EAAE,EAAE,IAAA,uBAAa,EAAC,EAAE,CAAC;QACrB,SAAS,EAAE,GAAG,EAAE,6CAA6C;KAC9D,EACD,UAAU,EAAE,sCAAsC;IAClD,IAAA,6BAAmB,EAAC,IAAI,CAAC,CAAC,0BAA0B;KACrD;SACA,IAAI,CAAC,UAAC,SAAS;QACd,uDAAuD;QACvD,OAAO,IAAA,6BAAmB,EAAC,SAAS,CAAC,CAAC;IACxC,CAAC,CAAC;SACD,KAAK,CAAC,qBAAW,CAAC,CAAC;AACxB,CAAC;AArBD,8BAqBC"}
+{"version":3,"file":"decryptData.js","sourceRoot":"","sources":["../../../src/utils/crypto/decryptData.ts"],"names":[],"mappings":";;;;;AAAA,8DAAwC;AACxC,wFAAkE;AAClE,4EAAsD;AACtD,+DAAyC;AACzC,wFAAkE;AAElE,SAAwB,WAAW,CACjC,IAAY,EACZ,UAAqB,EACrB,EAAU;IAEV,IAAM,MAAM,GAAG,IAAA,mBAAS,GAAE,CAAC;IAC3B,OAAO,MAAM,CAAC,MAAM;SACjB,OAAO,CACN;QACE,IAAI,EAAE,SAAS;QACf,EAAE,EAAE,IAAA,uBAAa,EAAC,EAAE,CAAC;QACrB,SAAS,EAAE,GAAG,EAAE,6CAA6C;KAC9D,EACD,UAAU,EAAE,sCAAsC;IAClD,IAAA,6BAAmB,EAAC,IAAI,CAAC,CAAC,0BAA0B;KACrD;SACA,IAAI,CAAC,UAAC,SAAS;QACd,uDAAuD;QACvD,OAAO,IAAA,6BAAmB,EAAC,SAAS,CAAC,CAAC;IACxC,CAAC,CAAC;SACD,KAAK,CAAC,qBAAW,CAAC,CAAC;AACxB,CAAC;AArBD,8BAqBC"}

package/dist/utils/crypto/decryptWithPass.d.ts

@@ -1 +1 @@
-export default function decryptWithPass(data: string, password: string, vector: Uint8Array): Promise<string | undefined>;
+export default function decryptWithPass(data: ArrayBuffer, password: string, vector: Uint8Array): Promise<string | undefined>;

package/dist/utils/crypto/decryptWithPass.js

@@ -3,17 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var arrayBufferToString_1 = __importDefault(require("../arrayBufferToString"));
+var arrayBufferToString_1 = __importDefault(require("../encoding/arrayBufferToString"));
 var catchReturn_1 = __importDefault(require("../catchReturn"));
 var generateKeyFromPassword_1 = __importDefault(require("./generateKeyFromPassword"));
-var stringToArrayBuffer_1 = __importDefault(require("../stringToArrayBuffer"));
 var getCrypto_1 = __importDefault(require("../../getCrypto"));
 function decryptWithPass(data, password, vector) {
     var crypto = (0, getCrypto_1.default)();
     return (0, generateKeyFromPassword_1.default)(password)
         .then(function (keyObject) {
         return crypto.subtle
-            .decrypt({ name: "AES-GCM", iv: vector }, keyObject, (0, stringToArrayBuffer_1.default)(data))
+            .decrypt({ name: "AES-GCM", iv: vector }, keyObject, data)
             .then(function (result) { return (0, arrayBufferToString_1.default)(result); })
             .catch(catchReturn_1.default);
     })

package/dist/utils/crypto/decryptWithPass.js.map

@@ -1 +1 @@
-{"version":3,"file":"decryptWithPass.js","sourceRoot":"","sources":["../../../src/utils/crypto/decryptWithPass.ts"],"names":[],"mappings":";;;;;AAAA,+EAAyD;AACzD,+DAAyC;AACzC,sFAAgE;AAChE,+EAAyD;AACzD,8DAAwC;AAExC,SAAwB,eAAe,CACrC,IAAY,EACZ,QAAgB,EAChB,MAAkB;IAElB,IAAM,MAAM,GAAG,IAAA,mBAAS,GAAE,CAAC;IAC3B,OAAO,IAAA,iCAAuB,EAAC,QAAQ,CAAC;SACrC,IAAI,CAAC,UAAC,SAAS;QACd,OAAO,MAAM,CAAC,MAAM;aACjB,OAAO,CACN,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,EAC/B,SAAS,EACT,IAAA,6BAAmB,EAAC,IAAI,CAAC,CAC1B;aACA,IAAI,CAAC,UAAC,MAAM,IAAK,OAAA,IAAA,6BAAmB,EAAC,MAAM,CAAC,EAA3B,CAA2B,CAAC;aAC7C,KAAK,CAAC,qBAAW,CAAC,CAAC;IACxB,CAAC,CAAC;SACD,KAAK,CAAC,qBAAW,CAAC,CAAC;AACxB,CAAC;AAlBD,kCAkBC"}
+{"version":3,"file":"decryptWithPass.js","sourceRoot":"","sources":["../../../src/utils/crypto/decryptWithPass.ts"],"names":[],"mappings":";;;;;AAAA,wFAAkE;AAClE,+DAAyC;AACzC,sFAAgE;AAEhE,8DAAwC;AAExC,SAAwB,eAAe,CACrC,IAAiB,EACjB,QAAgB,EAChB,MAAkB;IAElB,IAAM,MAAM,GAAG,IAAA,mBAAS,GAAE,CAAC;IAC3B,OAAO,IAAA,iCAAuB,EAAC,QAAQ,CAAC;SACrC,IAAI,CAAC,UAAC,SAAS;QACd,OAAO,MAAM,CAAC,MAAM;aACjB,OAAO,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC;aACzD,IAAI,CAAC,UAAC,MAAM,IAAK,OAAA,IAAA,6BAAmB,EAAC,MAAM,CAAC,EAA3B,CAA2B,CAAC;aAC7C,KAAK,CAAC,qBAAW,CAAC,CAAC;IACxB,CAAC,CAAC;SACD,KAAK,CAAC,qBAAW,CAAC,CAAC;AACxB,CAAC;AAdD,kCAcC"}

package/dist/utils/crypto/encodeKeyString.js

@@ -3,11 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var arrayBufferToString_1 = __importDefault(require("../arrayBufferToString"));
+var arrayBufferToHex_1 = __importDefault(require("../encoding/arrayBufferToHex"));
 function encodeKeyString(keydata) {
-    var keydataS = (0, arrayBufferToString_1.default)(keydata);
-    var keydataB64 = global.btoa(keydataS);
-    return keydataB64;
+    var keydataHexed = (0, arrayBufferToHex_1.default)(keydata);
+    return keydataHexed;
 }
 exports.default = encodeKeyString;
 //# sourceMappingURL=encodeKeyString.js.map

package/dist/utils/crypto/encodeKeyString.js.map

@@ -1 +1 @@
-{"version":3,"file":"encodeKeyString.js","sourceRoot":"","sources":["../../../src/utils/crypto/encodeKeyString.ts"],"names":[],"mappings":";;;;;AAAA,+EAAyD;AAEzD,SAAwB,eAAe,CAAC,OAAoB;IAC1D,IAAM,QAAQ,GAAG,IAAA,6BAAmB,EAAC,OAAO,CAAC,CAAC;IAC9C,IAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACzC,OAAO,UAAU,CAAC;AACpB,CAAC;AAJD,kCAIC"}
+{"version":3,"file":"encodeKeyString.js","sourceRoot":"","sources":["../../../src/utils/crypto/encodeKeyString.ts"],"names":[],"mappings":";;;;;AAAA,kFAA4D;AAE5D,SAAwB,eAAe,CAAC,OAAoB;IAC1D,IAAM,YAAY,GAAG,IAAA,0BAAgB,EAAC,OAAO,CAAC,CAAC;IAC/C,OAAO,YAAY,CAAC;AACtB,CAAC;AAHD,kCAGC"}

package/dist/utils/crypto/encryptData.d.ts

@@ -1 +1 @@
-export default function encryptData(data: string, publicKey: CryptoKey, iv: Uint8Array): Promise<string | void>;
+export default function encryptData(data: string, publicKey: CryptoKey, iv: Uint8Array): Promise<ArrayBuffer | void>;

package/dist/utils/crypto/encryptData.js

@@ -4,8 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var getCrypto_1 = __importDefault(require("../../getCrypto"));
-var arrayBufferToString_1 = __importDefault(require("../arrayBufferToString"));
-var stringToArrayBuffer_1 = __importDefault(require("../stringToArrayBuffer"));
+var stringToArrayBuffer_1 = __importDefault(require("../encoding/stringToArrayBuffer"));
 function encryptData(data, publicKey, iv) {
     var crypto = (0, getCrypto_1.default)();
     return crypto.subtle
@@ -20,10 +19,6 @@ function encryptData(data, publicKey, iv) {
     }, publicKey, // from generateKey or importKey above
     (0, stringToArrayBuffer_1.default)(data) // ArrayBuffer of data you want to encrypt
     )
-        .then(function (encrypted) {
-        // returns an ArrayBuffer containing the encrypted data
-        return (0, arrayBufferToString_1.default)(encrypted);
-    })
         .catch(console.error);
 }
 exports.default = encryptData;

package/dist/utils/crypto/encryptData.js.map

@@ -1 +1 @@
-{"version":3,"file":"encryptData.js","sourceRoot":"","sources":["../../../src/utils/crypto/encryptData.ts"],"names":[],"mappings":";;;;;AAAA,8DAAwC;AACxC,+EAAyD;AACzD,+EAAyD;AAEzD,SAAwB,WAAW,CACjC,IAAY,EACZ,SAAoB,EACpB,EAAc;IAEd,IAAM,MAAM,GAAG,IAAA,mBAAS,GAAE,CAAC;IAC3B,OAAO,MAAM,CAAC,MAAM;SACjB,OAAO,CACN;QACE,IAAI,EAAE,SAAS;QACf,uCAAuC;QACvC,oDAAoD;QACpD,qCAAqC;QACrC,EAAE,IAAA;QACF,wBAAwB;QACxB,SAAS,EAAE,GAAG,EAAE,oDAAoD;KACrE,EACD,SAAS,EAAE,sCAAsC;IACjD,IAAA,6BAAmB,EAAC,IAAI,CAAC,CAAC,0CAA0C;KACrE;SACA,IAAI,CAAC,UAAC,SAAS;QACd,uDAAuD;QACvD,OAAO,IAAA,6BAAmB,EAAC,SAAS,CAAC,CAAC;IACxC,CAAC,CAAC;SACD,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC1B,CAAC;AAzBD,8BAyBC"}
+{"version":3,"file":"encryptData.js","sourceRoot":"","sources":["../../../src/utils/crypto/encryptData.ts"],"names":[],"mappings":";;;;;AAAA,8DAAwC;AAExC,wFAAkE;AAElE,SAAwB,WAAW,CACjC,IAAY,EACZ,SAAoB,EACpB,EAAc;IAEd,IAAM,MAAM,GAAG,IAAA,mBAAS,GAAE,CAAC;IAC3B,OAAO,MAAM,CAAC,MAAM;SACjB,OAAO,CACN;QACE,IAAI,EAAE,SAAS;QACf,uCAAuC;QACvC,oDAAoD;QACpD,qCAAqC;QACrC,EAAE,IAAA;QACF,wBAAwB;QACxB,SAAS,EAAE,GAAG,EAAE,oDAAoD;KACrE,EACD,SAAS,EAAE,sCAAsC;IACjD,IAAA,6BAAmB,EAAC,IAAI,CAAC,CAAC,0CAA0C;KACrE;SACA,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC1B,CAAC;AArBD,8BAqBC"}

package/dist/utils/crypto/encryptWithPass.d.ts

@@ -1 +1 @@
-export default function encryptWithPass(secretmessage: string, password: string, vector: Uint8Array): Promise<string | undefined>;
+export default function encryptWithPass(secretmessage: string, password: string, vector: Uint8Array): Promise<ArrayBuffer | undefined>;

package/dist/utils/crypto/encryptWithPass.js

@@ -3,10 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var arrayBufferToString_1 = __importDefault(require("../arrayBufferToString"));
 var catchReturn_1 = __importDefault(require("../catchReturn"));
 var generateKeyFromPassword_1 = __importDefault(require("./generateKeyFromPassword"));
-var stringToArrayBuffer_1 = __importDefault(require("../stringToArrayBuffer"));
+var stringToArrayBuffer_1 = __importDefault(require("../encoding/stringToArrayBuffer"));
 var getCrypto_1 = __importDefault(require("../../getCrypto"));
 function encryptWithPass(secretmessage, password, vector) {
     var crypto = (0, getCrypto_1.default)();
@@ -15,9 +14,6 @@ function encryptWithPass(secretmessage, password, vector) {
         // encrypt promise
         return crypto.subtle
             .encrypt({ name: "AES-GCM", iv: vector }, keyObject, (0, stringToArrayBuffer_1.default)(secretmessage))
-            .then(function (result) {
-            return (0, arrayBufferToString_1.default)(result);
-        })
             .catch(catchReturn_1.default);
     })
         .catch(catchReturn_1.default);

package/dist/utils/crypto/encryptWithPass.js.map

@@ -1 +1 @@
-{"version":3,"file":"encryptWithPass.js","sourceRoot":"","sources":["../../../src/utils/crypto/encryptWithPass.ts"],"names":[],"mappings":";;;;;AAAA,+EAAyD;AACzD,+DAAyC;AACzC,sFAAgE;AAChE,+EAAyD;AACzD,8DAAwC;AAExC,SAAwB,eAAe,CACrC,aAAqB,EACrB,QAAgB,EAChB,MAAkB;IAElB,IAAM,MAAM,GAAG,IAAA,mBAAS,GAAE,CAAC;IAC3B,OAAO,IAAA,iCAAuB,EAAC,QAAQ,CAAC;SACrC,IAAI,CAAC,UAAC,SAAS;QACd,kBAAkB;QAClB,OAAO,MAAM,CAAC,MAAM;aACjB,OAAO,CACN,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,EAC/B,SAAS,EACT,IAAA,6BAAmB,EAAC,aAAa,CAAC,CACnC;aACA,IAAI,CAAC,UAAC,MAAM;YACX,OAAO,IAAA,6BAAmB,EAAC,MAAM,CAAC,CAAC;QACrC,CAAC,CAAC;aACD,KAAK,CAAC,qBAAW,CAAC,CAAC;IACxB,CAAC,CAAC;SACD,KAAK,CAAC,qBAAW,CAAC,CAAC;AACxB,CAAC;AArBD,kCAqBC"}
+{"version":3,"file":"encryptWithPass.js","sourceRoot":"","sources":["../../../src/utils/crypto/encryptWithPass.ts"],"names":[],"mappings":";;;;;AAAA,+DAAyC;AACzC,sFAAgE;AAChE,wFAAkE;AAClE,8DAAwC;AAExC,SAAwB,eAAe,CACrC,aAAqB,EACrB,QAAgB,EAChB,MAAkB;IAElB,IAAM,MAAM,GAAG,IAAA,mBAAS,GAAE,CAAC;IAC3B,OAAO,IAAA,iCAAuB,EAAC,QAAQ,CAAC;SACrC,IAAI,CAAC,UAAC,SAAS;QACd,kBAAkB;QAClB,OAAO,MAAM,CAAC,MAAM;aACjB,OAAO,CACN,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,EAC/B,SAAS,EACT,IAAA,6BAAmB,EAAC,aAAa,CAAC,CACnC;aACA,KAAK,CAAC,qBAAW,CAAC,CAAC;IACxB,CAAC,CAAC;SACD,KAAK,CAAC,qBAAW,CAAC,CAAC;AACxB,CAAC;AAlBD,kCAkBC"}

package/dist/utils/crypto/generateKeyFromPassword.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var getCrypto_1 = __importDefault(require("../../getCrypto"));
-var stringToArrayBuffer_1 = __importDefault(require("../stringToArrayBuffer"));
+var stringToArrayBuffer_1 = __importDefault(require("../encoding/stringToArrayBuffer"));
 function generateKeyFromPassword(password) {
     var crypto = (0, getCrypto_1.default)();
     return crypto.subtle

package/dist/utils/crypto/generateKeyFromPassword.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateKeyFromPassword.js","sourceRoot":"","sources":["../../../src/utils/crypto/generateKeyFromPassword.ts"],"names":[],"mappings":";;;;;AAAA,8DAAwC;AACxC,+EAAyD;AAEzD,SAAwB,uBAAuB,CAAC,QAAgB;IAC9D,IAAM,MAAM,GAAG,IAAA,mBAAS,GAAE,CAAC;IAC3B,OAAO,MAAM,CAAC,MAAM;SACjB,SAAS,CACR,KAAK,EACL,IAAA,6BAAmB,EAAC,QAAQ,CAAC,EAC7B,EAAE,IAAI,EAAE,QAAQ,EAAE,EAClB,KAAK,EACL,CAAC,WAAW,CAAC,CACd;SACA,IAAI,CAAC,UAAC,gBAAgB;QACrB,OAAO,MAAM,CAAC,MAAM,CAAC,SAAS,CAC5B;YACE,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,IAAA,6BAAmB,EAAC,uBAAuB,CAAC;YAClD,UAAU,EAAE,MAAM;YAClB,IAAI,EAAE,SAAS;SAChB,EACD,gBAAgB,EAChB;YACE,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,GAAG;SACZ,EACD,KAAK,EACL,CAAC,SAAS,EAAE,SAAS,CAAC,CACvB,CAAC;IACJ,CAAC,CAAC,CAAC;AACP,CAAC;AA3BD,0CA2BC"}
+{"version":3,"file":"generateKeyFromPassword.js","sourceRoot":"","sources":["../../../src/utils/crypto/generateKeyFromPassword.ts"],"names":[],"mappings":";;;;;AAAA,8DAAwC;AACxC,wFAAkE;AAElE,SAAwB,uBAAuB,CAAC,QAAgB;IAC9D,IAAM,MAAM,GAAG,IAAA,mBAAS,GAAE,CAAC;IAC3B,OAAO,MAAM,CAAC,MAAM;SACjB,SAAS,CACR,KAAK,EACL,IAAA,6BAAmB,EAAC,QAAQ,CAAC,EAC7B,EAAE,IAAI,EAAE,QAAQ,EAAE,EAClB,KAAK,EACL,CAAC,WAAW,CAAC,CACd;SACA,IAAI,CAAC,UAAC,gBAAgB;QACrB,OAAO,MAAM,CAAC,MAAM,CAAC,SAAS,CAC5B;YACE,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,IAAA,6BAAmB,EAAC,uBAAuB,CAAC;YAClD,UAAU,EAAE,MAAM;YAClB,IAAI,EAAE,SAAS;SAChB,EACD,gBAAgB,EAChB;YACE,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,GAAG;SACZ,EACD,KAAK,EACL,CAAC,SAAS,EAAE,SAAS,CAAC,CACvB,CAAC;IACJ,CAAC,CAAC,CAAC;AACP,CAAC;AA3BD,0CA2BC"}

package/dist/utils/crypto/loadKeysComb.js

@@ -40,25 +40,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var catchReturn_1 = __importDefault(require("../catchReturn"));
-var decodeKeyString_1 = __importDefault(require("./decodeKeyString"));
+var hexToArrayBuffer_1 = __importDefault(require("../encoding/hexToArrayBuffer"));
 var importKey_1 = __importDefault(require("./importKey"));
 function importKeys(parsedKeys) {
     return __awaiter(this, void 0, void 0, function () {
-        var skpub, skpriv, ekpub, ekpriv;
+        var skpriv, ekpriv, skpub, ekpub;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, (0, importKey_1.default)((0, decodeKeyString_1.default)(parsedKeys.skpub), "spki", "ECDSA", ["verify"]).catch(catchReturn_1.default)];
+                case 0: return [4 /*yield*/, (0, importKey_1.default)((0, hexToArrayBuffer_1.default)(parsedKeys.skpriv), "pkcs8", "ECDSA", ["sign"]).catch(catchReturn_1.default)];
                 case 1:
-                    skpub = _a.sent();
-                    return [4 /*yield*/, (0, importKey_1.default)((0, decodeKeyString_1.default)(parsedKeys.skpriv), "pkcs8", "ECDSA", ["sign"]).catch(catchReturn_1.default)];
-                case 2:
                     skpriv = _a.sent();
-                    return [4 /*yield*/, (0, importKey_1.default)((0, decodeKeyString_1.default)(parsedKeys.ekpub), "spki", "ECDH", []).catch(catchReturn_1.default)];
+                    return [4 /*yield*/, (0, importKey_1.default)((0, hexToArrayBuffer_1.default)(parsedKeys.ekpriv), "pkcs8", "ECDH", ["deriveKey", "deriveBits"]).catch(catchReturn_1.default)];
+                case 2:
+                    ekpriv = _a.sent();
+                    return [4 /*yield*/, (0, importKey_1.default)((0, hexToArrayBuffer_1.default)(parsedKeys.skpub), "spki", "ECDSA", ["verify"]).catch(catchReturn_1.default)];
                 case 3:
-                    ekpub = _a.sent();
-                    return [4 /*yield*/, (0, importKey_1.default)((0, decodeKeyString_1.default)(parsedKeys.ekpriv), "pkcs8", "ECDH", ["deriveKey", "deriveBits"]).catch(catchReturn_1.default)];
+                    skpub = _a.sent();
+                    return [4 /*yield*/, (0, importKey_1.default)((0, hexToArrayBuffer_1.default)(parsedKeys.ekpub), "spki", "ECDH", []).catch(catchReturn_1.default)];
                 case 4:
-                    ekpriv = _a.sent();
+                    ekpub = _a.sent();
                     return [2 /*return*/, { skpub: skpub, skpriv: skpriv, ekpub: ekpub, ekpriv: ekpriv }];
             }
         });

package/dist/utils/crypto/loadKeysComb.js.map

@@ -1 +1 @@
-{"version":3,"file":"loadKeysComb.js","sourceRoot":"","sources":["../../../src/utils/crypto/loadKeysComb.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+DAAyC;AACzC,sEAAgD;AAChD,0DAAoC;AAEpC,SAAe,UAAU,CAAC,UAAsB;;;;;wBAChC,qBAAM,IAAA,mBAAS,EAC3B,IAAA,yBAAe,EAAC,UAAU,CAAC,KAAK,CAAC,EACjC,MAAM,EACN,OAAO,EACP,CAAC,QAAQ,CAAC,CACX,CAAC,KAAK,CAAC,qBAAW,CAAC,EAAA;;oBALd,KAAK,GAAG,SAKM;oBAEL,qBAAM,IAAA,mBAAS,EAC5B,IAAA,yBAAe,EAAC,UAAU,CAAC,MAAM,CAAC,EAClC,OAAO,EACP,OAAO,EACP,CAAC,MAAM,CAAC,CACT,CAAC,KAAK,CAAC,qBAAW,CAAC,EAAA;;oBALd,MAAM,GAAG,SAKK;oBAEN,qBAAM,IAAA,mBAAS,EAC3B,IAAA,yBAAe,EAAC,UAAU,CAAC,KAAK,CAAC,EACjC,MAAM,EACN,MAAM,EACN,EAAE,CACH,CAAC,KAAK,CAAC,qBAAW,CAAC,EAAA;;oBALd,KAAK,GAAG,SAKM;oBAEL,qBAAM,IAAA,mBAAS,EAC5B,IAAA,yBAAe,EAAC,UAAU,CAAC,MAAM,CAAC,EAClC,OAAO,EACP,MAAM,EACN,CAAC,WAAW,EAAE,YAAY,CAAC,CAC5B,CAAC,KAAK,CAAC,qBAAW,CAAC,EAAA;;oBALd,MAAM,GAAG,SAKK;oBAEpB,sBAAO,EAAE,KAAK,OAAA,EAAE,MAAM,QAAA,EAAE,KAAK,OAAA,EAAE,MAAM,QAAA,EAAE,EAAC;;;;CACzC;AAED,SAAwB,YAAY,CAAC,UAAsB;IAOzD,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACjC,UAAU,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,UAAC,EAAgC;gBAA9B,KAAK,WAAA,EAAE,MAAM,YAAA,EAAE,KAAK,WAAA,EAAE,MAAM,YAAA;YACzD,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,EAAE;gBAC1C,MAAM,CAAC,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC,CAAC;aAC5C;iBAAM;gBACL,OAAO,CAAC;oBACN,QAAQ,EAAE;wBACR,SAAS,EAAE,KAAK;wBAChB,UAAU,EAAE,MAAM;qBACnB;oBACD,cAAc,EAAE;wBACd,SAAS,EAAE,KAAK;wBAChB,UAAU,EAAE,MAAM;qBACnB;iBACF,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAzBD,+BAyBC"}
+{"version":3,"file":"loadKeysComb.js","sourceRoot":"","sources":["../../../src/utils/crypto/loadKeysComb.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+DAAyC;AACzC,kFAA4D;AAE5D,0DAAoC;AAEpC,SAAe,UAAU,CAAC,UAAsB;;;;;wBAC/B,qBAAM,IAAA,mBAAS,EAC5B,IAAA,0BAAgB,EAAC,UAAU,CAAC,MAAM,CAAC,EACnC,OAAO,EACP,OAAO,EACP,CAAC,MAAM,CAAC,CACT,CAAC,KAAK,CAAC,qBAAW,CAAC,EAAA;;oBALd,MAAM,GAAG,SAKK;oBAEL,qBAAM,IAAA,mBAAS,EAC5B,IAAA,0BAAgB,EAAC,UAAU,CAAC,MAAM,CAAC,EACnC,OAAO,EACP,MAAM,EACN,CAAC,WAAW,EAAE,YAAY,CAAC,CAC5B,CAAC,KAAK,CAAC,qBAAW,CAAC,EAAA;;oBALd,MAAM,GAAG,SAKK;oBAEN,qBAAM,IAAA,mBAAS,EAC3B,IAAA,0BAAgB,EAAC,UAAU,CAAC,KAAK,CAAC,EAClC,MAAM,EACN,OAAO,EACP,CAAC,QAAQ,CAAC,CACX,CAAC,KAAK,CAAC,qBAAW,CAAC,EAAA;;oBALd,KAAK,GAAG,SAKM;oBAEN,qBAAM,IAAA,mBAAS,EAC3B,IAAA,0BAAgB,EAAC,UAAU,CAAC,KAAK,CAAC,EAClC,MAAM,EACN,MAAM,EACN,EAAE,CACH,CAAC,KAAK,CAAC,qBAAW,CAAC,EAAA;;oBALd,KAAK,GAAG,SAKM;oBAEpB,sBAAO,EAAE,KAAK,OAAA,EAAE,MAAM,QAAA,EAAE,KAAK,OAAA,EAAE,MAAM,QAAA,EAAE,EAAC;;;;CACzC;AAED,SAAwB,YAAY,CAAC,UAAsB;IAOzD,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACjC,UAAU,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,UAAC,EAAgC;gBAA9B,KAAK,WAAA,EAAE,MAAM,YAAA,EAAE,KAAK,WAAA,EAAE,MAAM,YAAA;YACzD,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,EAAE;gBAC1C,MAAM,CAAC,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC,CAAC;aAC5C;iBAAM;gBACL,OAAO,CAAC;oBACN,QAAQ,EAAE;wBACR,SAAS,EAAE,KAAK;wBAChB,UAAU,EAAE,MAAM;qBACnB;oBACD,cAAc,EAAE;wBACd,SAAS,EAAE,KAAK;wBAChB,UAAU,EAAE,MAAM;qBACnB;iBACF,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAzBD,+BAyBC"}

package/dist/utils/crypto/recoverPubKey.d.ts

@@ -1 +1 @@
-export default function recoverPubKey(origMessage: string, signature: ArrayBuffer): [string, string];
+export default function recoverPubKey(origMessage: string, signature: ArrayBuffer, compareToHex?: string): string;

package/dist/utils/crypto/recoverPubKey.js

@@ -3,11 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var arrayBufferToHex_1 = __importDefault(require("../arrayBufferToHex"));
-var ecCurve = typeof window === "undefined"
-    ? global.ecp256
-    : window.ecp256;
-function recoverPubKey(origMessage, signature) {
+var arrayBufferToHex_1 = __importDefault(require("../encoding/arrayBufferToHex"));
+function recoverPubKey(origMessage, signature, compareToHex) {
+    var ecCurve = typeof window === "undefined"
+        ? global.ecp256
+        : window.ecp256;
     // function hexToDec(hex: string) {
     //   return new BN(hex, 16);
     // }
@@ -19,9 +19,15 @@ function recoverPubKey(origMessage, signature) {
         r: (0, arrayBufferToHex_1.default)(signature.slice(0, 32)),
         s: (0, arrayBufferToHex_1.default)(signature.slice(32, 64)),
     };
+    // THIS IS SLOW! We shouldnt use this on browsers or nodejs at all
     var keyA = ecCurve.recoverPubKey(msg, ecSig, 0).encode("hex");
     var keyB = ecCurve.recoverPubKey(msg, ecSig, 1).encode("hex");
-    return [keyA, keyB];
+    var pubKeyString = keyA;
+    if (keyA.slice(-40) === (compareToHex === null || compareToHex === void 0 ? void 0 : compareToHex.slice(-40)))
+        pubKeyString = keyA;
+    if (keyB.slice(-40) === (compareToHex === null || compareToHex === void 0 ? void 0 : compareToHex.slice(-40)))
+        pubKeyString = keyB;
+    return pubKeyString;
 }
 exports.default = recoverPubKey;
 //# sourceMappingURL=recoverPubKey.js.map

package/dist/utils/crypto/recoverPubKey.js.map

@@ -1 +1 @@
-{"version":3,"file":"recoverPubKey.js","sourceRoot":"","sources":["../../../src/utils/crypto/recoverPubKey.ts"],"names":[],"mappings":";;;;;AAEA,yEAAmD;AAEnD,IAAM,OAAO,GACX,OAAO,MAAM,KAAK,WAAW;IAC3B,CAAC,CAAG,MAAc,CAAC,MAAa;IAChC,CAAC,CAAG,MAAc,CAAC,MAAa,CAAC;AAErC,SAAwB,aAAa,CACnC,WAAmB,EACnB,SAAsB;IAEtB,mCAAmC;IACnC,4BAA4B;IAC5B,IAAI;IAEJ,IAAM,YAAY,GAAG,UAAC,CAAS;QAC7B,OAAA,OAAO,CAAC,cAAc,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,UAAU,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;IAA1D,CAA0D,CAAC;IAE7D,IAAM,GAAG,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;IAEtC,IAAM,KAAK,GAAG;QACZ,CAAC,EAAE,IAAA,0BAAgB,EAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC3C,CAAC,EAAE,IAAA,0BAAgB,EAAC,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;KAC7C,CAAC;IAEF,IAAM,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAChE,IAAM,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAChE,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACtB,CAAC;AArBD,gCAqBC"}
+{"version":3,"file":"recoverPubKey.js","sourceRoot":"","sources":["../../../src/utils/crypto/recoverPubKey.ts"],"names":[],"mappings":";;;;;AAEA,kFAA4D;AAE5D,SAAwB,aAAa,CACnC,WAAmB,EACnB,SAAsB,EACtB,YAAqB;IAErB,IAAM,OAAO,GACX,OAAO,MAAM,KAAK,WAAW;QAC3B,CAAC,CAAG,MAAc,CAAC,MAAa;QAChC,CAAC,CAAG,MAAc,CAAC,MAAa,CAAC;IAErC,mCAAmC;IACnC,4BAA4B;IAC5B,IAAI;IAEJ,IAAM,YAAY,GAAG,UAAC,CAAS;QAC7B,OAAA,OAAO,CAAC,cAAc,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,UAAU,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;IAA1D,CAA0D,CAAC;IAE7D,IAAM,GAAG,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;IAEtC,IAAM,KAAK,GAAG;QACZ,CAAC,EAAE,IAAA,0BAAgB,EAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC3C,CAAC,EAAE,IAAA,0BAAgB,EAAC,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;KAC7C,CAAC;IAEF,kEAAkE;IAClE,IAAM,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAChE,IAAM,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAEhE,IAAI,YAAY,GAAG,IAAI,CAAC;IACxB,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,MAAK,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAA;QAAE,YAAY,GAAG,IAAI,CAAC;IACtE,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,MAAK,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAA;QAAE,YAAY,GAAG,IAAI,CAAC;IAEtE,OAAO,YAAY,CAAC;AACtB,CAAC;AAjCD,gCAiCC"}

package/dist/utils/crypto/saveSignKeys.d.ts

@@ -1,2 +1,2 @@
 import { Keys } from "../../types/tooldb";
-export default function saveKeysComb(signKeys: CryptoKeyPair): Promise<Keys>;
+export default function saveSignKeys(signKeys: CryptoKeyPair): Promise<Keys>;

package/dist/utils/crypto/saveSignKeys.js

@@ -41,7 +41,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var encodeKeyString_1 = __importDefault(require("./encodeKeyString"));
 var exportKey_1 = __importDefault(require("./exportKey"));
-function saveKeysComb(signKeys) {
+function saveSignKeys(signKeys) {
     return __awaiter(this, void 0, void 0, function () {
         var skpub, skpriv, jsonKeys;
         return __generator(this, function (_a) {
@@ -63,5 +63,5 @@ function saveKeysComb(signKeys) {
         });
     });
 }
-exports.default = saveKeysComb;
+exports.default = saveSignKeys;
 //# sourceMappingURL=saveSignKeys.js.map

package/dist/utils/crypto/verifyData.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var getCrypto_1 = __importDefault(require("../../getCrypto"));
-var stringToArrayBuffer_1 = __importDefault(require("../stringToArrayBuffer"));
+var stringToArrayBuffer_1 = __importDefault(require("../encoding/stringToArrayBuffer"));
 function verifyData(data, signature, publicKey, hashName) {
     if (hashName === void 0) { hashName = "SHA-256"; }
     var crypto = (0, getCrypto_1.default)();

package/dist/utils/crypto/verifyData.js.map

@@ -1 +1 @@
-{"version":3,"file":"verifyData.js","sourceRoot":"","sources":["../../../src/utils/crypto/verifyData.ts"],"names":[],"mappings":";;;;;AAAA,8DAAwC;AACxC,+EAAyD;AAEzD,SAAwB,UAAU,CAChC,IAAY,EACZ,SAAsB,EACtB,SAAoB,EACpB,QAAoB;IAApB,yBAAA,EAAA,oBAAoB;IAEpB,IAAM,MAAM,GAAG,IAAA,mBAAS,GAAE,CAAC;IAC3B,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CACzB;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,qDAAqD;KAChF,EACD,SAAS,EAAE,sCAAsC;IACjD,SAAS,EAAE,+BAA+B;IAC1C,IAAA,6BAAmB,EAAC,IAAI,CAAC,CAAC,0BAA0B;KACrD,CAAC;AACJ,CAAC;AAhBD,6BAgBC"}
+{"version":3,"file":"verifyData.js","sourceRoot":"","sources":["../../../src/utils/crypto/verifyData.ts"],"names":[],"mappings":";;;;;AAAA,8DAAwC;AACxC,wFAAkE;AAElE,SAAwB,UAAU,CAChC,IAAY,EACZ,SAAsB,EACtB,SAAoB,EACpB,QAAoB;IAApB,yBAAA,EAAA,oBAAoB;IAEpB,IAAM,MAAM,GAAG,IAAA,mBAAS,GAAE,CAAC;IAC3B,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CACzB;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,qDAAqD;KAChF,EACD,SAAS,EAAE,sCAAsC;IACjD,SAAS,EAAE,+BAA+B;IAC1C,IAAA,6BAAmB,EAAC,IAAI,CAAC,CAAC,0BAA0B;KACrD,CAAC;AACJ,CAAC;AAhBD,6BAgBC"}

package/dist/utils/encoding/arrayBufferToHex.js

@@ -13,7 +13,7 @@ function arrayBufferToHex(buffer) {
         }
         hex += c;
     }
-    return hex.toUpperCase();
+    return hex.toLowerCase();
 }
 exports.default = arrayBufferToHex;
 //# sourceMappingURL=arrayBufferToHex.js.map

package/dist/utils/encoding/base64ToHex.js

@@ -7,7 +7,7 @@ function base64ToHex(str) {
         var hex = raw.charCodeAt(i).toString(16);
         result += hex.length === 2 ? hex : "0" + hex;
     }
-    return result.toUpperCase();
+    return result.toLowerCase();
 }
 exports.default = base64ToHex;
 //# sourceMappingURL=base64ToHex.js.map

package/dist/utils/encoding/uint8ArrayToHex.d.ts

@@ -1,2 +1 @@
-import Automerge from "automerge";
-export default function uint8ArrayToHex(binary: Uint8Array | Automerge.BinaryDocument): string;
+export default function uint8ArrayToHex(binary: Uint8Array): string;

package/dist/utils/encoding/uint8ArrayToHex.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 function uint8ArrayToHex(binary) {
-    return Buffer.from(binary).toString("hex").toUpperCase();
+    return Buffer.from(binary).toString("hex").toLowerCase();
 }
 exports.default = uint8ArrayToHex;
 //# sourceMappingURL=uint8ArrayToHex.js.map

package/dist/utils/encoding/uint8ArrayToHex.js.map

@@ -1 +1 @@
-{"version":3,"file":"uint8ArrayToHex.js","sourceRoot":"","sources":["../../../src/utils/encoding/uint8ArrayToHex.ts"],"names":[],"mappings":";;AAEA,SAAwB,eAAe,CACrC,MAA6C;IAE7C,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;AAC3D,CAAC;AAJD,kCAIC"}
+{"version":3,"file":"uint8ArrayToHex.js","sourceRoot":"","sources":["../../../src/utils/encoding/uint8ArrayToHex.ts"],"names":[],"mappings":";;AAAA,SAAwB,eAAe,CAAC,MAAkB;IACxD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;AAC3D,CAAC;AAFD,kCAEC"}

package/dist/utils/encoding/uint8ToBase64.d.ts

@@ -1,2 +1 @@
-import { BinaryChange } from "automerge";
-export default function uint8ToBase64(byteArray: Uint8Array | BinaryChange): string;
+export default function uint8ToBase64(byteArray: Uint8Array): string;

package/dist/utils/encoding/uint8ToBase64.js.map

@@ -1 +1 @@
-{"version":3,"file":"uint8ToBase64.js","sourceRoot":"","sources":["../../../src/utils/encoding/uint8ToBase64.ts"],"names":[],"mappings":";;;;;AACA,wDAAkC;AAElC,SAAwB,aAAa,CACnC,SAAoC;IAEpC,IAAI,UAAU,GAAG,EAAE,CAAC;IACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,EAAE;QAChD,UAAU,IAAI,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;KAClD;IAED,OAAO,IAAA,kBAAQ,EAAC,UAAU,CAAC,CAAC;AAC9B,CAAC;AATD,gCASC"}
+{"version":3,"file":"uint8ToBase64.js","sourceRoot":"","sources":["../../../src/utils/encoding/uint8ToBase64.ts"],"names":[],"mappings":";;;;;AAAA,wDAAkC;AAElC,SAAwB,aAAa,CAAC,SAAqB;IACzD,IAAI,UAAU,GAAG,EAAE,CAAC;IACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,EAAE;QAChD,UAAU,IAAI,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;KAClD;IAED,OAAO,IAAA,kBAAQ,EAAC,UAAU,CAAC,CAAC;AAC9B,CAAC;AAPD,gCAOC"}

package/dist/utils/getPeerSignature.d.ts

@@ -1 +1,2 @@
-export default function getPeerSignature(privateKey: CryptoKey, topic: string, timestamp: number, host: string, port: number): Promise<string>;
+import { Account } from "web3-core";
+export default function getPeerSignature(account: Account, topic: string, timestamp: number, host: string, port: number): import("web3-core").Sign;

package/dist/utils/getPeerSignature.js

@@ -1,9 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-var __1 = require("..");
-function getPeerSignature(privateKey, topic, timestamp, host, port) {
-    var dataToSign = (0, __1.sha256)(topic + "-" + timestamp + "-" + host + ":" + port);
-    return (0, __1.signData)(dataToSign, privateKey, "SHA-1").then(__1.arrayBufferToBase64);
+var sha256_1 = __importDefault(require("./sha256"));
+function getPeerSignature(account, topic, timestamp, host, port) {
+    var dataToSign = (0, sha256_1.default)(topic + "-" + timestamp + "-" + host + ":" + port);
+    return account.sign(dataToSign);
 }
 exports.default = getPeerSignature;
 //# sourceMappingURL=getPeerSignature.js.map