circlecloud
/
tera
1
1
Fork 1
Code Releases Activity

feat: optimiz arr compare 

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

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

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