Revert "Observations that violate bid<=mid<=ask are invalid (#61)"

This reverts commit a4b7359.

mercury/v3/mercury.go

@@ -166,12 +166,7 @@ func (rp *reportingPlugin) Observation(ctx context.Context, repts types.ReportTi
 	}
 
 	if bpErr == nil && bidErr == nil && askErr == nil {
-		if err := validatePrices(obs.Bid.Val, obs.BenchmarkPrice.Val, obs.Ask.Val); err != nil {
-			rp.logger.Errorw("Cannot generate price observation: invalid bid/mid/ask", "err", err)
-			p.PricesValid = false
-		} else {
-			p.PricesValid = true
-		}
+		p.PricesValid = true
 	}
 
 	var maxFinalizedTimestampErr error
@@ -230,13 +225,6 @@ func (rp *reportingPlugin) Observation(ctx context.Context, repts types.ReportTi
 	return proto.Marshal(&p)
 }
 
-func validatePrices(bid, benchmarkPrice, ask *big.Int) error {
-	if bid.Cmp(benchmarkPrice) > 0 || benchmarkPrice.Cmp(ask) > 0 {
-		return fmt.Errorf("invariant violated: expected bid<=mid<=ask, got bid: %s, mid: %s, ask: %s", bid, benchmarkPrice, ask)
-	}
-	return nil
-}
-
 func parseAttributedObservation(ao types.AttributedObservation) (PAO, error) {
 	var pao parsedAttributedObservation
 	var obs MercuryObservationProto
@@ -261,13 +249,6 @@ func parseAttributedObservation(ao types.AttributedObservation) (PAO, error) {
 		if err != nil {
 			return parsedAttributedObservation{}, fmt.Errorf("ask cannot be converted to big.Int: %s", err)
 		}
-		if err := validatePrices(pao.Bid, pao.BenchmarkPrice, pao.Ask); err != nil {
-			// NOTE: since nodes themselves are not supposed to set
-			// PricesValid=true if this invariant is violated, this indicates a
-			// faulty/misbehaving node and the entire observation should be
-			// ignored
-			return parsedAttributedObservation{}, fmt.Errorf("observation claimed to be valid, but contains invalid prices: %w", err)
-		}
 		pao.PricesValid = true
 	}
 

mercury/v3/mercury_test.go

@@ -164,34 +164,6 @@ func newValidAos(t *testing.T, protos ...*MercuryObservationProto) (aos []types.
 	return
 }
 
-func Test_parseAttributedObservation(t *testing.T) {
-	t.Run("returns error if bid<=mid<=ask is violated, even if observation claims itself to be valid", func(t *testing.T) {
-		obs := &MercuryObservationProto{
-			Timestamp: 42,
-
-			BenchmarkPrice: mercury.MustEncodeValueInt192(big.NewInt(123)),
-			Bid:            mercury.MustEncodeValueInt192(big.NewInt(130)),
-			Ask:            mercury.MustEncodeValueInt192(big.NewInt(120)),
-			PricesValid:    true,
-
-			MaxFinalizedTimestamp:      40,
-			MaxFinalizedTimestampValid: true,
-
-			LinkFee:        mercury.MustEncodeValueInt192(big.NewInt(1.1e18)),
-			LinkFeeValid:   true,
-			NativeFee:      mercury.MustEncodeValueInt192(big.NewInt(2.1e18)),
-			NativeFeeValid: true,
-		}
-
-		serialized, err := proto.Marshal(obs)
-		require.NoError(t, err)
-
-		_, err = parseAttributedObservation(types.AttributedObservation{Observation: serialized, Observer: commontypes.OracleID(42)})
-		require.Error(t, err)
-		assert.Equal(t, "observation claimed to be valid, but contains invalid prices: invariant violated: expected bid<=mid<=ask, got bid: 130, mid: 123, ask: 120", err.Error())
-	})
-}
-
 func Test_Plugin_Report(t *testing.T) {
 	dataSource := &testDataSource{}
 	codec := &testReportCodec{
@@ -535,20 +507,16 @@ func Test_Plugin_Observation(t *testing.T) {
 		assert.LessOrEqual(t, len(b), maxObservationLength)
 	})
 
-	validBid := big.NewInt(rand.Int63() - 2)
-	validBenchmarkPrice := new(big.Int).Add(validBid, big.NewInt(1))
-	validAsk := new(big.Int).Add(validBid, big.NewInt(2))
-
 	t.Run("all observations succeeded", func(t *testing.T) {
 		obs := v3.Observation{
 			BenchmarkPrice: mercurytypes.ObsResult[*big.Int]{
-				Val: validBenchmarkPrice,
+				Val: big.NewInt(rand.Int63()),
 			},
 			Bid: mercurytypes.ObsResult[*big.Int]{
-				Val: validBid,
+				Val: big.NewInt(rand.Int63()),
 			},
 			Ask: mercurytypes.ObsResult[*big.Int]{
-				Val: validAsk,
+				Val: big.NewInt(rand.Int63()),
 			},
 			MaxFinalizedTimestamp: mercurytypes.ObsResult[int64]{
 				Val: rand.Int63(),
@@ -753,61 +721,6 @@ func Test_Plugin_Observation(t *testing.T) {
 		assert.Zero(t, p.Ask)
 		assert.False(t, p.PricesValid)
 	})
-
-	t.Run("bid<=mid<=ask violation", func(t *testing.T) {
-		obs := v3.Observation{
-			BenchmarkPrice: mercurytypes.ObsResult[*big.Int]{
-				Val: big.NewInt(10),
-			},
-			Bid: mercurytypes.ObsResult[*big.Int]{
-				Val: big.NewInt(11),
-			},
-			Ask: mercurytypes.ObsResult[*big.Int]{
-				Val: big.NewInt(12),
-			},
-			MaxFinalizedTimestamp: mercurytypes.ObsResult[int64]{
-				Val: rand.Int63(),
-			},
-			LinkPrice: mercurytypes.ObsResult[*big.Int]{
-				Val: big.NewInt(rand.Int63()),
-			},
-			NativePrice: mercurytypes.ObsResult[*big.Int]{
-				Val: big.NewInt(rand.Int63()),
-			},
-		}
-		dataSource.Obs = obs
-
-		parsedObs, err := rp.Observation(context.Background(), types.ReportTimestamp{}, nil)
-		require.NoError(t, err)
-
-		var p MercuryObservationProto
-		require.NoError(t, proto.Unmarshal(parsedObs, &p))
-
-		assert.LessOrEqual(t, p.Timestamp, uint32(time.Now().Unix()))
-		assert.Equal(t, obs.BenchmarkPrice.Val, mustDecodeBigInt(p.BenchmarkPrice))
-		assert.False(t, p.PricesValid) // not valid!
-
-		// other values passed through ok
-		assert.Equal(t, obs.MaxFinalizedTimestamp.Val, p.MaxFinalizedTimestamp)
-		assert.True(t, p.MaxFinalizedTimestampValid)
-
-		fee := mercury.CalculateFee(obs.LinkPrice.Val, decimal.NewFromInt32(1))
-		assert.Equal(t, fee, mustDecodeBigInt(p.LinkFee))
-		assert.True(t, p.LinkFeeValid)
-
-		fee = mercury.CalculateFee(obs.NativePrice.Val, decimal.NewFromInt32(1))
-		assert.Equal(t, fee, mustDecodeBigInt(p.NativeFee))
-		assert.True(t, p.NativeFeeValid)
-
-		// test benchmark price higher than ask
-		obs.BenchmarkPrice.Val = big.NewInt(13)
-		dataSource.Obs = obs
-
-		parsedObs, err = rp.Observation(context.Background(), types.ReportTimestamp{}, nil)
-		require.NoError(t, err)
-		require.NoError(t, proto.Unmarshal(parsedObs, &p))
-		assert.False(t, p.PricesValid) // not valid!
-	})
 }
 
 func newUnparseableAttributedObservation() types.AttributedObservation {