Skip to content

Use constant stop/start db syntax for current/pending validators #743

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 2 commits into from
Feb 1, 2021
Merged

Use constant stop/start db syntax for current/pending validators #743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
222b900
Use constant stop/start db syntax for current/pending validators
aaronbuchwald Jan 29, 2021
86961df
Merge branch 'dev' into platformvm-iter-syntax
StephenButtolph Feb 1, 2021
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
2 changes: 1 addition & 1 deletion vms/platformvm/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2098,7 +2098,7 @@ func (service *Service) GetStake(_ *http.Request, args *api.JSONAddresses, respo
startIter := startDB.NewIterator()
defer startIter.Release()

for startIter.Next() { // Iterates over current stakers
for startIter.Next() { // Iterates over pending stakers
stakerBytes := startIter.Value()

tx := Tx{}
Expand Down
32 changes: 16 additions & 16 deletions vms/platformvm/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,47 +264,47 @@ func (vm *VM) removeStaker(db database.Database, subnetID ids.ID, tx *rewardTx)

// Returns the pending staker that will start staking next
func (vm *VM) nextStakerStart(db database.Database, subnetID ids.ID) (*Tx, error) {
iter := prefixdb.NewNested([]byte(fmt.Sprintf("%s%s", subnetID, startDBPrefix)), db).NewIterator()
defer iter.Release()
startIter := prefixdb.NewNested([]byte(fmt.Sprintf("%s%s", subnetID, startDBPrefix)), db).NewIterator()
defer startIter.Release()

if !iter.Next() {
if !startIter.Next() {
return nil, errNoValidators
}
// Key: [Staker start time] | [Tx ID]
// Value: Byte repr. of tx that added this validator

tx := Tx{}
if _, err := Codec.Unmarshal(iter.Value(), &tx); err != nil {
if _, err := Codec.Unmarshal(startIter.Value(), &tx); err != nil {
return nil, err
}
return &tx, tx.Sign(vm.codec, nil)
}

// Returns the current staker that will stop staking next
func (vm *VM) nextStakerStop(db database.Database, subnetID ids.ID) (*rewardTx, error) {
iter := prefixdb.NewNested([]byte(fmt.Sprintf("%s%s", subnetID, stopDBPrefix)), db).NewIterator()
defer iter.Release()
stopIter := prefixdb.NewNested([]byte(fmt.Sprintf("%s%s", subnetID, stopDBPrefix)), db).NewIterator()
defer stopIter.Release()

if !iter.Next() {
if !stopIter.Next() {
return nil, errNoValidators
}
// Key: [Staker stop time] | [Tx ID]
// Value: Byte repr. of tx that added this validator

tx := rewardTx{}
if _, err := Codec.Unmarshal(iter.Value(), &tx); err != nil {
if _, err := Codec.Unmarshal(stopIter.Value(), &tx); err != nil {
return nil, err
}
return &tx, tx.Tx.Sign(vm.codec, nil)
}

// Returns true if [nodeID] is a validator (not a delegator) of subnet [subnetID]
func (vm *VM) isValidator(db database.Database, subnetID ids.ID, nodeID ids.ShortID) (TimedTx, bool, error) {
iter := prefixdb.NewNested([]byte(fmt.Sprintf("%s%s", subnetID, stopDBPrefix)), db).NewIterator()
defer iter.Release()
stopIter := prefixdb.NewNested([]byte(fmt.Sprintf("%s%s", subnetID, stopDBPrefix)), db).NewIterator()
defer stopIter.Release()

for iter.Next() {
txBytes := iter.Value()
for stopIter.Next() {
txBytes := stopIter.Value()
tx := rewardTx{}
if _, err := Codec.Unmarshal(txBytes, &tx); err != nil {
return nil, false, err
Expand Down Expand Up @@ -333,11 +333,11 @@ func (vm *VM) isValidator(db database.Database, subnetID ids.ID, nodeID ids.Shor
// Returns true if [nodeID] will be a validator (not a delegator) of subnet
// [subnetID]
func (vm *VM) willBeValidator(db database.Database, subnetID ids.ID, nodeID ids.ShortID) (TimedTx, bool, error) {
iter := prefixdb.NewNested([]byte(fmt.Sprintf("%s%s", subnetID, startDBPrefix)), db).NewIterator()
defer iter.Release()
startIter := prefixdb.NewNested([]byte(fmt.Sprintf("%s%s", subnetID, startDBPrefix)), db).NewIterator()
defer startIter.Release()

for iter.Next() {
txBytes := iter.Value()
for startIter.Next() {
txBytes := startIter.Value()
tx := Tx{}
if _, err := Codec.Unmarshal(txBytes, &tx); err != nil {
return nil, false, err
Expand Down
28 changes: 14 additions & 14 deletions vms/platformvm/vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ func (vm *VM) Bootstrapped() error {
stopIter := stopDB.NewIterator()
defer stopIter.Release()

for stopIter.Next() { // Iterates in order of increasing start time
for stopIter.Next() { // Iterates in order of increasing stop time
txBytes := stopIter.Value()

tx := rewardTx{}
Expand Down Expand Up @@ -485,7 +485,7 @@ func (vm *VM) Shutdown() error {
stopIter := stopDB.NewIterator()
defer stopIter.Release()

for stopIter.Next() { // Iterates in order of increasing start time
for stopIter.Next() { // Iterates in order of increasing stop time
txBytes := stopIter.Value()

tx := rewardTx{}
Expand Down Expand Up @@ -878,7 +878,7 @@ pendingStakerLoop:
defer stopIter.Release()

currentStakerLoop:
for stopIter.Next() { // Iterates in order of increasing start time
for stopIter.Next() { // Iterates in order of increasing stop time
txBytes := stopIter.Value()

tx := rewardTx{}
Expand Down Expand Up @@ -964,7 +964,7 @@ func (vm *VM) updateVdrSet(subnetID ids.ID) error {
stopIter := stopDB.NewIterator()
defer stopIter.Release()

for stopIter.Next() { // Iterates in order of increasing start time
for stopIter.Next() { // Iterates in order of increasing stop time
txBytes := stopIter.Value()

tx := rewardTx{}
Expand Down Expand Up @@ -1165,12 +1165,12 @@ func (vm *VM) getStakers() ([]validators.Validator, error) {
stopPrefix := []byte(fmt.Sprintf("%s%s", constants.PrimaryNetworkID, stopDBPrefix))
stopDB := prefixdb.NewNested(stopPrefix, vm.DB)
defer stopDB.Close()
iter := stopDB.NewIterator()
defer iter.Release()
stopIter := stopDB.NewIterator()
defer stopIter.Release()

stakers := []validators.Validator{}
for iter.Next() { // Iterates in order of increasing start time
txBytes := iter.Value()
for stopIter.Next() { // Iterates in order of increasing stop time
txBytes := stopIter.Value()
tx := rewardTx{}
if _, err := vm.codec.Unmarshal(txBytes, &tx); err != nil {
return nil, fmt.Errorf("couldn't unmarshal validator tx: %w", err)
Expand All @@ -1188,7 +1188,7 @@ func (vm *VM) getStakers() ([]validators.Validator, error) {

errs := wrappers.Errs{}
errs.Add(
iter.Error(),
stopIter.Error(),
stopDB.Close(),
)
return stakers, errs.Err
Expand All @@ -1202,12 +1202,12 @@ func (vm *VM) getPendingStakers() ([]validators.Validator, error) {
startDBPrefix := []byte(fmt.Sprintf("%s%s", constants.PrimaryNetworkID, startDBPrefix))
startDB := prefixdb.NewNested(startDBPrefix, vm.DB)
defer startDB.Close()
iter := startDB.NewIterator()
defer iter.Release()
startIter := startDB.NewIterator()
defer startIter.Release()

stakers := []validators.Validator{}
for iter.Next() { // Iterates in order of increasing start time
txBytes := iter.Value()
for startIter.Next() { // Iterates in order of increasing start time
txBytes := startIter.Value()
tx := rewardTx{}
if _, err := vm.codec.Unmarshal(txBytes, &tx); err != nil {
return nil, fmt.Errorf("couldn't unmarshal validator tx: %w", err)
Expand All @@ -1225,7 +1225,7 @@ func (vm *VM) getPendingStakers() ([]validators.Validator, error) {

errs := wrappers.Errs{}
errs.Add(
iter.Error(),
startIter.Error(),
startDB.Close(),
)
return stakers, errs.Err
Expand Down