From a41658640fb5aebd7f23294fa293941b564e2580 Mon Sep 17 00:00:00 2001
From: olumuyiwadad <olumuyiwadad@gmail.com>
Date: Fri, 17 Sep 2021 18:18:55 +0530
Subject: [PATCH] hotfix etherbase/coinbase

Send tx sign for block number to smart contract blockSigner.
---
 contracts/utils.go | 17 +++++++++++++----
 eth/backend.go     |  8 +++++---
 miner/worker.go    |  2 +-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/contracts/utils.go b/contracts/utils.go
index 3f563ccf7a..0ac7b06ec8 100644
--- a/contracts/utils.go
+++ b/contracts/utils.go
@@ -60,17 +60,26 @@ type rewardLog struct {
 var TxSignMu sync.RWMutex
 
 // Send tx sign for block number to smart contract blockSigner.
-func CreateTransactionSign(chainConfig *params.ChainConfig, pool *core.TxPool, manager *accounts.Manager, block *types.Block, chainDb ethdb.Database) error {
+func CreateTransactionSign(chainConfig *params.ChainConfig, pool *core.TxPool, manager *accounts.Manager, block *types.Block, chainDb ethdb.Database, eb common.Address) error {
 	TxSignMu.Lock()
 	defer TxSignMu.Unlock()
 	if chainConfig.XDPoS != nil {
 		// Find active account.
 		account := accounts.Account{}
 		var wallet accounts.Wallet
+		etherbaseAccount := accounts.Account{
+			Address: eb,
+			URL:     accounts.URL{},
+		}
 		if wallets := manager.Wallets(); len(wallets) > 0 {
-			wallet = wallets[0]
-			if accts := wallets[0].Accounts(); len(accts) > 0 {
-				account = accts[0]
+			if w, err := manager.Find(etherbaseAccount); err == nil && w != nil {
+				wallet = w
+				account = etherbaseAccount
+			} else {
+				wallet = wallets[0]
+				if accts := wallets[0].Accounts(); len(accts) > 0 {
+					account = accts[0]
+				}
 			}
 		}
 
diff --git a/eth/backend.go b/eth/backend.go
index 9a71dfb752..9d5cd91f6c 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -224,7 +224,7 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
 				return nil
 			}
 			if block.NumberU64()%common.MergeSignRange == 0 || !eth.chainConfig.IsTIP2019(block.Number()) {
-				if err := contracts.CreateTransactionSign(chainConfig, eth.txPool, eth.accountManager, block, chainDb); err != nil {
+				if err := contracts.CreateTransactionSign(chainConfig, eth.txPool, eth.accountManager, block, chainDb, eb); err != nil {
 					return fmt.Errorf("Fail to create tx sign for importing block: %v", err)
 				}
 			}
@@ -472,12 +472,14 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
 			sort.Slice(candidates, func(i, j int) bool {
 				return candidates[i].Stake.Cmp(candidates[j].Stake) >= 0
 			})
-			candidates = candidates[:150]
+			if len(candidates) > 150 {
+				candidates = candidates[:150]
+			}
 			result := []common.Address{}
 			for _, candidate := range candidates {
 				result = append(result, candidate.Address)
 			}
-			return result[:150], nil
+			return result, nil
 		}
 
 		// Hook calculates reward for masternodes
diff --git a/miner/worker.go b/miner/worker.go
index 238f615fe8..da4f33093e 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -413,7 +413,7 @@ func (self *worker) wait() {
 				}
 				// Send tx sign to smart contract blockSigners.
 				if block.NumberU64()%common.MergeSignRange == 0 || !self.config.IsTIP2019(block.Number()) {
-					if err := contracts.CreateTransactionSign(self.config, self.eth.TxPool(), self.eth.AccountManager(), block, self.chainDb); err != nil {
+					if err := contracts.CreateTransactionSign(self.config, self.eth.TxPool(), self.eth.AccountManager(), block, self.chainDb, self.coinbase); err != nil {
 						log.Error("Fail to create tx sign for signer", "error", "err")
 					}
 				}