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

refactor: rewrite rpc server client

Browse Source 
Signed-off-by: MiaoWoo <admin@yumc.pw>
This commit is contained in:
MiaoWoo
2019-07-20 13:12:21 +08:00
parent fd1b23a4c3
commit b05a00f87d
18 changed files with 315 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@
import CBlock from './block-loader'
import { RBTree } from './library'
import { STreeBuffer } from './base';
import { SendToWebClient } from '../rpc/server'
import { teraManager } from '../rpc/manager'
require('./library');
require('./crypto-library');
const TX_PROCESS_TIME = 100;
@@ -1352,16 +1352,16 @@ export default class CConsensus extends CBlock {
MiningProcess(msg) {
var BlockMining = this.GetBlock(msg.BlockNum);
if (!BlockMining) {
SendToWebClient({
teraManager.SendToWebClient({
msg: msg,
errror: '!BlockMining'
error: '!BlockMining'
})
return;
}
if (!BlockMining.StartMining || BlockMining.bSave) {
SendToWebClient({
teraManager.SendToWebClient({
msg: msg,
errror: `!BlockMining.StartMining ${BlockMining.StartMining} || BlockMining.bSave ${BlockMining.bSave}`
error: `!BlockMining.StartMining ${BlockMining.StartMining} || BlockMining.bSave ${BlockMining.bSave}`
})
return;
}
@@ -1404,19 +1404,19 @@ export default class CConsensus extends CBlock {
setTimeout(() => {
let webmsg: any = { BlockNum: msg.BlockNum }
webmsg.Mining = {
SeqHash: global.GetHexFromArr(BlockMining.SeqHash),
AddrHash: global.GetHexFromArr(BlockMining.AddrHash),
PrevHash: global.GetHexFromArr(BlockMining.PrevHash),
TreeHash: global.GetHexFromArr(BlockMining.TreeHash),
Hash: global.GetHexFromArr(BlockMining.Hash),
SeqHash: global.GetHexFromArr(BlockMining.Hash)
}
webmsg.New = {
Hash: global.GetHexFromArr(ValueNew.Hash),
PowHash: global.GetHexFromArr(ValueNew.PowHash)
PowHash: global.GetHexFromArr(BlockMining.PowHash)
}
Object.assign(webmsg, {
HashCount,
Power,
Num: msg.Num
Num: msg.NodeNum
})
SendToWebClient(webmsg)
teraManager.SendToWebClient(webmsg)
}, 1)
}
}