Merge pull request #11729 from vegaprotocol/fix_expiry

fix: handle pap expiry correctly
vegaprotocol · Oct 2, 2024 · ac9993d · ac9993d
2 parents a623d5a + 6fe07a5
commit ac9993d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/core/execution/spot/protocol_automated_purchase.go b/core/execution/spot/protocol_automated_purchase.go
@@ -338,7 +338,8 @@ func (m *Market) checkPAP(ctx context.Context) {
 		return
 	}
 	// pap has expired
-	if !m.pap.readyToStop && !m.pap.config.ExpiryTimestamp.IsZero() && m.pap.config.ExpiryTimestamp.Before(m.timeService.GetTimeNow()) {
+	if !m.pap.readyToStop && m.pap.config.ExpiryTimestamp.Unix() > 0 && m.pap.config.ExpiryTimestamp.Before(m.timeService.GetTimeNow()) {
+		m.log.Info("protocol automated purchase has expired, going to stop", logging.String("ID", m.pap.ID))
 		m.stopPAP(ctx)
 	}
 }

diff --git a/core/integration/steps/the_automated_puchase.go b/core/integration/steps/the_automated_puchase.go
@@ -74,10 +74,7 @@ func NewProtocolAutomatedPurchase(r apRow, config *market.Config) (*types.NewPro
 
 	auctionPriceOracle, priceOracleBinding, _ := config.OracleConfigs.GetOracleDefinitionForCompositePrice(r.row.MustStr("price oracle"))
 	expiry := r.row.MustI64("expiry timestamp")
-	var expiryTime time.Time
-	if expiry > 0 {
-		expiryTime = time.Unix(expiry, 0)
-	}
+	expiryTime := time.Unix(expiry, 0)
 
 	priceOracle := datasource.FromOracleSpecProto(auctionPriceOracle)