tool-db 2.1.2 → 2.2.0

package/dist/toolDbWebsocket.d.ts

@@ -0,0 +1,19 @@
+import WebSocket from "ws";
+import ToolDb from "./tooldb";
+import ToolDbNetworkAdapter from "./toolDbNetworkAdapter";
+export default class ToolDbWebsocket extends ToolDbNetworkAdapter {
+    private wnd;
+    private _wss;
+    private server;
+    private _connections;
+    private _awaitingConnections;
+    private removeFromAwaiting;
+    constructor(db: ToolDb);
+    /**
+     * Open a connection to a server
+     * @param url URL of the server (including port)
+     * @returns websocket
+     */
+    connectTo: (host: string, port: number, connectionId?: string | undefined) => WebSocket | undefined;
+    private reconnect;
+}

package/dist/toolDbWebsocket.js

@@ -0,0 +1,193 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var ws_1 = __importDefault(require("ws"));
+var _1 = require(".");
+var toolDbNetworkAdapter_1 = __importDefault(require("./toolDbNetworkAdapter"));
+var ToolDbWebsocket = /** @class */ (function (_super) {
+    __extends(ToolDbWebsocket, _super);
+    function ToolDbWebsocket(db) {
+        var _this = _super.call(this, db) || this;
+        _this.wnd = typeof window === "undefined" ? undefined : window;
+        _this._wss = _this.wnd
+            ? _this.wnd.WebSocket || _this.wnd.webkitWebSocket || _this.wnd.mozWebSocket
+            : ws_1.default;
+        _this.server = null;
+        _this._connections = {};
+        _this._awaitingConnections = [];
+        _this.removeFromAwaiting = function (id) {
+            var index = _this._awaitingConnections.findIndex(function (c) { return c.id === id; });
+            if (index !== -1) {
+                _this._awaitingConnections.slice(index, 1);
+            }
+        };
+        /**
+         * Open a connection to a server
+         * @param url URL of the server (including port)
+         * @returns websocket
+         */
+        _this.connectTo = function (host, port, connectionId) {
+            try {
+                var wsUrl = port === 443 ? "wss://" + host : "ws://" + host + ":" + port;
+                var wss_1 = new _this._wss(wsUrl);
+                var connId_1 = (0, _1.textRandom)(10);
+                var clientId_1 = "";
+                wss_1.connId = connectionId || connId_1;
+                var previousConnection = _this._awaitingConnections.filter(function (c) { return c.id === connectionId; })[0];
+                if (connectionId && previousConnection) {
+                    previousConnection.socket = wss_1;
+                }
+                else {
+                    _this._awaitingConnections.push({
+                        id: connId_1,
+                        socket: wss_1,
+                        tries: 0,
+                        defer: null,
+                        host: host,
+                        port: port,
+                    });
+                }
+                wss_1.onclose = function (_error) {
+                    if (_this.tooldb.options.debug) {
+                        console.log(_error.error);
+                    }
+                    _this.reconnect(connId_1);
+                };
+                wss_1.onerror = function (_error) {
+                    var _a;
+                    if (_this.tooldb.options.debug) {
+                        console.log(_error.error);
+                    }
+                    if (((_a = _error === null || _error === void 0 ? void 0 : _error.error) === null || _a === void 0 ? void 0 : _a.code) !== "ETIMEDOUT") {
+                        _this.reconnect(connId_1);
+                    }
+                };
+                wss_1.onopen = function () {
+                    _this.removeFromAwaiting(connId_1);
+                    if (_this.tooldb.options.debug) {
+                        console.warn("Connected to " + host + ": " + port + " sucessfully.");
+                    }
+                    // hi peer
+                    wss_1.send(JSON.stringify({
+                        type: "ping",
+                        clientId: _this.tooldb.network.getClientAddress(),
+                        to: [_this.tooldb.network.getClientAddress()],
+                        isServer: _this.tooldb.options.server,
+                        id: (0, _1.textRandom)(10),
+                    }));
+                };
+                wss_1.onmessage = function (msg) {
+                    if (!msg) {
+                        return;
+                    }
+                    _this.onClientMessage(msg.data, clientId_1, function (id) {
+                        clientId_1 = id;
+                        _this.isClientConnected[id] = function () {
+                            return wss_1.readyState === wss_1.OPEN;
+                        };
+                        _this.clientToSend[id] = function (_msg) {
+                            wss_1.send(_msg);
+                        };
+                    });
+                };
+                return wss_1;
+            }
+            catch (e) {
+                console.warn(e);
+            }
+            return undefined;
+        };
+        _this.reconnect = function (connectionId) {
+            var connection = _this._awaitingConnections.filter(function (c) { return c.id === connectionId; })[0];
+            if (connection) {
+                if (connection.defer) {
+                    clearTimeout(connection.defer);
+                }
+                if (connection.tries < _this.tooldb.options.maxRetries) {
+                    var defer = function () {
+                        connection.tries += 1;
+                        console.warn("Connection to " +
+                            connection.host +
+                            ":" +
+                            connection.port +
+                            " retry.");
+                        _this.connectTo(connection.host, connection.port, connectionId);
+                    };
+                    connection.defer = setTimeout(defer, _this.tooldb.options.wait);
+                }
+                else {
+                    console.warn("Connection attempts to " +
+                        connection.host +
+                        ":" +
+                        connection.port +
+                        " exceeded.");
+                    _this.removeFromAwaiting(connectionId);
+                    // There are no more peers to connect!
+                    if (Object.keys(_this._connections).length === 0) {
+                        _this.tooldb.onDisconnect();
+                        _this.tooldb.isConnected = false;
+                    }
+                }
+            }
+            // else , attempting to reconnect to a missing peer?
+        };
+        _this.tooldb.options.peers.forEach(function (p) {
+            _this.connectTo(p.host, p.port);
+        });
+        if (_this.tooldb.options.server) {
+            _this.server = new ws_1.default.Server({
+                port: _this.tooldb.options.port,
+                server: _this.tooldb.options.httpServer,
+            });
+            _this.server.on("connection", function (socket) {
+                var clientId = null;
+                // console.log("new connection:", clientId);
+                socket.on("close", function () {
+                    // console.log("closed connection:", clientId);
+                    if (clientId) {
+                        _this.onClientDisconnect(clientId);
+                    }
+                });
+                socket.on("error", function () {
+                    // console.log("errored connection:", clientId);
+                    if (clientId) {
+                        _this.onClientDisconnect(clientId);
+                    }
+                });
+                socket.on("message", function (message) {
+                    _this.onClientMessage(message, clientId || "", function (id) {
+                        clientId = id;
+                        // Set this socket's functions on the adapter
+                        _this.isClientConnected[id] = function () {
+                            return socket.readyState === socket.OPEN;
+                        };
+                        _this.clientToSend[id] = function (_msg) {
+                            socket.send(_msg);
+                        };
+                    });
+                });
+            });
+        }
+        return _this;
+    }
+    return ToolDbWebsocket;
+}(toolDbNetworkAdapter_1.default));
+exports.default = ToolDbWebsocket;
+//# sourceMappingURL=toolDbWebsocket.js.map

