refactor: fetched block number from block monitor module in voting process (#1269)

Yashk767 · web-flow · commit 96f1e2842c65 · 2025-02-28T12:24:04.000+05:30
* refactor: fetched block number from block monitor in voting

* refactor: fixed tests

* fix: added nil check for header from block monitor

* refactor: replaced empty block monitor reference with nil in case of error
diff --git a/cmd/addStake.go b/cmd/addStake.go
@@ -32,7 +32,7 @@ func initialiseStake(cmd *cobra.Command, args []string) {
 
 //This function sets the flags appropriately and executes the StakeCoins function
 func (*UtilsStruct) ExecuteStake(flagSet *pflag.FlagSet) {
-	config, rpcParameters, account, err := InitializeCommandDependencies(flagSet)
+	config, rpcParameters, _, account, err := InitializeCommandDependencies(flagSet)
 	utils.CheckError("Error in initialising command dependencies: ", err)
 
 	balance, err := razorUtils.FetchBalance(rpcParameters, account.Address)
diff --git a/cmd/claimBounty.go b/cmd/claimBounty.go
@@ -34,7 +34,7 @@ func initialiseClaimBounty(cmd *cobra.Command, args []string) {
 
 //This function sets the flags appropriately and executes the ClaimBounty function
 func (*UtilsStruct) ExecuteClaimBounty(flagSet *pflag.FlagSet) {
-	config, rpcParameters, account, err := InitializeCommandDependencies(flagSet)
+	config, rpcParameters, _, account, err := InitializeCommandDependencies(flagSet)
 	utils.CheckError("Error in initialising command dependencies: ", err)
 
 	if razorUtils.IsFlagPassed("bountyId") {
diff --git a/cmd/claimCommission.go b/cmd/claimCommission.go
@@ -26,7 +26,7 @@ Example:
 
 //This function allows the staker to claim the rewards earned from delegator's pool share as commission
 func (*UtilsStruct) ClaimCommission(flagSet *pflag.FlagSet) {
-	config, rpcParameters, account, err := InitializeCommandDependencies(flagSet)
+	config, rpcParameters, _, account, err := InitializeCommandDependencies(flagSet)
 	utils.CheckError("Error in initialising command dependencies: ", err)
 
 	stakerId, err := razorUtils.GetStakerId(rpcParameters, account.Address)
diff --git a/cmd/cmd-utils.go b/cmd/cmd-utils.go
@@ -130,7 +130,7 @@ func GetFormattedStateNames(states []int) string {
 	return statesAllowed
 }
 
-func InitializeCommandDependencies(flagSet *pflag.FlagSet) (types.Configurations, rpc.RPCParameters, types.Account, error) {
+func InitializeCommandDependencies(flagSet *pflag.FlagSet) (types.Configurations, rpc.RPCParameters, *block.BlockMonitor, types.Account, error) {
 	var (
 		account       types.Account
 		client        *ethclient.Client
@@ -141,15 +141,15 @@ func InitializeCommandDependencies(flagSet *pflag.FlagSet) (types.Configurations
 	config, err := cmdUtils.GetConfigData()
 	if err != nil {
 		log.Error("Error in getting config: ", err)
-		return types.Configurations{}, rpc.RPCParameters{}, types.Account{}, err
+		return types.Configurations{}, rpc.RPCParameters{}, nil, types.Account{}, err
 	}
 	log.Debugf("Config: %+v", config)
 
 	if razorUtils.IsFlagPassed("address") {
 		address, err := flagSetUtils.GetStringAddress(flagSet)
 		if err != nil {
 			log.Error("Error in getting address: ", err)
-			return types.Configurations{}, rpc.RPCParameters{}, types.Account{}, err
+			return types.Configurations{}, rpc.RPCParameters{}, nil, types.Account{}, err
 		}
 		log.Debugf("Address: %v", address)
 
@@ -159,21 +159,21 @@ func InitializeCommandDependencies(flagSet *pflag.FlagSet) (types.Configurations
 		accountManager, err := razorUtils.AccountManagerForKeystore()
 		if err != nil {
 			log.Error("Error in getting accounts manager for keystore: ", err)
-			return types.Configurations{}, rpc.RPCParameters{}, types.Account{}, err
+			return types.Configurations{}, rpc.RPCParameters{}, nil, types.Account{}, err
 		}
 
 		account = accounts.InitAccountStruct(address, password, accountManager)
 		err = razorUtils.CheckPassword(account)
 		if err != nil {
 			log.Error("Error in fetching private key from given password: ", err)
-			return types.Configurations{}, rpc.RPCParameters{}, types.Account{}, err
+			return types.Configurations{}, rpc.RPCParameters{}, nil, types.Account{}, err
 		}
 	}
 
 	rpcManager, err := rpc.InitializeRPCManager(config.Provider)
 	if err != nil {
 		log.Error("Error in initializing RPC Manager: ", err)
-		return types.Configurations{}, rpc.RPCParameters{}, types.Account{}, err
+		return types.Configurations{}, rpc.RPCParameters{}, nil, types.Account{}, err
 	}
 
 	rpcParameters = rpc.RPCParameters{
@@ -184,7 +184,7 @@ func InitializeCommandDependencies(flagSet *pflag.FlagSet) (types.Configurations
 	client, err = rpcManager.GetBestRPCClient()
 	if err != nil {
 		log.Error("Error in getting best RPC client: ", err)
-		return types.Configurations{}, rpc.RPCParameters{}, types.Account{}, err
+		return types.Configurations{}, rpc.RPCParameters{}, nil, types.Account{}, err
 	}
 
 	// Initialize BlockMonitor with RPCManager
@@ -196,5 +196,5 @@ func InitializeCommandDependencies(flagSet *pflag.FlagSet) (types.Configurations
 	// Update Logger Instance
 	logger.UpdateLogger(account.Address, client, blockMonitor)
 
-	return config, rpcParameters, account, nil
+	return config, rpcParameters, blockMonitor, account, nil
 }
diff --git a/cmd/collectionList.go b/cmd/collectionList.go
@@ -31,7 +31,7 @@ func initialiseCollectionList(cmd *cobra.Command, args []string) {
 
 //This function sets the flags appropriately and and executes the GetCollectionList function
 func (*UtilsStruct) ExecuteCollectionList(flagSet *pflag.FlagSet) {
-	_, rpcParameters, _, err := InitializeCommandDependencies(flagSet)
+	_, rpcParameters, _, _, err := InitializeCommandDependencies(flagSet)
 	utils.CheckError("Error in initialising command dependencies: ", err)
 
 	log.Debug("Calling GetCollectionList()")
diff --git a/cmd/contractAddresses.go b/cmd/contractAddresses.go
@@ -25,7 +25,7 @@ func initialiseContractAddresses(cmd *cobra.Command, args []string) {
 
 //This function sets the flag appropriatley and executes the ContractAddresses function
 func (*UtilsStruct) ExecuteContractAddresses(flagSet *pflag.FlagSet) {
-	_, _, _, err := InitializeCommandDependencies(flagSet)
+	_, _, _, _, err := InitializeCommandDependencies(flagSet)
 	utils.CheckError("Error in initialising command dependencies: ", err)
 
 	fmt.Println("The contract addresses are: ")
diff --git a/cmd/create.go b/cmd/create.go
@@ -28,7 +28,7 @@ func initialiseCreate(cmd *cobra.Command, args []string) {
 
 //This function sets the flags appropriately and executes the Create function
 func (*UtilsStruct) ExecuteCreate(flagSet *pflag.FlagSet) {
-	_, _, _, err := InitializeCommandDependencies(flagSet)
+	_, _, _, _, err := InitializeCommandDependencies(flagSet)
 	utils.CheckError("Error in initialising command dependencies: ", err)
 	log.Info("The password should be of minimum 8 characters containing least 1 uppercase, lowercase, digit and special character.")
 	password := razorUtils.AssignPassword(flagSet)
diff --git a/cmd/createCollection.go b/cmd/createCollection.go
@@ -34,7 +34,7 @@ func initialiseCreateCollection(cmd *cobra.Command, args []string) {
 
 //This function sets the flags appropriately and executes the CreateCollection function
 func (*UtilsStruct) ExecuteCreateCollection(flagSet *pflag.FlagSet) {
-	config, rpcParameters, account, err := InitializeCommandDependencies(flagSet)
+	config, rpcParameters, _, account, err := InitializeCommandDependencies(flagSet)
 	utils.CheckError("Error in initialising command dependencies: ", err)
 
 	name, err := flagSetUtils.GetStringName(flagSet)
diff --git a/cmd/createJob.go b/cmd/createJob.go
@@ -35,7 +35,7 @@ func initialiseCreateJob(cmd *cobra.Command, args []string) {
 
 //This function sets the flags appropriately and executes the CreateJob function
 func (*UtilsStruct) ExecuteCreateJob(flagSet *pflag.FlagSet) {
-	config, rpcParameters, account, err := InitializeCommandDependencies(flagSet)
+	config, rpcParameters, _, account, err := InitializeCommandDependencies(flagSet)
 	utils.CheckError("Error in initialising command dependencies: ", err)
 
 	name, err := flagSetUtils.GetStringName(flagSet)
diff --git a/cmd/delegate.go b/cmd/delegate.go
@@ -32,7 +32,7 @@ func initialiseDelegate(cmd *cobra.Command, args []string) {
 
 //This function sets the flags appropriately and executes the Delegate function
 func (*UtilsStruct) ExecuteDelegate(flagSet *pflag.FlagSet) {
-	config, rpcParameters, account, err := InitializeCommandDependencies(flagSet)
+	config, rpcParameters, _, account, err := InitializeCommandDependencies(flagSet)
 	utils.CheckError("Error in initialising command dependencies: ", err)
 
 	stakerId, err := flagSetUtils.GetUint32StakerId(flagSet)
diff --git a/cmd/import.go b/cmd/import.go
@@ -29,7 +29,7 @@ func initialiseImport(cmd *cobra.Command, args []string) {
 
 //This function sets the flags appropriately and executes the ImportAccount function
 func (*UtilsStruct) ExecuteImport(flagSet *pflag.FlagSet) {
-	_, _, _, err := InitializeCommandDependencies(flagSet)
+	_, _, _, _, err := InitializeCommandDependencies(flagSet)
 	utils.CheckError("Error in initialising command dependencies: ", err)
 	log.Debug("Calling ImportAccount()...")
 	account, err := cmdUtils.ImportAccount()
diff --git a/cmd/initiateWithdraw.go b/cmd/initiateWithdraw.go
@@ -31,7 +31,7 @@ Example:
 
 //This function sets the flags appropriately and executes the InitiateWithdraw function
 func (*UtilsStruct) ExecuteInitiateWithdraw(flagSet *pflag.FlagSet) {
-	config, rpcParameters, account, err := InitializeCommandDependencies(flagSet)
+	config, rpcParameters, _, account, err := InitializeCommandDependencies(flagSet)
 	utils.CheckError("Error in initialising command dependencies: ", err)
 
 	stakerId, err := razorUtils.AssignStakerId(rpcParameters, flagSet, account.Address)
diff --git a/cmd/interface.go b/cmd/interface.go
@@ -4,6 +4,7 @@ package cmd
 import (
 	"crypto/ecdsa"
 	"math/big"
+	"razor/block"
 	"razor/cache"
 	"razor/core/types"
 	"razor/path"
@@ -225,7 +226,7 @@ type UtilsCmdInterface interface {
 	CalculateSecret(account types.Account, epoch uint32, keystorePath string, chainId *big.Int) ([]byte, []byte, error)
 	HandleBlock(rpcParameters rpc.RPCParameters, account types.Account, stakerId uint32, header *Types.Header, config types.Configurations, commitParams *types.CommitParams, rogueData types.Rogue, backupNodeActionsToIgnore []string)
 	ExecuteVote(flagSet *pflag.FlagSet)
-	Vote(rpcParameters rpc.RPCParameters, config types.Configurations, account types.Account, stakerId uint32, commitParams *types.CommitParams, rogueData types.Rogue, backupNodeActionsToIgnore []string) error
+	Vote(rpcParameters rpc.RPCParameters, blockMonitor *block.BlockMonitor, config types.Configurations, account types.Account, stakerId uint32, commitParams *types.CommitParams, rogueData types.Rogue, backupNodeActionsToIgnore []string) error
 	HandleExit()
 	ExecuteListAccounts(flagSet *pflag.FlagSet)
 	ClaimCommission(flagSet *pflag.FlagSet)
diff --git a/cmd/jobList.go b/cmd/jobList.go
@@ -29,7 +29,7 @@ func initialiseJobList(cmd *cobra.Command, args []string) {
 
 //This function sets the flags appropriately and executes the GetJobList function
 func (*UtilsStruct) ExecuteJobList(flagSet *pflag.FlagSet) {
-	_, rpcParameters, _, err := InitializeCommandDependencies(flagSet)
+	_, rpcParameters, _, _, err := InitializeCommandDependencies(flagSet)
 	utils.CheckError("Error in initialising command dependencies: ", err)
 
 	log.Debug("ExecuteJobList: Calling JobList()...")
diff --git a/cmd/mocks/utils_cmd_interface.go b/cmd/mocks/utils_cmd_interface.go
diff --git a/cmd/modifyCollectionStatus.go b/cmd/modifyCollectionStatus.go
@@ -29,7 +29,7 @@ func initialiseModifyCollectionStatus(cmd *cobra.Command, args []string) {
 
 //This function sets the flags appropriately and executes the ModifyCollectionStatus function
 func (*UtilsStruct) ExecuteModifyCollectionStatus(flagSet *pflag.FlagSet) {
-	config, rpcParameters, account, err := InitializeCommandDependencies(flagSet)
+	config, rpcParameters, _, account, err := InitializeCommandDependencies(flagSet)
 	utils.CheckError("Error in initialising command dependencies: ", err)
 
 	collectionId, err := flagSetUtils.GetUint16CollectionId(flagSet)
diff --git a/cmd/resetUnstakeLock.go b/cmd/resetUnstakeLock.go
@@ -32,7 +32,7 @@ func initialiseExtendLock(cmd *cobra.Command, args []string) {
 
 //This function sets the flags appropriately and executes the ResetUnstakeLock function
 func (*UtilsStruct) ExecuteExtendLock(flagSet *pflag.FlagSet) {
-	config, rpcParameters, account, err := InitializeCommandDependencies(flagSet)
+	config, rpcParameters, _, account, err := InitializeCommandDependencies(flagSet)
 	utils.CheckError("Error in initialising command dependencies: ", err)
 
 	stakerId, err := razorUtils.AssignStakerId(rpcParameters, flagSet, account.Address)
diff --git a/cmd/setConfig.go b/cmd/setConfig.go
@@ -29,7 +29,7 @@ Example:
 
 // This function returns the error if there is any and sets the config
 func (*UtilsStruct) SetConfig(flagSet *pflag.FlagSet) error {
-	_, _, _, err := InitializeCommandDependencies(flagSet)
+	_, _, _, _, err := InitializeCommandDependencies(flagSet)
 	utils.CheckError("Error in initialising command dependencies: ", err)
 
 	flagDetails := []types.FlagDetail{
diff --git a/cmd/setDelegation.go b/cmd/setDelegation.go
@@ -32,7 +32,7 @@ func initialiseSetDelegation(cmd *cobra.Command, args []string) {
 
 //This function sets the flags appropriately and executes the SetDelegation function
 func (*UtilsStruct) ExecuteSetDelegation(flagSet *pflag.FlagSet) {
-	config, rpcParameters, account, err := InitializeCommandDependencies(flagSet)
+	config, rpcParameters, _, account, err := InitializeCommandDependencies(flagSet)
 	utils.CheckError("Error in initialising command dependencies: ", err)
 
 	statusString, err := flagSetUtils.GetStringStatus(flagSet)
diff --git a/cmd/stakerInfo.go b/cmd/stakerInfo.go
@@ -28,7 +28,7 @@ func initialiseStakerInfo(cmd *cobra.Command, args []string) {
 
 //This function sets the flag appropriately and executes the GetStakerInfo function
 func (*UtilsStruct) ExecuteStakerinfo(flagSet *pflag.FlagSet) {
-	_, rpcParameters, _, err := InitializeCommandDependencies(flagSet)
+	_, rpcParameters, _, _, err := InitializeCommandDependencies(flagSet)
 	utils.CheckError("Error in initialising command dependencies: ", err)
 
 	stakerId, err := flagSetUtils.GetUint32StakerId(flagSet)
diff --git a/cmd/transfer.go b/cmd/transfer.go
@@ -32,7 +32,7 @@ func initialiseTransfer(cmd *cobra.Command, args []string) {
 
 //This function sets the flag appropriately and executes the Transfer function
 func (*UtilsStruct) ExecuteTransfer(flagSet *pflag.FlagSet) {
-	config, rpcParameters, _, err := InitializeCommandDependencies(flagSet)
+	config, rpcParameters, _, _, err := InitializeCommandDependencies(flagSet)
 	utils.CheckError("Error in initialising command dependencies: ", err)
 
 	log.Debugf("ExecuteTransfer: Config: %+v", config)
diff --git a/cmd/unlockWithdraw.go b/cmd/unlockWithdraw.go
@@ -31,7 +31,7 @@ func initializeUnlockWithdraw(cmd *cobra.Command, args []string) {
 
 //This function sets the flag appropriately and executes the UnlockWithdraw function
 func (*UtilsStruct) ExecuteUnlockWithdraw(flagSet *pflag.FlagSet) {
-	config, rpcParameters, account, err := InitializeCommandDependencies(flagSet)
+	config, rpcParameters, _, account, err := InitializeCommandDependencies(flagSet)
 	utils.CheckError("Error in initialising command dependencies: ", err)
 
 	stakerId, err := razorUtils.AssignStakerId(rpcParameters, flagSet, account.Address)
diff --git a/cmd/unstake.go b/cmd/unstake.go
@@ -35,7 +35,7 @@ func initialiseUnstake(cmd *cobra.Command, args []string) {
 
 //This function sets the flag appropriately and executes the Unstake function
 func (*UtilsStruct) ExecuteUnstake(flagSet *pflag.FlagSet) {
-	config, rpcParameters, account, err := InitializeCommandDependencies(flagSet)
+	config, rpcParameters, _, account, err := InitializeCommandDependencies(flagSet)
 	utils.CheckError("Error in initialising command dependencies: ", err)
 
 	log.Debug("Getting amount in wei...")
diff --git a/cmd/updateCollection.go b/cmd/updateCollection.go
@@ -34,7 +34,7 @@ func initialiseUpdateCollection(cmd *cobra.Command, args []string) {
 
 //This function sets the flag appropriately and executes the UpdateCollection function
 func (*UtilsStruct) ExecuteUpdateCollection(flagSet *pflag.FlagSet) {
-	config, rpcParameters, account, err := InitializeCommandDependencies(flagSet)
+	config, rpcParameters, _, account, err := InitializeCommandDependencies(flagSet)
 	utils.CheckError("Error in initialising command dependencies: ", err)
 
 	collectionId, err := flagSetUtils.GetUint16CollectionId(flagSet)
diff --git a/cmd/updateCommission.go b/cmd/updateCommission.go
@@ -31,7 +31,7 @@ func initialiseUpdateCommission(cmd *cobra.Command, args []string) {
 
 //This function sets the flag appropriately and executes the UpdateCommission function
 func (*UtilsStruct) ExecuteUpdateCommission(flagSet *pflag.FlagSet) {
-	config, rpcParameters, account, err := InitializeCommandDependencies(flagSet)
+	config, rpcParameters, _, account, err := InitializeCommandDependencies(flagSet)
 	utils.CheckError("Error in initialising command dependencies: ", err)
 
 	commission, err := flagSetUtils.GetUint8Commission(flagSet)
diff --git a/cmd/updateJob.go b/cmd/updateJob.go
@@ -34,7 +34,7 @@ func initialiseUpdateJob(cmd *cobra.Command, args []string) {
 
 //This function sets the flag appropriately and executes the UpdateJob function
 func (*UtilsStruct) ExecuteUpdateJob(flagSet *pflag.FlagSet) {
-	config, rpcParameters, account, err := InitializeCommandDependencies(flagSet)
+	config, rpcParameters, _, account, err := InitializeCommandDependencies(flagSet)
 	utils.CheckError("Error in initialising command dependencies: ", err)
 
 	jobId, err := flagSetUtils.GetUint16JobId(flagSet)
diff --git a/cmd/vote.go b/cmd/vote.go
diff --git a/cmd/vote_test.go b/cmd/vote_test.go
