updated PR to acp proposal

vms/platformvm/state/staker.go

@@ -85,7 +85,7 @@ func (s *Staker) Less(than *Staker) bool {
 
 func NewCurrentStaker(
 	txID ids.ID,
-	staker txs.PostDurangoStaker,
+	staker txs.Staker,
 	startTime time.Time,
 	potentialReward uint64,
 ) (*Staker, error) {
@@ -94,8 +94,7 @@ func NewCurrentStaker(
 		return nil, err
 	}
 
-	stakingDuration := staker.Duration()
-	endTime := startTime.Add(stakingDuration)
+	endTime := staker.EndTime()
 	return &Staker{
 		TxID:            txID,
 		NodeID:          staker.NodeID(),
@@ -110,7 +109,7 @@ func NewCurrentStaker(
 	}, nil
 }
 
-func NewPendingStaker(txID ids.ID, staker txs.Staker) (*Staker, error) {
+func NewPendingStaker(txID ids.ID, staker txs.PreDurangoStaker) (*Staker, error) {
 	publicKey, _, err := staker.PublicKey()
 	if err != nil {
 		return nil, err

vms/platformvm/state/staker_test.go

@@ -144,13 +144,12 @@ func TestNewCurrentStaker(t *testing.T) {
 	subnetID := ids.GenerateTestID()
 	weight := uint64(12345)
 	startTime := time.Now()
-	duration := time.Hour
-	endTime := startTime.Add(duration)
+	endTime := startTime.Add(time.Hour)
 	potentialReward := uint64(54321)
 	currentPriority := txs.SubnetPermissionedValidatorCurrentPriority
 
-	stakerTx := txs.NewMockPostDurangoStaker(ctrl)
-	stakerTx.EXPECT().Duration().Return(duration)
+	stakerTx := txs.NewMockStaker(ctrl)
+	stakerTx.EXPECT().EndTime().Return(endTime)
 	stakerTx.EXPECT().NodeID().Return(nodeID)
 	stakerTx.EXPECT().PublicKey().Return(publicKey, true, nil)
 	stakerTx.EXPECT().SubnetID().Return(subnetID)

vms/platformvm/state/state.go

@@ -1460,15 +1460,14 @@ func (s *state) loadCurrentValidators() error {
 			// Note: we don't provide [LastUpdated] here because we expect it to
 			// always be present on disk.
 		}
-		err = parseValidatorMetadata(metadataBytes, metadata)
-		if err != nil {
+		if err := parseValidatorMetadata(metadataBytes, metadata); err != nil {
 			return err
 		}
 
 		staker, err := NewCurrentStaker(
 			txID,
-			stakerTx.(txs.PostDurangoStaker),
-			stakerTx.StartTime(),
+			stakerTx,
+			stakerTx.(txs.PreDurangoStaker).StartTime(),
 			metadata.PotentialReward)
 		if err != nil {
 			return err
@@ -1501,20 +1500,21 @@ func (s *state) loadCurrentValidators() error {
 		}
 
 		metadataBytes := subnetValidatorIt.Value()
+		startTime := stakerTx.(txs.PreDurangoStaker).StartTime()
 		metadata := &validatorMetadata{
 			txID: txID,
 			// use the start time as the fallback value
 			// in case it's not stored in the database
-			LastUpdated: uint64(stakerTx.StartTime().Unix()),
+			LastUpdated: uint64(startTime.Unix()),
 		}
 		if err := parseValidatorMetadata(metadataBytes, metadata); err != nil {
 			return err
 		}
 
 		staker, err := NewCurrentStaker(
 			txID,
-			stakerTx.(txs.PostDurangoStaker),
-			stakerTx.StartTime(),
+			stakerTx,
+			startTime,
 			metadata.PotentialReward,
 		)
 		if err != nil {
@@ -1561,8 +1561,8 @@ func (s *state) loadCurrentValidators() error {
 
 			staker, err := NewCurrentStaker(
 				txID,
-				stakerTx.(txs.PostDurangoStaker),
-				stakerTx.StartTime(),
+				stakerTx,
+				stakerTx.(txs.PreDurangoStaker).StartTime(),
 				metadata.PotentialReward,
 			)
 			if err != nil {
@@ -1608,7 +1608,7 @@ func (s *state) loadPendingValidators() error {
 				return err
 			}
 
-			stakerTx, ok := tx.Unsigned.(txs.Staker)
+			stakerTx, ok := tx.Unsigned.(txs.PreDurangoStaker)
 			if !ok {
 				return fmt.Errorf("expected tx type txs.Staker but got %T", tx.Unsigned)
 			}
@@ -1643,7 +1643,7 @@ func (s *state) loadPendingValidators() error {
 				return err
 			}
 
-			stakerTx, ok := tx.Unsigned.(txs.Staker)
+			stakerTx, ok := tx.Unsigned.(txs.PreDurangoStaker)
 			if !ok {
 				return fmt.Errorf("expected tx type txs.Staker but got %T", tx.Unsigned)
 			}

vms/platformvm/txs/add_delegator_tx.go

@@ -19,8 +19,8 @@ import (
 )
 
 var (
-	_ DelegatorTx       = (*AddDelegatorTx)(nil)
-	_ PostDurangoStaker = (*AddDelegatorTx)(nil)
+	_ DelegatorTx      = (*AddDelegatorTx)(nil)
+	_ PreDurangoStaker = (*AddDelegatorTx)(nil)
 
 	errDelegatorWeightMismatch = errors.New("delegator weight is not equal to total stake weight")
 	errStakeMustBeAVAX         = errors.New("stake must be AVAX")

vms/platformvm/txs/add_permissionless_delegator_tx.go

@@ -18,8 +18,8 @@ import (
 )
 
 var (
-	_ DelegatorTx       = (*AddPermissionlessDelegatorTx)(nil)
-	_ PostDurangoStaker = (*AddPermissionlessDelegatorTx)(nil)
+	_ DelegatorTx      = (*AddPermissionlessDelegatorTx)(nil)
+	_ PreDurangoStaker = (*AddPermissionlessDelegatorTx)(nil)
 )
 
 // AddPermissionlessDelegatorTx is an unsigned addPermissionlessDelegatorTx

vms/platformvm/txs/add_permissionless_validator_tx.go

@@ -21,8 +21,8 @@ import (
 )
 
 var (
-	_ ValidatorTx       = (*AddPermissionlessValidatorTx)(nil)
-	_ PostDurangoStaker = (*AddPermissionlessDelegatorTx)(nil)
+	_ ValidatorTx      = (*AddPermissionlessValidatorTx)(nil)
+	_ PreDurangoStaker = (*AddPermissionlessDelegatorTx)(nil)
 
 	errEmptyNodeID             = errors.New("validator nodeID cannot be empty")
 	errNoStake                 = errors.New("no stake")

vms/platformvm/txs/add_subnet_validator_tx.go

@@ -14,8 +14,8 @@ import (
 )
 
 var (
-	_ StakerTx          = (*AddSubnetValidatorTx)(nil)
-	_ PostDurangoStaker = (*AddSubnetValidatorTx)(nil)
+	_ StakerTx         = (*AddSubnetValidatorTx)(nil)
+	_ PreDurangoStaker = (*AddSubnetValidatorTx)(nil)
 
 	errAddPrimaryNetworkValidator = errors.New("can't add primary network validator with AddSubnetValidatorTx")
 )

vms/platformvm/txs/add_validator_tx.go

@@ -19,8 +19,8 @@ import (
 )
 
 var (
-	_ ValidatorTx       = (*AddValidatorTx)(nil)
-	_ PostDurangoStaker = (*AddValidatorTx)(nil)
+	_ ValidatorTx      = (*AddValidatorTx)(nil)
+	_ PreDurangoStaker = (*AddValidatorTx)(nil)
 
 	errTooManyShares = fmt.Errorf("a staker can only require at most %d shares from delegators", reward.PercentDenominator)
 )

vms/platformvm/txs/executor/standard_tx_executor.go

@@ -530,7 +530,7 @@ func (e *StandardTxExecutor) BaseTx(tx *txs.BaseTx) error {
 }
 
 // addStakerFromStakerTx creates the staker and adds it to state.
-func (e *StandardTxExecutor) addStakerFromStakerTx(stakerTx txs.Staker) error {
+func (e *StandardTxExecutor) addStakerFromStakerTx(stakerTx txs.PreDurangoStaker) error {
 	// Pre Durango fork, stakers are added as pending first, then promoted
 	// to current when chainTime reaches their start time.
 	// Post Durango fork, stakers are immediately marked as current.

vms/platformvm/txs/mempool/mempool.go

@@ -316,7 +316,7 @@ func DropExpiredStakerTxs(mempool Mempool, minStartTime time.Time) []ids.ID {
 
 	for mempool.HasStakerTx() {
 		tx := mempool.PeekStakerTx()
-		startTime := tx.Unsigned.(txs.Staker).StartTime()
+		startTime := tx.Unsigned.(txs.PreDurangoStaker).StartTime()
 		if !startTime.Before(minStartTime) {
 			// The next proposal tx in the mempool starts sufficiently far in
 			// the future.