Compress hex data

.gitignore

@@ -59,6 +59,7 @@ typings/
 # dotenv environment variables file
 .env
 
+package-lock.json
 
 Будет удалено .gitignore
 Будет удалено .idea/

Blockchain.js

@@ -64,12 +64,9 @@ function Blockchain(config) {
     const Frontend = require('./modules/frontend');
     const app = express();
 
-
     storj.put('app', app);
     storj.put('config', config);
 
-
-
     //Subsystems
     const blockController = new (require('./modules/blockchain'))();
     const NodeMetaInfo = require('./modules/NodeMetaInfo');
@@ -295,7 +292,7 @@ function Blockchain(config) {
         }
         blockHandler.changeMaxBlock(maxBlock);
         transactor.changeMaxBlock(maxBlock);
-        blockchain.put(Number(index), JSON.stringify(block), function () {
+        blockchain.put(Number(index), block, function () {
             if(!noHandle) {
                 blockHandler.handleBlock(block, cb);
             } else {
@@ -1097,7 +1094,7 @@ function Blockchain(config) {
     function getLatestBlock(callback) {
         blockchain.get(maxBlock, function (err, val) {
             if(!err) {
-                callback(JSON.parse(val));
+                callback(val);
             } else {
                 callback(false);
             }

main.js

@@ -90,6 +90,7 @@ const config = {
     keyringKeysCount: 5,                //Сколько генерировать ключей в связку при старте сети. Используется в Trusted консенсусе и  других
     checkExternalConnectionData: false, //Проверять внешние данные на соответствие
     disableInternalToken: false,        //выключить выпуск старых денег(false - разрешено выпускать старые деньги, true - запрет на выпуск)
+    compressHexData: false,              //сжимать для хранения и разжимать при чтении 16ричные данные
 
     //Tokens
     precision: 10000000000,                  //Точность вычислений для кошелька

modules/block.js

@@ -9,6 +9,11 @@
  */
 class Block {
     constructor(index, previousHash, timestamp, data, hash, startTimestamp, sign) {
+
+        if(typeof data === 'object') {
+            data = JSON.stringify(data);
+        }
+
         this.index = index;
         this.previousHash = String(previousHash).toString();
         this.timestamp = timestamp;

modules/blockHandler.js

@@ -161,7 +161,7 @@ class BlockHandler {
     }
 
     exBlockHandler(result, callback) {
-        this.handleBlock(JSON.parse(result), callback)
+        this.handleBlock(result, callback)
     }
 
     /**
@@ -194,7 +194,7 @@ class BlockHandler {
                 try {
                     result = that.exBlockhainGet.sync(that, i);
                     if(prevBlock !== null) {
-                        if(JSON.parse(prevBlock).hash !== JSON.parse(result).previousHash) {
+                        if(prevBlock.hash !== result.previousHash) {
                             if(that.config.program.autofix) {
                                 logger.info('Autofix: Delete chain data after ' + i + ' block');
 
@@ -215,13 +215,11 @@ class BlockHandler {
                                     cb();
                                 }
 
-
                                 return;
-                                break;
                             } else {
                                 logger.disable = false;
-                                console.log(JSON.parse(prevBlock));
-                                console.log(JSON.parse(result));
+                                console.log(prevBlock);
+                                console.log(result);
                                 logger.fatal('Saved chain corrupted in block ' + i + '. Remove wallets and blocks dirs for resync. Also you can use --autofix');
                                 process.exit(1);
                             }
@@ -271,7 +269,7 @@ class BlockHandler {
                 }
                 let block;
                 try {
-                    block = JSON.parse(val);
+                    block = val;
                     block.data = JSON.parse(block.data);
                 } catch (e) {
                     return cb(false);
@@ -332,6 +330,7 @@ class BlockHandler {
                     logger.warning('Network without keyring');
                 }
 
+                that.wallet.keysPair.public = that.wallet.keysPair.public.replace(String.fromCharCode(10), "\\n");
                 if(that.isKeyFromKeyring(that.wallet.keysPair.public)) {
                     logger.warning('THRUSTED NODE. BE CAREFUL.');
                 }

modules/blockchain.js

@@ -9,6 +9,7 @@ const KeyValue = require('./keyvalue');
 const levelup = require('levelup');
 const memdown = require('memdown');
 const leveldown = require('leveldown');
+const utils = require('./utils');
 
 /**
  * Blockchain manager object
@@ -33,11 +34,57 @@ class Blockchain {
 
     get(key, callback) {
         let that = this;
-        that.db.get(key, callback);
+        that.db.get(key, function (error, block) {
+            if (!error) {
+                try{
+                    block = JSON.parse(block);
+
+                    if(that.config.compressHexData){
+                        if(typeof block === 'object'){
+                            block = utils.decompressBlockPartsFromUnicode(block);
+                        }
+                    }
+                } catch (e) {
+                    logger.error('Error prepare block getted from db.');
+                    //console.log(block);
+                    //console.log(e);
+                }
+            }
+            callback(error, block);
+        });
     }
 
     put(key, value, callback) {
         let that = this;
+        if(that.config.compressHexData){
+            if(typeof value === 'object'){
+                let previousHash = value.previousHash || false;
+                let hash = value.hash || false;
+                let sign = value.sign || false;
+                if(previousHash && previousHash.length){
+                    previousHash = utils.hexString2Unicode(previousHash);
+                    if(false !== previousHash){
+                        value.previousHash = previousHash;
+                    }
+                }
+                if(hash && hash.length){
+                    hash = utils.hexString2Unicode(hash);
+                    if(false !== hash){
+                        value.hash = hash;
+                    } else {
+                        console.log('ERROR COMPRESS HASH - '+value.hash);
+                        process.exit();
+                    }
+                }
+                if(sign && sign.length){
+                    sign = utils.hexString2Unicode(sign);
+                    if(false !== sign){
+                        value.sign = sign;
+                    }
+                }
+            }
+        }
+        value = JSON.stringify(value);
         that.db.put(key, value, callback);
     }
 

modules/keyvalue.js

@@ -84,8 +84,6 @@ class KeyValue {
                 that.levelup.get(key, options, callback);
                 break;
         }
-
-
     }
 
     /**
@@ -117,8 +115,6 @@ class KeyValue {
                 that.levelup.put(key, value, callback);
                 break;
         }
-
-
     }
 
     /**
@@ -141,8 +137,6 @@ class KeyValue {
                 that.levelup.del(key, options, callback);
                 break;
         }
-
-
     }
 
 

modules/transactor.js

@@ -5,7 +5,7 @@
 
 const storj = require('./instanceStorage');
 const logger = new (require('./logger'))();
-
+const utils = require('./utils');
 
 /**
  * Реализация тёщи, которая пилит блок, пока он не будет принят в сеть
@@ -94,7 +94,7 @@ class Transactor {
                     }
                     return;// cb();
                 }
-                block = JSON.parse(block);
+
                 if(block.hash !== i.block.hash) {
                     logger.warning('Transactor: Block ' + i.block.index + ' was rejected and replaced.');
                     i.repeats++;
@@ -163,6 +163,12 @@ class Transactor {
              * @var {Block} block
              */
             logger.info('Transactor: Block ' + block.index + ' generated. Addes to watch list');
+
+            if(that.blockchainObject.config.compressHexData){
+                if(typeof block === 'object'){
+                    block = utils.decompressBlockPartsFromUnicode(block);
+                }
+            }
             that.transactions[index].block = block;
             that.transactions[index].watchlist = watchlist;
             that.transactions[index].index = index;

modules/utils.js

@@ -74,5 +74,28 @@ module.exports = {
         }
 
         return str;
+    },
+
+    /**
+     * Decompress parts of block from utf-16 string to hex
+     * @param block
+     * @return {object}
+     */
+    decompressBlockPartsFromUnicode: function (block) {
+        let previousHash = block.previousHash || false;
+        let hash = block.hash || false;
+        let sign = block.sign || false;
+
+        if (previousHash && previousHash.length) {
+            block.previousHash = this.unicode2HexString(previousHash);
+        }
+        if (hash && hash.length) {
+            block.hash = this.unicode2HexString(hash);
+        }
+        if (sign && sign.length) {
+            block.sign = this.unicode2HexString(sign);
+        }
+
+        return block;
     }
 };

modules/validators/thrusted.js

@@ -183,10 +183,6 @@ function generateNextBlock(blockData, cb, cancelCondition, timestamp) {
         return false;
     }
 
-    if(typeof blockData === 'object') {
-        blockData = JSON.stringify(blockData);
-    }
-
     blockchain.getLatestBlock(function (previousBlock) {
         if(!previousBlock) {
             return;