circlecloud/tera
1
1
Fork 1
Code Releases Activity

fix: method refactor error

Browse Source 
Signed-off-by: MiaoWoo <admin@yumc.pw>
This commit is contained in:
MiaoWoo
2019-07-10 17:28:08 +08:00
parent 87a863a228
commit 812813da8d
21 changed files with 92 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/base.ts
View File

@@ -271,8 +271,8 @@ class STreeBuffer {
CheckName
constructor(MaxTime, CompareFunction?, KeyType?, CheckName?) {
this.KeyType = KeyType
this.MetaTree1 = new RBTree(CompareFunction)
this.MetaTree2 = new RBTree(CompareFunction)
this.MetaTree1 = new global.RBTree(CompareFunction)
this.MetaTree2 = new global.RBTree(CompareFunction)
this.CheckName = CheckName
setInterval(this.ShiftMapDirect.bind(this), MaxTime)
}

11
src/core/block-exchange.ts
View File

@@ -51,7 +51,7 @@ module.exports = class CConsensus extends require("./block-loader")
this.CurrentBlockNum = 0
this.SendBlockID = 0
this.RelayMode = false
this.TreeSendPacket = new RBTree(global.CompareItemHash)
this.TreeSendPacket = new global.RBTree(global.CompareItemHash)
if (!global.ADDRLIST_MODE && !this.VirtualMode) {
this.idBlockChainTimer = setInterval(this.StartBlockChain.bind(this), global.CONSENSUS_PERIOD_TIME - 5)
setInterval(this.DoTransfer.bind(this), global.CONSENSUS_CHECK_TIME)
@@ -85,8 +85,8 @@ module.exports = class CConsensus extends require("./block-loader")
Context.TransferFromAddr = {}
Context.LevelsTransfer = []
Context.ErrRun = ""
Context.PowTxTree = new RBTree(global.CompareItemTimePow)
Context.PowTicketTree = new RBTree(global.CompareItemTimePow)
Context.PowTxTree = new global.RBTree(global.CompareItemTimePow)
Context.PowTicketTree = new global.RBTree(global.CompareItemTimePow)
Context.bSave = false
Context.PrevHash = undefined
Context.TreeHash = undefined
@@ -692,7 +692,7 @@ module.exports = class CConsensus extends require("./block-loader")
}
AddPOWToMaxTree(POW, item) {
if (!POW.MaxTree) {
POW.MaxTree = new RBTree(function(a, b) {
POW.MaxTree = new global.RBTree(function(a, b) {
return global.CompareArr(a.PowHash, b.PowHash);
})
}
@@ -1367,8 +1367,7 @@ module.exports = class CConsensus extends require("./block-loader")
}
}
};
let STreeBuffer = global.STreeBuffer;
global.TreeBlockBuf = new STreeBuffer(50 * 1000, global.CompareItemHashSimple, "string");
global.TreeBlockBuf = new global.STreeBuffer(50 * 1000, global.CompareItemHashSimple, "string");
var PrevTimeIdle = 0;
OnTimeIdle();

6
src/core/block-loader.ts
View File

@@ -13,7 +13,7 @@ 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.js")
module.exports = class CBlock extends require("./rest-loader")
{
MapMapLoaded
BlockChain
@@ -1188,7 +1188,7 @@ module.exports = class CBlock extends require("./rest-loader.js")
GetHistoryTree(typedata) {
var Tree = global.HistoryBlockBuf.LoadValue(typedata, 1);
if (!Tree) {
Tree = new RBTree(global.CompareItemHash)
Tree = new global.RBTree(global.CompareItemHash)
global.HistoryBlockBuf.SaveValue(typedata, Tree)
}
return Tree;
@@ -1300,4 +1300,4 @@ global.LoadBlockFromNetwork = function(Params, F) {
F(1);
}
};
global.HistoryBlockBuf = new STreeBuffer(global.HISTORY_BLOCK_COUNT * 1000, global.CompareItemHashSimple, "string");
global.HistoryBlockBuf = new global.STreeBuffer(global.HISTORY_BLOCK_COUNT * 1000, global.CompareItemHashSimple, "string");

6
src/core/connect.ts
View File

@@ -352,7 +352,7 @@ module.exports = class CConnect extends require("./transfer-msg")
if (global.CREATE_ON_START)
return;
if (Data.CheckPoint.BlockNum && Data.CheckPoint.BlockNum > global.CHECK_POINT.BlockNum) {
var SignArr = global.arr2(Data.CheckPoint.Hash, global.SaveToFile(Data.CheckPoint.BlockNum));
var SignArr = global.arr2(Data.CheckPoint.Hash, global.GetArrFromValue(Data.CheckPoint.BlockNum));
if (global.CheckDevelopSign(SignArr, Data.CheckPoint.Sign)) {
global.CHECK_POINT = Data.CheckPoint
this.ResetNextPingAllNode()
@@ -451,7 +451,7 @@ module.exports = class CConnect extends require("./transfer-msg")
Level += Delta / CodeVersion.BlockPeriod
}
if (Level >= CodeVersion.LevelUpdate) {
var SignArr = global.arr2(CodeVersion.Hash, global.SaveToFile(CodeVersion.VersionNum));
var SignArr = global.arr2(CodeVersion.Hash, global.GetArrFromValue(CodeVersion.VersionNum));
if (global.CheckDevelopSign(SignArr, CodeVersion.Sign)) {
global.ToLog("Get new CodeVersion = " + CodeVersion.VersionNum + " HASH:" + global.GetHexFromArr(CodeVersion.Hash).substr(0, 20))
if (CodeVersion.VersionNum > global.CODE_VERSION.VersionNum && CodeVersion.VersionNum > global.START_LOAD_CODE.StartLoadVersionNum) {
@@ -879,7 +879,7 @@ module.exports = class CConnect extends require("./transfer-msg")
}
if (!this.SignCurrentTimeDev) {
var SignArr = global.GetArrFromHex(global.SERVER.addrStr);
this.SignCurrentTimeDev = global.SaveToFile(global.SHA3BUF(SignArr), global.WALLET.KeyPair.getPrivateKey('')).signature
this.SignCurrentTimeDev = global.GetArrFromValue(global.SHA3BUF(SignArr), global.WALLET.KeyPair.getPrivateKey('')).signature
}
var Time = global.GetCurrentTime() - 0;
global.ToLog("Send time: " + Time + " to " + NodeInfo(Node))

4
src/core/constant.ts
View File

@@ -8,7 +8,7 @@
* Telegram: https://t.me/terafoundation
*/
global.UPDATE_CODE_VERSION_NUM = 1102;
global.UPDATE_CODE_VERSION_NUM = 1127;
global.MIN_CODE_VERSION_NUM = 1094;
global.MINING_VERSION_NUM = 0;
global.InitParamsArg = InitParamsArg;
@@ -115,7 +115,7 @@ global.HTTP_HOSTING_PORT = 0;
global.HTTPS_HOSTING_DOMAIN = "";
global.HTTP_MAX_COUNT_ROWS = 20;
global.HTTP_ADMIN_PASSORD = "";
require("./startlib.js");
require("./startlib");
global.MIN_POWER_POW_HANDSHAKE = 12;
global.USE_HINT = 0;
global.ALL_VIEW_ROWS = 0;

2
src/core/crypto-library.ts
View File

@@ -7,7 +7,7 @@
* Twitter: https://twitter.com/terafoundation
* Telegram: https://t.me/terafoundation
*/
require("./library.js");
require("./library");
import * as crypto from 'crypto'
global.MAX_SUPER_VALUE_POW = (1 << 30) * 2;

2
src/core/html-server.ts
View File

@@ -15,7 +15,7 @@ import './log'
import * as crypto from 'crypto';
const os = require('os');
var BlockTree = new STreeBuffer(300 * 1000, global.CompareItemHashSimple, "number");
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');
var ContenTypeMap = {};
ContenTypeMap["js"] = "application/javascript";

37
src/core/library.ts
View File

@@ -13,17 +13,6 @@ import * as os from 'os'
import './constant'
import './log'
let {
TO_ERROR_LOG,
TimeStart,
LOAD_CONST,
LoadParams,
CONST_NAME_ARR,
SaveParams,
SAVE_CONST,
GetDeltaCurrentTime,
} = global
Number.prototype.toStringZ = function(count) {
var strnum = this.toString();
if (strnum.length > count)
@@ -144,7 +133,7 @@ global.LoadParams = function(filename, DefaultValue) {
}
}
catch (err) {
TO_ERROR_LOG("MAINLIB", 100, "Error in file:" + filename + "\n" + err);
global.TO_ERROR_LOG("MAINLIB", 100, "Error in file:" + filename + "\n" + err);
}
return DefaultValue;
};
@@ -157,7 +146,7 @@ global.StartTime = function() {
global.FinishTime = function(Str) {
Str = Str || "";
var TimeFinish = global.GetCurrentTime();
var delta = TimeFinish - TimeStart;
var delta = TimeFinish - global.TimeStart;
console.log(Str + " time: " + delta + " ms");
};
global.CompareItemBufFD = function(a, b) {
@@ -229,10 +218,10 @@ global.CompareItemTimePow = function(a, b) {
};
global.LOAD_CONST = function() {
var Count = 0;
var constants = LoadParams(global.GetDataPath("const.lst"), {});
var constants = global.LoadParams(global.GetDataPath("const.lst"), {});
if (constants) {
for (var i = 0; i < CONST_NAME_ARR.length; i++) {
var key = CONST_NAME_ARR[i];
for (var i = 0; i < global.CONST_NAME_ARR.length; i++) {
var key = global.CONST_NAME_ARR[i];
if (constants[key] !== undefined) {
Count++;
global[key] = constants[key];
@@ -245,12 +234,12 @@ var WasStartSaveConst = false;
function SaveConst() {
var constants = {};
for (var i = 0; i < CONST_NAME_ARR.length; i++) {
var key = CONST_NAME_ARR[i];
for (var i = 0; i < global.CONST_NAME_ARR.length; i++) {
var key = global.CONST_NAME_ARR[i];
if (global[key] !== undefined)
constants[key] = global[key];
}
SaveParams(global.GetDataPath("const.lst"), constants);
global.SaveParams(global.GetDataPath("const.lst"), constants);
WasStartSaveConst = false;
};
global.SAVE_CONST = function(bForce) {
@@ -267,7 +256,7 @@ global.SAVE_CONST = function(bForce) {
function CheckGlobalTime() {
global.ntpClient.getNetworkTime("pool.ntp.org", 123, function(err, NetTime) {
if (err) {
TO_ERROR_LOG("MAINLIB", 110, err);
global.TO_ERROR_LOG("MAINLIB", 110, err);
return;
}
var curTime = new Date;
@@ -278,9 +267,9 @@ function CheckGlobalTime() {
if (Math.abs(global.DELTA_CURRENT_TIME) > 24 * 3600 * 1000)
global.DELTA_CURRENT_TIME = 0;
global.ToLog("Get global time: " + NetTime);
SAVE_CONST();
global.SAVE_CONST();
});
SAVE_CONST();
global.SAVE_CONST();
};
global.CheckGlobalTime = CheckGlobalTime;
global.GetDeltaCurrentTime = function() {
@@ -326,7 +315,7 @@ function GetSecFromStrTime(Str) {
global.GetSecFromStrTime = GetSecFromStrTime;
global.GetCurrentTime = function(Delta_Time) {
if (Delta_Time === undefined)
Delta_Time = GetDeltaCurrentTime();
Delta_Time = global.GetDeltaCurrentTime();
var curTime: any = new Date;
var Time = new Date(curTime - (- Delta_Time));
return Time;
@@ -393,7 +382,7 @@ function GrayConnect() {
return 0;
};
global.GrayConnect = GrayConnect;
var ResConst = LOAD_CONST();
var ResConst = global.LOAD_CONST();
if (global.START_SERVER) {
if (!ResConst) {
CheckGlobalTime();

13
src/core/node.ts
View File

@@ -9,10 +9,9 @@
*/
"use strict";
require("./library.js");
require("./library");
const net = require("net");
var ConnectIDCount = 1;
let RBTree = global.RBTree;
module.exports = class CNode {
addrStr
ip
@@ -154,7 +153,7 @@ module.exports = class CNode {
this.CanHardTraffic = 0
this.BufWriteLength = 0
this.BufWrite = Buffer.alloc(0)
this.SendPacket = new RBTree(function(a, b) {
this.SendPacket = new global.RBTree(function(a, b) {
return b.PacketNum - a.PacketNum;
})
this.ConnectCount = 0
@@ -343,19 +342,19 @@ module.exports = class CNode {
var Buf = global.BufLib.GetObjectFromBuffer(data, global.FORMAT_POW_TO_CLIENT, {});
}
catch (e) {
global.SERVER.Sendglobal.CloseSocket(Socket, "FORMAT_POW_TO_CLIENT")
global.SERVER.SendCloseSocket(Socket, "FORMAT_POW_TO_CLIENT")
return 0;
}
if (global.CompareArr(Buf.addrArr, global.SERVER.addrArr) === 0) {
Node.Self = true
global.AddNodeInfo(Node, "END: SELF")
global.SERVER.Sendglobal.CloseSocket(Socket, "SELF")
global.SERVER.SendCloseSocket(Socket, "SELF")
return;
}
var addrStr = global.GetHexFromAddres(Buf.addrArr);
if (!Node.StartFindList && addrStr !== Node.addrStr) {
global.AddNodeInfo(Node, "END: CHANGED ADDR: " + Node.addrStr.substr(0, 16) + "->" + addrStr.substr(0, 16))
global.SERVER.Sendglobal.CloseSocket(Socket, "ADDRESS_HAS_BEEN_CHANGED")
global.SERVER.SendCloseSocket(Socket, "ADDRESS_HAS_BEEN_CHANGED")
return;
}
if (Node.addrStrTemp) {
@@ -373,7 +372,7 @@ module.exports = class CNode {
if (!Result) {
global.ToLog("END: ERROR_SIGN_SERVER ADDR: " + addrStr.substr(0, 16) + " from ip: " + Socket.remoteAddress)
global.AddNodeInfo(Node, "END: ERROR_SIGN_SERVER ADDR: " + addrStr.substr(0, 16) + " from ip: " + Socket.remoteAddress)
global.SERVER.Sendglobal.CloseSocket(Socket, "ERROR_SIGN_SERVER")
global.SERVER.SendCloseSocket(Socket, "ERROR_SIGN_SERVER")
return;
}
if (Buf.MIN_POWER_POW_HANDSHAKE > 1 + global.MIN_POWER_POW_HANDSHAKE) {

22
src/core/server.ts
View File

@@ -9,11 +9,11 @@
*/
"use strict";
const net = require("net");
const dgram = require("dgram");
import net = require("net");
import dgram = require("dgram");
import * as crypto from 'crypto';
require("./library.js");
require("./crypto-library");
import "./library"
import "./crypto-library"
const HARD_PACKET_PERIOD = 20;
global.BUF_TYPE = 1;
global.STR_TYPE = 2;
@@ -57,9 +57,7 @@ const FORMAT_PACKET_SEND_TCP = "{\
Hash:hash,\
Data:data,\
}";
let RBTree = global.RBTree;
let STreeBuffer = global.STreeBuffer;
module.exports = class CTransport extends require("./connect")
export default class CTransport extends require("./connect")
{
UseRNDHeader
BAN_IP
@@ -90,7 +88,7 @@ module.exports = class CTransport extends require("./connect")
this.port = RunPort
this.CanSend = 0
this.SendFormatMap = {}
this.ActualNodes = new RBTree(function(a, b) {
this.ActualNodes = new global.RBTree(function(a, b) {
if (b.Prioritet !== a.Prioritet)
return b.Prioritet - a.Prioritet;
return global.CompareArr(a.addrArr, b.addrArr);
@@ -99,7 +97,7 @@ module.exports = class CTransport extends require("./connect")
this.LoadedPacketNum = 0
this.LoadedSocketNum = 0
setInterval(this.DoLoadBuf.bind(this), 1)
this.LoadBufSocketList = new RBTree(function(a, b) {
this.LoadBufSocketList = new global.RBTree(function(a, b) {
if (b.SocketPrioritet !== a.SocketPrioritet)
return b.SocketPrioritet - a.SocketPrioritet;
return a.SocketNum - b.SocketNum;
@@ -108,7 +106,7 @@ module.exports = class CTransport extends require("./connect")
this.LastTimeHard = 0
this.LastTimeHardOK = 0
setInterval(this.DoHardPacketForSend.bind(this), HARD_PACKET_PERIOD)
this.HardPacketForSend = new RBTree(function(a, b) {
this.HardPacketForSend = new global.RBTree(function(a, b) {
if (b.BlockProcessCount === a.BlockProcessCount)
return a.PacketNum - b.PacketNum;
else
@@ -859,7 +857,7 @@ module.exports = class CTransport extends require("./connect")
return;
}
let SELF = this;
this.Server = net.createServer(function(sock) {
this.Server = net.createServer(function(sock: any) {
if (SELF.WasBanIP({ address: sock.remoteAddress })) {
sock.ConnectID = "new"
global.CloseSocket(sock, "WAS BAN", true)
@@ -1040,7 +1038,7 @@ module.exports = class CTransport extends require("./connect")
}
}
};
global.ContextPackets = new STreeBuffer(10 * 1000, global.CompareItemHash32, "object");
global.ContextPackets = new global.STreeBuffer(10 * 1000, global.CompareItemHash32, "object");
function CalcStatArr(arr, arrAvg, arrNext, Period) {
var arrSum = [arr[0]];

4
src/core/terahashmining.ts
View File

@@ -15,8 +15,8 @@ var BLOCKNUM_ALGO2 = 6560000;
if (global.LOCAL_RUN || global.TEST_NETWORK) {
BLOCKNUM_ALGO2 = 0;
}
require('./library.js');
require('./crypto-library.js');
require('./library');
require('./crypto-library');
require('../HTML/JS/terahashlib.js');
var DELTA_NONCE = Math.pow(2, 40) * global.MINING_VERSION_NUM;
global.CreateHashMinimal = CreateHashMinimal;

2
src/core/transaction-validator.ts
View File

@@ -22,7 +22,7 @@ module.exports = class CSmartContract extends require("./block-exchange")
BufHashTree
constructor(SetKeyPair, RunIP, RunPort, UseRNDHeader, bVirtual) {
super(SetKeyPair, RunIP, RunPort, UseRNDHeader, bVirtual)
this.BufHashTree = new RBTree(global.CompareArr)
this.BufHashTree = new global.RBTree(global.CompareArr)
this.BufHashTree.LastAddNum = 0
}
AddBlockToHashTree(Block) {

2
src/core/transfer-msg.ts
View File

@@ -18,7 +18,7 @@ module.exports = class CMessages extends require("./transaction-validator")
super(SetKeyPair, RunIP, RunPort, UseRNDHeader, bVirtual)
this.MemPoolMsg = []
for (var i = 0; i <= global.MAX_LEVEL_SPECIALIZATION; i++)
this.MemPoolMsg[i] = new RBTree(global.CompareItemTimePow)
this.MemPoolMsg[i] = new global.RBTree(global.CompareItemTimePow)
}
AddMsgToQuote(Msg) {
var Tree = this.MemPoolMsg[Msg.Level];