From ce42246ab9acc391f6880eabfe8b3017ddecf575 Mon Sep 17 00:00:00 2001 From: Joe Tsang <30622993+jtsang586@users.noreply.github.com> Date: Tue, 19 Sep 2023 15:32:11 +0100 Subject: [PATCH] chore: fix failing tests by adding liquidity sla params --- .../src/fixtures/proposals/new-market-raw.json | 6 ++++++ .../governance-e2e/src/fixtures/proposals/new-market.json | 6 ++++++ .../src/fixtures/proposals/successor-market.json | 6 ++++++ .../src/fixtures/proposals/update-market.json | 6 ++++++ .../src/integration/flow/proposal-forms.cy.ts | 5 +++++ libs/cypress/src/lib/capsule/propose-market.ts | 6 ++++++ libs/wallet/src/connectors/vega-connector.ts | 8 ++++++++ vegacapsule/genesis.tmpl | 1 + 8 files changed, 44 insertions(+) diff --git a/apps/governance-e2e/src/fixtures/proposals/new-market-raw.json b/apps/governance-e2e/src/fixtures/proposals/new-market-raw.json index fec795e32..a2cb90692 100644 --- a/apps/governance-e2e/src/fixtures/proposals/new-market-raw.json +++ b/apps/governance-e2e/src/fixtures/proposals/new-market-raw.json @@ -103,6 +103,12 @@ "r": 0.016, "sigma": 0.5 } + }, + "liquiditySlaParameters": { + "priceRange": "0.95", + "commitmentMinTimeFraction": "0.5", + "performanceHysteresisEpochs": 2, + "slaCompetitionFactor": "0.75" } } }, diff --git a/apps/governance-e2e/src/fixtures/proposals/new-market.json b/apps/governance-e2e/src/fixtures/proposals/new-market.json index 3c3bf9ed6..46f60b2aa 100644 --- a/apps/governance-e2e/src/fixtures/proposals/new-market.json +++ b/apps/governance-e2e/src/fixtures/proposals/new-market.json @@ -97,6 +97,12 @@ "r": 0.016, "sigma": 0.8 } + }, + "liquiditySlaParameters": { + "priceRange": "0.95", + "commitmentMinTimeFraction": "0.5", + "performanceHysteresisEpochs": 2, + "slaCompetitionFactor": "0.75" } } } diff --git a/apps/governance-e2e/src/fixtures/proposals/successor-market.json b/apps/governance-e2e/src/fixtures/proposals/successor-market.json index eaa4c0d4c..429e1c5f6 100644 --- a/apps/governance-e2e/src/fixtures/proposals/successor-market.json +++ b/apps/governance-e2e/src/fixtures/proposals/successor-market.json @@ -98,6 +98,12 @@ "sigma": 0.8 } }, + "liquiditySlaParameters": { + "priceRange": "0.95", + "commitmentMinTimeFraction": "0.5", + "performanceHysteresisEpochs": 2, + "slaCompetitionFactor": "0.75" + }, "successor": { "parentMarketId": "", "insurancePoolFraction": "0.75" diff --git a/apps/governance-e2e/src/fixtures/proposals/update-market.json b/apps/governance-e2e/src/fixtures/proposals/update-market.json index b975102bc..3955982d8 100644 --- a/apps/governance-e2e/src/fixtures/proposals/update-market.json +++ b/apps/governance-e2e/src/fixtures/proposals/update-market.json @@ -97,5 +97,11 @@ "r": 0.016, "sigma": 0.3 } + }, + "liquiditySlaParameters": { + "priceRange": "0.95", + "commitmentMinTimeFraction": "0.5", + "performanceHysteresisEpochs": 2, + "slaCompetitionFactor": "0.75" } } diff --git a/apps/governance-e2e/src/integration/flow/proposal-forms.cy.ts b/apps/governance-e2e/src/integration/flow/proposal-forms.cy.ts index 2b3eeed26..fafc7f5a1 100644 --- a/apps/governance-e2e/src/integration/flow/proposal-forms.cy.ts +++ b/apps/governance-e2e/src/integration/flow/proposal-forms.cy.ts @@ -36,6 +36,7 @@ const proposalType = 'proposal-type'; const proposalDetails = 'proposal-details'; const newProposalSubmitButton = 'proposal-submit'; const proposalVoteDeadline = 'proposal-vote-deadline'; +const proposalEnactmentDeadline = 'proposal-enactment-deadline'; const proposalParameterSelect = 'proposal-parameter-select'; const proposalMarketSelect = 'proposal-market-select'; const newProposalTitle = 'proposal-title'; @@ -227,6 +228,8 @@ context( parseSpecialCharSequences: false, delay: 2, }); + cy.getByTestId(proposalVoteDeadline).clear().type('2'); + cy.getByTestId(proposalEnactmentDeadline).clear().type('3'); }); cy.getByTestId(proposalDownloadBtn) .should('be.visible') @@ -634,6 +637,8 @@ context( parseSpecialCharSequences: false, delay: 2, }); + cy.getByTestId(proposalVoteDeadline).clear().type('2'); + cy.getByTestId(proposalEnactmentDeadline).clear().type('3'); }); cy.getByTestId(proposalDownloadBtn) .should('be.visible') diff --git a/libs/cypress/src/lib/capsule/propose-market.ts b/libs/cypress/src/lib/capsule/propose-market.ts index 8ff53a0d6..465cc18e4 100644 --- a/libs/cypress/src/lib/capsule/propose-market.ts +++ b/libs/cypress/src/lib/capsule/propose-market.ts @@ -131,6 +131,12 @@ function createNewMarketProposal(): ProposalSubmissionBody { sigma: 0.5, }, }, + liquiditySlaParameters: { + priceRange: '0.95', + commitmentMinTimeFraction: '0.5', + performanceHysteresisEpochs: 2, + slaCompetitionFactor: '0.75', + }, }, }, closingTimestamp, diff --git a/libs/wallet/src/connectors/vega-connector.ts b/libs/wallet/src/connectors/vega-connector.ts index b14a69546..2ee88e2fd 100644 --- a/libs/wallet/src/connectors/vega-connector.ts +++ b/libs/wallet/src/connectors/vega-connector.ts @@ -154,6 +154,7 @@ interface ProposalNewMarketTerms { }; logNormal: LogNormal; successor?: Successor; + liquiditySlaParameters: LiquiditySLAParameters; }; }; closingTimestamp: number; @@ -323,6 +324,13 @@ interface Trigger { auctionExtension: string; } +interface LiquiditySLAParameters { + priceRange: string; + commitmentMinTimeFraction: string; + performanceHysteresisEpochs: number; + slaCompetitionFactor: string; +} + export interface ProposalSubmission { rationale: { description: string; diff --git a/vegacapsule/genesis.tmpl b/vegacapsule/genesis.tmpl index 692bd7efc..c4a6e60e8 100644 --- a/vegacapsule/genesis.tmpl +++ b/vegacapsule/genesis.tmpl @@ -195,6 +195,7 @@ "market.fee.factors.makerFee": "0.004", "market.liquidity.stakeToCcyVolume": "0.3", "market.liquidity.targetstake.triggering.ratio": "0.7", + "market.liquidity.providersFeeCalculationTimeStep": "5s", "network.checkpoint.timeElapsedBetweenCheckpoints": "10s", "reward.asset": "{{.GetVegaContractID "VEGA"}}", "reward.staking.delegation.competitionLevel": "3.1",