reduce the batch tx number (#557)

* reduce the batch tx number

* prevent the roll back

Co-authored-by: paladz <colt@ColtdeMBP.partners>

diff --git a/proposal/proposal.go b/proposal/proposal.go
index 9381402..ea0cc62 100644 (file)
--- a/proposal/proposal.go
+++ b/proposal/proposal.go
@@ -21,7 +21,7 @@ import (
 
 const (
        logModule     = "mining"
-       batchApplyNum = 64
+       batchApplyNum = 16
        softMaxTxNum  = 128
 
        timeoutOk = iota + 1

diff --git a/toolbar/federation/synchron/sidechain_keeper.go b/toolbar/federation/synchron/sidechain_keeper.go
index 8d00c78..707fdfc 100644 (file)
--- a/toolbar/federation/synchron/sidechain_keeper.go
+++ b/toolbar/federation/synchron/sidechain_keeper.go
@@ -275,7 +275,7 @@ func (s *sidechainKeeper) syncBlock() (bool, error) {
                return false, err
        }
 
-       if netInfo.IrreversibleBlock <= chain.BlockHeight {
+       if netInfo.IrreversibleBlock <= chain.BlockHeight+s.cfg.Confirmations {
                return false, nil
        }