Fri Jul 19 12:26:00 CST 2019 Source Update...

This commit is contained in:
2019-07-19 12:26:00 +08:00
parent 9e5466dfdd
commit 6d7e4474f7
26 changed files with 400 additions and 368 deletions

View File

@@ -8,7 +8,7 @@
* Telegram: https://t.me/terafoundation
*/
global.UPDATE_CODE_VERSION_NUM = 1137;
global.UPDATE_CODE_VERSION_NUM = 1151;
global.MIN_CODE_VERSION_NUM = 1114;
global.MINING_VERSION_NUM = 0;
global.InitParamsArg = InitParamsArg;
@@ -67,7 +67,7 @@ global.HARD_PACKET_PERIOD120 = 160;
global.MINING_START_TIME = "";
global.MINING_PERIOD_TIME = "";
global.CHECK_RUN_MINING = 21 * 1000;
global.CHECK_STOP_CHILD_PROCESS = 10 * 1000;
global.CHECK_STOP_CHILD_PROCESS = 100 * 1000;
global.COUNT_MINING_CPU = 0;
global.SIZE_MINING_MEMORY = 0;
global.HTTP_HOSTING_PORT = 0;
@@ -80,7 +80,6 @@ global.MIN_POWER_POW_HANDSHAKE = 12;
global.USE_HINT = 0;
global.ALL_VIEW_ROWS = 0;
global.COUNT_BLOCK_PROOF = 300;
global.COUNT_NODE_PROOF = 10;
global.MIN_POWER_POW_MSG = 2;
global.MEM_POOL_MSG_COUNT = 1000;
global.MAX_LEVEL_SPECIALIZATION = 24;
@@ -91,7 +90,7 @@ global.TRUST_PROCESS_COUNT = 80000;
global.MAX_NODES_RETURN = 100;
global.MAX_WAIT_PERIOD_FOR_STATUS = 10 * 1000;
global.MAX_GRAY_CONNECTIONS_TO_SERVER = 10;
global.MAX_PACKET_LENGTH = 450 * 1024;
global.MAX_PACKET_LENGTH = 550 * 1024;
global.COUNT_BLOCKS_FOR_LOAD = 600;
global.TR_LEN = 100;
global.BLOCK_PROCESSING_LENGTH = 8;
@@ -165,7 +164,6 @@ if(global.LOCAL_RUN)
global.NEW_FORMULA_TARGET2 = 1;
NETWORK = "LOCAL";
global.ALL_VIEW_ROWS = 1;
global.COUNT_NODE_PROOF = 1;
global.NEW_SIGN_TIME = 0;
}
else
@@ -196,11 +194,11 @@ else
global.NEW_FORMULA_KTERA = 3;
global.NEW_FORMULA_TARGET1 = 0;
global.NEW_FORMULA_TARGET2 = 1;
global.COUNT_NODE_PROOF = 8;
global.REST_START_COUNT = 1000;
global.NEW_SIGN_TIME = 1;
global.MAX_LENGTH_SENDER_MAP = 100;
global.DELTA_START_SENDER_MAP = 12;
global.REST_START_COUNT = 0;
global.LOAD_TO_BEGIN = 0;
}
if(global.LOCAL_RUN)
{

View File

@@ -685,13 +685,15 @@ HTTPCaller.SendTransactionHex = function (Params)
HTTPCaller.SendDirectCode = function (Params,response)
{
var Result;
if(Params.TX || Params.WEB)
if(Params.TX || Params.WEB || Params.ST)
{
var RunProcess;
if(Params.TX)
RunProcess = global.TX_PROCESS;
if(Params.WEB)
RunProcess = global.WEB_PROCESS;
if(Params.ST)
RunProcess = global.STATIC_PROCESS;
if(RunProcess && RunProcess.RunRPC)
{
RunProcess.RunRPC("EvalCode", Params.Code, function (Err,Ret)

View File

@@ -9,6 +9,13 @@
*/
"use strict";
var MIN_POW_CHAINS = 2;
global.COUNT_NODE_PROOF = 6;
if(global.TEST_NETWORK)
{
MIN_POW_CHAINS = 1;
global.COUNT_NODE_PROOF = 1;
}
module.exports = class CRest extends require("./db/block-db")
{
constructor(SetKeyPair, RunIP, RunPort, UseRNDHeader, bVirtual)
@@ -54,6 +61,10 @@ module.exports = class CRest extends require("./db/block-db")
switch(Context.Mode)
{
case 0:
if(!global.TX_PROCESS)
{
return ;
}
var ArrNodes = this.GetActualNodes();
for(var i = 0; i < ArrNodes.length; i++)
{
@@ -63,7 +74,7 @@ module.exports = class CRest extends require("./db/block-db")
continue;
}
Node.SendRestGetHeader = 1
ToLog("Send rest get headers from " + Context.BlockNumProof + " to " + NodeName(Node), 2)
ToLog("Send rest get header " + Context.BlockNumProof + " to " + NodeName(Node), 2)
this.SendF(Node, {"Method":"GETBLOCKHEADER", "Data":{Foward:1, BlockNum:Context.BlockNumProof, Hash:[]}, "Context":{F:this.RETBLOCKHEADER_REST.bind(this)},
})
Context.SendGetHeaderCount++
@@ -95,7 +106,7 @@ module.exports = class CRest extends require("./db/block-db")
MaxPow = parseInt(key)
}
}
if(MaxCount < 2 || MaxPow === 0)
if(MaxCount < MIN_POW_CHAINS || MaxPow === 0)
{
ToLog("****************************************************************** Error MaxPow=" + MaxPow + " - reload.")
this.CheckSyncRest()

View File

@@ -15,8 +15,10 @@ require("../system/smart");
require("../system/file");
require("../system/messager");
require("../system/names");
if(global.PROCESS_NAME === "MAIN" || global.PROCESS_NAME === "TX")
if(global.PROCESS_NAME === "MAIN")
{
require("./wallet");
}
module.exports = class CSmartContract extends require("./block-exchange")
{
constructor(SetKeyPair, RunIP, RunPort, UseRNDHeader, bVirtual)

View File

@@ -28,6 +28,14 @@ function RunOnUpdate()
{
SERVER.ClearDataBase();
}
if(CurNum < 1142)
{
setTimeout(function ()
{
ToLog("UPD: START RewriteAllTransactions");
SERVER.RewriteAllTransactions();
}, 3000);
}
}
else
{

View File

@@ -45,7 +45,7 @@ class CApp
this.KeyPair = crypto.createECDH('secp256k1')
if(Params.Protect)
{
ToLogClient("Wallet protect by password")
ToLog("Wallet protect by password")
this.KeyXOR = GetArrFromHex(Params.KeyXOR)
this.WalletOpen = false
this.SetPrivateKey(Params.PubKey)