PoS Add GlobalParams for Max Validators and Max Stakers

.gitignore

@@ -7,6 +7,7 @@ backend
 core
 
 .idea
+.vscode
 
 local_scripts/*
 lib/mem.log

lib/block_view.go

@@ -3035,6 +3035,18 @@ func (bav *UtxoView) _connectUpdateGlobalParams(
  return 0, 0, nil, fmt.Errorf("_connectUpdateGlobalParams: unable to decode LeaderScheduleMaxNumValidators as uint64")
  }
  }
+ if len(extraData[ValidatorSetMaxNumValidatorsKey]) > 0 {
+ newGlobalParamsEntry.ValidatorSetMaxNumValidators, bytesRead = Uvarint(extraData[ValidatorSetMaxNumValidatorsKey])
+ if bytesRead <= 0 {
+ return 0, 0, nil, fmt.Errorf("_connectUpdateGlobalParams: unable to decode ValidatorSetMaxNumValidators as uint64")
+ }
+ }
+ if len(extraData[StakingRewardDistributionMaxNumStakersKey]) > 0 {
+ newGlobalParamsEntry.StakingRewardDistributionMaxNumStakers, bytesRead = Uvarint(extraData[StakingRewardDistributionMaxNumStakersKey])
+ if bytesRead <= 0 {
+ return 0, 0, nil, fmt.Errorf("_connectUpdateGlobalParams: unable to decode StakingRewardDistributionMaxNumStakers as uint64")
+ }
+ }
  if len(extraData[EpochDurationNumBlocksKey]) > 0 {
  newGlobalParamsEntry.EpochDurationNumBlocks, bytesRead = Uvarint(extraData[EpochDurationNumBlocksKey])
  if bytesRead <= 0 {

lib/block_view_types.go

@@ -3785,6 +3785,16 @@ type GlobalParamsEntry struct {
  // are included when generating a new Proof-of-Stake leader schedule.
  LeaderScheduleMaxNumValidators uint64
 
+ // ValidatorSetMaxNumValidators is the maximum number of validators that
+ // are included in the active validator set every epoch in the Proof-of-Stake
+ // consensus.
+ ValidatorSetMaxNumValidators uint64
+
+ // StakingRewardDistributionMaxNumStakers is the maximum number of stake entries
+ // that are eligible to receive block rewards every epoch in the Proof-of-Stake
+ // consensus.
+ StakingRewardDistributionMaxNumStakers uint64
+
  // EpochDurationNumBlocks is the number of blocks included in one epoch.
  EpochDurationNumBlocks uint64
 
@@ -3805,6 +3815,8 @@ func (gp *GlobalParamsEntry) Copy() *GlobalParamsEntry {
  StakeLockupEpochDuration: gp.StakeLockupEpochDuration,
  ValidatorJailEpochDuration: gp.ValidatorJailEpochDuration,
  LeaderScheduleMaxNumValidators: gp.LeaderScheduleMaxNumValidators,
+ ValidatorSetMaxNumValidators: gp.ValidatorSetMaxNumValidators,
+ StakingRewardDistributionMaxNumStakers: gp.StakingRewardDistributionMaxNumStakers,
  EpochDurationNumBlocks: gp.EpochDurationNumBlocks,
  JailInactiveValidatorGracePeriodEpochs: gp.JailInactiveValidatorGracePeriodEpochs,
  }
@@ -3825,6 +3837,8 @@ func (gp *GlobalParamsEntry) RawEncodeWithoutMetadata(blockHeight uint64, skipMe
  data = append(data, UintToBuf(gp.StakeLockupEpochDuration)...)
  data = append(data, UintToBuf(gp.ValidatorJailEpochDuration)...)
  data = append(data, UintToBuf(gp.LeaderScheduleMaxNumValidators)...)
+ data = append(data, UintToBuf(gp.ValidatorSetMaxNumValidators)...)
+ data = append(data, UintToBuf(gp.StakingRewardDistributionMaxNumStakers)...)
  data = append(data, UintToBuf(gp.EpochDurationNumBlocks)...)
  data = append(data, UintToBuf(gp.JailInactiveValidatorGracePeriodEpochs)...)
  }
@@ -3873,6 +3887,14 @@ func (gp *GlobalParamsEntry) RawDecodeWithoutMetadata(blockHeight uint64, rr *by
  if err != nil {
  return errors.Wrapf(err, "GlobalParamsEntry.Decode: Problem reading LeaderScheduleMaxNumValidators: ")
  }
+ gp.ValidatorSetMaxNumValidators, err = ReadUvarint(rr)
+ if err != nil {
+ return errors.Wrapf(err, "GlobalParamsEntry.Decode: Problem reading ValidatorSetMaxNumValidators: ")
+ }
+ gp.StakingRewardDistributionMaxNumStakers, err = ReadUvarint(rr)
+ if err != nil {
+ return errors.Wrapf(err, "GlobalParamsEntry.Decode: Problem reading StakingRewardDistributionMaxNumStakers: ")
+ }
  gp.EpochDurationNumBlocks, err = ReadUvarint(rr)
  if err != nil {
  return errors.Wrapf(err, "GlobalParamsEntry.Decode: Problem reading EpochDurationNumBlocks: ")

lib/constants.go

@@ -627,6 +627,14 @@ type DeSoParams struct {
  // that are included when generating a new Proof-of-Stake leader schedule.
  DefaultLeaderScheduleMaxNumValidators uint64
 
+ // DefaultValidatorSetMaxNumValidators is the default maximum number of validators
+ // that are included in the validator set for any given epoch.
+ DefaultValidatorSetMaxNumValidators uint64
+
+ // DefaultStakingRewardDistributionMaxNumStakers is the default number of stake entries
+ // that are included in the staking reward distribution in each epoch.
+ DefaultStakingRewardDistributionMaxNumStakers uint64
+
  // DefaultEpochDurationNumBlocks is the default number of blocks included in one epoch.
  DefaultEpochDurationNumBlocks uint64
 
@@ -1024,6 +1032,12 @@ var DeSoMainnetParams = DeSoParams{
  // The max number of validators included in a leader schedule.
  DefaultLeaderScheduleMaxNumValidators: uint64(100),
 
+ // The max number of validators included in a validator set for any given epoch.
+ DefaultValidatorSetMaxNumValidators: uint64(1000),
+
+ // The max number of stakers included in a staking rewards distribution every epoch.
+ DefaultStakingRewardDistributionMaxNumStakers: uint64(10000),
+
  // The number of blocks in one epoch
  DefaultEpochDurationNumBlocks: uint64(3600),
 
@@ -1273,6 +1287,12 @@ var DeSoTestnetParams = DeSoParams{
  // The max number of validators included in a leader schedule.
  DefaultLeaderScheduleMaxNumValidators: uint64(100),
 
+ // The max number of validators included in a validator set for any given epoch.
+ DefaultValidatorSetMaxNumValidators: uint64(1000),
+
+ // The max number of stakers included in a staking rewards distribution every epoch.
+ DefaultStakingRewardDistributionMaxNumStakers: uint64(10000),
+
  // The number of blocks in one epoch
  DefaultEpochDurationNumBlocks: uint64(3600),
 
@@ -1326,6 +1346,8 @@ const (
  StakeLockupEpochDurationKey = "StakeLockupEpochDuration"
  ValidatorJailEpochDurationKey = "ValidatorJailEpochDuration"
  LeaderScheduleMaxNumValidatorsKey = "LeaderScheduleMaxNumValidators"
+ ValidatorSetMaxNumValidatorsKey = "ValidatorSetMaxNumValidators"
+ StakingRewardDistributionMaxNumStakersKey = "StakingRewardDistributionMaxNumStakers"
  EpochDurationNumBlocksKey = "EpochDurationNumBlocks"
  JailInactiveValidatorGracePeriodEpochsKey = "JailInactiveValidatorGracePeriodEpochs"
 

lib/pos_snapshot_entries.go

@@ -3,12 +3,13 @@ package lib
 import (
  "bytes"
  "fmt"
+ "math"
+ "sort"
+
  "github.com/dgraph-io/badger/v3"
  "github.com/golang/glog"
  "github.com/holiman/uint256"
  "github.com/pkg/errors"
- "math"
- "sort"
 )
 
 const SnapshotLookbackNumEpochs uint64 = 2
@@ -97,6 +98,12 @@ func _mergeGlobalParamEntryDefaults(bav *UtxoView, globalParamsEntry *GlobalPara
  if globalParamsEntryCopy.LeaderScheduleMaxNumValidators == 0 {
  globalParamsEntryCopy.LeaderScheduleMaxNumValidators = bav.Params.DefaultLeaderScheduleMaxNumValidators
  }
+ if globalParamsEntryCopy.ValidatorSetMaxNumValidators == 0 {
+ globalParamsEntryCopy.ValidatorSetMaxNumValidators = bav.Params.DefaultValidatorSetMaxNumValidators
+ }
+ if globalParamsEntryCopy.StakingRewardDistributionMaxNumStakers == 0 {
+ globalParamsEntryCopy.StakingRewardDistributionMaxNumStakers = bav.Params.DefaultStakingRewardDistributionMaxNumStakers
+ }
  if globalParamsEntryCopy.EpochDurationNumBlocks == 0 {
  globalParamsEntryCopy.EpochDurationNumBlocks = bav.Params.DefaultEpochDurationNumBlocks
  }