Merge branch 'develop' into cometv1

Author: ze97286

CHANGELOG.md

@@ -49,6 +49,7 @@
 - [11380](https://github.com/vegaprotocol/vega/issues/11380) - Handle broken stop orders in prepare proposal. 
 - [11136](https://github.com/vegaprotocol/vega/issues/11136) - Fix premature invocation of post commit hooks in case of fee stats event.
 - [11409](https://github.com/vegaprotocol/vega/issues/11409) - When updating a capped market - copy the cap from the existing market definition. 
+- [11415](https://github.com/vegaprotocol/vega/issues/11415) - End long block auction when expired. 
 
 ## 0.76.1
 

core/execution/future/auction.go

@@ -126,6 +126,13 @@ func (m *Market) checkAuction(ctx context.Context, now time.Time, idgen common.I
 	if m.as.Trigger() == types.AuctionTriggerLiquidityTargetNotMet || m.as.Trigger() == types.AuctionTriggerUnableToDeployLPOrders {
 		m.as.SetReadyToLeave()
 	}
+
+	if m.as.Trigger() == types.AuctionTriggerLongBlock || m.as.ExtensionTrigger() == types.AuctionTriggerLongBlock {
+		if endTS := m.as.ExpiresAt(); endTS != nil && endTS.Before(now) {
+			m.as.SetReadyToLeave()
+		}
+	}
+
 	// price and liquidity auctions
 	isPrice := m.as.IsPriceAuction() || m.as.IsPriceExtension()
 	if !isPrice {

core/execution/spot/auction.go

@@ -111,6 +111,12 @@ func (m *Market) checkAuction(ctx context.Context, now time.Time, idgen common.I
 		return
 	}
 
+	if m.as.Trigger() == types.AuctionTriggerLongBlock || m.as.ExtensionTrigger() == types.AuctionTriggerLongBlock {
+		if endTS := m.as.ExpiresAt(); endTS != nil && endTS.Before(now) {
+			m.as.SetReadyToLeave()
+		}
+	}
+
 	isPrice := m.as.IsPriceAuction() || m.as.IsPriceExtension()
 	if isPrice || m.as.CanLeave() {
 		m.pMonitor.CheckPrice(ctx, m.as, indicativeUncrossingPrice, true, true)