circlecloud/tera
1
1
Fork 1
Code Releases Activity

refactor: split pow cacl process

Browse Source 
Signed-off-by: MiaoWoo <admin@yumc.pw>
This commit is contained in:
MiaoWoo
2019-07-14 18:27:58 +08:00
parent 375134fdc3
commit a11f96e775
7 changed files with 43 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1325,7 +1325,7 @@ export default class CConsensus extends CBlock {
return SumPow / Count;
}
CreatePOWNew(Block) {
CreateHashMinimal(Block, global.GENERATE_BLOCK_ACCOUNT)
global.CreateHashMinimal(Block, global.GENERATE_BLOCK_ACCOUNT)
this.AddToMaxPOW(Block, {
SeqHash: Block.SeqHash, AddrHash: Block.AddrHash, PrevHash: Block.PrevHash, TreeHash: Block.TreeHash,
})

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

@@ -170,8 +170,7 @@ export default class CBlock extends CRest {
if (StartBlockNum <= 0)
StartBlockNum = 15
global.ToLog("Current DeltaNum=" + DeltaNum + " StartBlockNum=" + StartBlockNum, 2)
}
else {
} else {
StartBlockNum = this.BlockNumDB
}
this.LoadHistoryMode = true

9
src/core/connect.ts
View File

@@ -401,8 +401,7 @@ export default class CConnect extends CMessages {
var SignArr = this.GetSignCheckDeltaTime(Data.CheckDeltaTime);
if (global.CheckDevelopSign(SignArr, Data.CheckDeltaTime.Sign)) {
global.CHECK_DELTA_TIME = Data.CheckDeltaTime
}
else {
} else {
Node.NextConnectDelta = 60 * 1000
global.ToLog("Error Sign CheckDeltaTime Num=" + Data.CheckDeltaTime.Num + " from " + global.NodeInfo(Node))
this.AddCheckErrCount(Node, 10, "Error Sign CheckDeltaTime")
@@ -475,12 +474,10 @@ export default class CConnect extends CMessages {
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) {
this.StartLoadCode(Node, CodeVersion)
}
else {
} else {
global.CODE_VERSION = CodeVersion
}
}
else {
} else {
global.ToLog("Error Sign CodeVersion=" + CodeVersion.VersionNum + " from " + global.NodeInfo(Node) + " HASH:" + global.GetHexFromArr(CodeVersion.Hash).substr(0, 20))
global.ToLog(JSON.stringify(CodeVersion))
this.AddCheckErrCount(Node, 10, "Error Sign CodeVersion")

7
src/core/terahashmining.ts
View File

@@ -20,7 +20,6 @@ require('./crypto-library');
require('../HTML/JS/terahashlib.js');
var DELTA_NONCE = Math.pow(2, 40) * global.MINING_VERSION_NUM;
global.CreateHashMinimal = CreateHashMinimal;
global.CreatePOWVersionX = CreatePOWVersion3;
function CreateHashMinimal(Block, MinerID) {
if (Block.BlockNum < BLOCKNUM_ALGO2) {
@@ -73,7 +72,7 @@ function InitVer3(Block) {
}
};
function CreatePOWVersion3(Block, bHashPump) {
let CreatePOWVersionX = function CreatePOWVersion3(Block, bHashPump?) {
if (!bWasInitVer3)
InitVer3(Block);
if (!bWasInitVerOK3)
@@ -201,3 +200,7 @@ global.GetNonceHashArr = function(BlockNum, Miner, StartNonceRnd, CountNonce) {
}
return { ArrNonce: ArrNonce, ArrHash: ArrHash };
};
export {
CreatePOWVersionX
}