0.886

2019-02-15 18:56:11 +03:00
parent 4ae7e3b8bc
commit 4087d50a65
20 changed files with 426 additions and 71 deletions
--- a/Source/core/block-exchange.js
+++ b/Source/core/block-exchange.js
@@ -1546,7 +1546,7 @@ module.exports = class CConsensus extends require("./block-loader")
            BlockMining.Power = GetPowPower(BlockMining.PowHash)
            ADD_TO_STAT("MAX:POWER", BlockMining.Power)
            var Power = GetPowPower(BlockMining.PowHash);
-            var HashCount = (1 << Power) >>> 0;
+            var HashCount = Math.pow(2, Power);
            ADD_HASH_RATE(HashCount)
            AddInfoBlock(BlockMining, "Set POW: " + Power)
            this.SetNoPOW(BlockMining.BlockNum + 8, 0, BlockMining.BlockNum)
--- a/Source/core/block-loader.js
+++ b/Source/core/block-loader.js
@@ -827,7 +827,7 @@ module.exports = class CBlock extends require("./db/block-db")
            return ;
        var startTime = process.hrtime();
        if(this.LoadHistoryMessage)
-            ToLog("WRITE DATA Count:" + arr.length + "  " + arr[0].BlockNum + "-" + arr[arr.length - 1].BlockNum)
+            ToLog("WRITE DATA Count:" + arr.length + "  " + arr[0].BlockNum + "-" + arr[arr.length - 1].BlockNum, 2)
        var CurrentBlockNum = GetCurrentBlockNumByTime();
        var Block, FirstBlock;
        for(var i = 0; i < arr.length; i++)
--- a/Source/core/constant.js
+++ b/Source/core/constant.js
@@ -8,17 +8,18 @@
 * Telegram: https://web.telegram.org/#/im?p=@terafoundation
 */

-global.UPDATE_CODE_VERSION_NUM = 886;
+global.UPDATE_CODE_VERSION_NUM = 891;
 global.MIN_CODE_VERSION_NUM = 884;
 global.MINING_VERSION_NUM = 3;
 global.InitParamsArg = InitParamsArg;
 global.CONST_NAME_ARR = ["AUTO_COORECT_TIME", "DELTA_CURRENT_TIME", "COMMON_KEY", "NODES_NAME", "SERVER_PRIVATE_KEY_HEX", "USE_NET_FOR_SERVER_ADDRES",
 "NET_WORK_MODE", "STAT_MODE", "MAX_STAT_PERIOD", "HTTP_PORT_NUMBER", "HTTP_PORT_PASSWORD", "HTTP_IP_CONNECT", "WALLET_NAME",
-"WALLET_DESCRIPTION", "USE_HARD_API_V2", "COUNT_VIEW_ROWS", "USE_HINT", "ALL_VIEW_ROWS", "ALL_LOG_TO_CLIENT", "USE_MINING",
-"MINING_START_TIME", "MINING_PERIOD_TIME", "POW_MAX_PERCENT", "COUNT_MINING_CPU", "SIZE_MINING_MEMORY", "POW_RUN_COUNT", "POW_RUN_COUNT_FIND",
-"USE_AUTO_UPDATE", "RESTART_PERIOD_SEC", "MAX_GRAY_CONNECTIONS_TO_SERVER", "TRANSACTION_PROOF_COUNT", "UPDATE_NUM_COMPLETE",
-"LIMIT_SEND_TRAFIC", "WATCHDOG_DEV", "ADDRLIST_MODE", "CheckPointDelta", "MIN_VER_STAT", "DEBUG_WALLET", "HTTP_HOSTING_PORT",
-"HTTPS_HOSTING_DOMAIN", "HTTP_MAX_COUNT_ROWS", "WATCHDOG_BADACCOUNT", "COREY_WATCH_DOG", "MAX_CONNECTIONS_COUNT", ];
+"WALLET_DESCRIPTION", "USE_HARD_API_V2", "COUNT_VIEW_ROWS", "USE_HINT", "ALL_VIEW_ROWS", "ALL_LOG_TO_CLIENT", "LOG_LEVEL",
+"USE_MINING", "MINING_START_TIME", "MINING_PERIOD_TIME", "POW_MAX_PERCENT", "COUNT_MINING_CPU", "SIZE_MINING_MEMORY", "POW_RUN_COUNT",
+"POW_RUN_COUNT_FIND", "USE_AUTO_UPDATE", "RESTART_PERIOD_SEC", "MAX_GRAY_CONNECTIONS_TO_SERVER", "TRANSACTION_PROOF_COUNT",
+"UPDATE_NUM_COMPLETE", "LIMIT_SEND_TRAFIC", "WATCHDOG_DEV", "ADDRLIST_MODE", "CheckPointDelta", "MIN_VER_STAT", "DEBUG_WALLET",
+"HTTP_HOSTING_PORT", "HTTPS_HOSTING_DOMAIN", "HTTP_MAX_COUNT_ROWS", "WATCHDOG_BADACCOUNT", "COREY_WATCH_DOG", "MAX_CONNECTIONS_COUNT",
+];
 global.USE_HARD_API_V2 = 0;
 global.USE_TICKET = 0;
 global.USE_CHECK_SENDING = 1;
