ACP-77: Implement validator state

RELEASES.md

@@ -1,5 +1,14 @@
 # Release Notes
 
+## Pending Release
+
+### Configs
+
+- Added P-chain configs
+  - `"l1-weights-cache-size"`
+  - `"l1-inactive-validators-cache-size"`
+  - `"l1-subnet-id-node-id-cache-size"`
+
 ## [v1.11.11](https://github.com/ava-labs/avalanchego/releases/tag/v1.11.11)
 
 This version is backwards compatible to [v1.11.0](https://github.com/ava-labs/avalanchego/releases/tag/v1.11.0). It is optional, but encouraged.

vms/platformvm/block/executor/proposal_block_test.go

@@ -93,6 +93,7 @@ func TestApricotProposalBlockTimeVerification(t *testing.T) {
 	onParentAccept.EXPECT().GetFeeState().Return(gas.State{}).AnyTimes()
 	onParentAccept.EXPECT().GetSoVExcess().Return(gas.Gas(0)).AnyTimes()
 	onParentAccept.EXPECT().GetAccruedFees().Return(uint64(0)).AnyTimes()
+	onParentAccept.EXPECT().NumActiveSubnetOnlyValidators().Return(0).AnyTimes()
 
 	onParentAccept.EXPECT().GetCurrentStakerIterator().Return(
 		iterator.FromSlice(&state.Staker{
@@ -165,6 +166,7 @@ func TestBanffProposalBlockTimeVerification(t *testing.T) {
 	onParentAccept.EXPECT().GetFeeState().Return(gas.State{}).AnyTimes()
 	onParentAccept.EXPECT().GetSoVExcess().Return(gas.Gas(0)).AnyTimes()
 	onParentAccept.EXPECT().GetAccruedFees().Return(uint64(0)).AnyTimes()
+	onParentAccept.EXPECT().NumActiveSubnetOnlyValidators().Return(0).AnyTimes()
 	onParentAccept.EXPECT().GetCurrentSupply(constants.PrimaryNetworkID).Return(uint64(1000), nil).AnyTimes()
 
 	env.blkManager.(*manager).blkIDToState[parentID] = &blockState{

vms/platformvm/block/executor/standard_block_test.go

@@ -61,6 +61,7 @@ func TestApricotStandardBlockTimeVerification(t *testing.T) {
 	onParentAccept.EXPECT().GetFeeState().Return(gas.State{}).AnyTimes()
 	onParentAccept.EXPECT().GetSoVExcess().Return(gas.Gas(0)).AnyTimes()
 	onParentAccept.EXPECT().GetAccruedFees().Return(uint64(0)).AnyTimes()
+	onParentAccept.EXPECT().NumActiveSubnetOnlyValidators().Return(0).AnyTimes()
 
 	// wrong height
 	apricotChildBlk, err := block.NewApricotStandardBlock(
@@ -137,6 +138,7 @@ func TestBanffStandardBlockTimeVerification(t *testing.T) {
 	onParentAccept.EXPECT().GetFeeState().Return(gas.State{}).AnyTimes()
 	onParentAccept.EXPECT().GetSoVExcess().Return(gas.Gas(0)).AnyTimes()
 	onParentAccept.EXPECT().GetAccruedFees().Return(uint64(0)).AnyTimes()
+	onParentAccept.EXPECT().NumActiveSubnetOnlyValidators().Return(0).AnyTimes()
 
 	txID := ids.GenerateTestID()
 	utxo := &avax.UTXO{

vms/platformvm/block/executor/verifier_test.go

@@ -105,6 +105,7 @@ func TestVerifierVisitProposalBlock(t *testing.T) {
 	parentOnAcceptState.EXPECT().GetFeeState().Return(gas.State{}).Times(2)
 	parentOnAcceptState.EXPECT().GetSoVExcess().Return(gas.Gas(0)).Times(2)
 	parentOnAcceptState.EXPECT().GetAccruedFees().Return(uint64(0)).Times(2)
+	parentOnAcceptState.EXPECT().NumActiveSubnetOnlyValidators().Return(0).Times(2)
 
 	backend := &backend{
 		lastAccepted: parentID,
@@ -338,6 +339,7 @@ func TestVerifierVisitStandardBlock(t *testing.T) {
 	parentState.EXPECT().GetFeeState().Return(gas.State{}).Times(1)
 	parentState.EXPECT().GetSoVExcess().Return(gas.Gas(0)).Times(1)
 	parentState.EXPECT().GetAccruedFees().Return(uint64(0)).Times(1)
+	parentState.EXPECT().NumActiveSubnetOnlyValidators().Return(0).Times(1)
 	parentStatelessBlk.EXPECT().Height().Return(uint64(1)).Times(1)
 	mempool.EXPECT().Remove(apricotBlk.Txs()).Times(1)
 
@@ -601,6 +603,7 @@ func TestBanffAbortBlockTimestampChecks(t *testing.T) {
 			s.EXPECT().GetFeeState().Return(gas.State{}).Times(3)
 			s.EXPECT().GetSoVExcess().Return(gas.Gas(0)).Times(3)
 			s.EXPECT().GetAccruedFees().Return(uint64(0)).Times(3)
+			s.EXPECT().NumActiveSubnetOnlyValidators().Return(0).Times(3)
 
 			onDecisionState, err := state.NewDiff(parentID, backend)
 			require.NoError(err)
@@ -700,6 +703,7 @@ func TestBanffCommitBlockTimestampChecks(t *testing.T) {
 			s.EXPECT().GetFeeState().Return(gas.State{}).Times(3)
 			s.EXPECT().GetSoVExcess().Return(gas.Gas(0)).Times(3)
 			s.EXPECT().GetAccruedFees().Return(uint64(0)).Times(3)
+			s.EXPECT().NumActiveSubnetOnlyValidators().Return(0).Times(3)
 
 			onDecisionState, err := state.NewDiff(parentID, backend)
 			require.NoError(err)
@@ -817,6 +821,7 @@ func TestVerifierVisitStandardBlockWithDuplicateInputs(t *testing.T) {
 	parentState.EXPECT().GetFeeState().Return(gas.State{}).Times(1)
 	parentState.EXPECT().GetSoVExcess().Return(gas.Gas(0)).Times(1)
 	parentState.EXPECT().GetAccruedFees().Return(uint64(0)).Times(1)
+	parentState.EXPECT().NumActiveSubnetOnlyValidators().Return(0).Times(1)
 	parentStatelessBlk.EXPECT().Parent().Return(grandParentID).Times(1)
 
 	err = verifier.ApricotStandardBlock(blk)

vms/platformvm/config/execution_config.go

@@ -12,34 +12,40 @@ import (
 )
 
 var DefaultExecutionConfig = ExecutionConfig{
-	Network:                      network.DefaultConfig,
-	BlockCacheSize:               64 * units.MiB,
-	TxCacheSize:                  128 * units.MiB,
-	TransformedSubnetTxCacheSize: 4 * units.MiB,
-	RewardUTXOsCacheSize:         2048,
-	ChainCacheSize:               2048,
-	ChainDBCacheSize:             2048,
-	BlockIDCacheSize:             8192,
-	FxOwnerCacheSize:             4 * units.MiB,
-	SubnetConversionCacheSize:    4 * units.MiB,
-	ChecksumsEnabled:             false,
-	MempoolPruneFrequency:        30 * time.Minute,
+	Network:                       network.DefaultConfig,
+	BlockCacheSize:                64 * units.MiB,
+	TxCacheSize:                   128 * units.MiB,
+	TransformedSubnetTxCacheSize:  4 * units.MiB,
+	RewardUTXOsCacheSize:          2048,
+	ChainCacheSize:                2048,
+	ChainDBCacheSize:              2048,
+	BlockIDCacheSize:              8192,
+	FxOwnerCacheSize:              4 * units.MiB,
+	SubnetConversionCacheSize:     4 * units.MiB,
+	L1WeightsCacheSize:            16 * units.KiB,
+	L1InactiveValidatorsCacheSize: 256 * units.KiB,
+	L1SubnetIDNodeIDCacheSize:     16 * units.KiB,
+	ChecksumsEnabled:              false,
+	MempoolPruneFrequency:         30 * time.Minute,
 }
 
 // ExecutionConfig provides execution parameters of PlatformVM
 type ExecutionConfig struct {
-	Network                      network.Config `json:"network"`
-	BlockCacheSize               int            `json:"block-cache-size"`
-	TxCacheSize                  int            `json:"tx-cache-size"`
-	TransformedSubnetTxCacheSize int            `json:"transformed-subnet-tx-cache-size"`
-	RewardUTXOsCacheSize         int            `json:"reward-utxos-cache-size"`
-	ChainCacheSize               int            `json:"chain-cache-size"`
-	ChainDBCacheSize             int            `json:"chain-db-cache-size"`
-	BlockIDCacheSize             int            `json:"block-id-cache-size"`
-	FxOwnerCacheSize             int            `json:"fx-owner-cache-size"`
-	SubnetConversionCacheSize    int            `json:"subnet-conversion-cache-size"`
-	ChecksumsEnabled             bool           `json:"checksums-enabled"`
-	MempoolPruneFrequency        time.Duration  `json:"mempool-prune-frequency"`
+	Network                       network.Config `json:"network"`
+	BlockCacheSize                int            `json:"block-cache-size"`
+	TxCacheSize                   int            `json:"tx-cache-size"`
+	TransformedSubnetTxCacheSize  int            `json:"transformed-subnet-tx-cache-size"`
+	RewardUTXOsCacheSize          int            `json:"reward-utxos-cache-size"`
+	ChainCacheSize                int            `json:"chain-cache-size"`
+	ChainDBCacheSize              int            `json:"chain-db-cache-size"`
+	BlockIDCacheSize              int            `json:"block-id-cache-size"`
+	FxOwnerCacheSize              int            `json:"fx-owner-cache-size"`
+	SubnetConversionCacheSize     int            `json:"subnet-conversion-cache-size"`
+	L1WeightsCacheSize            int            `json:"l1-weights-cache-size"`
+	L1InactiveValidatorsCacheSize int            `json:"l1-inactive-validators-cache-size"`
+	L1SubnetIDNodeIDCacheSize     int            `json:"l1-subnet-id-node-id-cache-size"`
+	ChecksumsEnabled              bool           `json:"checksums-enabled"`
+	MempoolPruneFrequency         time.Duration  `json:"mempool-prune-frequency"`
 }
 
 // GetExecutionConfig returns an ExecutionConfig

vms/platformvm/config/execution_config_test.go

@@ -81,17 +81,20 @@ func TestExecutionConfigUnmarshal(t *testing.T) {
 				ExpectedBloomFilterFalsePositiveProbability: 16,
 				MaxBloomFilterFalsePositiveProbability:      17,
 			},
-			BlockCacheSize:               1,
-			TxCacheSize:                  2,
-			TransformedSubnetTxCacheSize: 3,
-			RewardUTXOsCacheSize:         5,
-			ChainCacheSize:               6,
-			ChainDBCacheSize:             7,
-			BlockIDCacheSize:             8,
-			FxOwnerCacheSize:             9,
-			SubnetConversionCacheSize:    10,
-			ChecksumsEnabled:             true,
-			MempoolPruneFrequency:        time.Minute,
+			BlockCacheSize:                1,
+			TxCacheSize:                   2,
+			TransformedSubnetTxCacheSize:  3,
+			RewardUTXOsCacheSize:          5,
+			ChainCacheSize:                6,
+			ChainDBCacheSize:              7,
+			BlockIDCacheSize:              8,
+			FxOwnerCacheSize:              9,
+			SubnetConversionCacheSize:     10,
+			L1WeightsCacheSize:            11,
+			L1InactiveValidatorsCacheSize: 12,
+			L1SubnetIDNodeIDCacheSize:     13,
+			ChecksumsEnabled:              true,
+			MempoolPruneFrequency:         time.Minute,
 		}
 		verifyInitializedStruct(t, *expected)
 		verifyInitializedStruct(t, expected.Network)

vms/platformvm/state/diff.go

@@ -35,15 +35,17 @@ type diff struct {
 	parentID      ids.ID
 	stateVersions Versions
 
-	timestamp   time.Time
-	feeState    gas.State
-	sovExcess   gas.Gas
-	accruedFees uint64
+	timestamp           time.Time
+	feeState            gas.State
+	sovExcess           gas.Gas
+	accruedFees         uint64
+	parentNumActiveSOVs int
 
 	// Subnet ID --> supply of native asset of the subnet
 	currentSupply map[ids.ID]uint64
 
 	expiryDiff *expiryDiff
+	sovDiff    *subnetOnlyValidatorsDiff
 
 	currentStakerDiffs diffStakers
 	// map of subnetID -> nodeID -> total accrued delegatee rewards
@@ -77,15 +79,17 @@ func NewDiff(
 		return nil, fmt.Errorf("%w: %s", ErrMissingParentState, parentID)
 	}
 	return &diff{
-		parentID:          parentID,
-		stateVersions:     stateVersions,
-		timestamp:         parentState.GetTimestamp(),
-		feeState:          parentState.GetFeeState(),
-		sovExcess:         parentState.GetSoVExcess(),
-		accruedFees:       parentState.GetAccruedFees(),
-		expiryDiff:        newExpiryDiff(),
-		subnetOwners:      make(map[ids.ID]fx.Owner),
-		subnetConversions: make(map[ids.ID]SubnetConversion),
+		parentID:            parentID,
+		stateVersions:       stateVersions,
+		timestamp:           parentState.GetTimestamp(),
+		feeState:            parentState.GetFeeState(),
+		sovExcess:           parentState.GetSoVExcess(),
+		accruedFees:         parentState.GetAccruedFees(),
+		parentNumActiveSOVs: parentState.NumActiveSubnetOnlyValidators(),
+		expiryDiff:          newExpiryDiff(),
+		sovDiff:             newSubnetOnlyValidatorsDiff(),
+		subnetOwners:        make(map[ids.ID]fx.Owner),
+		subnetConversions:   make(map[ids.ID]SubnetConversion),
 	}, nil
 }
 
@@ -194,6 +198,70 @@ func (d *diff) DeleteExpiry(entry ExpiryEntry) {
 	d.expiryDiff.DeleteExpiry(entry)
 }
 
+func (d *diff) GetActiveSubnetOnlyValidatorsIterator() (iterator.Iterator[SubnetOnlyValidator], error) {
+	parentState, ok := d.stateVersions.GetState(d.parentID)
+	if !ok {
+		return nil, fmt.Errorf("%w: %s", ErrMissingParentState, d.parentID)
+	}
+
+	parentIterator, err := parentState.GetActiveSubnetOnlyValidatorsIterator()
+	if err != nil {
+		return nil, err
+	}
+
+	return d.sovDiff.getActiveSubnetOnlyValidatorsIterator(parentIterator), nil
+}
+
+func (d *diff) NumActiveSubnetOnlyValidators() int {
+	return d.parentNumActiveSOVs + d.sovDiff.netAddedActive
+}
+
+func (d *diff) WeightOfSubnetOnlyValidators(subnetID ids.ID) (uint64, error) {
+	if weight, modified := d.sovDiff.modifiedTotalWeight[subnetID]; modified {
+		return weight, nil
+	}
+
+	parentState, ok := d.stateVersions.GetState(d.parentID)
+	if !ok {
+		return 0, fmt.Errorf("%w: %s", ErrMissingParentState, d.parentID)
+	}
+
+	return parentState.WeightOfSubnetOnlyValidators(subnetID)
+}
+
+func (d *diff) GetSubnetOnlyValidator(validationID ids.ID) (SubnetOnlyValidator, error) {
+	if sov, modified := d.sovDiff.modified[validationID]; modified {
+		if sov.isDeleted() {
+			return SubnetOnlyValidator{}, database.ErrNotFound
+		}
+		return sov, nil
+	}
+
+	parentState, ok := d.stateVersions.GetState(d.parentID)
+	if !ok {
+		return SubnetOnlyValidator{}, fmt.Errorf("%w: %s", ErrMissingParentState, d.parentID)
+	}
+
+	return parentState.GetSubnetOnlyValidator(validationID)
+}
+
+func (d *diff) HasSubnetOnlyValidator(subnetID ids.ID, nodeID ids.NodeID) (bool, error) {
+	if has, modified := d.sovDiff.hasSubnetOnlyValidator(subnetID, nodeID); modified {
+		return has, nil
+	}
+
+	parentState, ok := d.stateVersions.GetState(d.parentID)
+	if !ok {
+		return false, fmt.Errorf("%w: %s", ErrMissingParentState, d.parentID)
+	}
+
+	return parentState.HasSubnetOnlyValidator(subnetID, nodeID)
+}
+
+func (d *diff) PutSubnetOnlyValidator(sov SubnetOnlyValidator) error {
+	return d.sovDiff.putSubnetOnlyValidator(d, sov)
+}
+
 func (d *diff) GetCurrentValidator(subnetID ids.ID, nodeID ids.NodeID) (*Staker, error) {
 	// If the validator was modified in this diff, return the modified
 	// validator.
@@ -504,6 +572,26 @@ func (d *diff) Apply(baseState Chain) error {
 			baseState.DeleteExpiry(entry)
 		}
 	}
+	// Ensure that all sov deletions happen before any sov additions. This
+	// ensures that a subnetID+nodeID pair that was deleted and then re-added in
+	// a single diff can't get reordered into the addition happening first;
+	// which would return an error.
+	for _, sov := range d.sovDiff.modified {
+		if !sov.isDeleted() {
+			continue
+		}
+		if err := baseState.PutSubnetOnlyValidator(sov); err != nil {
+			return err
+		}
+	}
+	for _, sov := range d.sovDiff.modified {
+		if sov.isDeleted() {
+			continue
+		}
+		if err := baseState.PutSubnetOnlyValidator(sov); err != nil {
+			return err
+		}
+	}
 	for _, subnetValidatorDiffs := range d.currentStakerDiffs.validatorDiffs {
 		for _, validatorDiff := range subnetValidatorDiffs {
 			switch validatorDiff.validatorStatus {