502647092/tera
1
0
Fork 0
Code Releases Activity

Mon Jul 15 09:22:45 CST 2019 Source Update...

Browse Source
This commit is contained in:
MiaoWoo
2019-07-15 09:22:45 +08:00
parent b415da0a52
commit 9e5466dfdd
8 changed files with 86 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Source/core/connect.js
View File

@@ -114,7 +114,7 @@ module.exports = class CConnect extends require("./transfer-msg")
Node = this.NodesIPMap[key]
if(!Node)
{
Node = this.GetNewNode(addrStr, ip, port)
Node = this.GetNewNode(ip, port, addrStr)
}
}
if(Node.addrStr !== addrStr)
@@ -643,12 +643,44 @@ module.exports = class CConnect extends require("./transfer-msg")
Info.Node.IsAddrList = Data.IsAddrList
AddNodeInfo(Info.Node, "RETGETNODES2 length=" + arr.length)
}
GetNewNode(addrStr, ip, port)
GetNewNode(ip, port, addrStr)
{
var bTemp;
if(!addrStr)
{
bTemp = 1
addrStr = GetHexFromAddres(crypto.randomBytes(32))
}
var Node = new CNode(addrStr, ip, port);
this.AddToArrNodes(Node, false)
if(bTemp)
Node.addrStrTemp = addrStr
return Node;
}
AddNode(Str)
{
var ip, port;
var Index = Str.indexOf(":");
if(Index > 0)
{
ip = Str.substr(0, Index)
port = ParseNum(Str.substr(Index + 1))
}
else
{
ip = Str
if(global.TEST_NETWORK || global.LOCAL_RUN)
{
port = 40000
}
else
{
port = 30000
}
}
this.GetNewNode(ip, port)
return "AddNode " + ip + ":" + port;
}
IsCanConnect(Node)
{
if(Node.addrStr === this.addrStr || this.NodeInBan(Node) || Node.Delete || Node.Self || Node.DoubleConnection)

31
Source/core/constant.js
View File

@@ -8,7 +8,7 @@
* Telegram: https://t.me/terafoundation
*/
global.UPDATE_CODE_VERSION_NUM = 1133;
global.UPDATE_CODE_VERSION_NUM = 1137;
global.MIN_CODE_VERSION_NUM = 1114;
global.MINING_VERSION_NUM = 0;
global.InitParamsArg = InitParamsArg;
@@ -111,6 +111,7 @@ global.TRANSACTION_PROOF_COUNT = 1000 * 1000;
global.MIN_POWER_POW_ACC_CREATE = 16;
global.START_MINING = 2 * 1000 * 1000;
global.REF_PERIOD_MINING = 1 * 1000 * 1000;
global.REF_PERIOD_END = 30 * 1000 * 1000;
global.DELTA_BLOCK_ACCOUNT_HASH = 1000;
global.PERIOD_ACCOUNT_HASH = 50;
global.START_BLOCK_ACCOUNT_HASH = 14500000;
@@ -151,6 +152,7 @@ if(global.LOCAL_RUN)
global.BLOCKNUM_TICKET_ALGO = 1;
global.SMART_BLOCKNUM_START = 0;
global.START_MINING = 60;
global.REF_PERIOD_END = 0;
global.REF_PERIOD_MINING = 10;
global.TEST_TRANSACTION_GENERATE = 0;
global.MIN_POWER_POW_TR = 8;
@@ -173,29 +175,30 @@ else
var Num = Date.now() - 50 * 1000;
console.log("CURRENT NUM: " + (Math.trunc(Num / 1000) * 1000));
global.SMART_BLOCKNUM_START = 0;
global.START_NETWORK_DATE = 1550843168000 + 1000 * 1000;
global.START_MINING = 1000;
global.REF_PERIOD_MINING = 1000;
global.START_NETWORK_DATE = 1563043550000 + 500 * 1000;
global.START_MINING = 100;
global.REF_PERIOD_END = 0;
global.REF_PERIOD_MINING = 200;
global.MIN_POWER_POW_ACC_CREATE = 8;
global.TRANSACTION_PROOF_COUNT = 200 * 1000;
global.MAX_SIZE_LOG = 20 * 1024 * 1024;
global.START_BLOCK_ACCOUNT_HASH = 1000;
global.START_BLOCK_ACCOUNT_HASH3 = 2356000;
global.START_BLOCK_ACCOUNT_HASH = 100;
global.START_BLOCK_ACCOUNT_HASH3 = 200;
global.BLOCKNUM_TICKET_ALGO = 1;
global.WALLET_NAME = "TEST";
NETWORK = "TERA-TEST2";
NETWORK = "TERA-TEST3";
if(global.START_PORT_NUMBER === undefined)
global.START_PORT_NUMBER = 40000;
global.ALL_VIEW_ROWS = 1;
global.NEW_ACCOUNT_INCREMENT = 1903000;
global.NEW_BLOCK_REWARD1 = 1905000;
global.NEW_FORMULA_START = 11402000;
global.NEW_ACCOUNT_INCREMENT = 1;
global.NEW_BLOCK_REWARD1 = 1;
global.NEW_FORMULA_START = 1;
global.NEW_FORMULA_KTERA = 3;
global.NEW_FORMULA_TARGET1 = 11403000;
global.NEW_FORMULA_TARGET2 = 11405000;
global.NEW_FORMULA_TARGET1 = 0;
global.NEW_FORMULA_TARGET2 = 1;
global.COUNT_NODE_PROOF = 8;
global.REST_START_COUNT = 10000;
global.NEW_SIGN_TIME = 4859000;
global.REST_START_COUNT = 1000;
global.NEW_SIGN_TIME = 1;
global.MAX_LENGTH_SENDER_MAP = 100;
global.DELTA_START_SENDER_MAP = 12;
}

4
Source/core/update.js
View File

@@ -24,6 +24,10 @@ function RunOnUpdate()
SaveParams(fname, UpdateInfo);
if(global.TEST_NETWORK || global.LOCAL_RUN)
{
if(CurNum < 1137)
{
SERVER.ClearDataBase();
}
}
else
{