Merge branch 'implement-acp-77-warp-verification' into implement-acp-…

…77-warp-signing
ava-labs · Nov 13, 2024 · 7953623 · 7953623
2 parents e485bd0 + 52e04ff
commit 7953623
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/snow/validators/traced_state.go b/snow/validators/traced_state.go
@@ -51,7 +51,7 @@ func (s *tracedState) GetCurrentHeight(ctx context.Context) (uint64, error) {
 }
 
 func (s *tracedState) GetSubnetID(ctx context.Context, chainID ids.ID) (ids.ID, error) {
-	ctx, span := s.tracer.Start(ctx, s.getValidatorSetTag, oteltrace.WithAttributes(
+	ctx, span := s.tracer.Start(ctx, s.getSubnetIDTag, oteltrace.WithAttributes(
 		attribute.Stringer("chainID", chainID),
 	))
 	defer span.End()

diff --git a/vms/platformvm/client.go b/vms/platformvm/client.go
@@ -341,7 +341,7 @@ type SubnetOnlyValidator struct {
 	StartTime             uint64
 	Weight                uint64
 	MinNonce              uint64
-	// Balance is the remaining amount of AVAX this SoV has to pay the
+	// Balance is the remaining amount of AVAX this SoV has for paying the
 	// continuous fee.
 	Balance uint64
 }
@@ -352,9 +352,12 @@ func (c *client) GetSubnetOnlyValidator(
 	options ...rpc.Option,
 ) (SubnetOnlyValidator, uint64, error) {
 	res := &GetSubnetOnlyValidatorReply{}
-	err := c.requester.SendRequest(ctx, "platform.getSubnetOnlyValidator", &GetSubnetOnlyValidatorArgs{
-		ValidationID: validationID,
-	}, res, options...)
+	err := c.requester.SendRequest(ctx, "platform.getSubnetOnlyValidator",
+		&GetSubnetOnlyValidatorArgs{
+			ValidationID: validationID,
+		},
+		res, options...,
+	)
 	if err != nil {
 		return SubnetOnlyValidator{}, 0, err
 	}

diff --git a/vms/platformvm/service.go b/vms/platformvm/service.go
@@ -984,8 +984,9 @@ type GetSubnetOnlyValidatorReply struct {
 	StartTime             avajson.Uint64      `json:"startTime"`
 	Weight                avajson.Uint64      `json:"weight"`
 	MinNonce              avajson.Uint64      `json:"minNonce"`
-	// Balance is the remaining amount of AVAX this SoV has to pay the
-	// continuous fee, according to the last accepted state.
+	// Balance is the remaining amount of AVAX this SoV has for paying the
+	// continuous fee, according to the last accepted state. If the validator is
+	// inactive, the balance will be 0.
 	Balance avajson.Uint64 `json:"balance"`
 	// Height is the height of the last accepted block
 	Height avajson.Uint64 `json:"height"`
@@ -996,6 +997,7 @@ func (s *Service) GetSubnetOnlyValidator(r *http.Request, args *GetSubnetOnlyVal
 	s.vm.ctx.Log.Debug("API called",
 		zap.String("service", "platform"),
 		zap.String("method", "getSubnetOnlyValidator"),
+		zap.Stringer("validationID", args.ValidationID),
 	)
 
 	s.vm.ctx.Lock.Lock()