fix: save AMM's proposed fee into snapshot

vegaprotocol · May 22, 2024 · d9deea4 · d9deea4
1 parent 7bc6864
commit d9deea4
Show file tree

Hide file tree

Showing 3 changed files with 1,423 additions and 1,404 deletions.
diff --git a/core/execution/amm/pool.go b/core/execution/amm/pool.go
@@ -190,10 +190,16 @@ func NewPoolFromProto(
 		return nil, err
 	}
 
+	proposedFee, err := num.DecimalFromString(state.ProposedFee)
+	if err != nil {
+		return nil, err
+	}
+
 	return &Pool{
-		ID:         state.Id,
-		AMMParty:   state.AmmPartyId,
-		Commitment: num.MustUintFromString(state.Commitment, 10),
+		ID:          state.Id,
+		AMMParty:    state.AmmPartyId,
+		Commitment:  num.MustUintFromString(state.Commitment, 10),
+		ProposedFee: proposedFee,
 		Parameters: &types.ConcentratedLiquidityParameters{
 			Base:                 base,
 			LowerBound:           lower,
@@ -246,12 +252,13 @@ func NewCurveFromProto(c *snapshotpb.PoolMapEntry_Curve) (*curve, error) {
 
 func (p *Pool) IntoProto() *snapshotpb.PoolMapEntry_Pool {
 	return &snapshotpb.PoolMapEntry_Pool{
-		Id:         p.ID,
-		AmmPartyId: p.AMMParty,
-		Commitment: p.Commitment.String(),
-		Parameters: p.Parameters.ToProtoEvent(),
-		Market:     p.market,
-		Asset:      p.asset,
+		Id:          p.ID,
+		AmmPartyId:  p.AMMParty,
+		Commitment:  p.Commitment.String(),
+		ProposedFee: p.ProposedFee.String(),
+		Parameters:  p.Parameters.ToProtoEvent(),
+		Market:      p.market,
+		Asset:       p.asset,
 		Lower: &snapshotpb.PoolMapEntry_Curve{
 			L:     p.lower.l.String(),
 			High:  p.lower.high.String(),

diff --git a/protos/sources/vega/snapshot/v1/snapshot.proto b/protos/sources/vega/snapshot/v1/snapshot.proto
@@ -586,6 +586,7 @@ message PoolMapEntry {
     Curve lower = 7;
     Curve upper = 8;
     vega.events.v1.AMM.Status status = 9;
+    string proposed_fee = 10;
   }
 
   string party = 1;