Merge pull request #9942 from vegaprotocol/fix/9940

fix: truncate fee stats quantume balances down to 6th decimal
vegaprotocol · Oct 31, 2023 · d098780 · d098780
2 parents dfddefe + b8a6b7c
commit d098780
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,7 +16,8 @@
 
 ### 🐛 Fixes
 
-- [](https://github.com/vegaprotocol/vega/issues/xxxx) -
+- [9941](https://github.com/vegaprotocol/vega/issues/9941) - Add data node mapping for `WasEligible` field in referral set.
+- [9940](https://github.com/vegaprotocol/vega/issues/9940) - Truncate fee stats in quantum down to the 6 decimal.
 
 
 ## 0.73.0

diff --git a/core/fee/rebate_stats.go b/core/fee/rebate_stats.go
@@ -179,7 +179,7 @@ func (f *FeesStats) ToProto(asset string, assetQuantum num.Decimal) *eventspb.Fe
 		fs.TotalRewardsReceived = append(fs.TotalRewardsReceived, &eventspb.PartyAmount{
 			Party:         party,
 			Amount:        amount.String(),
-			QuantumAmount: amount.ToDecimal().Div(assetQuantum).Truncate(2).String(),
+			QuantumAmount: amount.ToDecimal().Div(assetQuantum).Truncate(6).String(),
 		})
 	}
 
@@ -190,7 +190,7 @@ func (f *FeesStats) ToProto(asset string, assetQuantum num.Decimal) *eventspb.Fe
 		fs.RefereesDiscountApplied = append(fs.RefereesDiscountApplied, &eventspb.PartyAmount{
 			Party:         party,
 			Amount:        amount.String(),
-			QuantumAmount: amount.ToDecimal().Div(assetQuantum).Truncate(2).String(),
+			QuantumAmount: amount.ToDecimal().Div(assetQuantum).Truncate(6).String(),
 		})
 	}
 
@@ -201,7 +201,7 @@ func (f *FeesStats) ToProto(asset string, assetQuantum num.Decimal) *eventspb.Fe
 		fs.VolumeDiscountApplied = append(fs.VolumeDiscountApplied, &eventspb.PartyAmount{
 			Party:         party,
 			Amount:        amount.String(),
-			QuantumAmount: amount.ToDecimal().Div(assetQuantum).Truncate(2).String(),
+			QuantumAmount: amount.ToDecimal().Div(assetQuantum).Truncate(6).String(),
 		})
 	}
 
@@ -224,7 +224,7 @@ func (f *FeesStats) ToProto(asset string, assetQuantum num.Decimal) *eventspb.Fe
 				&eventspb.PartyAmount{
 					Party:         party,
 					Amount:        amount.String(),
-					QuantumAmount: amount.ToDecimal().Div(assetQuantum).Truncate(2).String(),
+					QuantumAmount: amount.ToDecimal().Div(assetQuantum).Truncate(6).String(),
 				},
 			)
 		}
@@ -239,7 +239,7 @@ func (f *FeesStats) ToProto(asset string, assetQuantum num.Decimal) *eventspb.Fe
 		fs.TotalMakerFeesReceived = append(fs.TotalMakerFeesReceived, &eventspb.PartyAmount{
 			Party:         maker,
 			Amount:        amount.String(),
-			QuantumAmount: amount.ToDecimal().Div(assetQuantum).Truncate(2).String(),
+			QuantumAmount: amount.ToDecimal().Div(assetQuantum).Truncate(6).String(),
 		})
 	}
 
@@ -262,7 +262,7 @@ func (f *FeesStats) ToProto(asset string, assetQuantum num.Decimal) *eventspb.Fe
 				&eventspb.PartyAmount{
 					Party:         maker,
 					Amount:        amount.String(),
-					QuantumAmount: amount.ToDecimal().Div(assetQuantum).Truncate(2).String(),
+					QuantumAmount: amount.ToDecimal().Div(assetQuantum).Truncate(6).String(),
 				},
 			)
 		}

diff --git a/datanode/api/trading_data_v2.go b/datanode/api/trading_data_v2.go
@@ -185,14 +185,19 @@ func (t *TradingDataServiceV2) GetVestingBalancesSummary(
 		outVesting = make([]*eventspb.PartyVestingBalance, 0, len(vestingBalances))
 		outLocked  = make([]*eventspb.PartyLockedBalance, 0, len(lockedBalances))
 		epoch      *uint64
+		setEpoch   = func(e uint64) {
+			if epoch == nil {
+				epoch = ptr.From(e)
+				return
+			}
+			if *epoch < e {
+				epoch = ptr.From(e)
+			}
+		}
 	)
-	if len(vestingBalances) > 0 {
-		epoch = ptr.From(vestingBalances[0].AtEpoch)
-	} else if len(lockedBalances) > 0 {
-		epoch = ptr.From(lockedBalances[0].AtEpoch)
-	}
 
 	for _, v := range vestingBalances {
+		setEpoch(v.AtEpoch)
 		outVesting = append(
 			outVesting, &eventspb.PartyVestingBalance{
 				Asset:   v.AssetID.String(),
@@ -202,6 +207,7 @@ func (t *TradingDataServiceV2) GetVestingBalancesSummary(
 	}
 
 	for _, v := range lockedBalances {
+		setEpoch(v.AtEpoch)
 		outLocked = append(
 			outLocked, &eventspb.PartyLockedBalance{
 				Asset:      v.AssetID.String(),

diff --git a/datanode/sqlstore/party_locked_balance.go b/datanode/sqlstore/party_locked_balance.go
@@ -27,7 +27,7 @@ func (plb *PartyLockedBalance) Prune(
 	defer metrics.StartSQLQuery("PartyLockedBalance", "Prune")()
 	_, err := plb.Connection.Exec(
 		ctx,
-		"DELETE FROM party_locked_balances_current WHERE until_epoch < $1",
+		"DELETE FROM party_locked_balances_current WHERE until_epoch <= $1",
 		currentEpoch,
 	)