@@ -50,6 +51,7 @@ global.POW_RUN_COUNT = 5000;
 global.POWRunPeriod = 1;
 global.CheckPointDelta = 20;
 global.ALL_LOG_TO_CLIENT = 1;
+global.LOG_LEVEL = 1;
 global.LIMIT_SEND_TRAFIC = 0;
 global.COUNT_VIEW_ROWS = 20;
 global.MIN_VER_STAT = 0;
@@ -97,7 +99,6 @@ global.GENERATE_BLOCK_ACCOUNT = 0;
 global.TOTAL_TER_MONEY = 1e9;
 global.TRANSACTION_PROOF_COUNT = 1000 * 1000;
 global.MIN_POWER_POW_ACC_CREATE = 16;
-global.MIN_POWER_POW_ACC_CREATE_LAST = MIN_POWER_POW_ACC_CREATE + 3;
 global.START_MINING = 2 * 1000 * 1000;
 global.REF_PERIOD_MINING = 1 * 1000 * 1000;
 global.DELTA_BLOCK_ACCOUNT_HASH = 1000;
@@ -134,7 +135,6 @@ if(global.LOCAL_RUN)
    global.TEST_TRANSACTION_GENERATE = 0;
    global.MIN_POWER_POW_TR = 8;
    global.MIN_POWER_POW_ACC_CREATE = 8;
-    global.MIN_POWER_POW_ACC_CREATE_LAST = 8;
    NETWORK = "LOCAL";
    global.ALL_VIEW_ROWS = 1;
 }
@@ -149,7 +149,6 @@ else
        global.REF_PERIOD_MINING = 1000;
        global.MIN_POWER_POW_TR = 8;
        global.MIN_POWER_POW_ACC_CREATE = 8;
-        global.MIN_POWER_POW_ACC_CREATE_LAST = 8;
        global.TRANSACTION_PROOF_COUNT = 200 * 1000;
        global.MAX_SIZE_LOG = 20 * 1024 * 1024;
        global.DELTA_BLOCK_ACCOUNT_HASH = 1000;
