[RFC-201/205]: EVM-580-Update validator set in stake manager

command/genesis/polybft_params.go

@@ -102,6 +102,7 @@ func (p *genesisParams) generatePolyBftChainConfig(o command.OutputFormatter) er
 		InitialTrieRoot:     types.StringToHash(p.initialStateRoot),
 		MintableNativeToken: p.mintableNativeToken,
 		NativeTokenConfig:   p.nativeTokenConfig,
+		MaxValidatorSetSize: p.maxNumValidators,
 	}
 
 	chainConfig := &chain.Chain{

consensus/polybft/consensus_runtime.go

@@ -12,6 +12,7 @@ import (
 	"github.com/0xPolygon/polygon-edge/consensus/polybft/contractsapi"
 	bls "github.com/0xPolygon/polygon-edge/consensus/polybft/signer"
 	"github.com/0xPolygon/polygon-edge/consensus/polybft/wallet"
+	"github.com/0xPolygon/polygon-edge/contracts"
 	"github.com/0xPolygon/polygon-edge/txrelayer"
 	"github.com/0xPolygon/polygon-edge/types"
 
@@ -112,6 +113,9 @@ type consensusRuntime struct {
 	// manager for state sync bridge transactions
 	stateSyncManager StateSyncManager
 
+	// manager for handling validator stake change and updating validator set
+	stakeManager StakeManager
+
 	// logger instance
 	logger hcf.Logger
 }
@@ -139,6 +143,10 @@ func newConsensusRuntime(log hcf.Logger, config *runtimeConfig) (*consensusRunti
 		return nil, err
 	}
 
+	if err := runtime.initStakeManager(log); err != nil {
+		return nil, err
+	}
+
 	// we need to call restart epoch on runtime to initialize epoch state
 	runtime.epoch, err = runtime.restartEpoch(runtime.lastBuiltBlock)
 	if err != nil {
@@ -211,6 +219,26 @@ func (c *consensusRuntime) initCheckpointManager(logger hcf.Logger) error {
 	return nil
 }
 
+// initStakeManager initializes stake manager
+func (c *consensusRuntime) initStakeManager(logger hcf.Logger) error {
+	txRelayer, err := txrelayer.NewTxRelayer(txrelayer.WithIPAddress(c.config.PolyBFTConfig.Bridge.JSONRPCEndpoint))
+	if err != nil {
+		return err
+	}
+
+	c.stakeManager = newStakeManager(
+		logger.Named("stake-manager"),
+		c.state,
+		txRelayer,
+		wallet.NewEcdsaSigner(c.config.Key),
+		contracts.NewValidatorSetContract,
+		c.config.PolyBFTConfig.Bridge.CustomSupernetManagerAddr,
+		int(c.config.PolyBFTConfig.MaxValidatorSetSize),
+	)
+
+	return nil
+}
+
 // getGuardedData returns last build block, proposer snapshot and current epochMetadata in a thread-safe manner.
 func (c *consensusRuntime) getGuardedData() (guardedDataDTO, error) {
 	c.lock.RLock()
@@ -280,6 +308,11 @@ func (c *consensusRuntime) OnBlockInserted(fullBlock *types.FullBlock) {
 		c.logger.Error("Could not update proposer calculator", "err", err)
 	}
 
+	// handle transfer events that happened in block
+	if err := c.stakeManager.PostBlock(postBlock); err != nil {
+		c.logger.Error("failed to post block in stake manager", "err", err)
+	}
+
 	if isEndOfEpoch {
 		if epoch, err = c.restartEpoch(fullBlock.Block.Header); err != nil {
 			c.logger.Error("failed to restart epoch after block inserted", "error", err)
@@ -362,6 +395,11 @@ func (c *consensusRuntime) FSM() error {
 		if err != nil {
 			return fmt.Errorf("cannot calculate commit epoch info: %w", err)
 		}
+
+		ff.newValidatorsDelta, err = c.stakeManager.UpdateValidatorSet(epoch.Number, epoch.Validators.Copy())
+		if err != nil {
+			return fmt.Errorf("cannot update validator set on epoch ending: %w", err)
+		}
 	}
 
 	c.logger.Info(

consensus/polybft/consensus_runtime_test.go

@@ -228,6 +228,7 @@ func TestConsensusRuntime_OnBlockInserted_EndOfEpoch(t *testing.T) {
 		lastBuiltBlock:    &types.Header{Number: header.Number - 1},
 		stateSyncManager:  &dummyStateSyncManager{},
 		checkpointManager: &dummyCheckpointManager{},
+		stakeManager:      &dummyStakeManager{},
 	}
 	runtime.OnBlockInserted(&types.FullBlock{Block: builtBlock})
 
@@ -421,6 +422,7 @@ func TestConsensusRuntime_FSM_EndOfEpoch_BuildCommitEpoch(t *testing.T) {
 		lastBuiltBlock:     lastBuiltBlock,
 		stateSyncManager:   &dummyStateSyncManager{},
 		checkpointManager:  &dummyCheckpointManager{},
+		stakeManager:       &dummyStakeManager{},
 	}
 
 	err := runtime.FSM()

consensus/polybft/contractsapi/bindings-gen/main.go

@@ -169,6 +169,14 @@ func main() {
 				"StakeAdded",
 			},
 		},
+		{
+			"ValidatorSet",
+			gensc.ValidatorSet,
+			[]string{},
+			[]string{
+				"Transfer",
+			},
+		},
 	}
 
 	generatedData := &generatedData{}

consensus/polybft/contractsapi/helper.go

@@ -39,3 +39,14 @@ func (u *Uptime) AddValidatorUptime(address types.Address, count int64) {
 }
 
 var _ StateTransactionInput = &CommitEpochChildValidatorSetFn{}
+
+// IsStake indicates if transfer event (from ERC20 implementation) mints tokens to a non zero address
+func (t *TransferEvent) IsStake() bool {
+	return t.To != types.ZeroAddress && t.From == types.ZeroAddress
+}
+
+// IsUnstake indicates if transfer event (from ERC20 implementation) burns tokens from a non zero address
+// meaning, it transfers them to zero address
+func (t *TransferEvent) IsUnstake() bool {
+	return t.To == types.ZeroAddress && t.From != types.ZeroAddress
+}

consensus/polybft/fsm.go

@@ -216,16 +216,7 @@ func (f *fsm) getValidatorsTransition(delta *ValidatorSetDelta) (AccountSet, err
 		return nil, err
 	}
 
-	if f.logger.IsDebug() {
-		var buf bytes.Buffer
-		for _, v := range nextValidators {
-			if _, err := buf.WriteString(fmt.Sprintf("%s\n", v.String())); err != nil {
-				return nil, err
-			}
-		}
-
-		f.logger.Debug("getValidatorsTransition", "Next validators", buf.String())
-	}
+	f.logger.Debug("getValidatorsTransition", "Next validators", nextValidators)
 
 	return nextValidators, nil
 }

consensus/polybft/polybft_config.go

@@ -45,6 +45,9 @@ type PolyBFTConfig struct {
 	NativeTokenConfig *TokenConfig `json:"nativeTokenConfig"`
 
 	InitialTrieRoot types.Hash `json:"initialTrieRoot"`
+
+	// MaxValidatorSetSize indicates the maximum size of validator set
+	MaxValidatorSetSize uint64 `json:"maxValidatorSetSize"`
 }
 
 // LoadPolyBFTConfig loads chain config from provided path and unmarshals PolyBFTConfig