enable transactions by addiontally removing network check

pull/1319/head
Dennis Won 5 years ago
parent b8550ab001
commit 3a63192506
  1. 5
      node/node_newblock.go
  2. 4
      node/worker/worker.go

@ -67,11 +67,6 @@ func (node *Node) WaitForConsensusReadyv2(readySignal chan struct{}, stopChan ch
viewID := node.Consensus.GetViewID() viewID := node.Consensus.GetViewID()
// add aggregated commit signatures from last block, except for the first two blocks // add aggregated commit signatures from last block, except for the first two blocks
if err = node.Worker.UpdateCurrent(coinbase); err != nil {
utils.GetLogger().Debug("Failed updating worker's state", "Error", err)
continue
}
newBlock, err = node.Worker.Commit(sig, mask, viewID, coinbase) newBlock, err = node.Worker.Commit(sig, mask, viewID, coinbase)
if err != nil { if err != nil {

@ -125,7 +125,9 @@ func (w *Worker) SelectTransactionsForNewBlock(newBlockNum uint64, txs types.Tra
if err != nil { if err != nil {
w.current.state.RevertToSnapshot(snap) w.current.state.RevertToSnapshot(snap)
invalid = append(invalid, tx) invalid = append(invalid, tx)
utils.GetLogInstance().Error("Commit transaction error",
"Transaction Id", tx.Hash().Hex(),
"err", err)
} else { } else {
selected = append(selected, tx) selected = append(selected, tx)
// handle the case when msg was not able to extracted from tx // handle the case when msg was not able to extracted from tx

Loading…
Cancel
Save