--- a/Source/core/html-server.js
+++ b/Source/core/html-server.js
@@ -302,8 +302,8 @@ HTTPCaller.DappInfo = function (Params,responce,ObjectOnly)
        ArrLog.push(Item);
    }
    var Ret = {result:1, DELTA_CURRENT_TIME:DELTA_CURRENT_TIME, MIN_POWER_POW_TR:MIN_POWER_POW_TR, FIRST_TIME_BLOCK:FIRST_TIME_BLOCK,
-        CONSENSUS_PERIOD_TIME:CONSENSUS_PERIOD_TIME, MIN_POWER_POW_ACC_CREATE:MIN_POWER_POW_ACC_CREATE_LAST, PRICE_DAO:PRICE_DAO(SERVER.BlockNumDB),
-        Smart:Smart, Account:Account, ArrWallet:WLData.arr, ArrEvent:EArr, ArrLog:ArrLog, };
+        CONSENSUS_PERIOD_TIME:CONSENSUS_PERIOD_TIME, PRICE_DAO:PRICE_DAO(SERVER.BlockNumDB), Smart:Smart, Account:Account, ArrWallet:WLData.arr,
+        ArrEvent:EArr, ArrLog:ArrLog, };
    if(global.WALLET)
    {
        Ret.WalletIsOpen = (WALLET.WalletOpen !== false);
@@ -456,12 +456,11 @@ HTTPCaller.GetWalletInfo = function (Params)
        ArrLog:ArrLogClient, MaxAccID:DApps.Accounts.GetMaxAccount(), MaxActNum:DApps.Accounts.GetActsMaxNum(), MaxDappsID:DApps.Smart.GetMaxNum(),
        NeedRestart:global.NeedRestart, ip:SERVER.ip, port:SERVER.port, NET_WORK_MODE:global.NET_WORK_MODE, INTERNET_IP_FROM_STUN:global.INTERNET_IP_FROM_STUN,
        HistoryMaxNum:MaxHistory, DELTA_CURRENT_TIME:DELTA_CURRENT_TIME, FIRST_TIME_BLOCK:FIRST_TIME_BLOCK, CONSENSUS_PERIOD_TIME:CONSENSUS_PERIOD_TIME,
-        MIN_POWER_POW_ACC_CREATE:MIN_POWER_POW_ACC_CREATE_LAST, DATA_PATH:(DATA_PATH.substr(1, 1) === ":" ? DATA_PATH : GetNormalPathString(process.cwd() + "/" + DATA_PATH)),
-        NodeAddrStr:SERVER.addrStr, STAT_MODE:global.STAT_MODE, HTTPPort:global.HTTP_PORT_NUMBER, HTTPPassword:HTTP_PORT_PASSWORD,
-        CONSTANTS:Constants, CheckPointBlockNum:CHECK_POINT.BlockNum, MiningAccount:global.GENERATE_BLOCK_ACCOUNT, CountMiningCPU:GetCountMiningCPU(),
-        CountRunCPU:global.ArrMiningWrk.length, MiningPaused:global.MiningPaused, HashRate:HashRateOneSec, MIN_POWER_POW_TR:MIN_POWER_POW_TR,
-        PRICE_DAO:PRICE_DAO(SERVER.BlockNumDB), NWMODE:global.NWMODE, PERIOD_ACCOUNT_HASH:PERIOD_ACCOUNT_HASH, MAX_ACCOUNT_HASH:DApps.Accounts.DBAccountsHash.GetMaxNum(),
-        TXBlockNum:TXBlockNum, };
+        DATA_PATH:(DATA_PATH.substr(1, 1) === ":" ? DATA_PATH : GetNormalPathString(process.cwd() + "/" + DATA_PATH)), NodeAddrStr:SERVER.addrStr,
+        STAT_MODE:global.STAT_MODE, HTTPPort:global.HTTP_PORT_NUMBER, HTTPPassword:HTTP_PORT_PASSWORD, CONSTANTS:Constants, CheckPointBlockNum:CHECK_POINT.BlockNum,
+        MiningAccount:global.GENERATE_BLOCK_ACCOUNT, CountMiningCPU:GetCountMiningCPU(), CountRunCPU:global.ArrMiningWrk.length, MiningPaused:global.MiningPaused,
+        HashRate:HashRateOneSec, MIN_POWER_POW_TR:MIN_POWER_POW_TR, PRICE_DAO:PRICE_DAO(SERVER.BlockNumDB), NWMODE:global.NWMODE, PERIOD_ACCOUNT_HASH:PERIOD_ACCOUNT_HASH,
+        MAX_ACCOUNT_HASH:DApps.Accounts.DBAccountsHash.GetMaxNum(), TXBlockNum:TXBlockNum, };
    if(Params.Account)
        Ret.PrivateKey = GetHexFromArr(WALLET.GetPrivateKey(WALLET.AccountMap[Params.Account]));
    else
--- a/Source/core/log.js
+++ b/Source/core/log.js
@@ -27,9 +27,10 @@ function ToLogClient(t,e,r)
 {
    t && (ToLogFile(file_name_log, t), e || (e = ""), ArrLogClient.push({text:GetStrOnlyTime() + " " + t, key:e, final:r}), 13 < ArrLogClient.length && ArrLogClient.shift());
 };
-CheckSizeLogFile(file_name_error, file_name_errorPrev), global.ToLog = function (t)
+CheckSizeLogFile(file_name_error, file_name_errorPrev), global.ToLog = function (t,e)
 {
-    global.ALL_LOG_TO_CLIENT ? ToLogClient(t, void 0, void 0) : ToLogFile(file_name_log, t);
+    void 0 === e && (e = 1), e && e > global.LOG_LEVEL || (global.ALL_LOG_TO_CLIENT ? ToLogClient(t, void 0, void 0) : ToLogFile(file_name_log,
+    t));
 }, global.SmallAddr = function (t)
 {
    return t.substr(0, 5);
--- a/Source/core/server.js
+++ b/Source/core/server.js
@@ -357,16 +357,10 @@ module.exports = class CTransport extends require("./connect")
        ADD_TO_STAT("USEPACKET")
        var CurTime = GetCurrentTime();
        Meta.Node.LastTime = CurTime - 0
-        if(Meta.MethodTiming.Process)
+        if(Meta.MethodTiming.Process && Meta.MethodTiming.Process.Worker)
        {
            var Data = this.DataFromF(Meta);
-            try
-            {
-                Meta.MethodTiming.Process.Worker.send({cmd:Meta.Method, Data:Data, addrStr:Meta.Node.addrStr, Context:Meta.Context})
-            }
-            catch(e)
-            {
-            }
+            Meta.MethodTiming.Process.Worker.send({cmd:Meta.Method, Data:Data, addrStr:Meta.Node.addrStr, Context:Meta.Context})
        }
        else
        {
--- a/Source/core/wallet.js
+++ b/Source/core/wallet.js
@@ -234,6 +234,7 @@ class CApp
    {
        if(IsZeroArr(this.PubKeyArr))
            return ;
+        this.AccountMap = {}
        DApps.Accounts.FindAccounts([this.PubKeyArr], this.AccountMap, 0)
    }
    GetAccountKey(Num)