Commit a15cd2a7 authored by mdj33's avatar mdj33 Committed by vipwzw

rmv logs

parent 0d9cf285
......@@ -320,17 +320,13 @@ func (client *client) getLastBlockMainInfo() (int64, []byte, error) {
if lastBlock.Height == 0 && lastSeq > -1 {
mainBlock, err := client.GetBlockOnMainByHash(lastBlock.MainHash)
if err != nil {
plog.Error("Parachain GetBlockOnMainByHash fail", "err", err)
return -2, nil, err
}
mainSeq, err := client.GetSeqByHashOnMainChain(lastBlock.MainHash)
if err != nil {
plog.Error("Parachain GetSeqByHashOnMainChain fail", "err", err, "mainhash", common.ToHex(lastBlock.MainHash))
return -2, nil, err
}
plog.Error("Parachain GetSeqByHashOnMainChain ",
"geneSeq", lastSeq, "newseq", mainSeq-1, "mainhash", common.ToHex(lastBlock.MainHash), "mainHeight", mainBlock.Height)
return mainSeq - 1, mainBlock.ParentHash, nil
}
return lastSeq, lastBlock.MainHash, nil
......@@ -685,6 +681,9 @@ func (client *client) addMinerTx(preStateHash []byte, block *types.Block, main *
//获取当前区块的所有原始tx hash 和跨链hash作为bitmap base hashs,因为有可能在执行过程中有些tx 执行error被剔除掉
if main.Detail.Block.Height >= mainForkParacrossCommitTx {
for _, tx := range txs {
status.TxHashs = append(status.TxHashs, tx.Hash())
}
txHashs := paraexec.FilterParaCrossTxHashes(types.GetTitle(), txs)
status.CrossTxHashs = append(status.CrossTxHashs, txHashs...)
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment