Merge pull request #9796 from vegaprotocol/referral-timestamps

fix: referral api timestamp consistency

CHANGELOG.md

@@ -174,6 +174,7 @@
 - [8729](https://github.com/vegaprotocol/vega/issues/8729) - Stop order direction not set in datanode
 - [8545](https://github.com/vegaprotocol/vega/issues/8545) - Block Explorer pagination does not order correctly.
 - [8748](https://github.com/vegaprotocol/vega/issues/8748) - `ListSuccessorMarkets` does not return results.
+- [9784](https://github.com/vegaprotocol/vega/issues/9784) - Referral timestamp consistency 
 - [8749](https://github.com/vegaprotocol/vega/issues/8749) - Ensure stop order expiry is in the future
 - [9337](https://github.com/vegaprotocol/vega/issues/9337) - Non deterministic ordering of vesting ledger events
 - [8773](https://github.com/vegaprotocol/vega/issues/8773) - Fix panic with stop orders

datanode/gateway/graphql/referral_program_resolver.go

@@ -19,7 +19,6 @@ import (
 	"context"
 	"errors"
 	"math"
-	"time"
 
 	v2 "code.vegaprotocol.io/vega/protos/data-node/api/v2"
 
@@ -44,11 +43,6 @@ func (r *referralProgramResolver) WindowLength(ctx context.Context, obj *vega.Re
 	return int(obj.WindowLength), nil
 }
 
-func (r *referralProgramResolver) EndOfProgramTimestamp(ctx context.Context, obj *vega.ReferralProgram) (string, error) {
-	endTime := time.Unix(obj.EndOfProgramTimestamp, 0)
-	return endTime.Format(time.RFC3339), nil
-}
-
 type currentReferralProgramResolver VegaResolverRoot
 
 func (r *currentReferralProgramResolver) Version(ctx context.Context, obj *v2.ReferralProgram) (int, error) {

datanode/gateway/graphql/schema.graphql

@@ -4339,8 +4339,8 @@ type UpdateMarketState {
 type UpdateReferralProgram {
   "Defined tiers in increasing order. First element will give Tier 1, second element will give Tier 2, etc."
   benefitTiers: [BenefitTier!]!
-  "Timestamp as RFC3339, after which when the current epoch ends, the programs will end and benefits will be disabled."
-  endOfProgramTimestamp: String!
+  "Timestamp as Unix time in nanoseconds, after which when the current epoch ends, the program will end and benefits will be disabled."
+  endOfProgramTimestamp: Timestamp!
   "Number of epochs over which to evaluate a referral set's running volume."
   windowLength: Int!
   """
@@ -4372,7 +4372,7 @@ type StakingTier {
 type UpdateVolumeDiscountProgram {
   "The benefit tiers for the program"
   benefitTiers: [VolumeBenefitTier!]!
-  "The end time of the program"
+  "Timestamp as Unix time in nanoseconds, after which program ends."
   endOfProgramTimestamp: Timestamp!
   "The window length to consider for the volume discount program"
   windowLength: Int!
@@ -5996,8 +5996,8 @@ type ReferralProgram {
   version: Int!
   "Defined tiers in increasing order. First element will give Tier 1, second element will give Tier 2, etc."
   benefitTiers: [BenefitTier!]!
-  "Timestamp as RFC3339, after which when the current epoch ends, the programs will end and benefits will be disabled."
-  endOfProgramTimestamp: String!
+  "Timestamp as Unix time in nanoseconds, after which when the current epoch ends, the program will end and benefits will be disabled."
+  endOfProgramTimestamp: Timestamp!
   "Number of epochs over which to evaluate a referral set's running volume."
   windowLength: Int!
   """
@@ -6016,7 +6016,7 @@ type CurrentReferralProgram {
   version: Int!
   "Defined tiers in increasing order. First element will give Tier 1, second element will give Tier 2, etc."
   benefitTiers: [BenefitTier!]!
-  "Timestamp as RFC3339Nano, after which when the current epoch ends, the program will end and benefits will be disabled."
+  "Timestamp as Unix time in nanoseconds, after which when the current epoch ends, the program will end and benefits will be disabled."
   endOfProgramTimestamp: Timestamp!
   "Number of epochs over which to evaluate a referral set's running volume."
   windowLength: Int!
@@ -6269,7 +6269,7 @@ type VolumeDiscountProgram {
   version: Int!
   "Defined tiers in increasing order. First element will give Tier 1, second element will give Tier 2, etc."
   benefitTiers: [VolumeBenefitTier!]!
-  "Timestamp as Unix time in nanoseconds, after which when the current epoch ends, the programs will end and benefits will be disabled."
+  "Timestamp as Unix time in nanoseconds, after which when the current epoch ends, the program will end and benefits will be disabled."
   endOfProgramTimestamp: Timestamp!
   "Number of epochs over which to evaluate parties' running volume."
   windowLength: Int!

datanode/gateway/graphql/update_referral_program_resolver.go

@@ -28,8 +28,9 @@ func (u updateReferralProgramResolver) BenefitTiers(_ context.Context, obj *vega
 	return obj.Changes.BenefitTiers, nil
 }
 
-func (u updateReferralProgramResolver) EndOfProgramTimestamp(_ context.Context, obj *vega.UpdateReferralProgram) (string, error) {
-	return time.Unix(obj.Changes.EndOfProgramTimestamp, 0).String(), nil
+func (u updateReferralProgramResolver) EndOfProgramTimestamp(_ context.Context, obj *vega.UpdateReferralProgram) (int64, error) {
+	endTime := time.Unix(obj.Changes.EndOfProgramTimestamp, 0)
+	return endTime.UnixNano(), nil
 }
 
 func (u updateReferralProgramResolver) WindowLength(_ context.Context, obj *vega.UpdateReferralProgram) (int, error) {

datanode/gateway/graphql/update_volume_discount_program_resolver.go

@@ -17,6 +17,7 @@ package gql
 
 import (
 	"context"
+	"time"
 
 	"code.vegaprotocol.io/vega/protos/vega"
 )
@@ -32,7 +33,8 @@ func (r *updateVolumeDiscountProgramResolver) BenefitTiers(
 func (r *updateVolumeDiscountProgramResolver) EndOfProgramTimestamp(
 	_ context.Context, obj *vega.UpdateVolumeDiscountProgram,
 ) (int64, error) {
-	return obj.Changes.EndOfProgramTimestamp, nil
+	endTime := time.Unix(obj.Changes.EndOfProgramTimestamp, 0)
+	return endTime.UnixNano(), nil
 }
 
 func (r *updateVolumeDiscountProgramResolver) WindowLength(