tool-db 2.0.2 → 2.1.2

package/dist/chain/Block.d.ts

@@ -1,21 +1,29 @@
-import { TxJson } from "./Tx";
-export declare type BlockData = TxJson[];
+import { Transactions } from "./Tx";
+export declare type BlockData = Transactions[];
+export declare function decodeBlock(encoded: string): Block;
 export default class Block {
     private _timestamp;
     private _lastHash;
     private _hash;
     private _data;
-    private _validator;
-    private _signature;
-    constructor(timestamp: number, lastHash: string, hash: string, data: BlockData, validator: string, signature: string);
-    toString(): string;
+    private _height;
+    private _merkleRoot;
+    private _nonce;
+    private _difficulty;
+    constructor(height: number, timestamp: number, lastHash: string, data: BlockData, nonce: number, difficulty: string);
+    encode(): string;
     get hash(): string;
+    get merkleRoot(): string;
+    get height(): number;
     get lastHash(): string;
     get timestamp(): number;
     get data(): BlockData;
+    get nonce(): number;
+    set nonce(n: number);
+    get difficulty(): string;
     static genesis(): Block;
-    static hash(timestamp: number, lastHash: string, data: BlockData): string;
+    static merkleRoot(block: Block): any;
     static blockHash(block: Block): string;
-    static createBlock(lastBlock: Block, data: BlockData): Block;
+    static verifyBlockNonce(block: Block): boolean;
     static verifyBlockData(block: Block): boolean;
 }

package/dist/chain/Block.js

@@ -3,23 +3,40 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.decodeBlock = void 0;
 var __1 = require("..");
 var web3_1 = __importDefault(require("web3"));
+var bn_js_1 = __importDefault(require("bn.js"));
+var merkletreejs_1 = require("merkletreejs");
 var getTimestamp_1 = __importDefault(require("../utils/getTimestamp"));
 var web3 = new web3_1.default(web3_1.default.givenProvider);
