tool-db 2.0.2 → 2.1.2

package/dist/toolDbSignUp.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -46,12 +35,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 var _1 = require(".");
-var uint8ArrayToHex_1 = __importDefault(require("./utils/encoding/uint8ArrayToHex"));
 function toolDbSignUp(user, password) {
     return __awaiter(this, void 0, void 0, function () {
         var userRoot;
@@ -62,44 +47,40 @@ function toolDbSignUp(user, password) {
                     _this.getData(userRoot, false, 3000)
                         .then(function (data) {
                         if (data === null) {
-                            var account_1 = _this.web3.eth.accounts.create();
-                            var iv_1 = (0, _1.generateIv)();
-                            (0, _1.encryptWithPass)(account_1.privateKey, password, iv_1).then(function (encryptedPrivateKey) {
-                                if (encryptedPrivateKey) {
-                                    var userData_1 = {
-                                        address: account_1.address,
-                                        privateKey: (0, _1.arrayBufferToHex)(encryptedPrivateKey),
-                                        iv: (0, uint8ArrayToHex_1.default)(iv_1),
-                                        pass: (0, _1.sha256)(password),
-                                    };
-                                    var timestamp_1 = new Date().getTime();
-                                    var userDataString = "" + JSON.stringify(userData_1) + account_1.address + timestamp_1;
-                                    (0, _1.proofOfWork)(userDataString, 0)
-                                        .then(function (_a) {
-                                        var hash = _a.hash, nonce = _a.nonce;
-                                        var signature = _this.web3.eth.accounts.sign(hash, account_1.privateKey);
-                                        var signupMessage = {
-                                            k: userRoot,
-                                            a: account_1.address,
-                                            n: nonce,
-                                            t: timestamp_1,
-                                            h: hash,
-                                            s: signature.signature,
-                                            v: userData_1,
-                                        };
-                                        _this.store.put(userRoot, JSON.stringify(signupMessage), function (err, data) {
-                                            //
-                                        });
-                                        if (_this.options.debug) {
-                                            console.log("SIGNUP PUT > " + userRoot, signupMessage);
-                                        }
-                                        var finalMsg = __assign({ type: "put", id: (0, _1.textRandom)(10), to: [] }, signupMessage);
-                                        _this.network.sendToAll(finalMsg);
-                                        resolve(finalMsg);
-                                    })
-                                        .catch(reject);
+                            var account_1 = _this.createAccount();
+                            var userData_1 = _this.encryptAccount(account_1, (0, _1.sha256)(password));
+                            var timestamp_1 = new Date().getTime();
+                            var userDataString = "" + JSON.stringify(userData_1) + account_1.address + timestamp_1;
+                            (0, _1.proofOfWork)(userDataString, 0)
+                                .then(function (_a) {
+                                var hash = _a.hash, nonce = _a.nonce;
+                                var signature = _this.signData(hash, account_1.privateKey);
+                                var signupMessage = {
+                                    k: userRoot,
+                                    a: account_1.address,
+                                    n: nonce,
+                                    t: timestamp_1,
+                                    h: hash,
+                                    s: signature.signature,
+                                    v: userData_1,
+                                    c: null,
+                                };
+                                _this.store.put(userRoot, JSON.stringify(signupMessage), function (err, data) {
+                                    //
+                                });
+                                if (_this.options.debug) {
+                                    console.log("SIGNUP PUT > " + userRoot, signupMessage);
                                 }
-                            });
+                                var finalMsg = {
+                                    type: "put",
+                                    id: (0, _1.textRandom)(10),
+                                    to: [],
+                                    data: signupMessage,
+                                };
+                                _this.network.sendToAll(finalMsg);
+                                resolve(finalMsg);
+                            })
+                                .catch(reject);
                         }
                         else {
                             reject(new Error("User already exists!"));

package/dist/toolDbSignUp.js.map

@@ -1 +1 @@
-{"version":3,"file":"toolDbSignUp.js","sourceRoot":"","sources":["../src/toolDbSignUp.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"toolDbSignUp.js","sourceRoot":"","sources":["../src/toolDbSignUp.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,sBAMW;AAEX,SAA8B,YAAY,CAExC,IAAY,EACZ,QAAgB;;;;;YAEV,QAAQ,GAAG,OAAK,IAAM,CAAC;YAC7B,sBAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;oBACjC,KAAI,CAAC,OAAO,CAA0B,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC;yBACzD,IAAI,CAAC,UAAC,IAAI;wBACT,IAAI,IAAI,KAAK,IAAI,EAAE;4BACjB,IAAM,SAAO,GAAG,KAAI,CAAC,aAAa,EAAE,CAAC;4BACrC,IAAM,UAAQ,GAAG,KAAI,CAAC,cAAc,CAAC,SAAO,EAAE,IAAA,SAAM,EAAC,QAAQ,CAAC,CAAC,CAAC;4BAEhE,IAAM,WAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;4BACvC,IAAM,cAAc,GAAG,KAAG,IAAI,CAAC,SAAS,CAAC,UAAQ,CAAC,GAChD,SAAO,CAAC,OAAO,GACd,WAAW,CAAC;4BAEf,IAAA,cAAW,EAAC,cAAc,EAAE,CAAC,CAAC;iCAC3B,IAAI,CAAC,UAAC,EAAe;oCAAb,IAAI,UAAA,EAAE,KAAK,WAAA;gCAClB,IAAM,SAAS,GAAG,KAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAO,CAAC,UAAU,CAAC,CAAC;gCAE1D,IAAM,aAAa,GAA8C;oCAC/D,CAAC,EAAE,QAAQ;oCACX,CAAC,EAAE,SAAO,CAAC,OAAO;oCAClB,CAAC,EAAE,KAAK;oCACR,CAAC,EAAE,WAAS;oCACZ,CAAC,EAAE,IAAI;oCACP,CAAC,EAAE,SAAS,CAAC,SAAS;oCACtB,CAAC,EAAE,UAAQ;oCACX,CAAC,EAAE,IAAI;iCACR,CAAC;gCAEF,KAAI,CAAC,KAAK,CAAC,GAAG,CACZ,QAAQ,EACR,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAC7B,UAAC,GAAG,EAAE,IAAI;oCACR,EAAE;gCACJ,CAAC,CACF,CAAC;gCAEF,IAAI,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE;oCACtB,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,QAAQ,EAAE,aAAa,CAAC,CAAC;iCACxD;gCAED,IAAM,QAAQ,GAAG;oCACf,IAAI,EAAE,KAAK;oCACX,EAAE,EAAE,IAAA,aAAU,EAAC,EAAE,CAAC;oCAClB,EAAE,EAAE,EAAE;oCACN,IAAI,EAAE,aAAa;iCACN,CAAC;gCAEhB,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;gCACjC,OAAO,CAAC,QAAQ,CAAC,CAAC;4BACpB,CAAC,CAAC;iCACD,KAAK,CAAC,MAAM,CAAC,CAAC;yBAClB;6BAAM;4BACL,MAAM,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC;yBAC3C;oBACH,CAAC,CAAC;yBACD,KAAK,CAAC;wBACL,MAAM,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC;oBAC5C,CAAC,CAAC,CAAC;gBACP,CAAC,CAAC,EAAC;;;CACJ;AAhED,+BAgEC"}

package/dist/toolDbVerificationWrapper.d.ts

@@ -1,2 +1,2 @@
-import { BaseMessage, ToolDb, VerificationData } from ".";
-export default function toolDbVerificationWrapper(this: ToolDb, data: VerificationData<any> & BaseMessage): Promise<unknown>;
+import { ToolDb, VerificationData } from ".";
+export default function toolDbVerificationWrapper(this: ToolDb, data: VerificationData<any>): Promise<unknown>;

package/dist/toolDbVerificationWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"toolDbVerificationWrapper.js","sourceRoot":"","sources":["../src/toolDbVerificationWrapper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sBAAwE;AAExE,SAAwB,yBAAyB,CAE/C,IAAyC;IAF3C,iBAgDC;IA5CC,gFAAgF;IAChF,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO;QACzB,KAAI,CAAC,aAAa,CAAC,IAAI,EAAE,KAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,UAAO,QAAQ;;;;gBAC7D,IAAI,QAAQ,EAAE;oBACR,eAAa,IAAI,CAAC;oBACtB,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,UAAC,QAAQ;wBACvC,IAAI,QAAQ,IAAI,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;4BACzD,YAAU,GAAG,KAAK,CAAC;4BAEnB,8CAA8C;4BAC9C,KAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE,UAAC,GAAG,EAAE,IAAI;gCAC/B,IAAI,YAAY,GAAG,SAAS,CAAC;gCAC7B,IAAI,IAAI,EAAE;oCACR,IAAI;wCACF,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;qCACjC;oCAAC,OAAO,CAAC,EAAE;wCACV,aAAa;qCACd;iCACF;gCAED,QAAQ;qCACL,EAAE,CAAC,IAAI,EAAE,YAAY,CAAC;qCACtB,IAAI,CAAC,UAAC,QAAiB;oCACtB,IAAI,QAAQ,EAAE;wCACZ,OAAO,CAAC,eAAY,CAAC,QAAQ,CAAC,CAAC;qCAChC;yCAAM;wCACL,OAAO,CAAC,eAAY,CAAC,wBAAwB,CAAC,CAAC;qCAChD;gCACH,CAAC,CAAC;qCACD,KAAK,CAAC,UAAC,CAAC;oCACP,OAAO,CAAC,eAAY,CAAC,wBAAwB,CAAC,CAAC;gCACjD,CAAC,CAAC,CAAC;4BACP,CAAC,CAAC,CAAC;yBACJ;oBACH,CAAC,CAAC,CAAC;oBAEH,IAAI,YAAU,EAAE;wBACd,OAAO,CAAC,QAAQ,CAAC,CAAC;qBACnB;iBACF;qBAAM;oBACL,OAAO,CAAC,eAAY,CAAC,mBAAmB,CAAC,CAAC;iBAC3C;;;aACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAhDD,4CAgDC"}
+{"version":3,"file":"toolDbVerificationWrapper.js","sourceRoot":"","sources":["../src/toolDbVerificationWrapper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sBAA2D;AAE3D,SAAwB,yBAAyB,CAE/C,IAA2B;IAF7B,iBAgDC;IA5CC,gFAAgF;IAChF,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO;QACzB,KAAI,CAAC,aAAa,CAAC,IAAI,EAAE,KAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,UAAO,QAAQ;;;;gBAC7D,IAAI,QAAQ,EAAE;oBACR,eAAa,IAAI,CAAC;oBACtB,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,UAAC,QAAQ;wBACvC,IAAI,QAAQ,IAAI,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;4BACzD,YAAU,GAAG,KAAK,CAAC;4BAEnB,8CAA8C;4BAC9C,KAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE,UAAC,GAAG,EAAE,IAAI;gCAC/B,IAAI,YAAY,GAAG,SAAS,CAAC;gCAC7B,IAAI,IAAI,EAAE;oCACR,IAAI;wCACF,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;qCACjC;oCAAC,OAAO,CAAC,EAAE;wCACV,aAAa;qCACd;iCACF;gCAED,QAAQ;qCACL,EAAE,CAAC,IAAI,EAAE,YAAY,CAAC;qCACtB,IAAI,CAAC,UAAC,QAAiB;oCACtB,IAAI,QAAQ,EAAE;wCACZ,OAAO,CAAC,eAAY,CAAC,QAAQ,CAAC,CAAC;qCAChC;yCAAM;wCACL,OAAO,CAAC,eAAY,CAAC,wBAAwB,CAAC,CAAC;qCAChD;gCACH,CAAC,CAAC;qCACD,KAAK,CAAC,UAAC,CAAC;oCACP,OAAO,CAAC,eAAY,CAAC,wBAAwB,CAAC,CAAC;gCACjD,CAAC,CAAC,CAAC;4BACP,CAAC,CAAC,CAAC;yBACJ;oBACH,CAAC,CAAC,CAAC;oBAEH,IAAI,YAAU,EAAE;wBACd,OAAO,CAAC,QAAQ,CAAC,CAAC;qBACnB;iBACF;qBAAM;oBACL,OAAO,CAAC,eAAY,CAAC,mBAAmB,CAAC,CAAC;iBAC3C;;;aACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAhDD,4CAgDC"}

package/dist/toolchain.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/toolchain.js

@@ -0,0 +1,8 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var toolChainServer_1 = __importDefault(require("./toolChainServer"));
+var server = new toolChainServer_1.default({});
+//# sourceMappingURL=toolchain.js.map

package/dist/toolchain.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"toolchain.js","sourceRoot":"","sources":["../src/toolchain.ts"],"names":[],"mappings":";;;;;AAAA,sEAAgD;AAEhD,IAAM,MAAM,GAAG,IAAI,yBAAe,CAAC,EAAE,CAAC,CAAC"}

package/dist/tooldb.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 import EventEmitter from "events";
 import w3 from "web3";
-import { Account } from "web3-core";
-import { BaseMessage, PutMessage, ToolDbMessage, VerificationData, verifyMessage } from ".";
+import { EncryptedKeystoreV3Json, Account } from "web3-core";
+import { ToolDbMessage, VerificationData, verifyMessage } from ".";
 import toolDbGet from "./toolDbGet";
 import toolDbPut from "./toolDbPut";
 import toolDbSignIn from "./toolDbSignIn";
@@ -24,15 +24,14 @@ import handleCrdtGet from "./messageHandlers/handleCrdtGet";
 import handleCrdtPut from "./messageHandlers/handleCrdtPut";
 import handleSubscribe from "./messageHandlers/handleSubscribe";
 import { Peer, ToolDbOptions, ToolDbStore } from "./types/tooldb";
-import { CrdtPutMessage } from "./types/message";
-export interface Listener {
+export interface Listener<T = any> {
     key: string;
     timeout: number | null;
-    fn: (msg: PutMessage | CrdtPutMessage) => void;
+    fn: (msg: VerificationData<T>) => void;
 }
 interface Verificator<T> {
     key: string;
-    fn: (msg: VerificationData<T> & BaseMessage, previousData: T | undefined) => Promise<boolean>;
+    fn: (msg: VerificationData<T>, previousData: T | undefined) => Promise<boolean>;
 }
 export default class ToolDb extends EventEmitter {
     private _network;
@@ -78,7 +77,12 @@ export default class ToolDb extends EventEmitter {
     handleQuery: typeof handleQuery;
     handleSubscribe: typeof handleSubscribe;
     setUser(account: Account | undefined, name: string): void;
-    signData(data: string): import("web3-core").Sign | undefined;
+    signData(data: string, privateKey?: string): import("web3-core").Sign;
+    recoverAddress(message: string, signature: string): string;
+    getAccountFromPrivate(privateKey: string): Account;
+    createAccount(): Account;
+    encryptAccount(account: Account, password: string): EncryptedKeystoreV3Json;
+    decryptAccount(acc: EncryptedKeystoreV3Json, password: string): Account;
     getAddress(): string | undefined;
     getUsername(): string | undefined;
     /**
@@ -92,14 +96,14 @@ export default class ToolDb extends EventEmitter {
      * Key listeners listen for a specific key, as long as the listener remains active
      */
     _keyListeners: (Listener | null)[];
-    addKeyListener: <T>(key: string, fn: (msg: CrdtPutMessage<any> | PutMessage<T>) => void) => number;
+    addKeyListener: <T>(key: string, fn: (msg: VerificationData<T>) => void) => number;
     removeKeyListener: (id: number) => void;
-    triggerKeyListener: (key: string, message: PutMessage | CrdtPutMessage) => void;
+    triggerKeyListener: <T = any>(key: string, message: VerificationData<T>) => void;
     /**
      * Custom verificators can enhance default verification on any key field
      */
     _customVerificator: (Verificator<any> | null)[];
-    addCustomVerification: <T = any>(key: string, fn: (msg: VerificationData & BaseMessage, previous: T | undefined) => Promise<boolean>) => number;
+    addCustomVerification: <T = any>(key: string, fn: (msg: VerificationData<T>, previous: T | undefined) => Promise<boolean>) => number;
     removeCustomVerification: (id: number) => void;
     private _user;
     private _options;

package/dist/tooldb.js

@@ -220,12 +220,31 @@ var ToolDb = /** @class */ (function (_super) {
             }
             : undefined;
     };
-    ToolDb.prototype.signData = function (data) {
-        if (this._user) {
-            var signature = this.web3.eth.accounts.sign(data, this._user.account.privateKey);
-            return signature;
+    ToolDb.prototype.signData = function (data, privateKey) {
+        var _a;
+        var signature = this.web3.eth.accounts.sign(data, privateKey || ((_a = this._user) === null || _a === void 0 ? void 0 : _a.account.privateKey) || "");
+        return signature;
+    };
+    ToolDb.prototype.recoverAddress = function (message, signature) {
+        return this.web3.eth.accounts.recover(message, signature);
+    };
+    ToolDb.prototype.getAccountFromPrivate = function (privateKey) {
+        return this.web3.eth.accounts.privateKeyToAccount(privateKey);
+    };
+    ToolDb.prototype.createAccount = function () {
+        return this.web3.eth.accounts.create();
+    };
+    ToolDb.prototype.encryptAccount = function (account, password) {
+        return account.encrypt(password);
+    };
+    ToolDb.prototype.decryptAccount = function (acc, password) {
+        try {
+            var newAccount = this.web3.eth.accounts.decrypt(acc, password);
+            return newAccount;
+        }
+        catch (e) {
+            throw e;
         }
-        return undefined;
     };
     ToolDb.prototype.getAddress = function () {
         var _a;

package/dist/tooldb.js.map

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

package/dist/types/message.d.ts

@@ -40,6 +40,10 @@ export interface VerificationData<T = any> {
      * Value
      */
     v: T;
+    /**
+     * CRDT type (null for regular values)
+     */
+    c: string | null;
 }
 export declare type MessageType = "ping" | "pong" | "query" | "queryAck" | "subscribe" | "get" | "put" | "crdtPut" | "crdtGet" | "crdt" | "join" | "servers";
 export interface BaseMessage {
@@ -85,17 +89,15 @@ 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> {
+export interface PutMessage<T = any> extends BaseMessage {
     type: "put";
+    data: VerificationData<T>;
 }
-export interface CrdtPutMessage<T = any> extends BaseMessage, VerificationData<any> {
+export interface CrdtPutMessage<T = any> extends BaseMessage {
     type: "crdtPut";
-    crdt: string;
+    data: VerificationData<T>;
 }
 export interface CrdtGetMessage<T = any> extends BaseMessage {
     type: "crdtGet";

package/dist/types/message.js.map

@@ -1 +1 @@
-{"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"}
+{"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,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

@@ -94,22 +94,3 @@ export interface ToolDbOptions {
      */
     peerAccount: Account;
 }
-export interface ParsedKeys {
-    skpub: string;
-    skpriv: string;
-    ekpub: string;
-    ekpriv: string;
-}
-export interface Keys {
-    pub: string;
-    priv: string;
-}
-export declare type GenericObject = {
-    [key: string]: any;
-};
-export interface UserRootData {
-    address: string;
-    privateKey: string;
-    iv: string;
-    pass: string;
-}

package/dist/utils/verifyMessage.js

@@ -60,7 +60,8 @@ function verifyMessage(msg, pow) {
                         msg.k === undefined ||
                         msg.h === undefined ||
                         msg.a === undefined ||
-                        msg.s === undefined) {
+                        msg.s === undefined ||
+                        msg.c === undefined) {
                         return [2 /*return*/, message_1.VerifyResult.InvalidData];
                     }
                     // Max clock shift allowed is 30 seconds.
@@ -115,7 +116,7 @@ function verifyMessage(msg, pow) {
                             return [2 /*return*/, message_1.VerifyResult.InvalidHashNonce];
                         }
                     }
-                    address = this.web3.eth.accounts.recover(msg.h, msg.s);
+                    address = this.recoverAddress(msg.h, msg.s);
                     verified = address === msg.a;
                     // console.warn(`Signature validation: ${verified ? "Sucess" : "Failed"}`);
                     return [2 /*return*/, verified ? message_1.VerifyResult.Verified : message_1.VerifyResult.InvalidSignature];

package/dist/utils/verifyMessage.js.map

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

package/dist/utils/verifyPeer.d.ts

@@ -1,3 +1,3 @@
 import { Peer } from "../types/tooldb";
-import Web3 from "web3";
-export default function verifyPeer(web3: Web3, peer: Peer): boolean;
+import ToolDb from "../tooldb";
+export default function verifyPeer(tooldb: ToolDb, peer: Peer): boolean;

package/dist/utils/verifyPeer.js

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var sha256_1 = __importDefault(require("./sha256"));
-function verifyPeer(web3, peer) {
+function verifyPeer(tooldb, peer) {
     var data = (0, sha256_1.default)(peer.topic + "-" + peer.timestamp + "-" + peer.host + ":" + peer.port);
-    var recoveredAddress = web3.eth.accounts.recover(data, peer.sig);
+    var recoveredAddress = tooldb.recoverAddress(data, peer.sig); // web3.eth.accounts.recover(data, peer.sig);
     var verified = recoveredAddress === peer.adress;
     return verified;
 }

package/dist/utils/verifyPeer.js.map

@@ -1 +1 @@
-{"version":3,"file":"verifyPeer.js","sourceRoot":"","sources":["../../src/utils/verifyPeer.ts"],"names":[],"mappings":";;;;;AAAA,oDAA8B;AAM9B,SAAwB,UAAU,CAAC,IAAU,EAAE,IAAU;IACvD,IAAM,IAAI,GAAG,IAAA,gBAAM,EACd,IAAI,CAAC,KAAK,SAAI,IAAI,CAAC,SAAS,SAAI,IAAI,CAAC,IAAI,SAAI,IAAI,CAAC,IAAM,CAC5D,CAAC;IAEF,IAAM,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IAEnE,IAAM,QAAQ,GAAG,gBAAgB,KAAK,IAAI,CAAC,MAAM,CAAC;IAClD,OAAO,QAAQ,CAAC;AAClB,CAAC;AATD,6BASC"}
+{"version":3,"file":"verifyPeer.js","sourceRoot":"","sources":["../../src/utils/verifyPeer.ts"],"names":[],"mappings":";;;;;AAAA,oDAA8B;AAM9B,SAAwB,UAAU,CAAC,MAAc,EAAE,IAAU;IAC3D,IAAM,IAAI,GAAG,IAAA,gBAAM,EACd,IAAI,CAAC,KAAK,SAAI,IAAI,CAAC,SAAS,SAAI,IAAI,CAAC,IAAI,SAAI,IAAI,CAAC,IAAM,CAC5D,CAAC;IAEF,IAAM,gBAAgB,GAAG,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,6CAA6C;IAE7G,IAAM,QAAQ,GAAG,gBAAgB,KAAK,IAAI,CAAC,MAAM,CAAC;IAClD,OAAO,QAAQ,CAAC;AAClB,CAAC;AATD,6BASC"}

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "tool-db",
-  "version": "2.0.2",
+  "version": "2.1.2",
   "private": false,
   "description": "A decentralized database model for federated p2p networks.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "eslint:fix": "eslint --fix . --ext .ts",
-    "bundle": "browserify ./dist/index.js --standalone tooldb > ./bundle.js",
+    "bundle": "browserify ./dist/index.js --standalone tooldb | uglifyjs -cm > ./bundle.js",
     "build": "tsc && npm run bundle",
+    "tsc": "tsc",
     "publish": "np",
     "prepublish": "npm run build",
     "test": "jest --clearCache && jest ./src --detectOpenHandles",
@@ -22,7 +23,6 @@
     "babel": "^6.23.0",
     "buffer": "^6.0.3",
     "crypto": "^1.0.1",
-    "ethers": "^5.6.1",
     "level": "^7.0.0",
     "lodash": "^4.17.21",
     "simple-peer": "^9.11.0",
@@ -32,7 +32,6 @@
   "devDependencies": {
     "@babel/preset-env": "^7.15.0",
     "@babel/preset-typescript": "^7.15.0",
-    "@types/elliptic": "^6.4.14",
     "@types/jest": "^26.0.24",
     "@types/lodash": "^4.14.172",
     "@types/node": "^15.0.1",
@@ -53,7 +52,8 @@
     "prettier": "^2.3.2",
     "ts-node": "^10.2.0",
     "typescript": "^4.1.2",
-    "typescript-eslint": "0.0.1-alpha.0"
+    "typescript-eslint": "0.0.1-alpha.0",
+    "uglify-js": "^3.15.4"
   },
   "engines": {
     "node": ">=16.0.0"

package/test-alice/CURRENT

@@ -1 +1 @@
-MANIFEST-000276
+MANIFEST-000429

package/test-alice/LOG

@@ -1,5 +1,5 @@
-2022/05/07-02:18:07.680 51bc Recovering log #275
-2022/05/07-02:18:07.680 51bc Level-0 table #277: started
-2022/05/07-02:18:07.687 51bc Level-0 table #277: 1707 bytes OK
-2022/05/07-02:18:07.696 51bc Delete type=0 #275
-2022/05/07-02:18:07.696 51bc Delete type=3 #273
+2022/06/11-14:24:58.352 1838 Recovering log #428
+2022/06/11-14:24:58.352 1838 Level-0 table #430: started
+2022/06/11-14:24:58.358 1838 Level-0 table #430: 1911 bytes OK
+2022/06/11-14:24:58.366 1838 Delete type=0 #428
+2022/06/11-14:24:58.366 1838 Delete type=3 #426

package/test-alice/LOG.old

@@ -1,5 +1,5 @@
-2022/05/06-09:52:13.664 20bc Recovering log #272
-2022/05/06-09:52:13.664 20bc Level-0 table #274: started
-2022/05/06-09:52:13.670 20bc Level-0 table #274: 1723 bytes OK
-2022/05/06-09:52:13.679 20bc Delete type=0 #272
-2022/05/06-09:52:13.680 20bc Delete type=3 #270
+2022/06/11-14:14:04.319 628c Recovering log #424
+2022/06/11-14:14:04.319 628c Level-0 table #427: started
+2022/06/11-14:14:04.326 628c Level-0 table #427: 2190 bytes OK
+2022/06/11-14:14:04.333 628c Delete type=0 #424
+2022/06/11-14:14:04.334 628c Delete type=3 #422

package/test-alice-speed/CURRENT

@@ -1 +1 @@
-MANIFEST-000186
+MANIFEST-000234

package/test-alice-speed/LOG

@@ -1,5 +1,14 @@
-2022/05/07-02:18:19.484 6b24 Recovering log #184
-2022/05/07-02:18:19.485 6b24 Level-0 table #187: started
-2022/05/07-02:18:19.490 6b24 Level-0 table #187: 24185 bytes OK
-2022/05/07-02:18:19.500 6b24 Delete type=0 #184
-2022/05/07-02:18:19.500 6b24 Delete type=3 #182
+2022/06/11-14:25:09.974 4e18 Recovering log #233
+2022/06/11-14:25:09.975 4e18 Level-0 table #235: started
+2022/06/11-14:25:09.979 4e18 Level-0 table #235: 24494 bytes OK
+2022/06/11-14:25:09.987 4e18 Delete type=0 #233
+2022/06/11-14:25:09.987 4e18 Delete type=3 #231
+2022/06/11-14:25:09.987 3dd4 Compacting 4@0 + 1@1 files
+2022/06/11-14:25:09.996 3dd4 Generated table #237@0: 100 keys, 24494 bytes
+2022/06/11-14:25:09.996 3dd4 Compacted 4@0 + 1@1 files => 24494 bytes
+2022/06/11-14:25:09.998 3dd4 compacted to: files[ 0 1 0 0 0 0 0 ]
+2022/06/11-14:25:09.998 3dd4 Delete type=2 #224
+2022/06/11-14:25:09.999 3dd4 Delete type=2 #226
+2022/06/11-14:25:09.999 3dd4 Delete type=2 #229
+2022/06/11-14:25:09.999 3dd4 Delete type=2 #232
+2022/06/11-14:25:10.000 3dd4 Delete type=2 #235

package/test-alice-speed/LOG.old

@@ -1,14 +1,5 @@
-2022/05/06-09:52:12.685 6a8 Recovering log #181
-2022/05/06-09:52:12.685 6a8 Level-0 table #183: started
-2022/05/06-09:52:12.701 6a8 Level-0 table #183: 24130 bytes OK
-2022/05/06-09:52:12.711 6a8 Delete type=0 #181
-2022/05/06-09:52:12.711 6a8 Delete type=3 #179
-2022/05/06-09:52:12.711 5748 Compacting 4@0 + 1@1 files
-2022/05/06-09:52:12.717 5748 Generated table #185@0: 100 keys, 24130 bytes
-2022/05/06-09:52:12.717 5748 Compacted 4@0 + 1@1 files => 24130 bytes
-2022/05/06-09:52:12.719 5748 compacted to: files[ 0 1 0 0 0 0 0 ]
-2022/05/06-09:52:12.719 5748 Delete type=2 #172
-2022/05/06-09:52:12.719 5748 Delete type=2 #174
-2022/05/06-09:52:12.720 5748 Delete type=2 #177
-2022/05/06-09:52:12.720 5748 Delete type=2 #180
-2022/05/06-09:52:12.720 5748 Delete type=2 #183
+2022/06/11-14:14:15.872 4328 Recovering log #230
+2022/06/11-14:14:15.873 4328 Level-0 table #232: started
+2022/06/11-14:14:15.878 4328 Level-0 table #232: 24389 bytes OK
+2022/06/11-14:14:15.885 4328 Delete type=0 #230
+2022/06/11-14:14:15.886 4328 Delete type=3 #228

package/test-bob/CURRENT

@@ -1 +1 @@
-MANIFEST-000276
+MANIFEST-000429

package/test-bob/LOG

@@ -1,5 +1,5 @@
-2022/05/07-02:18:07.745 6b24 Recovering log #275
-2022/05/07-02:18:07.745 6b24 Level-0 table #277: started
-2022/05/07-02:18:07.753 6b24 Level-0 table #277: 1618 bytes OK
-2022/05/07-02:18:07.761 6b24 Delete type=0 #275
-2022/05/07-02:18:07.761 6b24 Delete type=3 #273
+2022/06/11-14:24:58.427 5140 Recovering log #428
+2022/06/11-14:24:58.427 5140 Level-0 table #430: started
+2022/06/11-14:24:58.434 5140 Level-0 table #430: 1859 bytes OK
+2022/06/11-14:24:58.441 5140 Delete type=0 #428
+2022/06/11-14:24:58.442 5140 Delete type=3 #426

package/test-bob/LOG.old

@@ -1,5 +1,5 @@
-2022/05/06-09:52:13.749 3e5c Recovering log #272
-2022/05/06-09:52:13.749 3e5c Level-0 table #274: started
-2022/05/06-09:52:13.755 3e5c Level-0 table #274: 1950 bytes OK
-2022/05/06-09:52:13.765 3e5c Delete type=0 #272
-2022/05/06-09:52:13.765 3e5c Delete type=3 #270
+2022/06/11-14:14:04.393 4328 Recovering log #424
+2022/06/11-14:14:04.393 4328 Level-0 table #427: started
+2022/06/11-14:14:04.399 4328 Level-0 table #427: 1859 bytes OK
+2022/06/11-14:14:04.408 4328 Delete type=0 #424
+2022/06/11-14:14:04.408 4328 Delete type=3 #422

package/test-node-a/CURRENT

@@ -1 +1 @@
-MANIFEST-000276
+MANIFEST-000429