api: support enable/disable voting via rpc

node-real · Aug 13, 2024 · 164fcc3 · 164fcc3
1 parent 9a923e0
commit 164fcc3
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 0 deletions.
diff --git a/core/vote/vote_manager.go b/core/vote/vote_manager.go
@@ -31,6 +31,7 @@ var notContinuousJustified = metrics.NewRegisteredCounter("votesManager/notConti
 // Backend wraps all methods required for voting.
 type Backend interface {
 	IsMining() bool
+	VoteEnabled() bool
 	EventMux() *event.TypeMux
 }
 
@@ -136,6 +137,11 @@ func (voteManager *VoteManager) loop() {
 				log.Debug("skip voting because mining is disabled, continue")
 				continue
 			}
+			if !voteManager.eth.VoteEnabled() {
+				log.Debug("skip voting because voting is disabled, continue")
+				continue
+			}
+
 			blockCountSinceMining++
 			if blockCountSinceMining <= blocksNumberSinceMining {
 				log.Debug("skip voting", "blockCountSinceMining", blockCountSinceMining, "blocksNumberSinceMining", blocksNumberSinceMining)

diff --git a/core/vote/vote_pool_test.go b/core/vote/vote_pool_test.go
@@ -77,6 +77,7 @@ func newTestBackend() *testBackend {
 	return &testBackend{eventMux: new(event.TypeMux)}
 }
 func (b *testBackend) IsMining() bool           { return true }
+func (b *testBackend) VoteEnabled() bool         { return true }
 func (b *testBackend) EventMux() *event.TypeMux { return b.eventMux }
 
 func (p *mockPOSA) GetJustifiedNumberAndHash(chain consensus.ChainHeaderReader, headers []*types.Header) (uint64, common.Hash, error) {

diff --git a/eth/api_miner.go b/eth/api_miner.go
@@ -133,6 +133,11 @@ func (api *MinerAPI) SetDoubleSign(on bool) miner.MBConfig {
 	return api.e.Miner().MBConfig()
 }
 
+func (api *MinerAPI) SetVoteDisable(on bool) miner.MBConfig {
+	api.e.Miner().SetVoteDisable(on)
+	return api.e.Miner().MBConfig()
+}
+
 func (api *MinerAPI) SetSkipOffsetInturn(offset uint64) miner.MBConfig {
 	api.e.Miner().SetSkipOffsetInturn(offset)
 	return api.e.Miner().MBConfig()

diff --git a/eth/backend.go b/eth/backend.go
@@ -621,6 +621,7 @@ func (s *Ethereum) StopMining() {
 }
 
 func (s *Ethereum) IsMining() bool      { return s.miner.Mining() }
+func (s *Ethereum) VoteEnabled() bool    { return s.miner.VoteEnabled() }
 func (s *Ethereum) Miner() *miner.Miner { return s.miner }
 
 func (s *Ethereum) AccountManager() *accounts.Manager  { return s.accountManager }

diff --git a/miner/gen_mb_config.go b/miner/gen_mb_config.go
diff --git a/miner/malicious_behaviour.go b/miner/malicious_behaviour.go
@@ -4,6 +4,8 @@ package miner
 type MBConfig struct {
 	// Generate two consecutive blocks for the same parent block
 	DoubleSign bool
+	// Disable voting for Fast Finality
+	VoteDisable bool
 	// Skip block production for in-turn validators at a specified offset
 	SkipOffsetInturn *uint64 `toml:",omitempty"`
 	// Delay broadcasting mined blocks by a specified number of blocks, only for in turn validators
@@ -14,6 +16,7 @@ type MBConfig struct {
 
 var DefaultMBConfig = MBConfig{
 	DoubleSign:           false,
+	VoteDisable:          false,
 	BroadcastDelayBlocks: 0,
 	LastBlockMiningTime:  0,
 }
diff --git a/miner/miner.go b/miner/miner.go
@@ -204,6 +204,10 @@ func (miner *Miner) Mining() bool {
 	return miner.worker.isRunning()
 }
 
+func (miner *Miner) VoteEnabled() bool {
+	return miner.worker.config.VoteEnable && !miner.worker.config.MB.VoteDisable
+}
+
 func (miner *Miner) InTurn() bool {
 	return miner.worker.inTurn()
 }
@@ -299,6 +303,10 @@ func (miner *Miner) SetDoubleSign(on bool) {
 	miner.worker.config.MB.DoubleSign = on
 }
 
+func (miner *Miner) SetVoteDisable(on bool) {
+	miner.worker.config.MB.VoteDisable = on
+}
+
 func (miner *Miner) SetSkipOffsetInturn(offset uint64) {
 	miner.worker.config.MB.SkipOffsetInturn = &offset
 }