Implement SoV data struct

vms/platformvm/state/state.go

@@ -71,6 +71,7 @@ var (
 	DelegatorPrefix               = []byte("delegator")
 	SubnetValidatorPrefix         = []byte("subnetValidator")
 	SubnetDelegatorPrefix         = []byte("subnetDelegator")
+	SubnetOnlyValidatorPrefix     = []byte("subnetOnlyValidator")
 	ValidatorWeightDiffsPrefix    = []byte("flatValidatorDiffs")
 	ValidatorPublicKeyDiffsPrefix = []byte("flatPublicKeyDiffs")
 	TxPrefix                      = []byte("tx")
@@ -236,6 +237,9 @@ type stateBlk struct {
  * | | '-. subnetDelegator
  * | |   '-. list
  * | |     '-- txID -> potential reward
+ * | | |-. subnetOnlyValidator
+ * | | | '-. list
+ * | | |   '-- validationID -> subnet + nodeID + minNonce + balance + endTime
  * | |-. pending
  * | | |-. validator
  * | | | '-. list
@@ -270,6 +274,8 @@ type stateBlk struct {
  * |   '-- txID -> nil
  * |-. subnetOwners
  * | '-. subnetID -> owner
+ * |-. subnetManagers
+ * | '-. subnetID -> manager
  * |-. chains
  * | '-. subnetID
  * |   '-. list
@@ -294,8 +300,9 @@ type state struct {
 
 	baseDB *versiondb.Database
 
-	currentStakers *baseStakers
-	pendingStakers *baseStakers
+	currentStakers       *baseStakers
+	pendingStakers       *baseStakers
+	subnetOnlyValidators *baseSubnetOnlyValidators
 
 	currentHeight uint64
 
@@ -307,25 +314,26 @@ type state struct {
 	blockCache  cache.Cacher[ids.ID, block.Block] // cache of blockID -> Block; if the entry is nil, it is not in the database
 	blockDB     database.Database
 
-	validatorsDB                 database.Database
-	currentValidatorsDB          database.Database
-	currentValidatorBaseDB       database.Database
-	currentValidatorList         linkeddb.LinkedDB
-	currentDelegatorBaseDB       database.Database
-	currentDelegatorList         linkeddb.LinkedDB
-	currentSubnetValidatorBaseDB database.Database
-	currentSubnetValidatorList   linkeddb.LinkedDB
-	currentSubnetDelegatorBaseDB database.Database
-	currentSubnetDelegatorList   linkeddb.LinkedDB
-	pendingValidatorsDB          database.Database
-	pendingValidatorBaseDB       database.Database
-	pendingValidatorList         linkeddb.LinkedDB
-	pendingDelegatorBaseDB       database.Database
-	pendingDelegatorList         linkeddb.LinkedDB
-	pendingSubnetValidatorBaseDB database.Database
-	pendingSubnetValidatorList   linkeddb.LinkedDB
-	pendingSubnetDelegatorBaseDB database.Database
-	pendingSubnetDelegatorList   linkeddb.LinkedDB
+	validatorsDB                     database.Database
+	currentValidatorsDB              database.Database
+	currentValidatorBaseDB           database.Database
+	currentValidatorList             linkeddb.LinkedDB
+	currentDelegatorBaseDB           database.Database
+	currentDelegatorList             linkeddb.LinkedDB
+	currentSubnetValidatorBaseDB     database.Database
+	currentSubnetValidatorList       linkeddb.LinkedDB
+	currentSubnetDelegatorBaseDB     database.Database
+	currentSubnetDelegatorList       linkeddb.LinkedDB
+	currentSubnetOnlyValidatorBaseDB database.Database
+	pendingValidatorsDB              database.Database
+	pendingValidatorBaseDB           database.Database
+	pendingValidatorList             linkeddb.LinkedDB
+	pendingDelegatorBaseDB           database.Database
+	pendingDelegatorList             linkeddb.LinkedDB
+	pendingSubnetValidatorBaseDB     database.Database
+	pendingSubnetValidatorList       linkeddb.LinkedDB
+	pendingSubnetDelegatorBaseDB     database.Database
+	pendingSubnetDelegatorList       linkeddb.LinkedDB
 
 	validatorWeightDiffsDB    database.Database
 	validatorPublicKeyDiffsDB database.Database
@@ -489,6 +497,7 @@ func New(
 	currentDelegatorBaseDB := prefixdb.New(DelegatorPrefix, currentValidatorsDB)
 	currentSubnetValidatorBaseDB := prefixdb.New(SubnetValidatorPrefix, currentValidatorsDB)
 	currentSubnetDelegatorBaseDB := prefixdb.New(SubnetDelegatorPrefix, currentValidatorsDB)
+	currentSubnetOnlyValidatorBaseDB := prefixdb.New(SubnetOnlyValidatorPrefix, currentValidatorsDB)
 
 	pendingValidatorsDB := prefixdb.New(PendingPrefix, validatorsDB)
 	pendingValidatorBaseDB := prefixdb.New(ValidatorPrefix, pendingValidatorsDB)
@@ -604,30 +613,32 @@ func New(
 		blockCache:  blockCache,
 		blockDB:     prefixdb.New(BlockPrefix, baseDB),
 
-		currentStakers: newBaseStakers(),
-		pendingStakers: newBaseStakers(),
-
-		validatorsDB:                 validatorsDB,
-		currentValidatorsDB:          currentValidatorsDB,
-		currentValidatorBaseDB:       currentValidatorBaseDB,
-		currentValidatorList:         linkeddb.NewDefault(currentValidatorBaseDB),
-		currentDelegatorBaseDB:       currentDelegatorBaseDB,
-		currentDelegatorList:         linkeddb.NewDefault(currentDelegatorBaseDB),
-		currentSubnetValidatorBaseDB: currentSubnetValidatorBaseDB,
-		currentSubnetValidatorList:   linkeddb.NewDefault(currentSubnetValidatorBaseDB),
-		currentSubnetDelegatorBaseDB: currentSubnetDelegatorBaseDB,
-		currentSubnetDelegatorList:   linkeddb.NewDefault(currentSubnetDelegatorBaseDB),
-		pendingValidatorsDB:          pendingValidatorsDB,
-		pendingValidatorBaseDB:       pendingValidatorBaseDB,
-		pendingValidatorList:         linkeddb.NewDefault(pendingValidatorBaseDB),
-		pendingDelegatorBaseDB:       pendingDelegatorBaseDB,
-		pendingDelegatorList:         linkeddb.NewDefault(pendingDelegatorBaseDB),
-		pendingSubnetValidatorBaseDB: pendingSubnetValidatorBaseDB,
-		pendingSubnetValidatorList:   linkeddb.NewDefault(pendingSubnetValidatorBaseDB),
-		pendingSubnetDelegatorBaseDB: pendingSubnetDelegatorBaseDB,
-		pendingSubnetDelegatorList:   linkeddb.NewDefault(pendingSubnetDelegatorBaseDB),
-		validatorWeightDiffsDB:       validatorWeightDiffsDB,
-		validatorPublicKeyDiffsDB:    validatorPublicKeyDiffsDB,
+		currentStakers:       newBaseStakers(),
+		pendingStakers:       newBaseStakers(),
+		subnetOnlyValidators: newBaseSubnetOnlyValidators(currentSubnetOnlyValidatorBaseDB),
+
+		validatorsDB:                     validatorsDB,
+		currentValidatorsDB:              currentValidatorsDB,
+		currentValidatorBaseDB:           currentValidatorBaseDB,
+		currentValidatorList:             linkeddb.NewDefault(currentValidatorBaseDB),
+		currentDelegatorBaseDB:           currentDelegatorBaseDB,
+		currentDelegatorList:             linkeddb.NewDefault(currentDelegatorBaseDB),
+		currentSubnetValidatorBaseDB:     currentSubnetValidatorBaseDB,
+		currentSubnetValidatorList:       linkeddb.NewDefault(currentSubnetValidatorBaseDB),
+		currentSubnetDelegatorBaseDB:     currentSubnetDelegatorBaseDB,
+		currentSubnetDelegatorList:       linkeddb.NewDefault(currentSubnetDelegatorBaseDB),
+		currentSubnetOnlyValidatorBaseDB: currentSubnetOnlyValidatorBaseDB,
+		pendingValidatorsDB:              pendingValidatorsDB,
+		pendingValidatorBaseDB:           pendingValidatorBaseDB,
+		pendingValidatorList:             linkeddb.NewDefault(pendingValidatorBaseDB),
+		pendingDelegatorBaseDB:           pendingDelegatorBaseDB,
+		pendingDelegatorList:             linkeddb.NewDefault(pendingDelegatorBaseDB),
+		pendingSubnetValidatorBaseDB:     pendingSubnetValidatorBaseDB,
+		pendingSubnetValidatorList:       linkeddb.NewDefault(pendingSubnetValidatorBaseDB),
+		pendingSubnetDelegatorBaseDB:     pendingSubnetDelegatorBaseDB,
+		pendingSubnetDelegatorList:       linkeddb.NewDefault(pendingSubnetDelegatorBaseDB),
+		validatorWeightDiffsDB:           validatorWeightDiffsDB,
+		validatorPublicKeyDiffsDB:        validatorPublicKeyDiffsDB,
 
 		addedTxs: make(map[ids.ID]*txAndStatus),
 		txDB:     prefixdb.New(TxPrefix, baseDB),
@@ -1709,6 +1720,7 @@ func (s *state) Close() error {
 		s.pendingValidatorsDB.Close(),
 		s.currentSubnetValidatorBaseDB.Close(),
 		s.currentSubnetDelegatorBaseDB.Close(),
+		s.currentSubnetOnlyValidatorBaseDB.Close(),
 		s.currentDelegatorBaseDB.Close(),
 		s.currentValidatorBaseDB.Close(),
 		s.currentValidatorsDB.Close(),
@@ -1939,8 +1951,11 @@ func (s *state) writeCurrentStakers(updateValidators bool, height uint64, codecV
 					// Record that the public key for the validator is being
 					// added. This means the prior value for the public key was
 					// nil.
-					err := s.validatorPublicKeyDiffsDB.Put(
-						marshalDiffKey(constants.PrimaryNetworkID, height, nodeID),
+					err := writeValidatorPublicKeyDiff(
+						s.validatorPublicKeyDiffsDB,
+						constants.PrimaryNetworkID,
+						height,
+						nodeID,
 						nil,
 					)
 					if err != nil {
@@ -1988,9 +2003,12 @@ func (s *state) writeCurrentStakers(updateValidators bool, height uint64, codecV
 					// Note: We store the uncompressed public key here as it is
 					// significantly more efficient to parse when applying
 					// diffs.
-					err := s.validatorPublicKeyDiffsDB.Put(
-						marshalDiffKey(constants.PrimaryNetworkID, height, nodeID),
-						bls.PublicKeyToUncompressedBytes(staker.PublicKey),
+					err := writeValidatorPublicKeyDiff(
+						s.validatorPublicKeyDiffsDB,
+						constants.PrimaryNetworkID,
+						height,
+						nodeID,
+						staker.PublicKey,
 					)
 					if err != nil {
 						return err
@@ -2019,9 +2037,12 @@ func (s *state) writeCurrentStakers(updateValidators bool, height uint64, codecV
 				continue
 			}
 
-			err = s.validatorWeightDiffsDB.Put(
-				marshalDiffKey(subnetID, height, nodeID),
-				marshalWeightDiff(weightDiff),
+			err = writeValidatorWeightDiff(
+				s.validatorWeightDiffsDB,
+				subnetID,
+				height,
+				nodeID,
+				weightDiff,
 			)
 			if err != nil {
 				return err
@@ -2555,3 +2576,34 @@ func getFeeState(db database.KeyValueReader) (gas.State, error) {
 	}
 	return feeState, nil
 }
+
+func writeValidatorWeightDiff(
+	db database.KeyValueWriter,
+	subnetID ids.ID,
+	height uint64,
+	nodeID ids.NodeID,
+	weightDiff *ValidatorWeightDiff,
+) error {
+	return db.Put(
+		marshalDiffKey(subnetID, height, nodeID),
+		marshalWeightDiff(weightDiff),
+	)
+}
+
+func writeValidatorPublicKeyDiff(
+	db database.KeyValueWriter,
+	subnetID ids.ID,
+	height uint64,
+	nodeID ids.NodeID,
+	pk *bls.PublicKey,
+) error {
+	value := []byte(nil)
+	if pk != nil {
+		value = bls.PublicKeyToUncompressedBytes(pk)
+	}
+
+	return db.Put(
+		marshalDiffKey(subnetID, height, nodeID),
+		value,
+	)
+}