Merge branch 'develop' into rebate_remove_invariant

Author: jeremyletang

CHANGELOG.md

@@ -22,20 +22,24 @@
 - [11535](https://github.com/vegaprotocol/vega/issues/11535) - Added support for lottery rank distribution strategy.
 - [11536](https://github.com/vegaprotocol/vega/issues/11536) - Make the batch market instructions errors programmatically usable.
 - [11546](https://github.com/vegaprotocol/vega/issues/11546) - Add validation to market proposals metadata.
-- [11562](https://github.com/vegaprotocol/vega/issues/11562) - Update average notional metric with mark price at the end of the epoch and when calculating live score. 
+- [11562](https://github.com/vegaprotocol/vega/issues/11562) - Update average notional metric with mark price at the end of the epoch and when calculating live score.
 - [11570](https://github.com/vegaprotocol/vega/issues/11570) - Include the required set of parties for evaluation for eligible entities reward.
 - [11576](https://github.com/vegaprotocol/vega/issues/11576) - Replace additional rebate validation with a cap. 
-  
+
+
 ### 🐛 Fixes
 
 - [11521](https://github.com/vegaprotocol/vega/issues/11521) - Restore `AMM` position factor when loading from a snapshot.
 - [11526](https://github.com/vegaprotocol/vega/issues/11526) - `EstimateAMMBounds` now respects the market's decimal places.
 - [11486](https://github.com/vegaprotocol/vega/issues/11486) - `AMMs` can now be submitted on markets with more decimal places than asset decimal places.
 - [11561](https://github.com/vegaprotocol/vega/issues/11561) - Failing amends on `AMMs` now restore original properly.
+- [11583](https://github.com/vegaprotocol/vega/issues/11583) - Remove `AMMs` entirely from engine when market closes.
 - [11568](https://github.com/vegaprotocol/vega/issues/11568) - order book shape on closing `AMM` no longer panics.
 - [11540](https://github.com/vegaprotocol/vega/issues/11540) - Fix spam check for spots to use not double count quantum.
 - [11542](https://github.com/vegaprotocol/vega/issues/11542) - Fix non determinism in lottery ranking.
 - [11544](https://github.com/vegaprotocol/vega/issues/11544) - Fix empty candles stream.
+- [11579](https://github.com/vegaprotocol/vega/issues/11579) - Spot calculate fee on amend, use order price if no amended price is provided.
+- [11585](https://github.com/vegaprotocol/vega/issues/11585) - Initialise rebate stats service in API.
 
 
 ## 0.77.5

cmd/data-node/commands/start/node.go

@@ -242,6 +242,8 @@ func (l *NodeCommand) createGRPCServer(config api.Config) *api.GRPCServer {
 		l.timeWeightedNotionalPositionService,
 		l.gameScoreService,
 		l.ammPoolsService,
+		l.volumeRebateStatsService,
+		l.volumeRebateProgramService,
 	)
 	return grpcServer
 }

core/execution/amm/engine.go

@@ -820,6 +820,10 @@ func (e *Engine) MarketClosing(ctx context.Context) error {
 		e.sendUpdate(ctx, p)
 		e.marketActivityTracker.RemoveAMMParty(e.assetID, e.marketID, p.AMMParty)
 	}
+
+	e.pools = nil
+	e.poolsCpy = nil
+	e.ammParties = nil
 	return nil
 }
 

core/execution/amm/engine_test.go

@@ -656,9 +656,9 @@ func testMarketClosure(t *testing.T) {
 	}
 
 	require.NoError(t, tst.engine.MarketClosing(ctx))
-	for _, p := range tst.engine.poolsCpy {
-		assert.Equal(t, types.AMMPoolStatusStopped, p.status)
-	}
+	require.Equal(t, 0, len(tst.engine.pools))
+	require.Equal(t, 0, len(tst.engine.poolsCpy))
+	require.Equal(t, 0, len(tst.engine.ammParties))
 }
 
 func expectSubaccountCreation(t *testing.T, tst *tstEngine, party, subAccount string) {

core/execution/spot/market.go

@@ -2380,13 +2380,13 @@ func (m *Market) validateOrderAmendment(order *types.Order, amendment *types.Ord
 		existingHoldingQty, existingHoldingFee := m.orderHoldingTracker.GetCurrentHolding(order.ID)
 		oldHoldingRequirement := num.Sum(existingHoldingQty, existingHoldingFee)
 		newFeesRequirement := num.UintZero()
-		if m.as.InAuction() {
-			newFeesRequirement, _ = m.calculateFees(order.Party, remaining, amendment.Price, order.Side)
-		}
 		price := order.Price
 		if amendment.Price != nil {
 			price, _ = num.UintFromDecimal(amendment.Price.ToDecimal().Mul(m.priceFactor))
 		}
+		if m.as.InAuction() {
+			newFeesRequirement, _ = m.calculateFees(order.Party, remaining, price, order.Side)
+		}
 		if order.PeggedOrder != nil {
 			p, err := m.getNewPeggedPrice(order)
 			if err != nil {

datanode/api/server.go

@@ -194,6 +194,8 @@ type GRPCServer struct {
 	timeWeightedNotionalPositionService *service.TimeWeightedNotionalPosition
 	gameScoreService                    *service.GameScore
 	ammPoolService                      *service.AMMPools
+	volumeRebateStatsService            *service.VolumeRebateStats
+	volumeRebateProgramService          *service.VolumeRebatePrograms
 
 	eventObserver *eventObserver
 
@@ -266,6 +268,8 @@ func NewGRPCServer(
 	timeWeightedNotionalPositionService *service.TimeWeightedNotionalPosition,
 	gameScoreService *service.GameScore,
 	ammPoolService *service.AMMPools,
+	volumeRebateStatsService *service.VolumeRebateStats,
+	volumeRebateProgramsService *service.VolumeRebatePrograms,
 ) *GRPCServer {
 	// setup logger
 	log = log.Named(namedLogger)
@@ -337,7 +341,8 @@ func NewGRPCServer(
 		timeWeightedNotionalPositionService: timeWeightedNotionalPositionService,
 		gameScoreService:                    gameScoreService,
 		ammPoolService:                      ammPoolService,
-
+		volumeRebateStatsService:            volumeRebateStatsService,
+		volumeRebateProgramService:          volumeRebateProgramsService,
 		eventObserver: &eventObserver{
 			log:          log,
 			eventService: eventService,
@@ -578,6 +583,8 @@ func (g *GRPCServer) Start(ctx context.Context, lis net.Listener) error {
 		twNotionalPositionService:     g.timeWeightedNotionalPositionService,
 		gameScoreService:              g.gameScoreService,
 		AMMPoolService:                g.ammPoolService,
+		volumeRebateStatsService:      g.volumeRebateStatsService,
+		volumeRebateProgramService:    g.volumeRebateProgramService,
 	}
 
 	protoapi.RegisterTradingDataServiceServer(g.srv, tradingDataSvcV2)

datanode/api/trading_test.go

@@ -163,6 +163,8 @@ func getTestGRPCServer(t *testing.T, ctx context.Context) (tidy func(), conn *gr
 	gameScoreService := service.NewGameScore(sqlstore.NewGameScores(sqlConn), logger)
 	ammPoolsService := service.NewAMMPools(sqlstore.NewAMMPools(sqlConn))
 	sqlMarketDepthService := service.NewMarketDepth(service.NewDefaultConfig().MarketDepth, sqlOrderService, ammPoolsService, nil, nil, nil, nil, logger)
+	volumeRebateStatsService := service.NewVolumeRebateStats(sqlstore.NewVolumeRebateStats(sqlConn))
+	volumeRebateProgramssService := service.NewVolumeRebatePrograms(sqlstore.NewVolumeRebatePrograms(sqlConn))
 
 	g := api.NewGRPCServer(
 		logger,
@@ -225,6 +227,8 @@ func getTestGRPCServer(t *testing.T, ctx context.Context) (tidy func(), conn *gr
 		timeWeightedNotionPositionService,
 		gameScoreService,
 		ammPoolsService,
+		volumeRebateStatsService,
+		volumeRebateProgramssService,
 	)
 	if g == nil {
 		err = fmt.Errorf("failed to create gRPC server")