package/dist/toolDbWebsocket.js.map

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

package/dist/tooldb.d.ts

@@ -1,7 +1,5 @@
 /// <reference types="node" />
 import EventEmitter from "events";
-import w3 from "web3";
-import { EncryptedKeystoreV3Json, Account } from "web3-core";
 import { ToolDbMessage, VerificationData, verifyMessage } from ".";
 import toolDbGet from "./toolDbGet";
 import toolDbPut from "./toolDbPut";
@@ -23,7 +21,7 @@ import handleQuery from "./messageHandlers/handleQuery";
 import handleCrdtGet from "./messageHandlers/handleCrdtGet";
 import handleCrdtPut from "./messageHandlers/handleCrdtPut";
 import handleSubscribe from "./messageHandlers/handleSubscribe";
-import { Peer, ToolDbOptions, ToolDbStore } from "./types/tooldb";
+import { Peer, ToolDbOptions, ToolDbStore, ToolDbUserAdapter } from "./types/tooldb";
 export interface Listener<T = any> {
     key: string;
     timeout: number | null;
@@ -37,7 +35,8 @@ export default class ToolDb extends EventEmitter {
     private _network;
     private _store;
     private _peers;
-    web3: w3;
+    private _peerAccount;
+    private _userAccount;
     clientOnMessage: typeof toolDbClientOnMessage;
     verifyMessage: typeof verifyMessage;
     private _subscriptions;
@@ -76,15 +75,6 @@ export default class ToolDb extends EventEmitter {
     handlePut: typeof handlePut;
     handleQuery: typeof handleQuery;
     handleSubscribe: typeof handleSubscribe;
-    setUser(account: Account | undefined, name: string): void;
-    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;
     /**
      * id listeners listen for a specific message ID just once
      */
@@ -105,12 +95,13 @@ export default class ToolDb extends EventEmitter {
     _customVerificator: (Verificator<any> | null)[];
     addCustomVerification: <T = any>(key: string, fn: (msg: VerificationData<T>, previous: T | undefined) => Promise<boolean>) => number;
     removeCustomVerification: (id: number) => void;
-    private _user;
     private _options;
     get options(): ToolDbOptions;
-    get network(): import(".").ToolDbNetworkAdapter;
+    get network(): import("./toolDbNetworkAdapter").default;
     get peers(): Peer[];
     get store(): ToolDbStore;
+    get userAccount(): ToolDbUserAdapter;
+    get peerAccount(): ToolDbUserAdapter;
     constructor(options?: Partial<ToolDbOptions>);
 }
 export {};

package/dist/tooldb.js

@@ -30,15 +30,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var events_1 = __importDefault(require("events"));
-var web3_1 = __importDefault(require("web3"));
 var _1 = require(".");
 var toolDbGet_1 = __importDefault(require("./toolDbGet"));
 var toolDbPut_1 = __importDefault(require("./toolDbPut"));
 var toolDbSignIn_1 = __importDefault(require("./toolDbSignIn"));
 var toolDbSignUp_1 = __importDefault(require("./toolDbSignUp"));
-var toolDbNetwork_1 = __importDefault(require("./toolDbNetwork"));
 var toolDbCrdtGet_1 = __importDefault(require("./toolDbCrdtGet"));
 var toolDbCrdtPut_1 = __importDefault(require("./toolDbCrdtPut"));
+var toolDbWebsocket_1 = __importDefault(require("./toolDbWebsocket"));
 var toolDbAnonSignIn_1 = __importDefault(require("./toolDbAnonSignIn"));
 var toolDbClientOnMessage_1 = __importDefault(require("./toolDbClientOnMessage"));
 var toolDbVerificationWrapper_1 = __importDefault(require("./toolDbVerificationWrapper"));
@@ -55,6 +54,7 @@ var handleQuery_1 = __importDefault(require("./messageHandlers/handleQuery"));
 var handleCrdtGet_1 = __importDefault(require("./messageHandlers/handleCrdtGet"));
 var handleCrdtPut_1 = __importDefault(require("./messageHandlers/handleCrdtPut"));
 var handleSubscribe_1 = __importDefault(require("./messageHandlers/handleSubscribe"));
+var toolDbWeb3User_1 = __importDefault(require("./toolDbWeb3User"));
 var ToolDb = /** @class */ (function (_super) {
     __extends(ToolDb, _super);
     function ToolDb(options) {
@@ -162,7 +162,6 @@ var ToolDb = /** @class */ (function (_super) {
         _this.removeCustomVerification = function (id) {
             _this._customVerificator[id] = null;
         };
-        _this._user = undefined;
         _this._options = {
             db: "tooldb",
             peers: [],
@@ -175,20 +174,18 @@ var ToolDb = /** @class */ (function (_super) {
             port: 8080,
             debug: false,
             httpServer: undefined,
-            networkAdapter: toolDbNetwork_1.default,
+            networkAdapter: toolDbWebsocket_1.default,
+            userAdapter: toolDbWeb3User_1.default,
             storageName: "tooldb",
             storageAdapter: typeof window === "undefined" ? leveldb_1.default : indexedb_1.default,
             topic: "tool-db-default",
-            peerAccount: undefined,
         };
         _this._options = __assign(__assign({}, _this.options), options);
-        _this.web3 = new web3_1.default(web3_1.default.givenProvider);
-        var account = _this.web3.eth.accounts.create();
-        _this.options.peerAccount = account;
-        _this.emit("init", account.address);
-        // These could be made to be customizable by setting the variables as public
-        _this._network = new _this.options.networkAdapter(_this);
         _this._store = _this.options.storageAdapter(_this.options.storageName);
+        _this._peerAccount = new _this.options.userAdapter(_this);
+        _this._userAccount = new _this.options.userAdapter(_this);
+        _this.emit("init", _this.userAccount.getAddress());
+        _this._network = new _this.options.networkAdapter(_this);
         return _this;
     }
     Object.defineProperty(ToolDb.prototype, "subscriptions", {
@@ -212,50 +209,9 @@ var ToolDb = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    ToolDb.prototype.setUser = function (account, name) {
-        this._user = account
-            ? {
-                account: account,
-                name: name,
-            }
-            : undefined;
-    };
-    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;
-        }
-    };
-    ToolDb.prototype.getAddress = function () {
-        var _a;
-        return (_a = this._user) === null || _a === void 0 ? void 0 : _a.account.address;
-    };
-    ToolDb.prototype.getUsername = function () {
-        var _a;
-        return (_a = this._user) === null || _a === void 0 ? void 0 : _a.name;
-    };
     ToolDb.prototype.getUserNamespacedKey = function (key) {
-        return ":" + (this.getAddress() || "") + "." + key;
+        var _a;
+        return ":" + (((_a = this.userAccount) === null || _a === void 0 ? void 0 : _a.getAddress()) || "") + "." + key;
     };
     Object.defineProperty(ToolDb.prototype, "options", {
         get: function () {
@@ -285,6 +241,20 @@ var ToolDb = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(ToolDb.prototype, "userAccount", {
+        get: function () {
+            return this._userAccount;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(ToolDb.prototype, "peerAccount", {
+        get: function () {
+            return this._peerAccount;
+        },
+        enumerable: false,
+        configurable: true
+    });
     return ToolDb;
 }(events_1.default));
 exports.default = ToolDb;

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/tooldb.d.ts

@@ -1,13 +1,19 @@
 /// <reference types="node" />
-import { Account } from "web3-core";
 import { Server as HTTPServer } from "http";
 import { Server as HTTPSServer } from "https";
-import { ToolDb, ToolDbMessage } from "..";
-export declare class ToolDbNetworkAdapter {
+import { ToolDb, ToolDbMessage, VerificationData } from "..";
+import ToolDbNetworkAdapter from "../toolDbNetworkAdapter";
+export declare class ToolDbUserAdapter {
     constructor(db: ToolDb);
-    close(clientId: string): void;
-    sendToAll(msg: ToolDbMessage, crossServerOnly?: boolean, isRelay?: boolean): void;
-    sendToClientId(clientId: string, msg: ToolDbMessage): void;
+    anonUser(): void;
+    setUser(account: unknown | undefined, name: string): void;
+    signData(data: string, privateKey?: string): string;
+    verifySignature(message: Partial<VerificationData<any>>): boolean;
+    getAccountFromPrivate(privateKey: string): unknown;
+    encryptAccount(password: string): unknown;
+    decryptAccount(acc: unknown, password: string): any;
+    getAddress(): string | undefined;
+    getUsername(): string | undefined;
 }
 export interface Peer {
     topic: string;
@@ -86,11 +92,11 @@ export interface ToolDbOptions {
      */
     storageAdapter: ToolDbStorageAdapter;
     /**
-     * The namespace/topic of our app (default is "tool-db-default")
+     * A custom user storage and validation adapter class
      */
-    topic: string;
+    userAdapter: typeof ToolDbUserAdapter;
     /**
-     * Peer's ETH account (generated at init, random)
+     * The namespace/topic of our app (default is "tool-db-default")
      */
-    peerAccount: Account;
+    topic: string;
 }

package/dist/types/tooldb.js

@@ -1,22 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ToolDbNetworkAdapter = void 0;
-var ToolDbNetworkAdapter = /** @class */ (function () {
-    function ToolDbNetworkAdapter(db) {
+exports.ToolDbUserAdapter = void 0;
+var ToolDbUserAdapter = /** @class */ (function () {
+    function ToolDbUserAdapter(db) {
         //
     }
-    ToolDbNetworkAdapter.prototype.close = function (clientId) {
-        //
+    ToolDbUserAdapter.prototype.anonUser = function () {
+        return;
     };
-    ToolDbNetworkAdapter.prototype.sendToAll = function (msg, crossServerOnly, isRelay) {
-        if (crossServerOnly === void 0) { crossServerOnly = false; }
-        if (isRelay === void 0) { isRelay = false; }
-        //
+    ToolDbUserAdapter.prototype.setUser = function (account, name) { };
+    ToolDbUserAdapter.prototype.signData = function (data, privateKey) {
+        return "";
     };
-    ToolDbNetworkAdapter.prototype.sendToClientId = function (clientId, msg) {
-        //
+    ToolDbUserAdapter.prototype.verifySignature = function (message) {
+        return false;
+    };
+    ToolDbUserAdapter.prototype.getAccountFromPrivate = function (privateKey) {
+        return undefined;
+    };
+    ToolDbUserAdapter.prototype.encryptAccount = function (password) {
+        return undefined;
+    };
+    ToolDbUserAdapter.prototype.decryptAccount = function (acc, password) {
+        return undefined;
+    };
+    ToolDbUserAdapter.prototype.getAddress = function () {
+        return "";
+    };
+    ToolDbUserAdapter.prototype.getUsername = function () {
+        return "";
     };
-    return ToolDbNetworkAdapter;
+    return ToolDbUserAdapter;
 }());
-exports.ToolDbNetworkAdapter = ToolDbNetworkAdapter;
+exports.ToolDbUserAdapter = ToolDbUserAdapter;
 //# sourceMappingURL=tooldb.js.map

package/dist/types/tooldb.js.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"tooldb.js","sourceRoot":"","sources":["../../src/types/tooldb.ts"],"names":[],"mappings":";;;AAMA;IACE,2BAAY,EAAU;QACpB,EAAE;IACJ,CAAC;IAEM,oCAAQ,GAAf;QACE,OAAO;IACT,CAAC;IAEM,mCAAO,GAAd,UAAe,OAA4B,EAAE,IAAY,IAAS,CAAC;IAE5D,oCAAQ,GAAf,UAAgB,IAAY,EAAE,UAAmB;QAC/C,OAAO,EAAE,CAAC;IACZ,CAAC;IAEM,2CAAe,GAAtB,UAAuB,OAAuC;QAC5D,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,iDAAqB,GAA5B,UAA6B,UAAkB;QAC7C,OAAO,SAAS,CAAC;IACnB,CAAC;IAEM,0CAAc,GAArB,UAAsB,QAAgB;QACpC,OAAO,SAAS,CAAC;IACnB,CAAC;IAEM,0CAAc,GAArB,UAAsB,GAAY,EAAE,QAAgB;QAClD,OAAO,SAAS,CAAC;IACnB,CAAC;IAEM,sCAAU,GAAjB;QACE,OAAO,EAAE,CAAC;IACZ,CAAC;IAEM,uCAAW,GAAlB;QACE,OAAO,EAAE,CAAC;IACZ,CAAC;IACH,wBAAC;AAAD,CAAC,AAtCD,IAsCC;AAtCY,8CAAiB"}

package/dist/utils/getPeerSignature.d.ts

@@ -1,2 +1,2 @@
-import { Account } from "web3-core";
-export default function getPeerSignature(account: Account, topic: string, timestamp: number, host: string, port: number): import("web3-core").Sign;
+import { ToolDbUserAdapter } from "../types/tooldb";
+export default function getPeerSignature(account: ToolDbUserAdapter, topic: string, timestamp: number, host: string, port: number): string;

package/dist/utils/getPeerSignature.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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);
+    return account.signData(dataToSign);
 }
 exports.default = getPeerSignature;
 //# sourceMappingURL=getPeerSignature.js.map

package/dist/utils/getPeerSignature.js.map

@@ -1 +1 @@
-{"version":3,"file":"getPeerSignature.js","sourceRoot":"","sources":["../../src/utils/getPeerSignature.ts"],"names":[],"mappings":";;;;;AAAA,oDAA8B;AAI9B,SAAwB,gBAAgB,CACtC,OAAgB,EAChB,KAAa,EACb,SAAiB,EACjB,IAAY,EACZ,IAAY;IAEZ,IAAM,UAAU,GAAG,IAAA,gBAAM,EAAI,KAAK,SAAI,SAAS,SAAI,IAAI,SAAI,IAAM,CAAC,CAAC;IACnE,OAAO,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AAClC,CAAC;AATD,mCASC"}
+{"version":3,"file":"getPeerSignature.js","sourceRoot":"","sources":["../../src/utils/getPeerSignature.ts"],"names":[],"mappings":";;;;;AACA,oDAA8B;AAE9B,SAAwB,gBAAgB,CACtC,OAA0B,EAC1B,KAAa,EACb,SAAiB,EACjB,IAAY,EACZ,IAAY;IAEZ,IAAM,UAAU,GAAG,IAAA,gBAAM,EAAI,KAAK,SAAI,SAAS,SAAI,IAAI,SAAI,IAAM,CAAC,CAAC;IACnE,OAAO,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;AACtC,CAAC;AATD,mCASC"}

package/dist/utils/randomAnimal.js

@@ -1,6 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+var adjectives = [
+    "Fast",
+    "Slow",
+    "Cute",
+    "Evil",
+    "Anxious",
+    "Cursed",
+    "Average",
+    "Zombie",
+    "Smart",
+    "Small",
+    "Tall",
+    "Amazing",
+    "Splendid",
+    "Fat",
+    "Invisible",
+    "Regular",
+    "Domestic",
+    "Unique",
+    "Soft",
+    "Lazy",
+    "Angry",
+    "Relaxed",
+    "Huge",
+    "Shy",
+    "Playful",
+    "Creepy",
+    "Ancient",
+    "Beautiful",
+];
 var animals = [
+    "Snake",
+    "Monkey",
+    "Platypus",
+    "Fox",
+    "Lynx",
     "Pug",
     "Chicken",
     "Slug",
@@ -36,7 +71,7 @@ var animals = [
     "Zebra",
 ];
 function randomAnimal() {
-    return animals[Math.round(Math.random() * animals.length)];
+    return adjectives[Math.floor(Math.random() * adjectives.length)] + " " + animals[Math.floor(Math.random() * animals.length)];
 }
 exports.default = randomAnimal;
 //# sourceMappingURL=randomAnimal.js.map

package/dist/utils/randomAnimal.js.map

@@ -1 +1 @@
-{"version":3,"file":"randomAnimal.js","sourceRoot":"","sources":["../../src/utils/randomAnimal.ts"],"names":[],"mappings":";;AAAA,IAAM,OAAO,GAAG;IACd,KAAK;IACL,SAAS;IACT,MAAM;IACN,OAAO;IACP,KAAK;IACL,KAAK;IACL,OAAO;IACP,OAAO;IACP,UAAU;IACV,QAAQ;IACR,SAAS;IACT,QAAQ;IACR,SAAS;IACT,KAAK;IACL,WAAW;IACX,UAAU;IACV,SAAS;IACT,YAAY;IACZ,MAAM;IACN,QAAQ;IACR,OAAO;IACP,QAAQ;IACR,OAAO;IACP,MAAM;IACN,KAAK;IACL,OAAO;IACP,KAAK;IACL,OAAO;IACP,MAAM;IACN,SAAS;IACT,KAAK;IACL,QAAQ;IACR,OAAO;CACR,CAAC;AAEF,SAAwB,YAAY;IAClC,OAAO,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;AAC7D,CAAC;AAFD,+BAEC"}
+{"version":3,"file":"randomAnimal.js","sourceRoot":"","sources":["../../src/utils/randomAnimal.ts"],"names":[],"mappings":";;AAAA,IAAM,UAAU,GAAG;IACjB,MAAM;IACN,MAAM;IACN,MAAM;IACN,MAAM;IACN,SAAS;IACT,QAAQ;IACR,SAAS;IACT,QAAQ;IACR,OAAO;IACP,OAAO;IACP,MAAM;IACN,SAAS;IACT,UAAU;IACV,KAAK;IACL,WAAW;IACX,SAAS;IACT,UAAU;IACV,QAAQ;IACR,MAAM;IACN,MAAM;IACN,OAAO;IACP,SAAS;IACT,MAAM;IACN,KAAK;IACL,SAAS;IACT,QAAQ;IACR,SAAS;IACT,WAAW;CACZ,CAAC;AAEF,IAAM,OAAO,GAAG;IACd,OAAO;IACP,QAAQ;IACR,UAAU;IACV,KAAK;IACL,MAAM;IACN,KAAK;IACL,SAAS;IACT,MAAM;IACN,OAAO;IACP,KAAK;IACL,KAAK;IACL,OAAO;IACP,OAAO;IACP,UAAU;IACV,QAAQ;IACR,SAAS;IACT,QAAQ;IACR,SAAS;IACT,KAAK;IACL,WAAW;IACX,UAAU;IACV,SAAS;IACT,YAAY;IACZ,MAAM;IACN,QAAQ;IACR,OAAO;IACP,QAAQ;IACR,OAAO;IACP,MAAM;IACN,KAAK;IACL,OAAO;IACP,KAAK;IACL,OAAO;IACP,MAAM;IACN,SAAS;IACT,KAAK;IACL,QAAQ;IACR,OAAO;CACR,CAAC;AAEF,SAAwB,YAAY;IAClC,OAAU,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,SACjE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAClD,CAAC;AACL,CAAC;AAJD,+BAIC"}

package/dist/utils/verifyMessage.js

@@ -50,7 +50,7 @@ var message_1 = require("../types/message");
 function verifyMessage(msg, pow) {
     if (pow === void 0) { pow = 0; }
     return __awaiter(this, void 0, void 0, function () {
-        var strData, adressNamespace, key_1, data, address, verified;
+        var strData, adressNamespace, key_1, data, verified;
         var _this = this;
         return __generator(this, function (_a) {
             switch (_a.label) {
@@ -116,8 +116,9 @@ function verifyMessage(msg, pow) {
                             return [2 /*return*/, message_1.VerifyResult.InvalidHashNonce];
                         }
                     }
-                    address = this.recoverAddress(msg.h, msg.s);
-                    verified = address === msg.a;
+                    verified = this.userAccount
+                        ? this.userAccount.verifySignature(msg)
+                        : false;
                     // console.warn(`Signature validation: ${verified ? "Sucess" : "Failed"}`);
                     return [2 /*return*/, verified ? message_1.VerifyResult.Verified : message_1.VerifyResult.InvalidSignature];
             }