Skip to content

Drop Pending Stakers 2 - Replace txs.ScheduledStaker with txs.Staker #2305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 74 commits into from
Dec 7, 2023
Merged

Drop Pending Stakers 2 - Replace txs.ScheduledStaker with txs.Staker #2305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
17723e2
wip: introduced post durango staker tx
abi87 Nov 14, 2023
88130e4
TO BE SQUASHED
abi87 Nov 14, 2023
acc1517
nit
abi87 Nov 14, 2023
3ec3cd2
Merge branch 'dev' into post_durango_staker_txs
abi87 Nov 15, 2023
19a8318
nit
abi87 Nov 15, 2023
b213740
updated PR to acp proposal
abi87 Nov 15, 2023
9e7f851
Merge branch 'dev' into post_durango_staker_txs
abi87 Nov 16, 2023
13d150f
Merge branch 'dev' into post_durango_staker_txs
abi87 Nov 16, 2023
6079eb0
introduced pre durango staker tx
abi87 Nov 16, 2023
9e5cc17
Merge branch 'post_durango_staker_txs_0' into post_durango_staker_txs
abi87 Nov 16, 2023
c6736b6
nit
abi87 Nov 16, 2023
6f34808
Merge branch 'post_durango_staker_txs_0' into post_durango_staker_txs
abi87 Nov 16, 2023
a0fb538
nit
abi87 Nov 16, 2023
944f309
Merge branch 'dev' into post_durango_staker_txs_0
abi87 Nov 17, 2023
7b79d43
Merge branch 'post_durango_staker_txs_0' into post_durango_staker_txs
abi87 Nov 17, 2023
0106d75
Merge branch 'dev' into post_durango_staker_txs_0
abi87 Nov 18, 2023
0ed0d1f
Merge branch 'post_durango_staker_txs_0' into post_durango_staker_txs
abi87 Nov 18, 2023
9a9897c
nit
abi87 Nov 18, 2023
409008f
Merge branch 'post_durango_staker_txs_0' into post_durango_staker_txs
abi87 Nov 18, 2023
d17f2a2
nits
abi87 Nov 18, 2023
6ab4d6e
Merge branch 'post_durango_staker_txs_0' into post_durango_staker_txs
abi87 Nov 18, 2023
4c4c011
nits to reduce future diffs
abi87 Nov 19, 2023
905e55e
nit
abi87 Nov 19, 2023
89094cd
improved e2e test
abi87 Nov 19, 2023
5dd8dd8
Merge branch 'post_durango_nits_0' into post_durango_staker_txs_0
abi87 Nov 19, 2023
6fe5652
Merge branch 'post_durango_staker_txs_0' into post_durango_staker_txs
abi87 Nov 19, 2023
698af90
Merge branch 'dev' into post_durango_nits_0
abi87 Nov 21, 2023
0c631c6
Merge branch 'post_durango_nits_0' into post_durango_staker_txs_0
abi87 Nov 21, 2023
8717574
Merge branch 'post_durango_staker_txs_0' into post_durango_staker_txs
abi87 Nov 21, 2023
c3e3670
nits
abi87 Nov 21, 2023
9606b77
Merge branch 'dev' into post_durango_nits_0
abi87 Nov 22, 2023
ce87dea
nits
abi87 Nov 22, 2023
fd33fde
Merge branch 'post_durango_nits_0' into post_durango_staker_txs_0
abi87 Nov 22, 2023
4f06497
Merge branch 'post_durango_staker_txs_0' into post_durango_staker_txs
abi87 Nov 22, 2023
6ea5add
Merge branch 'dev' into post_durango_nits_0
abi87 Nov 23, 2023
b820cae
Merge branch 'post_durango_nits_0' into post_durango_staker_txs_0
abi87 Nov 23, 2023
ef2443c
Merge branch 'post_durango_staker_txs_0' into post_durango_staker_txs
abi87 Nov 23, 2023
8260546
Merge branch 'dev' into post_durango_nits_0
abi87 Nov 27, 2023
73d5c2f
nit
abi87 Nov 27, 2023
84321ef
Merge branch 'dev' into post_durango_nits_0
abi87 Nov 28, 2023
c353c33
nits
abi87 Nov 28, 2023
d296e52
Merge branch 'post_durango_nits_0' into post_durango_staker_txs_0
abi87 Nov 28, 2023
3d27b66
Merge branch 'post_durango_staker_txs_0' into post_durango_staker_txs
abi87 Nov 28, 2023
9bd9d60
Merge branch 'dev' into post_durango_nits_0
abi87 Nov 28, 2023
a99a5f7
Merge branch 'dev' into post_durango_nits_0
abi87 Nov 29, 2023
c07e2c8
Merge branch 'post_durango_nits_0' into post_durango_staker_txs_0
abi87 Nov 29, 2023
105f5f1
Merge branch 'post_durango_staker_txs_0' into post_durango_staker_txs
abi87 Nov 29, 2023
5bb301b
Merge branch 'dev' into post_durango_nits_0
abi87 Nov 29, 2023
e6463b7
Merge branch 'dev' into post_durango_nits_0
abi87 Nov 30, 2023
43839ee
Merge branch 'post_durango_nits_0' into post_durango_staker_txs_0
abi87 Nov 30, 2023
15d7871
Merge branch 'dev' into post_durango_nits_0
abi87 Dec 1, 2023
5e10688
nits
abi87 Dec 1, 2023
0e40da4
Merge branch 'post_durango_nits_0' into post_durango_staker_txs_0
abi87 Dec 1, 2023
02ca462
Merge branch 'post_durango_staker_txs_0' into post_durango_staker_txs
abi87 Dec 1, 2023
a5b3875
Merge branch 'dev' into post_durango_nits_0
abi87 Dec 3, 2023
a7daf81
Merge branch 'post_durango_nits_0' into post_durango_staker_txs_0
abi87 Dec 3, 2023
a2115a4
Merge branch 'post_durango_staker_txs_0' into post_durango_staker_txs
abi87 Dec 3, 2023
fb85fe1
Merge branch 'dev' into post_durango_staker_txs_0
abi87 Dec 4, 2023
f0e490e
Merge branch 'post_durango_staker_txs_0' into post_durango_staker_txs
abi87 Dec 4, 2023
bfc29a1
Merge branch 'dev' into post_durango_staker_txs_0
abi87 Dec 5, 2023
9b97b59
fix
abi87 Dec 5, 2023
02449eb
Merge branch 'post_durango_staker_txs_0' into post_durango_staker_txs
abi87 Dec 5, 2023
0684a8a
nits
StephenButtolph Dec 5, 2023
d914f34
Merge branch 'dev' into post_durango_staker_txs_0
abi87 Dec 6, 2023
89ce3c2
fix error
abi87 Dec 6, 2023
f0c55ef
Merge branch 'post_durango_staker_txs_0' into post_durango_staker_txs
abi87 Dec 6, 2023
fa9269c
simplify comment
StephenButtolph Dec 6, 2023
e73b312
Merge branch 'post_durango_staker_txs_0' into post_durango_staker_txs
StephenButtolph Dec 6, 2023
5330986
merged
StephenButtolph Dec 6, 2023
d3a6bf5
Merge branch 'dev' into post_durango_staker_txs
abi87 Dec 7, 2023
db4c048
fixed bad merge
abi87 Dec 7, 2023
b100a3d
explicit type casts
abi87 Dec 7, 2023
b265b3c
Merge branch 'dev' into post_durango_staker_txs
StephenButtolph Dec 7, 2023
85c41e6
reduce diff
StephenButtolph Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions vms/platformvm/block/executor/proposal_block_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,9 +641,11 @@ func TestBanffProposalBlockUpdateStakers(t *testing.T) {
require.NoError(err)

// store Staker0 to state
addValTx := addStaker0.Unsigned.(*txs.AddValidatorTx)
staker0, err := state.NewCurrentStaker(
addStaker0.ID(),
addStaker0.Unsigned.(*txs.AddValidatorTx),
addValTx,
addValTx.StartTime(),
0,
)
require.NoError(err)
Expand Down Expand Up @@ -741,9 +743,11 @@ func TestBanffProposalBlockRemoveSubnetValidator(t *testing.T) {
)
require.NoError(err)

addSubnetValTx := tx.Unsigned.(*txs.AddSubnetValidatorTx)
staker, err := state.NewCurrentStaker(
tx.ID(),
tx.Unsigned.(*txs.AddSubnetValidatorTx),
addSubnetValTx,
addSubnetValTx.StartTime(),
0,
)
require.NoError(err)
Expand Down Expand Up @@ -799,9 +803,11 @@ func TestBanffProposalBlockRemoveSubnetValidator(t *testing.T) {
require.NoError(err)

// store Staker0 to state
addValTx := addStaker0.Unsigned.(*txs.AddValidatorTx)
staker, err = state.NewCurrentStaker(
addStaker0.ID(),
addStaker0.Unsigned.(*txs.AddValidatorTx),
addValTx,
addValTx.StartTime(),
0,
)
require.NoError(err)
Expand Down Expand Up @@ -912,9 +918,11 @@ func TestBanffProposalBlockTrackedSubnet(t *testing.T) {
require.NoError(err)

// store Staker0 to state
addValTx := addStaker0.Unsigned.(*txs.AddValidatorTx)
staker, err = state.NewCurrentStaker(
addStaker0.ID(),
addStaker0.Unsigned.(*txs.AddValidatorTx),
addValTx,
addValTx.StartTime(),
0,
)
require.NoError(err)
Expand Down Expand Up @@ -999,9 +1007,11 @@ func TestBanffProposalBlockDelegatorStakerWeight(t *testing.T) {
require.NoError(err)

// store Staker0 to state
addValTx := addStaker0.Unsigned.(*txs.AddValidatorTx)
staker, err := state.NewCurrentStaker(
addStaker0.ID(),
addStaker0.Unsigned.(*txs.AddValidatorTx),
addValTx,
addValTx.StartTime(),
0,
)
require.NoError(err)
Expand Down Expand Up @@ -1091,9 +1101,11 @@ func TestBanffProposalBlockDelegatorStakerWeight(t *testing.T) {
require.NoError(err)

// store Staker0 to state
addValTx = addStaker0.Unsigned.(*txs.AddValidatorTx)
staker, err = state.NewCurrentStaker(
addStaker0.ID(),
addStaker0.Unsigned.(*txs.AddValidatorTx),
addValTx,
addValTx.StartTime(),
0,
)
require.NoError(err)
Expand Down Expand Up @@ -1182,9 +1194,11 @@ func TestBanffProposalBlockDelegatorStakers(t *testing.T) {
require.NoError(err)

// store Staker0 to state
addValTx := addStaker0.Unsigned.(*txs.AddValidatorTx)
staker, err := state.NewCurrentStaker(
addStaker0.ID(),
addStaker0.Unsigned.(*txs.AddValidatorTx),
addValTx,
addValTx.StartTime(),
0,
)
require.NoError(err)
Expand Down Expand Up @@ -1273,9 +1287,11 @@ func TestBanffProposalBlockDelegatorStakers(t *testing.T) {
require.NoError(err)

// store Staker0 to state
addValTx = addStaker0.Unsigned.(*txs.AddValidatorTx)
staker, err = state.NewCurrentStaker(
addStaker0.ID(),
addStaker0.Unsigned.(*txs.AddValidatorTx),
addValTx,
addValTx.StartTime(),
0,
)
require.NoError(err)
Expand Down
4 changes: 3 additions & 1 deletion vms/platformvm/block/executor/standard_block_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,9 +628,11 @@ func TestBanffStandardBlockRemoveSubnetValidator(t *testing.T) {
)
require.NoError(err)

addSubnetValTx := tx.Unsigned.(*txs.AddSubnetValidatorTx)
staker, err := state.NewCurrentStaker(
tx.ID(),
tx.Unsigned.(*txs.AddSubnetValidatorTx),
addSubnetValTx,
addSubnetValTx.StartTime(),
0,
)
require.NoError(err)
Expand Down
8 changes: 6 additions & 2 deletions vms/platformvm/service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,9 +507,11 @@ func TestGetStake(t *testing.T) {
)
require.NoError(err)

addDelTx := tx.Unsigned.(*txs.AddDelegatorTx)
staker, err := state.NewCurrentStaker(
tx.ID(),
tx.Unsigned.(*txs.AddDelegatorTx),
addDelTx,
addDelTx.StartTime(),
0,
)
require.NoError(err)
Expand Down Expand Up @@ -643,9 +645,11 @@ func TestGetCurrentValidators(t *testing.T) {
)
require.NoError(err)

addDelTx := delTx.Unsigned.(*txs.AddDelegatorTx)
staker, err := state.NewCurrentStaker(
delTx.ID(),
delTx.Unsigned.(*txs.AddDelegatorTx),
addDelTx,
addDelTx.StartTime(),
0,
)
require.NoError(err)
Expand Down
9 changes: 7 additions & 2 deletions vms/platformvm/state/staker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,12 @@ func (s *Staker) Less(than *Staker) bool {
return bytes.Compare(s.TxID[:], than.TxID[:]) == -1
}

func NewCurrentStaker(txID ids.ID, staker txs.ScheduledStaker, potentialReward uint64) (*Staker, error) {
func NewCurrentStaker(
txID ids.ID,
staker txs.Staker,
startTime time.Time,
Copy link
Contributor Author

@abi87 abi87 Nov 14, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the main point of this PR. Upon drop of pending stakers, we'll explicitly pass chainTime here to create the staker object. In this PR we anticipate the structural change by spreading use of txs.Staker instead of txs.ScheduledStaker wherever possible

potentialReward uint64,
) (*Staker, error) {
publicKey, _, err := staker.PublicKey()
if err != nil {
return nil, err
Expand All @@ -95,7 +100,7 @@ func NewCurrentStaker(txID ids.ID, staker txs.ScheduledStaker, potentialReward u
PublicKey: publicKey,
SubnetID: staker.SubnetID(),
Weight: staker.Weight(),
StartTime: staker.StartTime(),
StartTime: startTime,
EndTime: endTime,
PotentialReward: potentialReward,
NextTime: endTime,
Expand Down
9 changes: 4 additions & 5 deletions vms/platformvm/state/staker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,16 +148,15 @@ func TestNewCurrentStaker(t *testing.T) {
potentialReward := uint64(54321)
currentPriority := txs.SubnetPermissionedValidatorCurrentPriority

stakerTx := txs.NewMockScheduledStaker(ctrl)
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)
stakerTx.EXPECT().Weight().Return(weight)
stakerTx.EXPECT().StartTime().Return(startTime)
stakerTx.EXPECT().EndTime().Return(endTime)
stakerTx.EXPECT().CurrentPriority().Return(currentPriority)

staker, err := NewCurrentStaker(txID, stakerTx, potentialReward)
staker, err := NewCurrentStaker(txID, stakerTx, startTime, potentialReward)
require.NotNil(staker)
require.NoError(err)
require.Equal(txID, staker.TxID)
Expand All @@ -173,7 +172,7 @@ func TestNewCurrentStaker(t *testing.T) {

stakerTx.EXPECT().PublicKey().Return(nil, false, errCustom)

_, err = NewCurrentStaker(txID, stakerTx, potentialReward)
_, err = NewCurrentStaker(txID, stakerTx, startTime, potentialReward)
require.ErrorIs(err, errCustom)
}

Expand Down
28 changes: 21 additions & 7 deletions vms/platformvm/state/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1346,7 +1346,7 @@ func (s *state) syncGenesis(genesisBlk block.Block, genesis *genesis.Genesis) er
return err
}

staker, err := NewCurrentStaker(vdrTx.ID(), validatorTx, potentialReward)
staker, err := NewCurrentStaker(vdrTx.ID(), validatorTx, validatorTx.StartTime(), potentialReward)
if err != nil {
return err
}
Expand Down Expand Up @@ -1457,7 +1457,7 @@ func (s *state) loadCurrentValidators() error {

stakerTx, ok := tx.Unsigned.(txs.ScheduledStaker)
if !ok {
return fmt.Errorf("expected tx type txs.Staker but got %T", tx.Unsigned)
return fmt.Errorf("expected tx type txs.ScheduledStaker but got %T", tx.Unsigned)
}

metadataBytes := validatorIt.Value()
Expand All @@ -1470,7 +1470,11 @@ func (s *state) loadCurrentValidators() error {
return err
}

staker, err := NewCurrentStaker(txID, stakerTx, metadata.PotentialReward)
staker, err := NewCurrentStaker(
txID,
stakerTx,
stakerTx.StartTime(),
metadata.PotentialReward)
if err != nil {
return err
}
Expand Down Expand Up @@ -1498,7 +1502,7 @@ func (s *state) loadCurrentValidators() error {

stakerTx, ok := tx.Unsigned.(txs.ScheduledStaker)
if !ok {
return fmt.Errorf("expected tx type txs.Staker but got %T", tx.Unsigned)
return fmt.Errorf("expected tx type txs.ScheduledStaker but got %T", tx.Unsigned)
}

metadataBytes := subnetValidatorIt.Value()
Expand All @@ -1513,7 +1517,12 @@ func (s *state) loadCurrentValidators() error {
return err
}

staker, err := NewCurrentStaker(txID, stakerTx, metadata.PotentialReward)
staker, err := NewCurrentStaker(
txID,
stakerTx,
startTime,
metadata.PotentialReward,
)
if err != nil {
return err
}
Expand Down Expand Up @@ -1545,7 +1554,7 @@ func (s *state) loadCurrentValidators() error {

stakerTx, ok := tx.Unsigned.(txs.ScheduledStaker)
if !ok {
return fmt.Errorf("expected tx type txs.Staker but got %T", tx.Unsigned)
return fmt.Errorf("expected tx type txs.ScheduledStaker but got %T", tx.Unsigned)
}

metadata := &delegatorMetadata{
Expand All @@ -1556,7 +1565,12 @@ func (s *state) loadCurrentValidators() error {
return err
}

staker, err := NewCurrentStaker(txID, stakerTx, metadata.PotentialReward)
staker, err := NewCurrentStaker(
txID,
stakerTx,
stakerTx.StartTime(),
metadata.PotentialReward,
)
if err != nil {
return err
}
Expand Down
4 changes: 3 additions & 1 deletion vms/platformvm/txs/executor/advance_time_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,9 +476,11 @@ func TestAdvanceTimeTxRemoveSubnetValidator(t *testing.T) {
)
require.NoError(err)

addSubnetValTx := tx.Unsigned.(*txs.AddSubnetValidatorTx)
staker, err := state.NewCurrentStaker(
tx.ID(),
tx.Unsigned.(*txs.AddSubnetValidatorTx),
addSubnetValTx,
addSubnetValTx.StartTime(),
0,
)
require.NoError(err)
Expand Down
20 changes: 15 additions & 5 deletions vms/platformvm/txs/executor/proposal_tx_executor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,11 @@ func TestProposalTxExecuteAddDelegator(t *testing.T) {
)
require.NoError(t, err)

addValTx := tx.Unsigned.(*txs.AddValidatorTx)
staker, err := state.NewCurrentStaker(
tx.ID(),
tx.Unsigned.(*txs.AddValidatorTx),
addValTx,
addValTx.StartTime(),
0,
)
require.NoError(t, err)
Expand All @@ -74,9 +76,11 @@ func TestProposalTxExecuteAddDelegator(t *testing.T) {
)
require.NoError(t, err)

addValTx := tx.Unsigned.(*txs.AddValidatorTx)
staker, err := state.NewCurrentStaker(
tx.ID(),
tx.Unsigned.(*txs.AddValidatorTx),
addValTx,
addValTx.StartTime(),
0,
)
require.NoError(t, err)
Expand Down Expand Up @@ -398,9 +402,11 @@ func TestProposalTxExecuteAddSubnetValidator(t *testing.T) {
require.ErrorIs(err, ErrNotValidator)
}

addValTx := addDSTx.Unsigned.(*txs.AddValidatorTx)
staker, err := state.NewCurrentStaker(
addDSTx.ID(),
addDSTx.Unsigned.(*txs.AddValidatorTx),
addValTx,
addValTx.StartTime(),
0,
)
require.NoError(err)
Expand Down Expand Up @@ -551,9 +557,11 @@ func TestProposalTxExecuteAddSubnetValidator(t *testing.T) {
)
require.NoError(err)

addSubnetValTx := subnetTx.Unsigned.(*txs.AddSubnetValidatorTx)
staker, err = state.NewCurrentStaker(
subnetTx.ID(),
subnetTx.Unsigned.(*txs.AddSubnetValidatorTx),
addSubnetValTx,
addSubnetValTx.StartTime(),
0,
)
require.NoError(err)
Expand Down Expand Up @@ -680,9 +688,11 @@ func TestProposalTxExecuteAddSubnetValidator(t *testing.T) {
)
require.NoError(err)

addSubnetValTx := subnetTx.Unsigned.(*txs.AddSubnetValidatorTx)
staker, err = state.NewCurrentStaker(
subnetTx.ID(),
subnetTx.Unsigned.(*txs.AddSubnetValidatorTx),
addSubnetValTx,
addSubnetValTx.StartTime(),
0,
)
require.NoError(err)
Expand Down
Loading