june/tera
1
0
Fork 0
forked from circlecloud/tera
Code Releases Activity

feat: optimiz arr compare

Browse Source 
Signed-off-by: MiaoWoo <admin@yumc.pw>
This commit is contained in:
MiaoWoo
2019-07-13 18:50:05 +08:00
parent 207db65a07
commit 04d8ef4ba8
1 changed files with 91 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

213
src/HTML/JS/terahashlib.js
View File

@@ -12,8 +12,7 @@ var DELTA_LONG_MINING = 5000;
var BLOCKNUM_ALGO2 = 6560000;
var BLOCKNUM_HASH_NEW = 10195000;
var BLOCKNUM_TICKET_ALGO = 16070000;
if(typeof global === "object")
{
if (typeof global === "object") {
global.GetHashFromSeqAddr = GetHashFromSeqAddr;
global.CalcHashBlockFromSeqAddr = CalcHashBlockFromSeqAddr;
global.GetHashFromNum2 = GetHashFromNum2;
@@ -21,26 +20,21 @@ if(typeof global === "object")
global.GetHashFromArrNum2 = GetHashFromArrNum2;
global.XORArr = XORArr;
global.GetHash = GetHash;
if(global.LOCAL_RUN || global.TEST_NETWORK)
{
if (global.LOCAL_RUN || global.TEST_NETWORK) {
BLOCKNUM_ALGO2 = 0;
if(global.TEST_NETWORK)
{
if (global.TEST_NETWORK) {
BLOCKNUM_HASH_NEW = 100;
BLOCKNUM_TICKET_ALGO = 0;
}
else
{
else {
BLOCKNUM_HASH_NEW = 100;
BLOCKNUM_TICKET_ALGO = 0;
}
}
}
function GetHashFromSeqAddr(SeqHash,AddrHash,BlockNum,PrevHash,MiningVer)
{
if(BlockNum < BLOCKNUM_ALGO2)
{
function GetHashFromSeqAddr(SeqHash, AddrHash, BlockNum, PrevHash, MiningVer) {
if (BlockNum < BLOCKNUM_ALGO2) {
var Hash = shaarrblock2(SeqHash, AddrHash, BlockNum);
return { Hash: Hash, PowHash: Hash, Hash1: Hash, Hash2: Hash };
}
@@ -51,19 +45,15 @@ function GetHashFromSeqAddr(SeqHash,AddrHash,BlockNum,PrevHash,MiningVer)
var DeltaNum1 = ReadUint16FromArr(AddrHash, 24);
var DeltaNum2 = ReadUint16FromArr(AddrHash, 26);
var PrevHashNum;
if(PrevHash)
{
if (PrevHash) {
PrevHashNum = ReadUint32FromArr(PrevHash, 28);
}
else
{
else {
PrevHashNum = ReadUint32FromArr(AddrHash, 28);
}
var Data = GetHash(SeqHash, PrevHashNum, BlockNum, MinerID, Nonce0, Nonce1, Nonce2, DeltaNum1, DeltaNum2);
if(MiningVer)
{
if(AddrHash[17] !== MiningVer || AddrHash[23] !== MiningVer)
{
if (MiningVer) {
if (AddrHash[17] !== MiningVer || AddrHash[23] !== MiningVer) {
Data.PowHash = [255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
255, 255, 255, 255, 255, 255, 255, 255, 255, 255];
}
@@ -71,8 +61,7 @@ function GetHashFromSeqAddr(SeqHash,AddrHash,BlockNum,PrevHash,MiningVer)
return Data;
};
function GetHash(BlockHash,PrevHashNum,BlockNum,Miner,Nonce0,Nonce1,Nonce2,DeltaNum1,DeltaNum2)
{
function GetHash(BlockHash, PrevHashNum, BlockNum, Miner, Nonce0, Nonce1, Nonce2, DeltaNum1, DeltaNum2) {
if (DeltaNum1 > DELTA_LONG_MINING)
DeltaNum1 = 0;
if (DeltaNum2 > DELTA_LONG_MINING)
@@ -84,16 +73,13 @@ function GetHash(BlockHash,PrevHashNum,BlockNum,Miner,Nonce0,Nonce1,Nonce2,Delta
var Hash1 = XORArr(HashBase, HashNonce1);
var Hash2 = XORArr(HashCurrent, HashNonce2);
var Ret = { Hash: Hash2, Hash1: Hash1, Hash2: Hash2 };
if(CompareArr(Hash1, Hash2) > 0)
{
if (CompareArr(Hash1, Hash2) > 0) {
Ret.PowHash = Hash1;
}
else
{
else {
Ret.PowHash = Hash2;
}
if(BlockNum >= BLOCKNUM_HASH_NEW)
{
if (BlockNum >= BLOCKNUM_HASH_NEW) {
if (BlockNum >= BLOCKNUM_TICKET_ALGO)
Ret.Hash = sha3arr2(Hash1, Hash2);
else
@@ -102,33 +88,28 @@ function GetHash(BlockHash,PrevHashNum,BlockNum,Miner,Nonce0,Nonce1,Nonce2,Delta
return Ret;
};
function CalcHashBlockFromSeqAddr(Block,PrevHash,MiningVer)
{
function CalcHashBlockFromSeqAddr(Block, PrevHash, MiningVer) {
var Value = GetHashFromSeqAddr(Block.SeqHash, Block.AddrHash, Block.BlockNum, PrevHash, MiningVer);
Block.Hash = Value.Hash;
Block.PowHash = Value.PowHash;
};
function XORArr(Arr1,Arr2)
{
function XORArr(Arr1, Arr2) {
var Ret = [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];
for(var i = 0; i < 32; i++)
{
for (var i = 0; i < 32; i++) {
Ret[i] = Arr1[i] ^ Arr2[i];
}
return Ret;
};
function GetHashFromNum2(Value1,Value2)
{
function GetHashFromNum2(Value1, Value2) {
var MeshArr = [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];
WriteUintToArrOnPos(MeshArr, Value1, 0);
WriteUintToArrOnPos(MeshArr, Value2, 6);
return sha3(MeshArr);
};
function GetHashFromArrNum2(Arr,Value1,Value2)
{
function GetHashFromArrNum2(Arr, Value1, Value2) {
var MeshArr = [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, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0];
WriteArrToArrOnPos(MeshArr, Arr, 0, 32);
@@ -137,8 +118,7 @@ function GetHashFromArrNum2(Arr,Value1,Value2)
return sha3(MeshArr);
};
function GetHashFromNum3(Value1,Value2,Value3)
{
function GetHashFromNum3(Value1, Value2, Value3) {
var MeshArr = [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];
WriteUintToArrOnPos(MeshArr, Value1, 0);
WriteUintToArrOnPos(MeshArr, Value2, 6);
@@ -146,10 +126,8 @@ function GetHashFromNum3(Value1,Value2,Value3)
return sha3(MeshArr);
};
function ReadUintFromArr(arr,len)
{
if(len === undefined)
{
function ReadUintFromArr(arr, len) {
if (len === undefined) {
len = arr.len;
arr.len += 6;
}
@@ -159,10 +137,8 @@ function ReadUintFromArr(arr,len)
return value;
};
function ReadUint32FromArr(arr,len)
{
if(len === undefined)
{
function ReadUint32FromArr(arr, len) {
if (len === undefined) {
len = arr.len;
arr.len += 4;
}
@@ -170,10 +146,8 @@ function ReadUint32FromArr(arr,len)
return value;
};
function ReadUint16FromArr(arr,len)
{
if(len === undefined)
{
function ReadUint16FromArr(arr, len) {
if (len === undefined) {
len = arr.len;
arr.len += 2;
}
@@ -181,20 +155,17 @@ function ReadUint16FromArr(arr,len)
return value;
};
function ReadArrFromArr(arr,length)
{
function ReadArrFromArr(arr, length) {
var Ret = [];
var len = arr.len;
for(var i = 0; i < length; i++)
{
for (var i = 0; i < length; i++) {
Ret[i] = arr[len + i];
}
arr.len += length;
return Ret;
};
function WriteUintToArr(arr,Num)
{
function WriteUintToArr(arr, Num) {
var len = arr.length;
arr[len] = Num & 0xFF;
arr[len + 1] = (Num >>> 8) & 0xFF;
@@ -205,8 +176,7 @@ function WriteUintToArr(arr,Num)
arr[len + 5] = (NumH >>> 8) & 0xFF;
};
function WriteUintToArrOnPos(arr,Num,Pos)
{
function WriteUintToArrOnPos(arr, Num, Pos) {
arr[Pos] = Num & 0xFF;
arr[Pos + 1] = (Num >>> 8) & 0xFF;
arr[Pos + 2] = (Num >>> 16) & 0xFF;
@@ -216,8 +186,7 @@ function WriteUintToArrOnPos(arr,Num,Pos)
arr[Pos + 5] = (NumH >>> 8) & 0xFF;
};
function WriteUint32ToArr(arr,Num)
{
function WriteUint32ToArr(arr, Num) {
var len = arr.length;
arr[len] = Num & 0xFF;
arr[len + 1] = (Num >>> 8) & 0xFF;
@@ -225,52 +194,41 @@ function WriteUint32ToArr(arr,Num)
arr[len + 3] = (Num >>> 24) & 0xFF;
};
function WriteUint32ToArrOnPos(arr,Num,Pos)
{
function WriteUint32ToArrOnPos(arr, Num, Pos) {
arr[Pos] = Num & 0xFF;
arr[Pos + 1] = (Num >>> 8) & 0xFF;
arr[Pos + 2] = (Num >>> 16) & 0xFF;
arr[Pos + 3] = (Num >>> 24) & 0xFF;
};
function WriteUint16ToArrOnPos(arr,Num,Pos)
{
function WriteUint16ToArrOnPos(arr, Num, Pos) {
arr[Pos] = Num & 0xFF;
arr[Pos + 1] = (Num >>> 8) & 0xFF;
};
function WriteArrToArr(arr,arr2,ConstLength)
{
function WriteArrToArr(arr, arr2, ConstLength) {
var len = arr.length;
for(var i = 0; i < ConstLength; i++)
{
for (var i = 0; i < ConstLength; i++) {
arr[len + i] = arr2[i];
}
};
function WriteArrToArrOnPos(arr,arr2,Pos,ConstLength)
{
for(var i = 0; i < ConstLength; i++)
{
function WriteArrToArrOnPos(arr, arr2, Pos, ConstLength) {
for (var i = 0; i < ConstLength; i++) {
arr[Pos + i] = arr2[i];
}
};
function WriteArrToArrHOnPos(arr,arr2,Pos,ConstLength)
{
for(var i = 0; i < ConstLength; i++)
{
function WriteArrToArrHOnPos(arr, arr2, Pos, ConstLength) {
for (var i = 0; i < ConstLength; i++) {
arr[Pos + i] |= (arr2[i] << 8);
}
};
function ConvertBufferToStr(Data)
{
for(var key in Data)
{
function ConvertBufferToStr(Data) {
for (var key in Data) {
var item = Data[key];
if(item instanceof Buffer)
{
if (item instanceof Buffer) {
Data[key] = GetHexFromArr(item);
}
else
@@ -279,13 +237,11 @@ function ConvertBufferToStr(Data)
}
};
function CopyObjValue(obj,num)
{
function CopyObjValue(obj, num) {
if (num && num > 5)
return obj;
var ret = {};
for(var key in obj)
{
for (var key in obj) {
var val = obj[key];
if ((typeof val === "object") && !(val instanceof Buffer) && !(val instanceof ArrayBuffer) && !(val instanceof Array))
val = CopyObjValue(val, num + 1);
@@ -294,17 +250,15 @@ function CopyObjValue(obj,num)
return ret;
};
function CopyArr(arr1)
{
function CopyArr(arr1) {
var arr2 = [];
if (arr1)
for(var i = 0; i < arr1.length; i++)
for (var i = 0, len = arr1.length; i < len; i++)
arr2[i] = arr1[i];
return arr2;
};
function ParseNum(a)
{
function ParseNum(a) {
var Num = parseInt(a);
if (!Num)
Num = 0;
@@ -315,57 +269,48 @@ function ParseNum(a)
return Num;
};
function CompareArr(a,b)
{
for(var i = 0; i < a.length; i++)
{
function CompareArr(a, b) {
for (var i = 0, len = a.length; i < len; i++) {
if (a[i] !== b[i])
return a[i] - b[i];
}
return 0;
};
function CompareArrL(a,b)
{
function CompareArrL(a, b) {
if (a.length !== b.length)
return a.length - b.length;
for(var i = 0; i < a.length; i++)
{
for (var i = 0, len = a.length; i < len; i++) {
if (a[i] !== b[i])
return a[i] - b[i];
}
return 0;
};
function GetSeqHash(BlockNum,PrevHash,TreeHash)
{
function GetSeqHash(BlockNum, PrevHash, TreeHash) {
var arr = [GetArrFromValue(BlockNum), PrevHash, TreeHash];
var SeqHash = CalcHashFromArray(arr, true);
return SeqHash;
};
function arr2(Value1,Value2)
{
function arr2(Value1, Value2) {
var Buf = [];
for(var n = 0; n < Value1.length; n++)
for (var n = 0, len = Value1.length; n < len; n++)
Buf.push(Value1[n]);
for(var n = 0; n < Value2.length; n++)
for (var n = 0, len = Value2.length; n < len; n++)
Buf.push(Value2[n]);
return Buf;
};
function shaarr2(Value1,Value2)
{
function shaarr2(Value1, Value2) {
return shaarr(arr2(Value1, Value2));
};
function sha3arr2(Value1,Value2)
{
function sha3arr2(Value1, Value2) {
return sha3(arr2(Value1, Value2));
};
function GetBlockArrFromBuffer(BufRead,Info)
{
function GetBlockArrFromBuffer(BufRead, Info) {
if (!BufRead || BufRead.length < 10)
return [];
var BLOCK_PROCESSING_LENGTH = 8;
@@ -374,24 +319,19 @@ function GetBlockArrFromBuffer(BufRead,Info)
var StartNum = ReadUintFromArr(BufRead);
var CountLoad = ReadUint32FromArr(BufRead);
var BufSize = 6 + 4 + BLOCK_PROCESSING_LENGTH2 * 32 + 32 + 6 + CountLoad * 64;
if(CountLoad <= 0 || BufSize !== BufRead.length)
{
if (CountLoad <= 0 || BufSize !== BufRead.length) {
return [];
}
var PrevBlock;
var BlockArr = [];
for(var i = 0; i < CountLoad + BLOCK_PROCESSING_LENGTH2; i++)
{
for (var i = 0; i < CountLoad + BLOCK_PROCESSING_LENGTH2; i++) {
var Block = {};
Block.BlockNum = StartNum + i;
if(i < BLOCK_PROCESSING_LENGTH2)
{
if (i < BLOCK_PROCESSING_LENGTH2) {
Block.Hash = ReadArrFromArr(BufRead, 32);
}
else
{
if(i === BLOCK_PROCESSING_LENGTH2)
{
else {
if (i === BLOCK_PROCESSING_LENGTH2) {
Block.SumHash = ReadArrFromArr(BufRead, 32);
Block.SumPow = ReadUintFromArr(BufRead);
}
@@ -399,8 +339,7 @@ function GetBlockArrFromBuffer(BufRead,Info)
Block.AddrHash = ReadArrFromArr(BufRead, 32);
var arr = [];
var start = i - BLOCK_PROCESSING_LENGTH2;
for(var n = 0; n < BLOCK_PROCESSING_LENGTH; n++)
{
for (var n = 0; n < BLOCK_PROCESSING_LENGTH; n++) {
var Prev = BlockArr[start + n];
arr.push(Prev.Hash);
}
@@ -408,10 +347,8 @@ function GetBlockArrFromBuffer(BufRead,Info)
Block.SeqHash = GetSeqHash(Block.BlockNum, Block.PrevHash, Block.TreeHash);
var PrevHashNum = ReadUint32FromArr(Block.PrevHash, 28);
var PrevAddrNum = ReadUint32FromArr(Block.AddrHash, 28);
if(PrevHashNum !== PrevAddrNum && Block.BlockNum > 20000000)
{
if(global.WATCHDOG_DEV)
{
if (PrevHashNum !== PrevAddrNum && Block.BlockNum > 20000000) {
if (global.WATCHDOG_DEV) {
var Str = "";
if (Info && Info.Node)
Str = " from " + NodeName(Info.Node);
@@ -421,8 +358,7 @@ function GetBlockArrFromBuffer(BufRead,Info)
}
CalcHashBlockFromSeqAddr(Block, Block.PrevHash);
Block.Power = GetPowPower(Block.PowHash);
if(PrevBlock)
{
if (PrevBlock) {
Block.SumHash = shaarr2(PrevBlock.SumHash, Block.Hash);
}
PrevBlock = Block;
@@ -432,11 +368,9 @@ function GetBlockArrFromBuffer(BufRead,Info)
Block.TrDataLen = 0;
BlockArr.push(Block);
}
for(var i = BlockArr.length - 1; i >= 0; i--)
{
for (var i = BlockArr.length - 1; i >= 0; i--) {
var Block = BlockArr[i];
if(!Block.SumHash)
{
if (!Block.SumHash) {
BlockArr = BlockArr.slice(i + 1);
break;
}
@@ -444,12 +378,10 @@ function GetBlockArrFromBuffer(BufRead,Info)
return BlockArr;
};
function shaarrblock2(Value1,Value2,BlockNum)
{
function shaarrblock2(Value1, Value2, BlockNum) {
return shaarrblock(arr2(Value1, Value2), BlockNum);
};
if(typeof global === "object")
{
if (typeof global === "object") {
global.ReadUint32FromArr = ReadUint32FromArr;
global.ReadUintFromArr = ReadUintFromArr;
global.ReadUint16FromArr = ReadUint16FromArr;
@@ -474,7 +406,6 @@ if(typeof global === "object")
global.shaarrblock2 = shaarrblock2;
}
else
if(typeof window === "object")
{
if (typeof window === "object") {
global = window;
}