diff --git a/Bin/Light/Tera-light.zip b/Bin/Light/Tera-light.zip index 62f3054..bd4d772 100644 Binary files a/Bin/Light/Tera-light.zip and b/Bin/Light/Tera-light.zip differ diff --git a/Bin/Light/tera_light_setup.exe b/Bin/Light/tera_light_setup.exe index 9ae4dc8..ce18c8d 100644 Binary files a/Bin/Light/tera_light_setup.exe and b/Bin/Light/tera_light_setup.exe differ diff --git a/Source/core/constant.js b/Source/core/constant.js index 34adf9c..f508fa8 100644 --- a/Source/core/constant.js +++ b/Source/core/constant.js @@ -8,7 +8,7 @@ * Telegram: https://web.telegram.org/#/im?p=@terafoundation */ -global.UPDATE_CODE_VERSION_NUM = 992; +global.UPDATE_CODE_VERSION_NUM = 993; global.MIN_CODE_VERSION_NUM = 922; global.MINING_VERSION_NUM = 3; global.InitParamsArg = InitParamsArg; diff --git a/Source/core/library.js b/Source/core/library.js index 6811064..a7a21ed 100644 --- a/Source/core/library.js +++ b/Source/core/library.js @@ -447,6 +447,7 @@ function GetCountMiningCPU() }; global.GetCountMiningCPU = GetCountMiningCPU; var AddTrMap = {}; +AddTrMap[ - 6] = "Inner node error"; AddTrMap[ - 5] = "Bad block num"; AddTrMap[ - 4] = "Bad type transaction"; AddTrMap[ - 3] = "Bad time"; diff --git a/Source/core/rest-loader.js b/Source/core/rest-loader.js index 85b28c6..2c7662b 100644 --- a/Source/core/rest-loader.js +++ b/Source/core/rest-loader.js @@ -254,10 +254,13 @@ module.exports = class CRest extends require("./db/block-db") return ; ToLog("Result GETREST Num:" + Task.StartNum + " arr=" + Data.Arr.length + " from " + NodeName(Info.Node), 2) if(!global.TX_PROCESS || !global.TX_PROCESS.RunRPC) + { + ToLog("ERROR global.TX_PROCESS") return ; + } + Task.OK = 1 global.TX_PROCESS.RunRPC("TXWriteAccArr", {StartNum:Task.StartNum, Arr:Data.Arr}, function (Err,Params) { - Task.OK = 1 Context.AccTaskFinished++ }) }}, }) @@ -298,9 +301,9 @@ module.exports = class CRest extends require("./db/block-db") Task.Node = Info.Node if(!global.TX_PROCESS || !global.TX_PROCESS.RunRPC) return ; + Task.OK = 1 global.TX_PROCESS.RunRPC("TXWriteSmartArr", {StartNum:Task.StartNum, Arr:Data.Arr}, function (Err,Params) { - Task.OK = 1 Context.SmartTaskFinished++ }) }}, }) @@ -334,6 +337,7 @@ module.exports = class CRest extends require("./db/block-db") } break; } + var SELF = this; global.TX_PROCESS.RunRPC("TXWriteAccHash", {}, function (Err,Params) { if(!Params) @@ -350,6 +354,12 @@ module.exports = class CRest extends require("./db/block-db") ToLog("Must SmartHash:" + GetHexFromArr(Context.TxProof.SmartHash)) ToLog("Write AccHash:" + GetHexFromArr(Params.AccHash)) ToLog("Write SmartHash:" + GetHexFromArr(Params.SmartHash)) + SELF.BlockNumDB = 0 + SELF.BlockNumDBMin = 0 + SELF.UseTruncateBlockDB = undefined + global.TX_PROCESS.RunRPC("TXPrepareLoadRest", 0, function (Err,Params) + { + }) Context.Mode = 100 } }) diff --git a/Source/core/transaction-validator.js b/Source/core/transaction-validator.js index 6367326..7755169 100644 --- a/Source/core/transaction-validator.js +++ b/Source/core/transaction-validator.js @@ -246,7 +246,7 @@ module.exports = class CSmartContract extends require("./block-exchange") AddTransactionOwn(Tr) { if(!global.TX_PROCESS.Worker) - return 0; + return - 6; var StrHex = GetHexFromArr(sha3(Tr.body)); global.TX_PROCESS.Worker.send({cmd:"FindTX", TX:StrHex}) return this.AddTransaction(Tr, 1); diff --git a/Source/process/main-process.js b/Source/process/main-process.js index 2c8ebd9..b0316da 100644 --- a/Source/process/main-process.js +++ b/Source/process/main-process.js @@ -35,8 +35,8 @@ setTimeout(function () global.glCurNumFindArr = 0; global.ArrReconnect = []; global.ArrConnect = []; -var FindList = [{"ip":"91.235.136.81", "port":30005}, {"ip":"149.154.70.158", "port":30000}, {"ip":"69.30.225.26", "port":30000}, - {"ip":"185.240.243.182", "port":30000}, ]; +var FindList = [{"ip":"149.154.70.158", "port":30000}, {"ip":"69.30.225.26", "port":30000}, {"ip":"185.240.243.182", "port":30000}, + {"ip":"212.109.197.205", "port":30000}, {"ip":"212.109.197.209", "port":30000}, {"ip":"80.87.192.24", "port":30000}, ]; if(global.LOCAL_RUN) { FindList = [{"ip":"127.0.0.1", "port":50001}, {"ip":"127.0.0.1", "port":50002}]; diff --git a/Source/process/tx-process.js b/Source/process/tx-process.js index e253c4f..f10e72b 100644 --- a/Source/process/tx-process.js +++ b/Source/process/tx-process.js @@ -127,9 +127,13 @@ function DoTXProcess() var BlockMin = FindMinimal(); if(!BlockMin) { + if(bShowDetail) + ToLog("!BlockMin"); return ; } var StartTime = Date.now(); + if(bShowDetail) + ToLog("BlockMin: " + BlockMin.BlockNum + " LastBlockNum=" + LastBlockNum); var CountTX = 0; for(var Num = BlockMin.BlockNum; Num < BlockMin.BlockNum + 200; Num++) { @@ -140,15 +144,21 @@ function DoTXProcess() var Block = SERVER.ReadBlockDB(Num); if(!Block) { + if(bShowDetail) + ToLog("!Block"); break; } if(!IsValidSumHash(Block)) { + if(bShowDetail) + ToLog("Stop calc: " + Block.BlockNum + " - ZERO"); break; } var Item = BlockTree.LoadValue(Block.BlockNum, 1); if(Item && CompareArr(Item.SumHash, Block.SumHash) === 0) { + if(bShowDetail) + ToLog("WAS CALC: " + Num + " SumHash: " + GetHexFromArr(Block.SumHash).substr(0, 12)); continue; } SERVER.BlockProcessTX(Block); @@ -196,7 +206,11 @@ function FindMinimal() var Item = BlockTree.LoadValue(Block.BlockNum, 1); if(Item && CompareArr(Item.SumHash, Block.SumHash) === 0) return Block; + if(bShowDetail) + ToLog("" + Num + " " + Block.BlockNum + ". Item=" + JSON.stringify(Item) + " MinimalValidBlock=" + MinimalValidBlock); } + if(bShowDetail) + ToLog("MinimalValidBlock:" + MinimalValidBlock); if(MinimalValidBlock === 0) RewriteAllTransactions(); Block = SERVER.ReadBlockHeaderDB(MinimalValidBlock);