Merge pull request #2402 from vegaprotocol/release/v0.25.1

Release v0.25.1

Author: ashleyvega

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.25.1
+
+*2020-10-14*
+
+This release backports two fixes from the forthcoming 0.26.0 release.
+
+### Improvements
+- [#2354](https://github.com/vegaprotocol/vega/pull/2354) Update `OrderEvent` to copy by value
+- [#2379](https://github.com/vegaprotocol/vega/pull/2379) Add missing `/governance/prepare/vote` REST endpoint
+
 ## 0.25.0
 
 *2020-09-24*

README.md

@@ -1,6 +1,6 @@
 # Vega
 
-Version 0.25.0.
+Version 0.25.1.
 
 A decentralised trading platform that allows pseudo-anonymous trading of derivatives on a blockchain.
 

events/order.go

@@ -8,14 +8,15 @@ import (
 
 type Order struct {
 	*Base
-	o *types.Order
+	o types.Order
 }
 
 func NewOrderEvent(ctx context.Context, o *types.Order) *Order {
-	return &Order{
+	order := &Order{
 		Base: newBase(ctx, OrderEvent),
-		o:    o,
+		o:    *o,
 	}
+	return order
 }
 
 func (o Order) IsParty(id string) bool {
@@ -31,15 +32,15 @@ func (o Order) MarketID() string {
 }
 
 func (o *Order) Order() *types.Order {
-	return o.o
+	return &o.o
 }
 
 func (o Order) Proto() types.Order {
-	return *o.o
+	return o.o
 }
 
 func (o Order) StreamMessage() *types.BusEvent {
-	cpy := *o.o
+	cpy := o.o
 	return &types.BusEvent{
 		ID:   o.eventID(),
 		Type: o.et.ToProto(),

execution/engine.go

@@ -382,7 +382,7 @@ func (e *Engine) onChainTimeUpdate(ctx context.Context, t time.Time) {
 	// remove expired orders
 	// TODO(FIXME): this should be remove, and handled inside the market directly
 	// when call with the new time (see the next for loop)
-	e.removeExpiredOrders(t)
+	e.removeExpiredOrders(ctx, t)
 
 	// notify markets of the time expiration
 	for mktID, mkt := range e.markets {
@@ -399,11 +399,8 @@ func (e *Engine) onChainTimeUpdate(ctx context.Context, t time.Time) {
 
 // Process any data updates (including state changes)
 // e.g. removing expired orders from matching engine.
-func (e *Engine) removeExpiredOrders(t time.Time) {
+func (e *Engine) removeExpiredOrders(ctx context.Context, t time.Time) {
 	timer := metrics.NewTimeCounter("-", "execution", "removeExpiredOrders")
-	if e.log.GetLevel() == logging.DebugLevel {
-		e.log.Debug("Removing expiring orders from matching engine")
-	}
 	expiringOrders := []types.Order{}
 	timeNow := t.UnixNano()
 	for _, mkt := range e.markets {
@@ -416,20 +413,12 @@ func (e *Engine) removeExpiredOrders(t time.Time) {
 		expiringOrders = append(
 			expiringOrders, orders...)
 	}
-	if e.log.GetLevel() == logging.DebugLevel {
-		e.log.Debug("Removed expired orders from matching engine",
-			logging.Int("orders-removed", len(expiringOrders)))
-	}
 	for _, order := range expiringOrders {
 		order := order
-		evt := events.NewOrderEvent(context.Background(), &order)
+		evt := events.NewOrderEvent(ctx, &order)
 		e.broker.Send(evt)
 		metrics.OrderGaugeAdd(-1, order.MarketID) // decrement gauge
 	}
-	if e.log.GetLevel() == logging.DebugLevel {
-		e.log.Debug("Updated expired orders in stores",
-			logging.Int("orders-removed", len(expiringOrders)))
-	}
 	timer.EngineTimeCounterAdd()
 }
 

gateway/rest/grpc-rest-bindings.yml

@@ -113,6 +113,9 @@ http:
     - selector: api.trading.PrepareProposal
       post: '/governance/prepare/proposal'
       body: "*"
+    - selector: api.trading.PrepareVote
+      post: '/governance/prepare/vote'
+      body: "*"
 
 
     # Miscellaneous

integration/execution_layer_test.go

@@ -404,7 +404,7 @@ func tradersCancelsTheFollowingOrdersReference(refs *gherkin.DataTable) error {
 			continue
 		}
 
-		o, err := execsetup.broker.getByReference(val(row, 0), val(row, 1))
+		o, err := execsetup.broker.getFirstByReference(val(row, 0), val(row, 1))
 		if err != nil {
 			return err
 		}

integration/stubs_test.go

@@ -252,7 +252,7 @@ func (b *brokerStub) getTraderGeneralAccount(trader, asset string) (proto.Accoun
 	return proto.Account{}, errors.New("account does not exist")
 }
 
-func (b *brokerStub) getByReference(party, ref string) (proto.Order, error) {
+func (b *brokerStub) getFirstByReference(party, ref string) (proto.Order, error) {
 	data := b.GetOrderEvents()
 	for _, o := range data {
 		v := o.Order()
@@ -263,6 +263,24 @@ func (b *brokerStub) getByReference(party, ref string) (proto.Order, error) {
 	return proto.Order{}, fmt.Errorf("no order for party %v and referrence %v", party, ref)
 }
 
+func (b *brokerStub) getByReference(party, ref string) (proto.Order, error) {
+	data := b.GetOrderEvents()
+
+	var last proto.Order // we need the most recent event, the order object is not updated (copy v pointer, issue 2353)
+	var matched bool = false
+	for _, o := range data {
+		v := o.Order()
+		if v.Reference == ref && v.PartyID == party {
+			last = *v
+			matched = true
+		}
+	}
+	if matched == true {
+		return last, nil
+	}
+	return proto.Order{}, fmt.Errorf("no order for party %v and referrence %v", party, ref)
+}
+
 func (b *brokerStub) getTrades() []proto.Trade {
 	data := b.GetTradeEvents()
 	trades := make([]proto.Trade, 0, len(data))

proto/api/trading.pb.gw.go

@@ -163,6 +163,33 @@
         ]
       }
     },
+    "/governance/prepare/vote": {
+      "post": {
+        "summary": "Prepare a governance vote",
+        "operationId": "PrepareVote",
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "$ref": "#/definitions/apiPrepareVoteResponse"
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/apiPrepareVoteRequest"
+            }
+          }
+        ],
+        "tags": [
+          "trading"
+        ]
+      }
+    },
     "/markets": {
       "get": {
         "summary": "Get a list of Markets",
@@ -1805,6 +1832,16 @@
       },
       "description": "Response for preparing an order submission."
     },
+    "apiPrepareVoteRequest": {
+      "type": "object",
+      "properties": {
+        "vote": {
+          "$ref": "#/definitions/vegaVote",
+          "description": "Vote. Required field."
+        }
+      },
+      "description": "Request to prepare a governance vote."
+    },
     "apiPrepareVoteResponse": {
       "type": "object",
       "properties": {