supprot disable empty block for tdpos and single consensus

OpenAtomFoundation · Dec 19, 2023 · 66ffb74 · 66ffb74
1 parent d295a7a
commit 66ffb74
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 0 deletions.
diff --git a/bcs/ledger/xledger/state/state.go b/bcs/ledger/xledger/state/state.go
@@ -1504,3 +1504,7 @@ func (t *State) GetContractDesc(contractName string) (*protos.WasmCodeDesc, erro
 	}
 	return valDesc, err
 }
+
+func (t *State) HasUnconfirmTx() bool {
+	return t.tx.Mempool.GetTxCounnt() != 0
+}
diff --git a/example/xchain/conf/engine.yaml b/example/xchain/conf/engine.yaml
@@ -6,3 +6,5 @@ blockBroadcastMode: 0
 txidCacheExpiredTime: 3m 
 # txIdCacheGCInterval set clean up interval for tx cache
 txIdCacheGCInterval: 10m
+# disableEmptyBlocks is the flag for disable empty block, supprot consensus: tdpos/single, not support chainedBFT
+disableEmptyBlocks: false
diff --git a/kernel/engines/xuperos/config/config.go b/kernel/engines/xuperos/config/config.go
@@ -31,6 +31,7 @@ type EngineConf struct {
 	SyncBlockFilterMode int `yaml:"syncBlockFilterMode,omitempty"`
 	// SyncFactorForFactorBucketMode only use for SyncWithFactorBucket mode of SyncBlockFilterMode configuration item
 	SyncFactorForFactorBucketMode float64 `yaml:"SyncFactorForFactorBucketMode,omitempty"`
+	DisableEmptyBlocks            bool    `yaml:"disableEmptyBlocks,omitempty"`
 }
 
 func LoadEngineConf(cfgFile string) (*EngineConf, error) {

diff --git a/kernel/engines/xuperos/miner/miner.go b/kernel/engines/xuperos/miner/miner.go
@@ -207,6 +207,18 @@ func (m *Miner) step() error {
 		}
 		m.status = statusMining
 
+		if m.ctx.EngCtx.EngCfg.DisableEmptyBlocks && !m.ctx.State.HasUnconfirmTx() {
+			consensusStatus, err := m.ctx.Consensus.GetConsensusStatus()
+			if err != nil {
+				return err
+			}
+
+			if consensusStatus.GetConsensusName() == "single" ||
+				consensusStatus.GetConsensusName() == "tdpos" {
+				return nil
+			}
+		}
+
 		// 开始挖矿
 		err = m.mining(ctx)
 		if err != nil {