feat: 1120 release c/s mode complete
Signed-off-by: MiaoWoo <admin@yumc.pw>
This commit is contained in:
@@ -12,6 +12,7 @@
|
||||
import CBlock from './block-loader'
|
||||
import { RBTree } from './library'
|
||||
import { STreeBuffer } from './base';
|
||||
import { SendToWebClient } from '../rpc/server'
|
||||
require('./library');
|
||||
require('./crypto-library');
|
||||
const TX_PROCESS_TIME = 100;
|
||||
@@ -423,8 +424,7 @@ export default class CConsensus extends CBlock {
|
||||
var SendData = { "Method": "RETTRANSFERTX", "Context": Info.Context, "Data": { BlockNum: Block.BlockNum, Array: Arr, } };
|
||||
this.SendF(Node, SendData, global.MAX_BLOCK_SIZE + 1000)
|
||||
}
|
||||
static
|
||||
RETTRANSFERTX_F() {
|
||||
static RETTRANSFERTX_F() {
|
||||
return "{BlockNum:uint,Array:[{body:tr}]}";
|
||||
}
|
||||
RETTRANSFERTX(Info, CurTime) {
|
||||
@@ -639,8 +639,7 @@ export default class CConsensus extends CBlock {
|
||||
var BufWrite = global.BufLib.GetBufferFromObject(Data, FORMAT_DATA_TRANSFER, global.MAX_BLOCK_SIZE + 30000, WorkStructSend);
|
||||
return BufWrite;
|
||||
}
|
||||
static
|
||||
TRANSFER_F() {
|
||||
static TRANSFER_F() {
|
||||
return FORMAT_DATA_TRANSFER;
|
||||
}
|
||||
CheckingMaxPowOther(Block) {
|
||||
@@ -1392,6 +1391,25 @@ export default class CConsensus extends CBlock {
|
||||
this.AddToMaxPOW(BlockMining, {
|
||||
SeqHash: BlockMining.SeqHash, AddrHash: BlockMining.AddrHash, PrevHash: BlockMining.PrevHash, TreeHash: BlockMining.TreeHash,
|
||||
})
|
||||
if (bWas == 3) {
|
||||
setTimeout(() => {
|
||||
let webmsg: any = { BlockNum: msg.BlockNum }
|
||||
webmsg.Mining = {
|
||||
Hash: BlockMining.Hash.toString(),
|
||||
SeqHash: BlockMining.Hash.toString()
|
||||
}
|
||||
webmsg.New = {
|
||||
Hash: ValueNew.Hash.toString(),
|
||||
PowHash: ValueNew.PowHash.toString()
|
||||
}
|
||||
Object.assign(webmsg, {
|
||||
HashCount,
|
||||
Power,
|
||||
Num: msg.Num
|
||||
})
|
||||
SendToWebClient(webmsg)
|
||||
}, 1)
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@@ -275,8 +275,7 @@ export default class CConnect extends CMessages {
|
||||
NetConstant:{Num:uint,BlockNum:uint,MaxTrasactionLimit:uint,Reserv1:uint,Reserv2:uint,Reserv3:uint,Reserv4:uint,Reserv5:uint,Sign:arr64},\
|
||||
}";
|
||||
}
|
||||
static
|
||||
PONG_F(bSend) {
|
||||
static PONG_F(bSend) {
|
||||
return CConnect.PING_F(bSend);
|
||||
}
|
||||
PING(Info, CurTime) {
|
||||
@@ -914,8 +913,7 @@ export default class CConnect extends CMessages {
|
||||
global.SAVE_CONST(true)
|
||||
}
|
||||
}
|
||||
static
|
||||
TIME_F() {
|
||||
static TIME_F() {
|
||||
return "{Time:uint, Sign:arr64}";
|
||||
}
|
||||
SendTimeDev(Node) {
|
||||
|
||||
@@ -88,8 +88,7 @@ export default class CMessages extends CSmartContract {
|
||||
}
|
||||
return true;
|
||||
}
|
||||
static
|
||||
MESSAGE_F() {
|
||||
static MESSAGE_F() {
|
||||
return "{Arr:[{addrArr:hash,body:tr,nonce:uint,time:uint}]}";
|
||||
}
|
||||
MESSAGE(Info, CurTime) {
|
||||
@@ -161,8 +160,7 @@ export default class CMessages extends CSmartContract {
|
||||
return - 5;
|
||||
if (Block.Active) {
|
||||
Res = - 3
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
Res = this.AddTrToBlockQuote(Block, Tr)
|
||||
if (Tr.ToAll)
|
||||
this.SendTransaction(Tr)
|
||||
@@ -200,8 +198,7 @@ export default class CMessages extends CSmartContract {
|
||||
break;
|
||||
}
|
||||
}
|
||||
static
|
||||
TRANSACTION_F() {
|
||||
static TRANSACTION_F() {
|
||||
return "{body:tr}";
|
||||
}
|
||||
TRANSACTION(Info, CurTime) {
|
||||
|
||||
Reference in New Issue
Block a user