chore(trading): merge

apps/explorer-e2e/src/integration/proposal.cy.js

@@ -1,7 +1,7 @@
 import { getNewAssetTxBody } from '../support/governance.functions';
 
 context('Proposal page', { tags: '@smoke' }, function () {
-  describe.skip('Verify elements on page', function () {
+  describe('Verify elements on page', function () {
     const proposalHeading = 'proposals-heading';
     const dateTimeRegex =
       /(\d{1,2})\/(\d{1,2})\/(\d{4}), (\d{1,2}):(\d{1,2}):(\d{1,2})/gm;

apps/governance-e2e/src/support/proposal.functions.ts

@@ -112,8 +112,6 @@ export function createNewMarketProposalTxBody(): ProposalSubmissionBody {
               performanceHysteresisEpochs: 2,
               slaCompetitionFactor: '0.1',
             },
-            // FIXME: workaround because of https://github.com/vegaprotocol/vega/issues/10343
-            quadraticSlippageFactor: '0',
             instrument: {
               name: 'Token test market',
               code: 'TEST.24h',
@@ -210,6 +208,16 @@ export function createNewMarketProposalTxBody(): ProposalSubmissionBody {
                 sigma: 0.5,
               },
             },
+            markPriceConfiguration: {
+              decayWeight: '1',
+              decayPower: '1',
+              cashAmount: '5000000',
+              sourceWeights: undefined,
+              sourceStalenessTolerance: ['1m0s', '1m0s', '1m0s'],
+              compositePriceType: 'COMPOSITE_PRICE_TYPE_WEIGHTED',
+              dataSourcesSpec: [],
+              dataSourcesSpecBinding: [],
+            },
           },
         },
         closingTimestamp,
@@ -242,8 +250,6 @@ export function createSuccessorMarketProposalTxBody(
             decimalPlaces: '5',
             positionDecimalPlaces: '5',
             linearSlippageFactor: '0.001',
-            // FIXME: workaround because of https://github.com/vegaprotocol/vega/issues/10343
-            quadraticSlippageFactor: '0',
             liquiditySlaParameters: {
               priceRange: '0.5',
               commitmentMinTimeFraction: '0.1',
@@ -354,6 +360,16 @@ export function createSuccessorMarketProposalTxBody(
               parentMarketId: parentMarketId,
               insurancePoolFraction: '0.75',
             },
+            markPriceConfiguration: {
+              decayWeight: '1',
+              decayPower: '1',
+              cashAmount: '5000000',
+              sourceWeights: undefined,
+              sourceStalenessTolerance: ['1m0s', '1m0s', '1m0s'],
+              compositePriceType: 'COMPOSITE_PRICE_TYPE_WEIGHTED',
+              dataSourcesSpec: [],
+              dataSourcesSpecBinding: [],
+            },
           },
         },
         closingTimestamp,

libs/cypress/src/lib/capsule/propose-market.ts

@@ -35,7 +35,6 @@ function createNewMarketProposal(): ProposalSubmissionBody {
             decimalPlaces: '5',
             positionDecimalPlaces: '5',
             linearSlippageFactor: '0.001',
-            quadraticSlippageFactor: '0',
             instrument: {
               name: 'Test market 1',
               code: 'TEST.24h',
@@ -137,6 +136,16 @@ function createNewMarketProposal(): ProposalSubmissionBody {
               performanceHysteresisEpochs: 2,
               slaCompetitionFactor: '0.75',
             },
+            markPriceConfiguration: {
+              decayWeight: '1',
+              decayPower: '1',
+              cashAmount: '5000000',
+              sourceWeights: undefined,
+              sourceStalenessTolerance: ['1m0s', '1m0s', '1m0s'],
+              compositePriceType: 'COMPOSITE_PRICE_TYPE_WEIGHTED',
+              dataSourcesSpec: [],
+              dataSourcesSpecBinding: [],
+            },
           },
         },
         closingTimestamp,

libs/wallet/src/connectors/snap-connector.ts

@@ -121,6 +121,7 @@ export class SnapConnector implements Connector {
   async listKeys() {
     try {
       const res = await this.invokeSnap<{
+        // eslint-disable-next-line no-restricted-globals
         keys: Array<{ publicKey: string; name: string }>;
       }>(JsonRpcMethod.ListKeys);
       return res.keys;

libs/wallet/src/transaction-types.ts

@@ -138,7 +138,6 @@ interface ProposalNewMarketTerms {
       positionDecimalPlaces: string;
       linearSlippageFactor: string;
       // FIXME: workaround because of https://github.com/vegaprotocol/vega/issues/10343
-      quadraticSlippageFactor: string;
       instrument: {
         name: string;
         code: string;
@@ -164,6 +163,16 @@ interface ProposalNewMarketTerms {
       logNormal: LogNormal;
       successor?: Successor;
       liquiditySlaParameters: LiquiditySLAParameters;
+      markPriceConfiguration: {
+        decayWeight: string;
+        decayPower: string;
+        cashAmount: string;
+        sourceWeights: undefined;
+        sourceStalenessTolerance: string[];
+        compositePriceType: string;
+        dataSourcesSpec: Schema.DataSourceDefinition[];
+        dataSourcesSpecBinding: Schema.SpecBindingForCompositePrice[];
+      };
     };
   };
   closingTimestamp: number;
@@ -175,8 +184,6 @@ interface ProposalUpdateMarketTerms {
     marketId: string;
     changes: {
       linearSlippageFactor: string;
-      // FIXME: workaround because of https://github.com/vegaprotocol/vega/issues/10343
-      quadraticSlippageFactor: string;
       instrument: {
         code: string;
         future: {