Skip to content

Commit 97e22b5

Browse files
committed
fix: save AMM's proposed fee into snapshot
1 parent e6b8ed1 commit 97e22b5

File tree

3 files changed

+1423
-1404
lines changed

3 files changed

+1423
-1404
lines changed

core/execution/amm/pool.go

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,16 @@ func NewPoolFromProto(
190190
return nil, err
191191
}
192192

193+
proposedFee, err := num.DecimalFromString(state.ProposedFee)
194+
if err != nil {
195+
return nil, err
196+
}
197+
193198
return &Pool{
194-
ID: state.Id,
195-
AMMParty: state.AmmPartyId,
196-
Commitment: num.MustUintFromString(state.Commitment, 10),
199+
ID: state.Id,
200+
AMMParty: state.AmmPartyId,
201+
Commitment: num.MustUintFromString(state.Commitment, 10),
202+
ProposedFee: proposedFee,
197203
Parameters: &types.ConcentratedLiquidityParameters{
198204
Base: base,
199205
LowerBound: lower,
@@ -246,12 +252,13 @@ func NewCurveFromProto(c *snapshotpb.PoolMapEntry_Curve) (*curve, error) {
246252

247253
func (p *Pool) IntoProto() *snapshotpb.PoolMapEntry_Pool {
248254
return &snapshotpb.PoolMapEntry_Pool{
249-
Id: p.ID,
250-
AmmPartyId: p.AMMParty,
251-
Commitment: p.Commitment.String(),
252-
Parameters: p.Parameters.ToProtoEvent(),
253-
Market: p.market,
254-
Asset: p.asset,
255+
Id: p.ID,
256+
AmmPartyId: p.AMMParty,
257+
Commitment: p.Commitment.String(),
258+
ProposedFee: p.ProposedFee.String(),
259+
Parameters: p.Parameters.ToProtoEvent(),
260+
Market: p.market,
261+
Asset: p.asset,
255262
Lower: &snapshotpb.PoolMapEntry_Curve{
256263
L: p.lower.l.String(),
257264
High: p.lower.high.String(),

protos/sources/vega/snapshot/v1/snapshot.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -586,6 +586,7 @@ message PoolMapEntry {
586586
Curve lower = 7;
587587
Curve upper = 8;
588588
vega.events.v1.AMM.Status status = 9;
589+
string proposed_fee = 10;
589590
}
590591

591592
string party = 1;

0 commit comments

Comments
 (0)