+function decodeBlock(encoded) {
+    var arr = JSON.parse(encoded);
+    return new Block(arr[0], arr[1], arr[2], arr[3], arr[4], arr[5]);
+}
+exports.decodeBlock = decodeBlock;
 var Block = /** @class */ (function () {
-    function Block(timestamp, lastHash, hash, data, validator, signature) {
+    function Block(height, timestamp, lastHash, data, nonce, difficulty) {
         this._timestamp = (0, getTimestamp_1.default)();
         this._data = [];
+        this._height = height;
         this._timestamp = timestamp;
         this._lastHash = lastHash;
-        this._hash = hash;
         this._data = data;
-        this._validator = validator;
-        this._signature = signature;
+        this._nonce = nonce;
+        this._difficulty = difficulty;
+        this._merkleRoot = Block.merkleRoot(this);
+        this._hash = Block.blockHash(this);
     }
-    Block.prototype.toString = function () {
-        return "Block - \n        Timestamp : " + this._timestamp + "\n        Last Hash : " + this._lastHash + "\n        Hash      : " + this._hash + "\n        Data      : " + this._data + "\n        Validator : " + this._validator + "\n        Signature : " + this._signature;
+    Block.prototype.encode = function () {
+        return JSON.stringify([
+            this._height,
+            this._timestamp,
+            this._lastHash,
+            this._data,
+            this._nonce,
+            this._difficulty,
+        ]);
     };
     Object.defineProperty(Block.prototype, "hash", {
         get: function () {
@@ -28,6 +45,20 @@ var Block = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(Block.prototype, "merkleRoot", {
+        get: function () {
+            return this._merkleRoot;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Block.prototype, "height", {
+        get: function () {
+            return this._height;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(Block.prototype, "lastHash", {
         get: function () {
             return this._lastHash;
@@ -49,31 +80,61 @@ var Block = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(Block.prototype, "nonce", {
+        get: function () {
+            return this._nonce;
+        },
+        set: function (n) {
+            this._nonce = n;
+            this._timestamp = (0, getTimestamp_1.default)();
+            this._hash = Block.blockHash(this);
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Block.prototype, "difficulty", {
+        get: function () {
+            return this._difficulty;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Block.genesis = function () {
-        return new this((0, getTimestamp_1.default)(), "0", "0", [], "0", "0");
+        var ffff = new bn_js_1.default("ffff", "hex");
+        var _2_254 = new bn_js_1.default(2, "le").pow(new bn_js_1.default(224, "le"));
+        var offset = ffff.mul(_2_254).div(new bn_js_1.default(1, "le")).div(new bn_js_1.default(2, "le"));
+        return new this(0, (0, getTimestamp_1.default)(), "000000000000000000000000000000000000000000000000000000000000000000000000000000", [], 0, offset.toString(16));
     };
-    Block.hash = function (timestamp, lastHash, data) {
-        // data should be a merkle root of all tx!
-        return (0, __1.sha256)("" + timestamp + lastHash + JSON.stringify(data)).toString();
+    Block.merkleRoot = function (block) {
+        var data = block.data;
+        var leaves = data.map(function (v) { return v.id; });
+        var tree = new merkletreejs_1.MerkleTree(leaves, __1.sha256);
+        var root = tree.getRoot().toString("hex");
+        return root;
     };
     Block.blockHash = function (block) {
-        var timestamp = block.timestamp, lastHash = block.lastHash, data = block.data;
-        return Block.hash(timestamp, lastHash, data);
+        var height = block.height, nonce = block.nonce, merkleRoot = block.merkleRoot;
+        return (0, __1.sha256)("" + nonce + height + merkleRoot).toString();
     };
-    Block.createBlock = function (lastBlock, data) {
-        var lastHash = lastBlock.hash;
-        var time = (0, getTimestamp_1.default)();
-        var hash = Block.hash(time, lastHash, data);
-        return new this(time, lastHash, hash, data, "0", "0");
+    Block.verifyBlockNonce = function (block) {
+        var isValid = true;
+        var hashAsNumber = new bn_js_1.default(block.hash, "hex");
+        var difficulty = new bn_js_1.default(block.difficulty, "hex");
+        if (hashAsNumber.gte(difficulty))
+            isValid = false;
+        return isValid;
     };
     Block.verifyBlockData = function (block) {
         var isValid = true;
         block.data.forEach(function (tx) {
-            var verify = web3.eth.accounts.recover(tx.txid, tx.sig);
-            if (verify !== tx.from)
+            var verify = web3.eth.accounts.recover(tx.adress, tx.sig);
+            if (verify !== tx.adress)
                 isValid = false;
         });
-        return isValid;
+        var hash = Block.blockHash(block);
+        if (hash !== block.hash)
+            isValid = false;
+        return Block.verifyBlockNonce(block);
     };
     return Block;
 }());

package/dist/chain/Block.js.map

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

package/dist/chain/ToolChain.d.ts

@@ -1,12 +1,27 @@
 import Block from "./Block";
+import { Transactions } from "./Tx";
 export default class ToolChain {
     private _chain;
+    private _noncesState;
     private _balancesState;
+    private _namesState;
+    private _dataState;
+    mempool: Record<string, Transactions>;
     private _lastBlockCalculated;
-    constructor();
+    private _noncetest;
+    constructor(enableMiner: boolean);
+    /**
+     * Simple loop to mine new blocks
+     * This is not meant for real world usage!
+     */
+    mineLoop(): void;
     calculateState(): Record<string, number>;
     get balances(): Record<string, number>;
-    pushBlock(block: Block): false | Block;
-    replaceChain(newChain: Block[]): void;
+    get names(): Record<string, string>;
+    get datas(): Record<string, any>;
+    get nonces(): Record<string, number>;
+    calculateNewDifficulty(): string;
+    pushBlock(block: Block): boolean;
+    replaceChain(newChain: string[]): void;
     isValidBlock(block: Block): boolean;
 }

package/dist/chain/ToolChain.js

@@ -1,30 +1,123 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var Block_1 = __importDefault(require("./Block"));
+var Block_1 = __importStar(require("./Block"));
 var isValidChain_1 = __importDefault(require("./isValidChain"));
-var Tx_1 = __importDefault(require("./Tx"));
+var bn_js_1 = __importDefault(require("bn.js"));
+var getTimestamp_1 = __importDefault(require("../utils/getTimestamp"));
+function sortTxs(a, b) {
+    if (a.adress === b.adress) {
+        if (a.nonce > b.nonce)
+            return -1;
+        if (a.nonce < b.nonce)
+            return 1;
+        return 0;
+    }
+    if (a.timestamp < b.timestamp)
+        return -1;
+    if (a.timestamp > b.timestamp)
+        return 1;
+    return 0;
+}
 var ToolChain = /** @class */ (function () {
-    function ToolChain() {
+    function ToolChain(enableMiner) {
+        var _this = this;
         this._chain = [];
+        this._noncesState = {};
         this._balancesState = {};
+        this._namesState = {};
+        this._dataState = {};
+        this.mempool = {};
         this._lastBlockCalculated = 0;
-        this._chain = [Block_1.default.genesis()];
+        this._noncetest = 0;
+        this._chain = [Block_1.default.genesis().encode()];
+        console.log((0, Block_1.decodeBlock)(this._chain[this._chain.length - 1]).difficulty);
+        if (enableMiner) {
+            // give it 10ms to breathe..
+            setInterval(function () {
+                _this.mineLoop();
+            }, 10);
+        }
     }
+    /**
+     * Simple loop to mine new blocks
+     * This is not meant for real world usage!
+     */
+    ToolChain.prototype.mineLoop = function () {
+        var lastBlock = (0, Block_1.decodeBlock)(this._chain[this._chain.length - 1]);
+        var difficulty = this.calculateNewDifficulty();
+        console.log("nonce:", this._noncetest);
+        var block = new Block_1.default(this._chain.length, new Date().getTime(), lastBlock.hash, Object.values(this.mempool), this._noncetest, difficulty);
+        for (var i = 0; i < 1000000; i += 1) {
+            this._noncetest += 1;
+            block.nonce = this._noncetest;
+            if (Block_1.default.verifyBlockNonce(block)) {
+                console.log("Time elapsed: " +
+                    (block.timestamp - lastBlock.timestamp) / 1000 +
+                    " seconds");
+                console.log("New block: ", {
+                    height: block.height,
+                    hash: block.hash,
+                    nonce: block.nonce,
+                    timestamp: block.timestamp,
+                    data: block.data,
+                    merkle: block.merkleRoot,
+                    difficulty: block.difficulty,
+                });
+                this._chain.push(block.encode());
+                this.calculateState();
+                i = 10000000;
+                this._noncetest = 0;
+            }
+        }
+    };
     ToolChain.prototype.calculateState = function () {
         var _this = this;
         this._chain.slice(this._lastBlockCalculated).forEach(function (block) {
-            block.data.sort(Tx_1.default.sortTxJson).forEach(function (tx) {
-                if (_this._balancesState[tx.from]) {
-                    _this._balancesState[tx.from] -= tx.amount;
+            var blockObj = (0, Block_1.decodeBlock)(block);
+            blockObj.data.sort(sortTxs).forEach(function (tx) {
+                _this._noncesState[tx.adress] = tx.nonce;
+                if (_this.mempool[tx.id]) {
+                    delete _this.mempool[tx.id];
                 }
-                if (_this._balancesState[tx.to]) {
-                    _this._balancesState[tx.to] += tx.amount;
+                if (tx.type === "tx") {
+                    if (_this._balancesState[tx.adress]) {
+                        _this._balancesState[tx.adress] -= tx.amount;
+                        _this._balancesState[tx.adress] -= tx.fee;
+                    }
+                    if (_this._balancesState[tx.to]) {
+                        _this._balancesState[tx.to] += tx.amount;
+                    }
+                    else {
+                        _this._balancesState[tx.to] = tx.amount;
+                    }
                 }
-                else {
-                    _this._balancesState[tx.to] = tx.amount;
+                if (tx.type === "name") {
+                    _this._namesState[tx.name] = tx.adress;
+                }
+                if (tx.type === "put") {
+                    _this._dataState[tx.key] = tx.data;
                 }
             });
         });
@@ -38,11 +131,91 @@ var ToolChain = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(ToolChain.prototype, "names", {
+        get: function () {
+            return this._namesState;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(ToolChain.prototype, "datas", {
+        get: function () {
+            return this._dataState;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(ToolChain.prototype, "nonces", {
+        get: function () {
+            return this._noncesState;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    ToolChain.prototype.calculateNewDifficulty = function () {
+        // 1440 block per adjustment (aprox 24hs)
+        var EPOCH = 1440;
+        // Each block should be mined every 60 seconds
+        var BLOCK_TIME = 60 * 1000;
+        // Adapt POW after 10 minutes
+        var ADAPTIVE_POW_TIME = BLOCK_TIME * 10;
+        // Get the first block in this epoch, with new difficulty
+        var initBlockN = this._chain.length - 1 - ((this._chain.length - 1) % EPOCH);
+        var initBlock = (0, Block_1.decodeBlock)(this._chain[initBlockN]);
+        // Difficulty of the epoch
+        var currentDifficulty = initBlock.difficulty;
+        // Last block timestamp
+        var lastTime = (0, Block_1.decodeBlock)(this._chain[this._chain.length - 1]).timestamp;
+        // Get the multiplier
+        var elapsed = lastTime - initBlock.timestamp;
+        var adjustment = (BLOCK_TIME * EPOCH) / elapsed;
+        console.warn("Avg block every " + Math.round(elapsed / EPOCH / 1000) + " seconds");
+        // Dont divide by zero
+        if (elapsed === 0)
+            return currentDifficulty;
+        // Convert to hex
+        var currentDiffBn = new bn_js_1.default(currentDifficulty, "hex");
+        var adjustmentBn = new bn_js_1.default(adjustment, "le");
+        var newDiff = currentDiffBn.div(adjustmentBn);
+        /**
+         * Adaptive proof of work
+         * This will fix the instance in which a poweful miner, or a group of miners
+         * leave the network, either by a diff stranding attack or just coincidence.
+         * The difficulty will decreased based on the delay there is to create a new block
+         * Every "APoW time" after the last block will cause the difficulty to drop 50%
+         * The APoW time should be a lot more than the average block time, 10x should be good
+         */
+        var apowValue = Math.floor(((0, getTimestamp_1.default)() - lastTime) / ADAPTIVE_POW_TIME);
+        if (apowValue > 0) {
+            // Adaptive POW adjustment
+            var _2Bn = new bn_js_1.default(2, "le");
+            // Divide by 2 for each factor of apow
+            // over 10 mins = x / 2
+            // over 20 mins = x / 2 / 2
+            // over 30 mins = x / 2 / 2 / 2 (etc)
+            for (var ii = 0; ii < apowValue; ii += 1) {
+                newDiff = newDiff.div(_2Bn);
+            }
+        }
+        var newDiffHex = newDiff.toString(16);
+        if (apowValue > 0) {
+            console.warn("APoW triggered: x", apowValue);
+            console.warn("Base adjustment multiplier:", adjustment);
+        }
+        if (this._chain.length % EPOCH === 0) {
+            console.warn("elapsed:", elapsed, "Avg block found in " + Math.round(elapsed / EPOCH / 1000) + " seconds");
+            console.warn("Adjustment multiplier:", adjustment);
+        }
+        // Recalculate difficulty for every 1440th block (one epoch) or if apow is triggered
+        return this._chain.length % EPOCH === 0 || apowValue > 0
+            ? newDiffHex
+            : currentDifficulty;
+    };
     ToolChain.prototype.pushBlock = function (block) {
         if (this.isValidBlock(block)) {
-            this._chain.push(block);
+            this._chain.push(block.encode());
             this.calculateState();
-            return block;
+            return true;
         }
         return false;
     };
@@ -58,22 +231,16 @@ var ToolChain = /** @class */ (function () {
         console.log("Replacing the current chain with new chain");
         this._chain = newChain;
     };
-    // getLeader() {
-    //   return this._stakes.getMax(this._validators.list);
-    // }
     ToolChain.prototype.isValidBlock = function (block) {
-        var lastBlock = this._chain[this._chain.length - 1];
+        var lastBlock = (0, Block_1.decodeBlock)(this._chain[this._chain.length - 1]);
         /**
          * check hash
          * check last hash
-         * check signature
-         * check leader
+         * check signatures
          */
-        if (block.lastHash === lastBlock.hash &&
-            block.hash === Block_1.default.blockHash(block) &&
-            Block_1.default.verifyBlockData(block)
-        // Block.verifyLeader(block, this.getLeader())
-        ) {
+        if (block.height === lastBlock.height + 1 &&
+            block.lastHash === lastBlock.hash &&
+            Block_1.default.verifyBlockData(block)) {
             return true;
         }
         else {

package/dist/chain/ToolChain.js.map

@@ -1 +1 @@
-{"version":3,"file":"ToolChain.js","sourceRoot":"","sources":["../../src/chain/ToolChain.ts"],"names":[],"mappings":";;;;;AAAA,kDAA2C;AAC3C,gEAA0C;AAC1C,4CAAsB;AAEtB;IAME;QALQ,WAAM,GAAY,EAAE,CAAC;QAErB,mBAAc,GAA2B,EAAE,CAAC;QAC5C,yBAAoB,GAAW,CAAC,CAAC;QAGvC,IAAI,CAAC,MAAM,GAAG,CAAC,eAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IAClC,CAAC;IAED,kCAAc,GAAd;QAAA,iBAiBC;QAhBC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC,UAAC,KAAK;YACzD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,UAAC,EAAE;gBACxC,IAAI,KAAI,CAAC,cAAc,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE;oBAChC,KAAI,CAAC,cAAc,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC;iBAC3C;gBACD,IAAI,KAAI,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE;oBAC9B,KAAI,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC;iBACzC;qBAAM;oBACL,KAAI,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;iBACxC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAE/C,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED,sBAAI,+BAAQ;aAAZ;YACE,OAAO,IAAI,CAAC,cAAc,CAAC;QAC7B,CAAC;;;OAAA;IAED,6BAAS,GAAT,UAAU,KAAY;QACpB,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;YAC5B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACxB,IAAI,CAAC,cAAc,EAAE,CAAC;YACtB,OAAO,KAAK,CAAC;SACd;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,gCAAY,GAAZ,UAAa,QAAiB;QAC5B,IAAI,QAAQ,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YACzC,OAAO,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAC;YACnE,OAAO;SACR;aAAM,IAAI,CAAC,IAAA,sBAAY,EAAC,QAAQ,CAAC,EAAE;YAClC,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;YACzC,OAAO;SACR;QAED,OAAO,CAAC,GAAG,CAAC,4CAA4C,CAAC,CAAC;QAC1D,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC;IACzB,CAAC;IAED,gBAAgB;IAChB,uDAAuD;IACvD,IAAI;IAEJ,gCAAY,GAAZ,UAAa,KAAY;QACvB,IAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACtD;;;;;WAKG;QACH,IACE,KAAK,CAAC,QAAQ,KAAK,SAAS,CAAC,IAAI;YACjC,KAAK,CAAC,IAAI,KAAK,eAAK,CAAC,SAAS,CAAC,KAAK,CAAC;YACrC,eAAK,CAAC,eAAe,CAAC,KAAK,CAAC;QAC5B,8CAA8C;UAC9C;YACA,OAAO,IAAI,CAAC;SACb;aAAM;YACL,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IACH,gBAAC;AAAD,CAAC,AA9ED,IA8EC"}
+{"version":3,"file":"ToolChain.js","sourceRoot":"","sources":["../../src/chain/ToolChain.ts"],"names":[],"mappings":"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"}

package/dist/chain/Tx.d.ts

@@ -1,34 +1,50 @@
-import { Account } from "web3-core";
-export interface TxJson {
-    from: string;
-    to: string;
+import ToolChain from "./ToolChain";
+declare type TxType = "tx" | "put" | "name";
+export interface TxBase {
     timestamp: number;
-    amount: number;
-    nonce: number;
-    datahash: string;
-    txid: string;
+    type: TxType;
+    /**
+     * Adress that sent the transaction, owner
+     */
+    adress: string;
+    /**
+     * ID/Hash, should be unique per transaction (a hash of the owner + timestamp + type)
+     */
+    id: string;
+    /**
+     * Signature of the id, signed by the owner
+     */
     sig: string;
+    /**
+     * Nonce, or ordinal number of transaction for this adress
+     */
+    nonce: number;
+    /**
+     * Amount of tokens for the miner
+     */
+    fee: number;
+}
+export interface TxSend extends TxBase {
+    type: "tx";
+    to: string;
+    amount: number;
+}
+export interface TxPut extends TxBase {
+    type: "put";
+    key: string;
+    data: any;
 }
-export default class Tx {
-    private _timestamp;
-    private _txid;
-    private _datahash;
-    private _nonce;
-    private _data;
-    private _signature;
-    private _sender;
-    private _receiver;
-    private _ammount;
-    constructor(from: Account, to: string, data: string, ammount: number);
-    get timestamp(): number;
-    get ammount(): number;
-    get data(): string;
-    get sender(): string;
-    get receiver(): string;
-    get verify(): string;
-    get txid(): string;
-    toJson(): TxJson;
-    static sortTx(a: Tx, b: Tx): 0 | 1 | -1;
-    static sortTxJson(a: TxJson, b: TxJson): 0 | 1 | -1;
-    static fn(): string;
+export interface TxName extends TxBase {
+    type: "name";
+    name: string;
 }
+export declare type Transactions = TxSend | TxPut | TxName;
+/**
+ * Validate a new transaction against the latest state of the chain
+ */
+export declare function validateNewTransaction(tx: Transactions, chain: ToolChain): -1 | -2 | -3 | -4 | -5 | -6 | -7 | -8 | -9 | undefined;
+/**
+ * Validate a transaction's data, regardless of the chain state
+ */
+export declare function validateTransactionData(tx: Transactions): -4 | -5 | -6 | -7 | -8 | -9 | undefined;
+export {};