add L1 support to getCurrentValidators API (#3564)

Signed-off-by: Ceyhun Onur <[email protected]> Signed-off-by: Stephen Buttolph <[email protected]> Co-authored-by: Stephen Buttolph <[email protected]> Co-authored-by: Quentin McGaw <[email protected]>
ava-labs · Jan 27, 2025 · d31320e · d31320e
1 parent 5d474d6
commit d31320e
Show file tree

Hide file tree

Showing 11 changed files with 616 additions and 390 deletions.
diff --git a/RELEASES.md b/RELEASES.md
@@ -39,6 +39,10 @@ The plugin version is unchanged at `38` and is compatible with versions `v1.12.0
   - `avm.GetTxFee`
   - `platform.getValidatorFeeConfig`
   - `platform.getValidatorFeeState`
+  - `validationID` field to `platform.getL1Validator` results
+  - L1 validators to `platform.getCurrentValidators`
+- Removed:
+  - `StakeAmount` field from `platform.getCurrentValidators` results
 
 ### Configs
 
@@ -51,7 +55,7 @@ The plugin version is unchanged at `38` and is compatible with versions `v1.12.0
   - `--add-subnet-validator-fee`
   - `--add-subnet-delegator-fee`
 - Removed `--api-keystore-enabled`
-  
+
 ### What's Changed
 
 **Full Changelog**: https://github.com/ava-labs/avalanchego/compare/v1.12.1...v1.12.2

diff --git a/vms/platformvm/api/static_service.go b/vms/platformvm/api/static_service.go
@@ -88,10 +88,6 @@ type Staker struct {
 	EndTime   json.Uint64 `json:"endTime"`
 	Weight    json.Uint64 `json:"weight"`
 	NodeID    ids.NodeID  `json:"nodeID"`
-
-	// Deprecated: Use Weight instead
-	// TODO: remove [StakeAmount] after enough time for dependencies to update
-	StakeAmount *json.Uint64 `json:"stakeAmount,omitempty"`
 }
 
 // GenesisValidator should to be used for genesis validators only.
@@ -141,14 +137,6 @@ type GenesisPermissionlessValidator struct {
 	Signer             *signer.ProofOfPossession `json:"signer,omitempty"`
 }
 
-// PermissionedValidator is the repr. of a permissioned validator sent over APIs.
-type PermissionedValidator struct {
-	Staker
-	// The owner the staking reward, if applicable, will go to
-	Connected *bool         `json:"connected,omitempty"`
-	Uptime    *json.Float32 `json:"uptime,omitempty"`
-}
-
 // PrimaryDelegator is the repr. of a primary network delegator sent over APIs.
 type PrimaryDelegator struct {
 	Staker

diff --git a/vms/platformvm/client_permissionless_validator.go b/vms/platformvm/client_permissionless_validator.go
@@ -22,8 +22,6 @@ type ClientStaker struct {
 	EndTime uint64
 	// the validator weight when sampling validators
 	Weight uint64
-	// the amount of tokens being staked.
-	StakeAmount *uint64
 	// the node ID of the staker
 	NodeID ids.NodeID
 }
@@ -66,12 +64,11 @@ type ClientDelegator struct {
 
 func apiStakerToClientStaker(validator api.Staker) ClientStaker {
 	return ClientStaker{
-		TxID:        validator.TxID,
-		StartTime:   uint64(validator.StartTime),
-		EndTime:     uint64(validator.EndTime),
-		Weight:      uint64(validator.Weight),
-		StakeAmount: (*uint64)(validator.StakeAmount),
-		NodeID:      validator.NodeID,
+		TxID:      validator.TxID,
+		StartTime: uint64(validator.StartTime),
+		EndTime:   uint64(validator.EndTime),
+		Weight:    uint64(validator.Weight),
+		NodeID:    validator.NodeID,
 	}
 }