style: comment unused code and format
Signed-off-by: MiaoWoo <admin@yumc.pw>
This commit is contained in:
@@ -12,7 +12,9 @@ global.HTTPCaller.CreateAccount = function(Params, response) {
|
||||
if (typeof Params === "object" && Params.Name && Params.PubKey) {
|
||||
var TYPE_TRANSACTION_CREATE = 100;
|
||||
var TR = {
|
||||
Type: global.TYPE_TRANSACTION_CREATE, Currency: Params.Currency, PubKey: global.GetArrFromHex(Params.PubKey), Description: Params.Name,
|
||||
Type: global.TYPE_TRANSACTION_CREATE,
|
||||
Currency: Params.Currency,
|
||||
PubKey: global.GetArrFromHex(Params.PubKey), Description: Params.Name,
|
||||
Smart: Params.Smart, Adviser: 0,
|
||||
};
|
||||
var Body = global.BufLib.GetBufferFromObject(TR, global.FORMAT_CREATE, 1000, {});
|
||||
|
||||
@@ -16,7 +16,7 @@ import * as crypto from 'crypto';
|
||||
import * as os from 'os'
|
||||
|
||||
global.glStopNode = false;
|
||||
const MAX_TIME_NETWORK_TRANSPORT = 1 * 1000;
|
||||
//const MAX_TIME_NETWORK_TRANSPORT = 1 * 1000;
|
||||
var GlSumUser;
|
||||
var GlSumSys;
|
||||
var GlSumIdle;
|
||||
@@ -204,7 +204,7 @@ module.exports = class CCommon {
|
||||
return crypto.randomBytes(32);
|
||||
}
|
||||
};
|
||||
class SMemBuffer {
|
||||
export class SMemBuffer {
|
||||
MetaMap1
|
||||
MetaMap2
|
||||
CheckName
|
||||
@@ -249,7 +249,7 @@ class SMemBuffer {
|
||||
return;
|
||||
if (this.CheckName) {
|
||||
var Count = 0;
|
||||
for (var key in this.MetaMap2) {
|
||||
for (var _ in this.MetaMap2) {
|
||||
Count++
|
||||
}
|
||||
if (Count) {
|
||||
@@ -366,15 +366,15 @@ global.STreeBuffer = STreeBuffer;
|
||||
global.TestCreateTr = TestCreateTr;
|
||||
|
||||
function TestCreateTr() {
|
||||
const FORMAT_CREATE = "{\
|
||||
Type:byte,\
|
||||
Currency:uint,\
|
||||
PubKey:arr33,\
|
||||
Description:str40,\
|
||||
Adviser:uint,\
|
||||
Reserve:arr7,\
|
||||
POWCreate:arr12,\
|
||||
}";
|
||||
// const FORMAT_CREATE = "{\
|
||||
// Type:byte,\
|
||||
// Currency:uint,\
|
||||
// PubKey:arr33,\
|
||||
// Description:str40,\
|
||||
// Adviser:uint,\
|
||||
// Reserve:arr7,\
|
||||
// POWCreate:arr12,\
|
||||
// }";
|
||||
var TR = {
|
||||
Type: 100, Currency: 0, PubKey: [2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0], Description: "Description", Adviser: 10,
|
||||
|
||||
@@ -99,7 +99,7 @@ module.exports = class CConsensus extends require("./block-loader")
|
||||
Context.TrDataLen = 0
|
||||
Context.Info = "Create at:" + global.GetStrOnlyTimeUTC()
|
||||
var Transfer;
|
||||
var TransferM2;
|
||||
//var TransferM2;
|
||||
var LocalLevel = 0;
|
||||
var Levels = this.LevelNodes;
|
||||
for (let L = 0; L < Levels.length; L++) {
|
||||
@@ -180,13 +180,14 @@ module.exports = class CConsensus extends require("./block-loader")
|
||||
global.ToLog("TRANSFER BlockNum:" + Block.BlockNum + " TxArray=" + Data.TxArray.length + " from " + NodeName(Node))
|
||||
this.ToMaxPOWList(Data.MaxPOW)
|
||||
this.ToMaxSumList(this.GetMaxSumListFromID(Node, Data.MaxSumID, Data.BlockList))
|
||||
var WasNewAdd = 0;
|
||||
//var WasNewAdd = 0;
|
||||
if (Data.TxArray.length) {
|
||||
for (var i = 0; i < Data.TxArray.length; i++) {
|
||||
var Tr = Data.TxArray[i];
|
||||
var Res = this.AddTrToBlockQuote(Block, Tr);
|
||||
if (Res === 1)
|
||||
WasNewAdd = 1
|
||||
if (Res === 1) {
|
||||
//WasNewAdd = 1
|
||||
}
|
||||
if (global.USE_CHECK_SENDING && Res > 0) {
|
||||
var Tt = Block.PowTxTree.find(Tr);
|
||||
if (Tt) {
|
||||
@@ -511,9 +512,8 @@ module.exports = class CConsensus extends require("./block-loader")
|
||||
bSend = 1
|
||||
CanEnd = 0
|
||||
break;
|
||||
}
|
||||
else {
|
||||
var Stop = 1;
|
||||
} else {
|
||||
//var Stop = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -825,7 +825,7 @@ module.exports = class CConsensus extends require("./block-loader")
|
||||
var SumPow = 0;
|
||||
if (arr.length !== global.SUM_LIST_LENGTH)
|
||||
return SumPow;
|
||||
var CountLoad = 0;
|
||||
//var CountLoad = 0;
|
||||
var BlockNumStart = CurBlockNum - arr.length + 1;
|
||||
for (var i = 0; i < arr.length; i++) {
|
||||
var Item = arr[i];
|
||||
@@ -1105,8 +1105,8 @@ module.exports = class CConsensus extends require("./block-loader")
|
||||
if (this.LoadHistoryMode)
|
||||
return;
|
||||
var bWasSave = false;
|
||||
var LoadBlockNum;
|
||||
var LoadHash;
|
||||
// var LoadBlockNum;
|
||||
// var LoadHash;
|
||||
var start_save = CURRENTBLOCKNUM + global.TIME_START_SAVE;
|
||||
for (var BlockNum = CURRENTBLOCKNUM - global.BLOCK_PROCESSING_LENGTH2; BlockNum > global.BLOCK_PROCESSING_LENGTH2 && BlockNum < CURRENTBLOCKNUM; BlockNum++) {
|
||||
var Block = this.GetBlock(BlockNum);
|
||||
|
||||
@@ -9,8 +9,8 @@
|
||||
*/
|
||||
|
||||
"use strict";
|
||||
const fs = require("fs");
|
||||
import * as crypto from 'crypto';
|
||||
//const fs = require("fs");
|
||||
//import * as crypto from 'crypto';
|
||||
require('./block-loader-const');
|
||||
const STAT_BLOCK_LOAD_PERIOD = global.CONSENSUS_PERIOD_TIME / 5;
|
||||
module.exports = class CBlock extends require("./rest-loader")
|
||||
@@ -264,7 +264,7 @@ module.exports = class CBlock extends require("./rest-loader")
|
||||
if (global.LOAD_TO_BEGIN && this.BlockNumDBMin) {
|
||||
this.SendLoadToBegin()
|
||||
}
|
||||
var CountStopSend = 0;
|
||||
//var CountStopSend = 0;
|
||||
var min_num = this.CurrentBlockNum - global.MAX_COUNT_CHAIN_LOAD;
|
||||
var min_num_load = this.CurrentBlockNum;
|
||||
for (var i = 0; i < this.LoadedChainList.length; i++) {
|
||||
@@ -309,8 +309,9 @@ module.exports = class CBlock extends require("./rest-loader")
|
||||
chain.StopSend = true
|
||||
}
|
||||
}
|
||||
if (chain && chain.StopSend)
|
||||
CountStopSend++
|
||||
if (chain && chain.StopSend) {
|
||||
//CountStopSend++
|
||||
}
|
||||
chain = this.LoadedChainList[i]
|
||||
if (chain && !chain.GetFindDB() && !chain.StopSend) {
|
||||
this.SendChainNext(chain, true)
|
||||
@@ -532,7 +533,7 @@ module.exports = class CBlock extends require("./rest-loader")
|
||||
chain.BlockHead = Block
|
||||
if (!chain.BlockNumMax)
|
||||
chain.BlockNumMax = Block.BlockNum
|
||||
var PrevBlock0 = PrevBlock;
|
||||
//var PrevBlock0 = PrevBlock;
|
||||
if (BlockFind) {
|
||||
if (PrevBlock) {
|
||||
PrevBlock.BlockDown = BlockFind
|
||||
@@ -671,9 +672,9 @@ module.exports = class CBlock extends require("./rest-loader")
|
||||
for (var num = 0; num < this.LoadedChainList.length; num++) {
|
||||
var chain = this.LoadedChainList[num];
|
||||
if (chain && chain.arr && chain.arr.length && chain.StopSend) {
|
||||
var Count = 0;
|
||||
//var Count = 0;
|
||||
for (var i = chain.CurNumArrLoad; i < chain.arr.length; i++) {
|
||||
Count++
|
||||
//Count++
|
||||
var Block = chain.arr[i];
|
||||
if (!global.IsZeroArr(Block.TreeHash) && !Block.TreeEq && !Block.LoadDBFinaly) {
|
||||
if (!Block.MapSend) {
|
||||
@@ -696,13 +697,13 @@ module.exports = class CBlock extends require("./rest-loader")
|
||||
if (CountSend >= global.MAX_BLOCK_SEND)
|
||||
return;
|
||||
}
|
||||
}
|
||||
else
|
||||
} else {
|
||||
if (i === chain.CurNumArrLoad) {
|
||||
chain.CurNumArrLoad++
|
||||
Block.LoadDBFinaly = true
|
||||
Count = 0
|
||||
//Count = 0
|
||||
}
|
||||
}
|
||||
}
|
||||
this.CheckAndWriteLoadedChain(chain)
|
||||
}
|
||||
@@ -1029,16 +1030,14 @@ module.exports = class CBlock extends require("./rest-loader")
|
||||
this.SendF(Node, { "Method": "CANBLOCK", "Data": { BlockNum: Block.BlockNum } })
|
||||
}
|
||||
}
|
||||
static
|
||||
CANBLOCK_F() {
|
||||
static CANBLOCK_F() {
|
||||
return "{BlockNum:uint}";
|
||||
}
|
||||
CANBLOCK(Info, CurTime) {
|
||||
var Data = this.DataFromF(Info);
|
||||
// var Data = this.DataFromF(Info);
|
||||
this.SendF(Info.Node, { "Method": "RETCANBLOCK", "Data": { Result: 1 } })
|
||||
}
|
||||
static
|
||||
RETCANBLOCK_F() {
|
||||
static RETCANBLOCK_F() {
|
||||
return "{Result:byte}";
|
||||
}
|
||||
RETCANBLOCK(Info, CurTime) {
|
||||
@@ -1149,10 +1148,10 @@ module.exports = class CBlock extends require("./rest-loader")
|
||||
this.FREE_MEM_BLOCKS(NumMax - global.BLOCK_COUNT_IN_MEMORY)
|
||||
var maxArrMap = Math.floor(NumMax / global.BLOCK_COUNT_IN_MEMORY) - 1;
|
||||
if (maxArrMap >= 0) {
|
||||
var nWasCount = 0;
|
||||
// var nWasCount = 0;
|
||||
for (var key in this.MapMapLoaded)
|
||||
if (key as any < maxArrMap) {
|
||||
nWasCount++
|
||||
// nWasCount++
|
||||
delete this.MapMapLoaded[key]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
*/
|
||||
|
||||
"use strict";
|
||||
import * as crypto from 'crypto';
|
||||
// import * as crypto from 'crypto';
|
||||
const CNode = require("./node");
|
||||
global.PERIOD_FOR_RECONNECT = 3600 * 1000;
|
||||
global.CHECK_DELTA_TIME = { Num: 0, bUse: 0, StartBlockNum: 0, EndBlockNum: 0, bAddTime: 0, DeltaTime: 0, Sign: [] };
|
||||
@@ -205,8 +205,8 @@ module.exports = class CConnect extends require("./transfer-msg")
|
||||
if (Node.BlockProcessCount <= this.BusyLevel)
|
||||
StopGetBlock = 1
|
||||
}
|
||||
var СтатДанные = [];
|
||||
var DirectMAccount = 0;
|
||||
// var СтатДанные = [];
|
||||
// var DirectMAccount = 0;
|
||||
var Ret = {
|
||||
VERSIONMAX: global.DEF_VERSION,
|
||||
FIRST_TIME_BLOCK: 0,
|
||||
|
||||
@@ -451,40 +451,42 @@ function CalcTreeHashFromArrBody(BlockNum, arrContent) {
|
||||
}
|
||||
};
|
||||
|
||||
function TestMerklTree() {
|
||||
var h1 = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
|
||||
var h2 = global.sha3("2");
|
||||
var h3 = global.sha3("3");
|
||||
var h4 = global.sha3("4");
|
||||
var h5 = global.sha3("5");
|
||||
var Tree: any = { RecalcCount: 0 };
|
||||
var CalcMap = {};
|
||||
Tree.LevelsHash = [[h1, h2]];
|
||||
Tree.RecalcCount = 0;
|
||||
CalcMap[0] = 1;
|
||||
CalcMap[1] = 1;
|
||||
UpdateMerklTree(Tree, CalcMap, 0);
|
||||
CalcMap = {};
|
||||
Tree.LevelsHash[0] = [h1, h2, h3, h4];
|
||||
Tree.RecalcCount = 0;
|
||||
CalcMap[2] = 1;
|
||||
CalcMap[3] = 1;
|
||||
UpdateMerklTree(Tree, CalcMap, 0);
|
||||
CalcMap = {};
|
||||
Tree.LevelsHash[0] = [h1, h2, h3];
|
||||
Tree.RecalcCount = 0;
|
||||
CalcMap[Tree.LevelsHash[0].length - 1] = 1;
|
||||
UpdateMerklTree(Tree, CalcMap, 0);
|
||||
global.ToLog("Root=" + global.GetHexFromArr(Tree.Root));
|
||||
global.ToLog("RecalcCount=" + Tree.RecalcCount);
|
||||
return Tree;
|
||||
};
|
||||
if (0)
|
||||
// function TestMerklTree() {
|
||||
// var h1 = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
|
||||
// var h2 = global.sha3("2");
|
||||
// var h3 = global.sha3("3");
|
||||
// var h4 = global.sha3("4");
|
||||
// // var h5 = global.sha3("5");
|
||||
// var Tree: any = { RecalcCount: 0 };
|
||||
// var CalcMap = {};
|
||||
// Tree.LevelsHash = [[h1, h2]];
|
||||
// Tree.RecalcCount = 0;
|
||||
// CalcMap[0] = 1;
|
||||
// CalcMap[1] = 1;
|
||||
// UpdateMerklTree(Tree, CalcMap, 0);
|
||||
// CalcMap = {};
|
||||
// Tree.LevelsHash[0] = [h1, h2, h3, h4];
|
||||
// Tree.RecalcCount = 0;
|
||||
// CalcMap[2] = 1;
|
||||
// CalcMap[3] = 1;
|
||||
// UpdateMerklTree(Tree, CalcMap, 0);
|
||||
// CalcMap = {};
|
||||
// Tree.LevelsHash[0] = [h1, h2, h3];
|
||||
// Tree.RecalcCount = 0;
|
||||
// CalcMap[Tree.LevelsHash[0].length - 1] = 1;
|
||||
// UpdateMerklTree(Tree, CalcMap, 0);
|
||||
// global.ToLog("Root=" + global.GetHexFromArr(Tree.Root));
|
||||
// global.ToLog("RecalcCount=" + Tree.RecalcCount);
|
||||
// return Tree;
|
||||
// };
|
||||
|
||||
if (0) {
|
||||
setTimeout(function() {
|
||||
TestMerkleProof(100);
|
||||
global.ToLog("=========END=========");
|
||||
process.exit(0);
|
||||
});
|
||||
}
|
||||
|
||||
function TestMerkleProof(CountTest) {
|
||||
for (var R = 0; R < CountTest; R++) {
|
||||
@@ -841,22 +843,22 @@ function DoSecret(Arr, Arr2, SecretBuf, StartLen) {
|
||||
}
|
||||
};
|
||||
|
||||
function TestEncryptDecrypt() {
|
||||
var ArrSecret = Buffer.from([1, 1, 1, 1, 1, 1]);
|
||||
var Arr = GetArrFromStr(" Secret message", 64);
|
||||
var Arr2 = Buffer.from(new Uint8Array(Arr.length));
|
||||
var Arr3 = Buffer.from(new Uint8Array(Arr.length));
|
||||
console.log("Message:");
|
||||
console.log(Arr);
|
||||
console.log("-------------------");
|
||||
Encrypt(Arr, Arr2, ArrSecret);
|
||||
console.log("Encrypt:");
|
||||
console.log(Arr2);
|
||||
console.log("-------------------");
|
||||
Decrypt(Arr2, Arr3, ArrSecret);
|
||||
console.log("Decrypt:");
|
||||
console.log(Utf8ArrayToStr(Arr3.slice(9)));
|
||||
};
|
||||
// function TestEncryptDecrypt() {
|
||||
// var ArrSecret = Buffer.from([1, 1, 1, 1, 1, 1]);
|
||||
// var Arr = GetArrFromStr(" Secret message", 64);
|
||||
// var Arr2 = Buffer.from(new Uint8Array(Arr.length));
|
||||
// var Arr3 = Buffer.from(new Uint8Array(Arr.length));
|
||||
// console.log("Message:");
|
||||
// console.log(Arr);
|
||||
// console.log("-------------------");
|
||||
// Encrypt(Arr, Arr2, ArrSecret);
|
||||
// console.log("Encrypt:");
|
||||
// console.log(Arr2);
|
||||
// console.log("-------------------");
|
||||
// Decrypt(Arr2, Arr3, ArrSecret);
|
||||
// console.log("Decrypt:");
|
||||
// console.log(Utf8ArrayToStr(Arr3.slice(9)));
|
||||
// };
|
||||
|
||||
function toUTF8Array(str) {
|
||||
var utf8 = [];
|
||||
@@ -921,9 +923,9 @@ function Utf8ArrayToStr(array) {
|
||||
return out;
|
||||
};
|
||||
|
||||
function GetArr32FromStr(Str) {
|
||||
return GetArrFromStr(Str, 32);
|
||||
};
|
||||
// function GetArr32FromStr(Str) {
|
||||
// return GetArrFromStr(Str, 32);
|
||||
// };
|
||||
|
||||
function GetArrFromStr(Str, Len) {
|
||||
var arr = toUTF8Array(Str);
|
||||
@@ -965,8 +967,7 @@ for (var i = 0; i < DEVELOP_PUB_KEY_ARR.length; i++)
|
||||
DEVELOP_PUB_KEY_ARR[i] = Buffer.from(global.GetArrFromHex(DEVELOP_PUB_KEY_ARR[i]));
|
||||
global.DEVELOP_PUB_KEY = DEVELOP_PUB_KEY_ARR[0];
|
||||
global.DEVELOP_PUB_KEY0 = Buffer.from(global.GetArrFromHex("022e80aa78bc07c72781fac12488096f0bfa7b4f48fbab0f2a92e208d1ee3654df"));
|
||||
let LOCAL_RUN = global.LOCAL_RUN;
|
||||
if (LOCAL_RUN) {
|
||||
if (global.LOCAL_RUN) {
|
||||
global.DEVELOP_PUB_KEY0 = Buffer.from(global.GetArrFromHex("026A04AB98D9E4774AD806E302DDDEB63BEA16B5CB5F223EE77478E861BB583EB3"));
|
||||
global.DEVELOP_PUB_KEY = global.DEVELOP_PUB_KEY0;
|
||||
}
|
||||
@@ -975,8 +976,8 @@ global.ARR_PUB_KEY = ["027ae0dce92d8be1f893525b226695ddf0fe6ad756349a76777ff51f3
|
||||
"0270e0c5acb8eefe7faddac45503da4885e02fb554975d12907f6c33ac6c6bdba5", "0202f2aad628f46d433faf70ba6bf12ab9ed96a46923b592a72508dc43af36cb80",
|
||||
"0254f373fc44ac4a3e80ec8cb8cc3693a856caa82e0493067bdead78ce8ec354b8", "027617f9511b0b0cdbda8f3e17907732731296321846f3fd6fd19460f7227d9482",
|
||||
];
|
||||
let GetHexFromArr = global.GetHexFromArr;
|
||||
if (global.TEST_NETWORK || LOCAL_RUN) {
|
||||
// let GetHexFromArr = global.GetHexFromArr;
|
||||
if (global.TEST_NETWORK || global.LOCAL_RUN) {
|
||||
for (var i = 0; i < 100; i++)
|
||||
global.ARR_PUB_KEY[i] = global.GetHexFromArr(global.DEVELOP_PUB_KEY0);
|
||||
global.DEVELOP_PUB_KEY_ARR = [global.DEVELOP_PUB_KEY0];
|
||||
|
||||
@@ -13,10 +13,12 @@ import './crypto-library'
|
||||
import './log'
|
||||
|
||||
import * as crypto from 'crypto';
|
||||
const os = require('os');
|
||||
|
||||
var BlockTree = new global.STreeBuffer(300 * 1000, global.CompareItemHashSimple, "number");
|
||||
const http = require('http'), net = require('net'), url = require('url'), fs = require('fs'), querystring = require('querystring');
|
||||
import http = require('http');
|
||||
const url = require('url')
|
||||
const fs = require('fs')
|
||||
const querystring = require('querystring');
|
||||
var ContenTypeMap = {};
|
||||
ContenTypeMap["js"] = "application/javascript";
|
||||
ContenTypeMap["css"] = "text/css";
|
||||
@@ -1117,27 +1119,27 @@ HTTPCaller.GetHistoryTransactions = function(Params) {
|
||||
return { result: 0 };
|
||||
};
|
||||
|
||||
function GetCopyBlock(Block) {
|
||||
var Result: any = {
|
||||
BlockNum: Block.BlockNum, bSave: Block.bSave, TreeHash: global.GetHexFromAddres(Block.TreeHash), AddrHash: global.GetHexFromAddres(Block.AddrHash),
|
||||
PrevHash: global.GetHexFromAddres(Block.PrevHash), SumHash: global.GetHexFromAddres(Block.SumHash), SumPow: Block.SumPow, TrDataPos: Block.TrDataPos,
|
||||
TrDataLen: Block.TrDataLen, SeqHash: global.GetHexFromAddres(Block.SeqHash), Hash: global.GetHexFromAddres(Block.Hash), Power: global.GetPowPower(Block.PowHash),
|
||||
TrCount: Block.TrCount, arrContent: Block.arrContent,
|
||||
};
|
||||
return Result;
|
||||
};
|
||||
// function GetCopyBlock(Block) {
|
||||
// var Result: any = {
|
||||
// BlockNum: Block.BlockNum, bSave: Block.bSave, TreeHash: global.GetHexFromAddres(Block.TreeHash), AddrHash: global.GetHexFromAddres(Block.AddrHash),
|
||||
// PrevHash: global.GetHexFromAddres(Block.PrevHash), SumHash: global.GetHexFromAddres(Block.SumHash), SumPow: Block.SumPow, TrDataPos: Block.TrDataPos,
|
||||
// TrDataLen: Block.TrDataLen, SeqHash: global.GetHexFromAddres(Block.SeqHash), Hash: global.GetHexFromAddres(Block.Hash), Power: global.GetPowPower(Block.PowHash),
|
||||
// TrCount: Block.TrCount, arrContent: Block.arrContent,
|
||||
// };
|
||||
// return Result;
|
||||
// };
|
||||
var AddrLength = 16;
|
||||
|
||||
function GetHexFromAddresShort(Hash) {
|
||||
return global.GetHexFromAddres(Hash).substr(0, AddrLength);
|
||||
};
|
||||
|
||||
function GetHexFromStrShort(Str) {
|
||||
if (Str === undefined)
|
||||
return Str;
|
||||
else
|
||||
return Str.substr(0, AddrLength);
|
||||
};
|
||||
// function GetHexFromStrShort(Str) {
|
||||
// if (Str === undefined)
|
||||
// return Str;
|
||||
// else
|
||||
// return Str.substr(0, AddrLength);
|
||||
// };
|
||||
var glid = 0;
|
||||
|
||||
function GetGUID(Block) {
|
||||
@@ -1247,7 +1249,7 @@ function AddMapList(arrLoadedBlocks, type, MapMapLoaded, MainChains?) {
|
||||
}
|
||||
}
|
||||
};
|
||||
var MapFileHTML5 = {};
|
||||
// var MapFileHTML5 = {};
|
||||
|
||||
function SendWebFile(response, name?, StrCookie?, bParsing?) {
|
||||
var type = name.substr(name.length - 4, 4);
|
||||
@@ -1385,21 +1387,21 @@ global.GetFileHTMLFromMarkdown = GetFileHTMLFromMarkdown;
|
||||
global.GetFileSimple = GetFileSimple;
|
||||
global.SaveFileSimple = SaveFileSimple;
|
||||
|
||||
function GetStrTime(now) {
|
||||
if (!now)
|
||||
now = global.GetCurrentTime(0);
|
||||
var Str = "" + now.getHours().toStringZ(2);
|
||||
Str = Str + ":" + now.getMinutes().toStringZ(2);
|
||||
Str = Str + ":" + now.getSeconds().toStringZ(2);
|
||||
return Str;
|
||||
};
|
||||
// function GetStrTime(now) {
|
||||
// if (!now)
|
||||
// now = global.GetCurrentTime(0);
|
||||
// var Str = "" + now.getHours().toStringZ(2);
|
||||
// Str = Str + ":" + now.getMinutes().toStringZ(2);
|
||||
// Str = Str + ":" + now.getSeconds().toStringZ(2);
|
||||
// return Str;
|
||||
// };
|
||||
|
||||
function OnGetData(arg) {
|
||||
var response = {
|
||||
end: function() {
|
||||
}, writeHead: function() {
|
||||
},
|
||||
};
|
||||
// var response = {
|
||||
// end: function() {
|
||||
// }, writeHead: function() {
|
||||
// },
|
||||
// };
|
||||
var Path = arg.path;
|
||||
var obj = arg.obj;
|
||||
if (Path.substr(0, 1) === "/")
|
||||
@@ -1573,18 +1575,18 @@ if (global.ELECTRON) {
|
||||
}
|
||||
exports.SendData = OnGetData;
|
||||
|
||||
function RunConsole(StrRun) {
|
||||
var Str = fs.readFileSync("./EXPERIMENTAL/!run-console.js", { encoding: "utf8" });
|
||||
if (StrRun)
|
||||
Str += "\n" + StrRun;
|
||||
try {
|
||||
var ret = eval(Str);
|
||||
}
|
||||
catch (e) {
|
||||
ret = e.message + "\n" + e.stack;
|
||||
}
|
||||
return ret;
|
||||
};
|
||||
// function RunConsole(StrRun) {
|
||||
// var Str = fs.readFileSync("./EXPERIMENTAL/!run-console.js", { encoding: "utf8" });
|
||||
// if (StrRun)
|
||||
// Str += "\n" + StrRun;
|
||||
// try {
|
||||
// var ret = eval(Str);
|
||||
// }
|
||||
// catch (e) {
|
||||
// ret = e.message + "\n" + e.stack;
|
||||
// }
|
||||
// return ret;
|
||||
// };
|
||||
var WebWalletUser = {};
|
||||
|
||||
function GetUserContext(Params) {
|
||||
|
||||
@@ -31,7 +31,7 @@ global.RBTree = require('bintrees').RBTree;
|
||||
global.ntpClient = require('ntp-client');
|
||||
global.Stun = require('stun');
|
||||
global.ZIP = require("zip");
|
||||
var strOS = os.platform() + "_" + os.arch();
|
||||
// var strOS = os.platform() + "_" + os.arch();
|
||||
if (!global.secp256k1) {
|
||||
global.secp256k1 = require('secp256k1');
|
||||
}
|
||||
@@ -56,16 +56,16 @@ global.GetCurrentBlockNumByTime = function GetCurrentBlockNumByTime() {
|
||||
return StartBlockNum;
|
||||
};
|
||||
global.DelDir = function(Path) {
|
||||
if (Path.substr(Path.length - 1, 1) === "/")
|
||||
if (Path.substr(Path.length - 1, 1) === "/") {
|
||||
Path = Path.substr(0, Path.length - 1);
|
||||
}
|
||||
if (fs.existsSync(Path)) {
|
||||
var arr = fs.readdirSync(Path);
|
||||
for (var i = 0; i < arr.length; i++) {
|
||||
var name = Path + "/" + arr[i];
|
||||
if (fs.statSync(name).isDirectory()) {
|
||||
global.DelDir(name);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
if (name.right(9) == "const.lst")
|
||||
continue;
|
||||
if (name.right(7) == "log.log")
|
||||
@@ -82,7 +82,7 @@ global.SliceArr = function(arr, start, end) {
|
||||
}
|
||||
return ret;
|
||||
};
|
||||
var nRand = Math.floor(123 + Math.random() * 1000);
|
||||
// var nRand = Math.floor(123 + Math.random() * 1000);
|
||||
|
||||
function random(max) {
|
||||
return Math.floor(Math.random() * max);
|
||||
|
||||
103
src/core/log.ts
103
src/core/log.ts
@@ -12,31 +12,30 @@ import * as fs from 'fs'
|
||||
import './constant'
|
||||
import './log-strict'
|
||||
|
||||
let {
|
||||
START_PORT_NUMBER,
|
||||
CheckSizeLogFile,
|
||||
} = global
|
||||
|
||||
var file_name_info = global.GetDataPath("info.log"), file_name_infoPrev = global.GetDataPath("info-prev.log");
|
||||
CheckSizeLogFile(file_name_info, file_name_infoPrev);
|
||||
var file_name_log = global.GetDataPath("log.log"), file_name_logPrev = global.GetDataPath("log-prev.log");
|
||||
CheckSizeLogFile(file_name_log, file_name_logPrev);
|
||||
var file_name_log_web = global.GetDataPath("web.log"), file_name_log_webPrev = global.GetDataPath("web-prev.log");
|
||||
CheckSizeLogFile(file_name_log_web, file_name_log_webPrev);
|
||||
var StartStatTime, file_name_error = global.GetDataPath("err.log"), file_name_errorPrev = global.GetDataPath("err-prev.log");
|
||||
var file_name_info = global.GetDataPath("info.log")
|
||||
var file_name_infoPrev = global.GetDataPath("info-prev.log");
|
||||
global.CheckSizeLogFile(file_name_info, file_name_infoPrev);
|
||||
var file_name_log = global.GetDataPath("log.log")
|
||||
var file_name_logPrev = global.GetDataPath("log-prev.log");
|
||||
global.CheckSizeLogFile(file_name_log, file_name_logPrev);
|
||||
var file_name_log_web = global.GetDataPath("web.log")
|
||||
var file_name_log_webPrev = global.GetDataPath("web-prev.log");
|
||||
global.CheckSizeLogFile(file_name_log_web, file_name_log_webPrev);
|
||||
var StartStatTime, file_name_error = global.GetDataPath("err.log")
|
||||
var file_name_errorPrev = global.GetDataPath("err-prev.log");
|
||||
|
||||
function ToLogFile(e, t, r?) {
|
||||
t instanceof Error && (t = t.message + "\n" + t.stack), global.START_SERVER || (t = global.PROCESS_NAME + ": " + t), "MAIN" !== global.PROCESS_NAME && process.send ? process.send({
|
||||
cmd: "log",
|
||||
message: t
|
||||
}) : (console.log(START_PORT_NUMBER + ": " + global.GetStrOnlyTime() + ": " + t), r || SaveToLogFileSync(e, t));
|
||||
}) : (console.log(global.START_PORT_NUMBER + ": " + global.GetStrOnlyTime() + ": " + t), r || SaveToLogFileSync(e, t));
|
||||
};
|
||||
|
||||
function ToLogClient(e, t, r) {
|
||||
let ArrLogClient = global.ArrLogClient;
|
||||
e && (ToLogFile(file_name_log, e), t || (t = ""), ArrLogClient.push({ text: global.GetStrOnlyTime() + " " + e, key: t, final: r }), 13 < ArrLogClient.length && ArrLogClient.shift());
|
||||
};
|
||||
CheckSizeLogFile(file_name_error, file_name_errorPrev), global.ToLog = function(e, t) {
|
||||
global.CheckSizeLogFile(file_name_error, file_name_errorPrev), global.ToLog = function(e, t) {
|
||||
void 0 === t && (t = 1), t && t > global.LOG_LEVEL || (global.ALL_LOG_TO_CLIENT ? ToLogClient(e, void 0, void 0) : ToLogFile(file_name_log,
|
||||
e));
|
||||
}, global.ToLogWeb = function(e) {
|
||||
@@ -70,11 +69,11 @@ function ResizeArrAvg(e) {
|
||||
return t;
|
||||
};
|
||||
|
||||
function ResizeArr(e) {
|
||||
for (var t = [], r = Math.trunc(e.length / 2), o = 0; o < r; o++)
|
||||
t[o] = e[2 * o];
|
||||
return t;
|
||||
};
|
||||
// function ResizeArr(e) {
|
||||
// for (var t = [], r = Math.trunc(e.length / 2), o = 0; o < r; o++)
|
||||
// t[o] = e[2 * o];
|
||||
// return t;
|
||||
// };
|
||||
|
||||
function GetDiagramData(e, t) {
|
||||
var r, o = 2 * MAX_STAT_PERIOD + 2;
|
||||
@@ -115,20 +114,20 @@ function CopyStatInterval(e, t) {
|
||||
r[n] = o[n], "MAX:" === n.substr(0, 4) && (o[n] = 0);
|
||||
};
|
||||
|
||||
function SaveToLogFileAsync(e, o) {
|
||||
fs.open(e, "a", void 0, function(e, r) {
|
||||
if (e)
|
||||
console.log("Ошибка открытия лог-файла ошибок");
|
||||
else {
|
||||
var t = global.GetStrTime() + " : " + o + "\r\n";
|
||||
fs.write(r, t, null, "utf8", function(e, t) {
|
||||
e ? console.log("Ошибка записи в лог-файл ошибок!") : fs.close(r, function(e) {
|
||||
e && console.log(e);
|
||||
});
|
||||
});
|
||||
}
|
||||
});
|
||||
};
|
||||
// function SaveToLogFileAsync(e, o) {
|
||||
// fs.open(e, "a", void 0, function(e, r) {
|
||||
// if (e)
|
||||
// console.log("Ошибка открытия лог-файла ошибок");
|
||||
// else {
|
||||
// var t = global.GetStrTime() + " : " + o + "\r\n";
|
||||
// fs.write(r, t, null, "utf8", function(e, t) {
|
||||
// e ? console.log("Ошибка записи в лог-файл ошибок!") : fs.close(r, function(e) {
|
||||
// e && console.log(e);
|
||||
// });
|
||||
// });
|
||||
// }
|
||||
// });
|
||||
// };
|
||||
|
||||
function SaveToLogFileSync(e, t) {
|
||||
try {
|
||||
@@ -143,29 +142,35 @@ global.PrepareStatEverySecond = function() {
|
||||
CurStatIndex++;
|
||||
var e = GetCurrentStatIndex();
|
||||
CopyStatInterval(CONTEXT_STATS, e), CopyStatInterval(CONTEXT_ERRORS, e);
|
||||
}, global.TO_ERROR_LOG = function(e, t, r, o, n, a) {
|
||||
}
|
||||
global.TO_ERROR_LOG = function(e, t, r, o, n, a) {
|
||||
r instanceof Error && (r = r.message + "\n"), "rinfo" === o ? r += " from: " + n.address + ":" + n.port : "node" === o && (r += " from: " + n.ip + ":" + n.port);
|
||||
var l = e + ":" + t;
|
||||
global.ToError(" ==ERROR== " + l + " " + r), AddToStatContext(CONTEXT_ERRORS, l), global.ADD_TO_STAT("ERRORS");
|
||||
}, global.HASH_RATE = 0, global.ADD_HASH_RATE = function(e) {
|
||||
}
|
||||
global.HASH_RATE = 0, global.ADD_HASH_RATE = function(e) {
|
||||
e /= 1e6, global.HASH_RATE += e, global.ADD_TO_STAT("HASHRATE", e);
|
||||
}, global.GET_STAT = function(e) {
|
||||
}
|
||||
global.GET_STAT = function(e) {
|
||||
var t = CONTEXT_STATS.Total[e];
|
||||
return t || (t = 0), t;
|
||||
}, global.ADD_TO_STAT_TIME = function(e, t, r) {
|
||||
}
|
||||
global.ADD_TO_STAT_TIME = function(e, t, r) {
|
||||
if (global.STAT_MODE) {
|
||||
if (r && 2 !== global.STAT_MODE)
|
||||
return;
|
||||
var o = process.hrtime(t), n = 1e3 * o[0] + o[1] / 1e6;
|
||||
global.ADD_TO_STAT(e, n);
|
||||
}
|
||||
}, global.ADD_TO_STAT = function(e, t, r) {
|
||||
}
|
||||
global.ADD_TO_STAT = function(e, t, r) {
|
||||
if (global.STAT_MODE) {
|
||||
if (r && 2 !== global.STAT_MODE)
|
||||
return;
|
||||
AddToStatContext(CONTEXT_STATS, e, t);
|
||||
}
|
||||
}, global.GET_STATDIAGRAMS = function(e) {
|
||||
}
|
||||
global.GET_STATDIAGRAMS = function(e) {
|
||||
global.GetCurrentTime();
|
||||
var t = GetCurrentStatIndex();
|
||||
if (!e || !e.length)
|
||||
@@ -195,7 +200,8 @@ global.PrepareStatEverySecond = function() {
|
||||
i.AvgValue = g, i.steptime = _, i.arr = T.slice(1);
|
||||
}
|
||||
return r;
|
||||
}, global.GET_STATS = function(e) {
|
||||
}
|
||||
global.GET_STATS = function(e) {
|
||||
var t = global.GetCurrentTime(), r = GetCurrentStatIndex();
|
||||
return {
|
||||
stats: {
|
||||
@@ -206,23 +212,28 @@ global.PrepareStatEverySecond = function() {
|
||||
r, 600)
|
||||
}, period: (t - StartStatTime) / 1e3, Confirmation: []
|
||||
};
|
||||
}, global.StartCommonStat = function() {
|
||||
for (var e in CONTEXT_STATS.Total)
|
||||
}
|
||||
global.StartCommonStat = function() {
|
||||
for (var _ in CONTEXT_STATS.Total)
|
||||
return;
|
||||
global.ClearCommonStat();
|
||||
}, global.ClearCommonStat = function() {
|
||||
}
|
||||
global.ClearCommonStat = function() {
|
||||
StartStatTime = void (CurStatIndex = 0), CONTEXT_STATS = { Total: {}, Interval: [] }, CONTEXT_ERRORS = { Total: {}, Interval: [] },
|
||||
global.HASH_RATE = 0, global.SERVER.ClearStat();
|
||||
}, global.ResizeArrAvg = ResizeArrAvg, global.ResizeArrMax = ResizeArrMax, global.DEBUG_MODE ? global.TO_DEBUG_LOG = function(e, t, r, o) {
|
||||
}
|
||||
global.ResizeArrAvg = ResizeArrAvg, global.ResizeArrMax = ResizeArrMax, global.DEBUG_MODE ? global.TO_DEBUG_LOG = function(e, t, r, o) {
|
||||
global.DEBUG_MODE && ("rinfo" === t && (e += " from: " + r.address + ":" + r.port + " - " + o.length), global.ToLog(e));
|
||||
} : global.TO_DEBUG_LOG = function(e, t, r, o) {
|
||||
}, global.GetStrOnlyTime = function(e) {
|
||||
}
|
||||
global.GetStrOnlyTime = function(e) {
|
||||
if (!global.GetCurrentTime)
|
||||
return ":::";
|
||||
e || (e = global.GetCurrentTime());
|
||||
var t = "" + e.getHours().toStringZ(2);
|
||||
return t = (t = (t = t + ":" + e.getMinutes().toStringZ(2)) + ":" + e.getSeconds().toStringZ(2)) + "." + e.getMilliseconds().toStringZ(3);
|
||||
}, global.GetStrTime = function(e) {
|
||||
}
|
||||
global.GetStrTime = function(e) {
|
||||
if (!global.GetCurrentTime)
|
||||
return ":::";
|
||||
e || (e = global.GetCurrentTime());
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
"use strict";
|
||||
import net = require("net");
|
||||
import dgram = require("dgram");
|
||||
// import dgram = require("dgram");
|
||||
import * as crypto from 'crypto';
|
||||
import "./library"
|
||||
import "./crypto-library"
|
||||
@@ -19,7 +19,7 @@ global.BUF_TYPE = 1;
|
||||
global.STR_TYPE = 2;
|
||||
global.MAX_STR_BUF_DATA = 200;
|
||||
global.MAX_CONNECTION_ACTIVE = 40;
|
||||
var MAX_CONNECTION_ANOTHER = 40;
|
||||
// var MAX_CONNECTION_ANOTHER = 40;
|
||||
const TRAFIC_LIMIT_NODE_1S = global.MAX_BLOCK_SIZE * 1.25;
|
||||
const TRAFIC_LIMIT_1S = 8 * TRAFIC_LIMIT_NODE_1S;
|
||||
global.STAT_PERIOD = global.CONSENSUS_PERIOD_TIME / 5;
|
||||
@@ -715,13 +715,13 @@ export default class CTransport extends require("./connect")
|
||||
}
|
||||
DoSendBuf() {
|
||||
this.RecalcSendStatictic()
|
||||
var CountNodeSend = 0;
|
||||
// var CountNodeSend = 0;
|
||||
var it = this.ActualNodes.iterator(), Node;
|
||||
NEXT_NODE:
|
||||
while ((Node = it.next()) !== null)
|
||||
if (Node.Socket && Node.ConnectStatus() === 100)
|
||||
if (Node.BufWrite.length > 0) {
|
||||
CountNodeSend++
|
||||
// CountNodeSend++
|
||||
var CountSend = Math.min(BUF_PACKET_SIZE, Node.BufWrite.length);
|
||||
var Value = CountSend / 1024;
|
||||
if (global.LIMIT_SEND_TRAFIC) {
|
||||
|
||||
@@ -30,7 +30,7 @@ function RunOnUpdate() {
|
||||
|
||||
function CreateHeadersHash100() {
|
||||
global.ToLog("CreateHeadersHash100");
|
||||
const DBRow = require("./db/db-row");
|
||||
// const DBRow = require("./db/db-row");
|
||||
global.UpdateMode = 1;
|
||||
var DB = global.SERVER.DBHeader100;
|
||||
var Num = 0;
|
||||
|
||||
@@ -9,12 +9,12 @@
|
||||
*/
|
||||
|
||||
"use strict";
|
||||
const fs = require('fs');
|
||||
// const fs = require('fs');
|
||||
import * as crypto from 'crypto';
|
||||
require("./library");
|
||||
require("./crypto-library");
|
||||
const WalletPath = "WALLET";
|
||||
const DBRow = require("./db/db-row");
|
||||
// const DBRow = require("./db/db-row");
|
||||
const CONFIG_NAME = global.GetDataPath(WalletPath + "/config.lst");
|
||||
class CApp {
|
||||
Password
|
||||
@@ -25,7 +25,7 @@ class CApp {
|
||||
PubKeyArr
|
||||
constructor() {
|
||||
global.CheckCreateDir(global.GetDataPath(WalletPath))
|
||||
var bReadOnly = (global.PROCESS_NAME !== "TX");
|
||||
// var bReadOnly = (global.PROCESS_NAME !== "TX");
|
||||
this.Password = ""
|
||||
this.WalletOpen = undefined
|
||||
var Params = global.LoadParams(CONFIG_NAME, undefined);
|
||||
|
||||
Reference in New Issue
Block a user