chore(trading): move local_server into .env

.gitattributes

@@ -1,4 +1,3 @@
 * text eol=lf
 *.png binary
 *.ico binary
-*.woff2 binary

apps/explorer/src/app/routes/blocks/id/block.tsx

@@ -54,7 +54,7 @@ const Block = () => {
               </Button>
             </Link>
           </div>
-          {blockData && 'result' in blockData && (
+          {blockData && (
             <>
               <TableWithTbody className="mb-8">
                 <TableRow modifier="bordered">

apps/governance/.env.capsule

@@ -32,7 +32,7 @@ CYPRESS_FAIRGROUND=false
 
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
-NX_METAMASK_SNAPS=true
+NX_METAMASK_SNAPS=false
 NX_PRODUCT_PERPETUALS=true
 NX_UPDATE_MARKET_STATE=true
 NX_REFERRALS=true

apps/governance/.env.mainnet

@@ -23,7 +23,7 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
 
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
-NX_METAMASK_SNAPS=true
+NX_METAMASK_SNAPS=false
 NX_PRODUCT_PERPETUALS=true
 NX_UPDATE_MARKET_STATE=true
 NX_REFERRALS=true

apps/governance/.env.mainnet-mirror

@@ -22,7 +22,7 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket
 
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
-NX_METAMASK_SNAPS=true
+NX_METAMASK_SNAPS=false
 NX_PRODUCT_PERPETUALS=true
 NX_UPDATE_MARKET_STATE=true
 NX_REFERRALS=true

apps/governance/.env.validators-testnet

@@ -21,7 +21,7 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.
 
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
-NX_METAMASK_SNAPS=true
+NX_METAMASK_SNAPS=false
 NX_PRODUCT_PERPETUALS=true
 NX_UPDATE_MARKET_STATE=true
 NX_REFERRALS=true

apps/governance/src/routes/proposals/components/vote-breakdown/vote-breakdown.spec.tsx

@@ -281,8 +281,8 @@ describe('VoteBreakdown', () => {
   });
 
   it('Progress bar displays status -  LP majority', () => {
-    const yesVotesLP = 0.8;
-    const noVotesLP = 0.2;
+    const yesVotesLP = 800;
+    const noVotesLP = 200;
     const expectedProgress = (yesVotesLP / (yesVotesLP + noVotesLP)) * 100; // 80%
 
     renderComponent(

apps/governance/src/routes/proposals/components/vote-breakdown/vote-breakdown.tsx

@@ -105,6 +105,8 @@ export const VoteBreakdown = ({ proposal }: VoteBreakdownProps) => {
     yesLPPercentage,
     yesTokens,
     noTokens,
+    yesEquityLikeShareWeight,
+    noEquityLikeShareWeight,
     totalEquityLikeShareWeight,
     requiredMajorityPercentage,
     requiredMajorityLPPercentage,
@@ -133,7 +135,6 @@ export const VoteBreakdown = ({ proposal }: VoteBreakdownProps) => {
         .multipliedBy(100),
       new BigNumber(100)
     );
-
   const willPass = willPassByTokenVote || willPassByLPVote;
   const updateMarketVotePassMethod = willPassByTokenVote
     ? t('byTokenVote')
@@ -201,24 +202,50 @@ export const VoteBreakdown = ({ proposal }: VoteBreakdownProps) => {
                 <div className="flex items-center gap-1">
                   <span>{t('liquidityProviderVotesFor')}:</span>
                   <Tooltip
-                    description={
-                      <span>{yesLPPercentage.toFixed(defaultDP)}%</span>
-                    }
+                    description={formatNumber(
+                      yesEquityLikeShareWeight,
+                      defaultDP
+                    )}
                   >
-                    <button>{yesLPPercentage.toFixed(1)}%</button>
+                    <button>
+                      <CompactVotes number={yesEquityLikeShareWeight} />
+                    </button>
                   </Tooltip>
+                  <span>
+                    (
+                    <Tooltip
+                      description={
+                        <span>{yesLPPercentage.toFixed(defaultDP)}%</span>
+                      }
+                    >
+                      <button>{yesLPPercentage.toFixed(0)}%</button>
+                    </Tooltip>
+                    )
+                  </span>
                 </div>
 
                 <div className="flex items-center gap-1">
                   <span>{t('liquidityProviderVotesAgainst')}:</span>
+                  <Tooltip
+                    description={formatNumber(
+                      noEquityLikeShareWeight,
+                      defaultDP
+                    )}
+                  >
+                    <button>
+                      <CompactVotes number={noEquityLikeShareWeight} />
+                    </button>
+                  </Tooltip>
                   <span>
+                    (
                     <Tooltip
                       description={
                         <span>{noLPPercentage.toFixed(defaultDP)}%</span>
                       }
                     >
-                      <button>{noLPPercentage.toFixed(1)}%</button>
+                      <button>{noLPPercentage.toFixed(0)}%</button>
                     </Tooltip>
+                    )
                   </span>
                 </div>
               </div>
@@ -255,8 +282,13 @@ export const VoteBreakdown = ({ proposal }: VoteBreakdownProps) => {
                       defaultDP
                     )}
                   >
-                    <span>{totalEquityLikeShareWeight.toFixed(1)}%</span>
+                    <button>
+                      <CompactVotes number={totalEquityLikeShareWeight} />
+                    </button>
                   </Tooltip>
+                  <span>
+                    ({totalEquityLikeShareWeight.toFixed(defaultDP)}%)
+                  </span>
                 </div>
               </div>
             </section>

apps/governance/src/routes/proposals/hooks/use-vote-information.spec.ts

@@ -54,8 +54,8 @@ describe('use-vote-information', () => {
   it('returns all required vote information', () => {
     const yesVotes = 40;
     const noVotes = 60;
-    const yesEquityLikeShareWeight = '0.30';
-    const noEquityLikeShareWeight = '0.70';
+    const yesEquityLikeShareWeight = '30';
+    const noEquityLikeShareWeight = '70';
     // Note - giving a fixedTokenValue of 1 means a ratio of 1:1 votes to tokens, making sums easier :)
     const fixedTokenValue = 1000000000000000000;
 
@@ -195,10 +195,10 @@ describe('use-vote-information', () => {
   });
 
   it('correctly shows whether an update market proposal will pass by token or LP vote - both failing', () => {
-    const yesVotes = 0.2;
-    const noVotes = 0.7;
-    const yesEquityLikeShareWeight = '0.30';
-    const noEquityLikeShareWeight = '0.60';
+    const yesVotes = 20;
+    const noVotes = 70;
+    const yesEquityLikeShareWeight = '30';
+    const noEquityLikeShareWeight = '60';
     const fixedTokenValue = 1000000000000000000;
 
     const proposal = generateProposal({

apps/governance/src/routes/proposals/hooks/use-vote-information.ts

@@ -61,7 +61,7 @@ export const useVoteInformation = ({
     const noEquityLikeShareWeight = !proposal?.votes.no
       .totalEquityLikeShareWeight
       ? new BigNumber(0)
-      : new BigNumber(proposal.votes.no.totalEquityLikeShareWeight).times(100);
+      : new BigNumber(proposal.votes.no.totalEquityLikeShareWeight);
 
     const yesTokens = new BigNumber(
       addDecimal(proposal?.votes.yes.totalTokens ?? 0, decimals)
@@ -70,7 +70,7 @@ export const useVoteInformation = ({
     const yesEquityLikeShareWeight = !proposal?.votes.yes
       .totalEquityLikeShareWeight
       ? new BigNumber(0)
-      : new BigNumber(proposal.votes.yes.totalEquityLikeShareWeight).times(100);
+      : new BigNumber(proposal.votes.yes.totalEquityLikeShareWeight);
 
     const totalTokensVoted = yesTokens.plus(noTokens);
 
@@ -81,7 +81,12 @@ export const useVoteInformation = ({
     const yesPercentage = totalTokensVoted.isZero()
       ? new BigNumber(0)
       : yesTokens.multipliedBy(100).dividedBy(totalTokensVoted);
-    const yesLPPercentage = yesEquityLikeShareWeight;
+
+    const yesLPPercentage = totalEquityLikeShareWeight.isZero()
+      ? new BigNumber(0)
+      : yesEquityLikeShareWeight
+          .multipliedBy(100)
+          .dividedBy(totalEquityLikeShareWeight);
 
     const noPercentage = totalTokensVoted.isZero()
       ? new BigNumber(0)
@@ -98,7 +103,9 @@ export const useVoteInformation = ({
     );
 
     const participationLPMet = requiredParticipationLP
-      ? totalEquityLikeShareWeight.isGreaterThan(requiredParticipationLP)
+      ? totalEquityLikeShareWeight.isGreaterThan(
+          totalSupply.multipliedBy(requiredParticipationLP)
+        )
       : false;
 
     const majorityMet = yesPercentage.isGreaterThanOrEqualTo(
@@ -113,7 +120,9 @@ export const useVoteInformation = ({
       .multipliedBy(100)
       .dividedBy(totalSupply);
 
-    const totalLPTokensPercentage = totalEquityLikeShareWeight;
+    const totalLPTokensPercentage = totalEquityLikeShareWeight
+      .multipliedBy(100)
+      .dividedBy(totalSupply);
 
     const willPassByTokenVote =
       participationMet &&

apps/governance/src/routes/proposals/protocol-upgrade/protocol-upgrade-proposal-container.tsx

@@ -95,7 +95,7 @@ export const ProtocolUpgradeProposalContainer = () => {
           time={
             pending && time ? (
               convertToCountdownString(time, '0:00:00:00')
-            ) : blockInfo && 'result' in blockInfo && blockInfo?.result ? (
+            ) : blockInfo?.result ? (
               <span title={blockInfo.result.block.header.time}>
                 {formatDateWithLocalTimezone(
                   new Date(blockInfo.result.block.header.time)

apps/governance/src/routes/proposals/test-helpers/generate-proposals.ts

@@ -116,8 +116,7 @@ export const generateYesVotes = (
   fixedTokenValue?: number,
   totalEquityLikeShareWeight?: string
 ): Votes => {
-  const votes = [];
-  for (let i = 0; i < numberOfVotes; i++) {
+  const votes = Array.from(Array(numberOfVotes)).map(() => {
     const vote: Vote = {
       __typename: 'Vote',
       value: Schema.VoteValue.VALUE_YES,
@@ -153,9 +152,8 @@ export const generateYesVotes = (
       datetime: faker.date.past().toISOString(),
     };
 
-    votes.push(vote);
-  }
-
+    return vote;
+  });
   return {
     __typename: 'ProposalVoteSide',
     totalNumber: votes.length.toString(),
@@ -174,8 +172,7 @@ export const generateNoVotes = (
   fixedTokenValue?: number,
   totalEquityLikeShareWeight?: string
 ): Votes => {
-  const votes = [];
-  for (let i = 0; i < numberOfVotes; i++) {
+  const votes = Array.from(Array(numberOfVotes)).map(() => {
     const vote: Vote = {
       __typename: 'Vote',
       value: Schema.VoteValue.VALUE_NO,
@@ -210,9 +207,8 @@ export const generateNoVotes = (
       },
       datetime: faker.date.past().toISOString(),
     };
-    votes.push(vote);
-  }
-
+    return vote;
+  });
   return {
     __typename: 'ProposalVoteSide',
     totalNumber: votes.length.toString(),

apps/trading/README.md

@@ -54,5 +54,3 @@ To run the UI automation tests with a mocked API, run:
 ```bash
 yarn nx run trading-e2e:e2e
 ```
-
-To run tests with market sim please read [the readme](e2e/README.md).

apps/trading/client-pages/market/market-header-stats.tsx

@@ -188,11 +188,12 @@ const useNow = () => {
   return now;
 };
 
-const useEvery = (marketId: string, skip: boolean) => {
+const useEvery = (marketId: string) => {
+  const { data: marketTradingMode } = useMarketTradingMode(marketId);
   const { data: marketInfo } = useDataProvider({
     dataProvider: marketInfoProvider,
     variables: { marketId },
-    skip,
+    skip: !marketTradingMode || isMarketInAuction(marketTradingMode),
   });
   let every: number | undefined = undefined;
   const sourceType =
@@ -210,10 +211,8 @@ const useEvery = (marketId: string, skip: boolean) => {
   return every;
 };
 
-const useStartTime = (marketId: string, skip: boolean) => {
+const useStartTime = (marketId: string) => {
   const { data: fundingPeriods } = useFundingPeriodsQuery({
-    pollInterval: 5000,
-    skip,
     variables: {
       marketId: marketId,
       pagination: { first: 1 },
@@ -247,10 +246,8 @@ const useFormatCountdown = (
 
 export const FundingCountdown = ({ marketId }: { marketId: string }) => {
   const now = useNow();
-  const { data: marketTradingMode } = useMarketTradingMode(marketId);
-  const skip = !marketTradingMode || isMarketInAuction(marketTradingMode);
-  const startTime = useStartTime(marketId, skip);
-  const every = useEvery(marketId, skip);
+  const startTime = useStartTime(marketId);
+  const every = useEvery(marketId);
 
   return (
     <div data-testid="funding-countdown">

apps/trading/components/fees-container/fees-container.tsx

@@ -333,7 +333,11 @@ export const CurrentVolume = ({
   return (
     <div className="flex flex-col gap-3 pt-4" data-testid="current-volume">
       <CardStat
-        value={formatNumberRounded(currentVolume)}
+        value={
+          currentVolume.isZero()
+            ? `<${formatNumberRounded(requiredForNextTier)}`
+            : formatNumberRounded(currentVolume)
+        }
         text={t('pastEpochs', 'Past {{count}} epochs', {
           count: windowLength,
         })}

apps/trading/components/rewards-container/rewards-container.spec.tsx

@@ -69,13 +69,11 @@ describe('RewardPot', () => {
         balance: '100',
         asset: rewardAsset,
       },
-      // should include this in total:
       {
         type: AccountType.ACCOUNT_TYPE_VESTED_REWARDS,
         balance: '100',
         asset: rewardAsset,
       },
-      // should include this in total:
       {
         type: AccountType.ACCOUNT_TYPE_VESTED_REWARDS,
         balance: '50',
@@ -140,20 +138,20 @@ describe('RewardPot', () => {
 
     renderComponent(props);
 
+    expect(screen.getByTestId('total-rewards')).toHaveTextContent(
+      `7.00 ${rewardAsset.symbol}`
+    );
+
     expect(screen.getByText(/Locked/).nextElementSibling).toHaveTextContent(
       '2.50'
     );
     expect(screen.getByText(/Vesting/).nextElementSibling).toHaveTextContent(
       '4.50'
     );
+
     expect(
       screen.getByText(/Available to withdraw/).nextElementSibling
     ).toHaveTextContent('1.50');
-
-    // should be sum of the above
-    expect(screen.getByTestId('total-rewards')).toHaveTextContent(
-      `8.50 ${rewardAsset.symbol}`
-    );
   });
 });
 

apps/trading/components/rewards-container/rewards-container.tsx

@@ -62,10 +62,6 @@ export const RewardsContainer = () => {
     },
     // Inclusion of activity streak in query currently fails
     errorPolicy: 'ignore',
-    // polling here so that as rewards are are moved to ACCOUNT_TYPE_VESTED_REWARDS the vesting stats information stays
-    // almost up to sync with accounts updating from subscriptions. There is a chance the data could be out
-    // of sync for 10s if you happen to be on the page at the end of an epoch
-    pollInterval: 10000,
   });
 
   if (!epochData?.epoch || !assetMap) return null;
@@ -299,9 +295,7 @@ export const RewardPot = ({
     : [0];
   const totalVesting = BigNumber.sum.apply(null, vestingBalances);
 
-  const totalRewards = totalLocked
-    .plus(totalVesting)
-    .plus(totalVestedRewardsByRewardAsset);
+  const totalRewards = totalLocked.plus(totalVesting);
 
   let rewardAsset = undefined;
 

apps/trading/e2e/poetry.lock

@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand.
 
 [[package]]
 name = "certifi"
@@ -1161,7 +1161,7 @@ profile = ["pytest-profiling", "snakeviz"]
 type = "git"
 url = "https://github.com/vegaprotocol/vega-market-sim.git/"
 reference = "fix/genesis_panic"
-resolved_reference = "de30d2d4c7a1b81a830527ca76473e23ef59de12"
+resolved_reference = "7ab04931924380db8000544b7f3d65fcb39b5467"
 
 [[package]]
 name = "websocket-client"

apps/trading/e2e/tests/fees/test_fees.py

@@ -641,7 +641,7 @@ def test_fills_maker_fee_tooltip_discount_program(
     row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
     row.locator(COL_FEE).hover()
     expect(page.get_by_test_id(FEE_BREAKDOWN_TOOLTIP)).to_have_text(
-        f"If the market was activeFee revenue to be received by the maker, takers' fee discounts already applied.During continuous trading the maker pays no infrastructure and liquidity fees.Infrastructure fee0.00 tDAILiquidity fee0.00 tDAIMaker fee-{fee} tDAITotal fees-{fee} tDAI"
+        f"If the market was activeThe maker will receive the maker fee.If the market is active the maker will pay zero infrastructure and liquidity fees.Infrastructure fee0.00 tDAILiquidity fee0.00 tDAIMaker fee-{fee} tDAITotal fees-{fee} tDAI"
     )
 
 
@@ -678,5 +678,5 @@ def test_fills_taker_fee_tooltip_discount_program(
     row = page.get_by_test_id(TAB_FILLS).locator(ROW_LOCATOR).first
     row.locator(COL_FEE).hover()
     expect(page.get_by_test_id(FEE_BREAKDOWN_TOOLTIP)).to_have_text(
-        f"If the market was activeFees to be paid by the taker; discounts are already applied.Infrastructure fee{infra_fee} tDAILiquidity fee0.00 tDAIMaker fee{maker_fee} tDAITotal fees{total_fee} tDAI"
+        f"If the market was activeFees to be paid by the taker.Infrastructure fee{infra_fee} tDAILiquidity fee0.00 tDAIMaker fee{maker_fee} tDAITotal fees{total_fee} tDAI"
     )

apps/trading/e2e/tests/market/test_market.py

@@ -208,11 +208,11 @@ def test_auction_uncross_fees(continuous_market, vega: VegaService, page: Page):
     expect(page.locator(COL_ID_FEE)).to_have_text("0.00 tDAI")
     page.locator(COL_ID_FEE).hover()
     expect(page.get_by_test_id("fee-breakdown-tooltip")).to_have_text(
-        "If the market was suspendedDuring auction, half the infrastructure and liquidity fees will be paid.Infrastructure fee0.00 tDAILiquidity fee0.00 tDAIMaker fee0.00 tDAITotal fees0.00 tDAI"
+        "If the market was suspendedIf the market is in monitoring auction, half of the infrastructure and liquidity fees will be paid.Infrastructure fee0.00 tDAILiquidity fee0.00 tDAIMaker fee0.00 tDAITotal fees0.00 tDAI"
     )
     change_keys(page, vega, "market_maker")
     expect(page.locator(COL_ID_FEE)).to_have_text("0.00 tDAI")
     page.locator(COL_ID_FEE).hover()
     expect(page.get_by_test_id("fee-breakdown-tooltip")).to_have_text(
-        "If the market was suspendedDuring auction, half the infrastructure and liquidity fees will be paid.Infrastructure fee0.00 tDAILiquidity fee0.00 tDAIMaker fee0.00 tDAITotal fees0.00 tDAI"
+        "If the market was suspendedIf the market is in monitoring auction, half of the infrastructure and liquidity fees will be paid.Infrastructure fee0.00 tDAILiquidity fee0.00 tDAIMaker fee0.00 tDAITotal fees0.00 tDAI"
     )

apps/trading/e2e/tests/market/test_market_info.py

@@ -280,7 +280,7 @@ def test_market_info_proposal(page: Page, vega: VegaService):
         "href", re.compile(r"(\/proposals\/propose\/update-market)")
     )
 
-@pytest.mark.skip("tbd-market-sim")
+
 def test_market_info_succession_line(page: Page, vega: VegaService):
     page.get_by_test_id(market_title_test_id).get_by_text("Succession line").click()
     market_id = vega.find_market_id("BTC:DAI_2023")

apps/trading/e2e/tests/perpetual_market/test_perpetuals.py

@@ -141,8 +141,8 @@ def test_perps_market_terminated(page: Page, vega: VegaService):
     page.goto(f"/#/markets/{perpetual_market}")
     # TODO change back to have text once bug #5465 is fixed
     expect(page.get_by_test_id("market-price")).to_have_text("Mark Price100.00")
-    expect(page.get_by_test_id("market-change")).to_contain_text("Change (24h)")
-    expect(page.get_by_test_id("market-volume")).to_contain_text("Volume (24h)")
+    expect(page.get_by_test_id("market-change")).to_contain_text("Change (24h)-")
+    expect(page.get_by_test_id("market-volume")).to_contain_text("Volume (24h)-")
     expect(page.get_by_test_id("market-trading-mode")).to_have_text(
         "Trading modeNo trading"
     )

apps/trading/pages/_document.page.tsx

@@ -13,7 +13,7 @@ export default function Document() {
         {/* preload fonts */}
         <link
           rel="preload"
-          href="/AlphaLyrae.woff2"
+          href="/AlphaLyrae-Medium.woff2"
           as="font"
           type="font/woff2"
         />

apps/trading/pages/styles.css

@@ -4,7 +4,8 @@
 /** Load AlphaLyrae font */
 @font-face {
   font-family: AlphaLyrae;
-  src: url('/AlphaLyrae.woff2') format('woff2');
+  src: url('/AlphaLyrae-Medium.woff2') format('woff2'),
+    url('/AlphaLyrae-Medium.woff') format('woff');
 }
 
 @tailwind base;

libs/data-provider/src/generic-data-provider.ts

@@ -7,7 +7,6 @@ import type {
   FetchResult,
   ErrorPolicy,
   ApolloQueryResult,
-  QueryOptions,
 } from '@apollo/client';
 import type { GraphQLErrors } from '@apollo/client/errors';
 import type { Subscription } from 'zen-observable-ts';
@@ -159,7 +158,6 @@ interface DataProviderParams<
   };
   fetchPolicy?: FetchPolicy;
   resetDelay?: number;
-  pollInterval?: number;
   additionalContext?: Record<string, unknown>;
   errorPolicyGuard?: (graphqlErrors: GraphQLErrors) => boolean;
   getQueryVariables?: (variables: Variables) => QueryVariables;
@@ -200,7 +198,6 @@ function makeDataProviderInternal<
   errorPolicyGuard,
   getQueryVariables,
   getSubscriptionVariables,
-  pollInterval,
 }: DataProviderParams<
   QueryData,
   Data,
@@ -225,7 +222,6 @@ function makeDataProviderInternal<
   let client: ApolloClient<object>;
   let subscription: Subscription[] | undefined;
   let pageInfo: PageInfo | null = null;
-  let watchQuerySubscription: Subscription | null = null;
 
   // notify single callback about current state, delta is passes optionally only if notify was invoked onNext
   const notify = (
@@ -247,100 +243,34 @@ function makeDataProviderInternal<
     callbacks.forEach((callback) => notify(callback, updateData));
   };
 
-  const getQueryOptions = (
-    pagination?: Pagination,
-    policy?: ErrorPolicy
-  ): QueryOptions<OperationVariables, QueryData> => ({
-    query,
-    variables: {
-      ...(getQueryVariables ? getQueryVariables(variables) : variables),
-      ...(pagination && {
-        // let the variables pagination be prior to provider param
-        pagination: {
-          ...pagination,
-          ...(variables?.['pagination'] ?? null),
-        },
-      }),
-    },
-    fetchPolicy: fetchPolicy || 'no-cache',
-    context: additionalContext,
-    errorPolicy: policy || 'none',
-    pollInterval,
-  });
-
-  const onNext = (res: ApolloQueryResult<QueryData>) => {
-    data = getData(res.data, variables);
-    if (data && pagination) {
-      if (!(data instanceof Array)) {
-        throw new Error(
-          'data needs to be instance of Edge[] when using pagination'
-        );
-      }
-      pageInfo = pagination.getPageInfo(res.data);
-    }
-    // if there was some updates received from subscription during initial query loading apply them on just received data
-    if (update && data && updateQueue && updateQueue.length > 0) {
-      while (updateQueue.length) {
-        const delta = updateQueue.shift();
-        if (delta) {
-          setData(update(data, delta, reload, variables));
-        }
-      }
-    }
-    loaded = true;
-  };
-
-  const onError = (e: Error) => {
-    if (isNotFoundGraphQLError(e, ['party'])) {
-      data = getData(null, variables);
-      loaded = true;
-      return;
-    }
-    // if error will occur data provider stops subscription
-    error = e;
-    subscriptionUnsubscribe();
-  };
-
-  const onComplete = (isUpdate?: boolean) => {
-    loading = false;
-    notifyAll({ isUpdate });
-  };
-
-  const callWatchQuery = (pagination?: Pagination, policy?: ErrorPolicy) => {
-    let onNextCalled = false;
-    try {
-      watchQuerySubscription = client
-        .watchQuery(getQueryOptions(pagination, policy))
-        .subscribe(
-          (res) => {
-            onNext(res);
-            onComplete(onNextCalled);
-            onNextCalled = true;
-          },
-          (error) => {
-            onError(error as Error);
-            onComplete();
-          }
-        );
-    } catch (e) {
-      onError(e as Error);
-      onComplete();
-    }
-  };
-
-  const callQuery = (
+  const call = (
     pagination?: Pagination,
     policy?: ErrorPolicy
   ): Promise<ApolloQueryResult<QueryData>> =>
     client
-      .query<QueryData>(getQueryOptions(pagination, policy))
+      .query<QueryData>({
+        query,
+        variables: {
+          ...(getQueryVariables ? getQueryVariables(variables) : variables),
+          ...(pagination && {
+            // let the variables pagination be prior to provider param
+            pagination: {
+              ...pagination,
+              ...(variables?.['pagination'] ?? null),
+            },
+          }),
+        },
+        fetchPolicy: fetchPolicy || 'no-cache',
+        context: additionalContext,
+        errorPolicy: policy || 'none',
+      })
       .catch((err) => {
         if (
           err.graphQLErrors &&
           errorPolicyGuard &&
           errorPolicyGuard(err.graphQLErrors)
         ) {
-          return callQuery(pagination, 'ignore');
+          return call(pagination, 'ignore');
         } else {
           throw err;
         }
@@ -364,7 +294,7 @@ function makeDataProviderInternal<
       }
     }
 
-    const res = await callQuery(paginationVariables);
+    const res = await call(paginationVariables);
 
     const insertionData = getData(res.data, variables);
     const insertionPageInfo = pagination.getPageInfo(res.data);
@@ -399,7 +329,7 @@ function makeDataProviderInternal<
             variables,
             fetchPolicy,
           })
-          .subscribe(subscriptionOnNext, subscriptionOnError)
+          .subscribe(onNext, onError)
       );
   };
 
@@ -417,16 +347,39 @@ function makeDataProviderInternal<
     const paginationVariables = pagination
       ? { first: pagination.first }
       : undefined;
-    if (pollInterval) {
-      callWatchQuery();
-      return;
-    }
     try {
-      onNext(await callQuery(paginationVariables));
+      const res = await call(paginationVariables);
+      data = getData(res.data, variables);
+      if (data && pagination) {
+        if (!(data instanceof Array)) {
+          throw new Error(
+            'data needs to be instance of Edge[] when using pagination'
+          );
+        }
+        pageInfo = pagination.getPageInfo(res.data);
+      }
+      // if there was some updates received from subscription during initial query loading apply them on just received data
+      if (update && data && updateQueue && updateQueue.length > 0) {
+        while (updateQueue.length) {
+          const delta = updateQueue.shift();
+          if (delta) {
+            setData(update(data, delta, reload, variables));
+          }
+        }
+      }
+      loaded = true;
     } catch (e) {
-      onError(e as Error);
+      if (isNotFoundGraphQLError(e as Error, ['party'])) {
+        data = getData(null, variables);
+        loaded = true;
+        return;
+      }
+      // if error will occur data provider stops subscription
+      error = e as Error;
+      subscriptionUnsubscribe();
     } finally {
-      onComplete(isUpdate);
+      loading = false;
+      notifyAll({ isUpdate });
     }
   };
 
@@ -446,7 +399,7 @@ function makeDataProviderInternal<
     }
   };
 
-  const subscriptionOnNext = ({
+  const onNext = ({
     data: subscriptionData,
   }: FetchResult<SubscriptionData>) => {
     if (!subscriptionData || !getDelta || !update) {
@@ -465,7 +418,7 @@ function makeDataProviderInternal<
     }
   };
 
-  const subscriptionOnError = (e: Error) => {
+  const onError = (e: Error) => {
     error = e;
     subscriptionUnsubscribe();
     notifyAll();
@@ -489,9 +442,6 @@ function makeDataProviderInternal<
   };
 
   const reset = () => {
-    if (watchQuerySubscription) {
-      watchQuerySubscription.unsubscribe();
-    }
     subscriptionUnsubscribe();
     initialized = false;
     data = null;

libs/fills/src/lib/fills-table.tsx

@@ -87,9 +87,9 @@ export const FillsTable = forwardRef<AgGridReact, Props>(
           colId: 'fee',
           field: 'market',
           valueFormatter: formatFee(partyId),
-          tooltipComponent: FeesBreakdownTooltip,
           type: 'rightAligned',
           tooltipField: 'market',
+          tooltipComponent: FeesBreakdownTooltip,
           tooltipComponentParams: { partyId },
         },
         {
@@ -97,13 +97,13 @@ export const FillsTable = forwardRef<AgGridReact, Props>(
           colId: 'fee-discount',
           field: 'market',
           valueFormatter: formatFeeDiscount(partyId),
+          type: 'rightAligned',
+          // return null to disable tooltip if fee discount is 0 or empty
           tooltipValueGetter: ({ valueFormatted, value }) => {
             return valueFormatted && /[1-9]/.test(valueFormatted)
               ? valueFormatted
               : null;
           },
-          type: 'rightAligned',
-          // return null to disable tooltip if fee discount is 0 or empty
           cellRenderer: ({
             value,
             valueFormatted,
@@ -146,7 +146,7 @@ export const FillsTable = forwardRef<AgGridReact, Props>(
         overlayNoRowsTemplate={t('No fills')}
         getRowId={({ data }) => data?.id}
         tooltipShowDelay={0}
-        tooltipHideDelay={10000}
+        tooltipHideDelay={2000}
         components={{ MarketNameCell }}
         {...props}
       />
@@ -292,27 +292,21 @@ const FeesBreakdownTooltip = ({
       )}
       {role === MAKER && (
         <>
+          <p className="mb-1">{t('The maker will receive the maker fee.')}</p>
           <p className="mb-1">
             {t(
-              `Fee revenue to be received by the maker, takers' fee discounts already applied.`
-            )}
-          </p>
-          <p className="mb-1">
-            {t(
-              'During continuous trading the maker pays no infrastructure and liquidity fees.'
+              'If the market is active the maker will pay zero infrastructure and liquidity fees.'
             )}
           </p>
         </>
       )}
       {role === TAKER && (
-        <p className="mb-1">
-          {t('Fees to be paid by the taker; discounts are already applied.')}
-        </p>
+        <p className="mb-1">{t('Fees to be paid by the taker.')}</p>
       )}
       {(role === '-' || marketState === Schema.MarketState.STATE_SUSPENDED) && (
         <p className="mb-1">
           {t(
-            'During auction, half the infrastructure and liquidity fees will be paid.'
+            'If the market is in monitoring auction, half of the infrastructure and liquidity fees will be paid.'
           )}
         </p>
       )}

libs/i18n/src/locales/en/fills.json

@@ -5,9 +5,9 @@
   "Date": "Date",
   "Fee": "Fee",
   "Fee Discount": "Fee Discount",
-  "Fees to be paid by the taker; discounts are already applied.": "Fees to be paid by the taker; discounts are already applied.",
-  "During continuous trading the maker pays no infrastructure and liquidity fees.": "During continuous trading the maker pays no infrastructure and liquidity fees.",
-  "During auction, half the infrastructure and liquidity fees will be paid.": "During auction, half the infrastructure and liquidity fees will be paid.",
+  "Fees to be paid by the taker.": "Fees to be paid by the taker.",
+  "If the market is active the maker will pay zero infrastructure and liquidity fees.": "If the market is active the maker will pay zero infrastructure and liquidity fees.",
+  "If the market is in monitoring auction, half of the infrastructure and liquidity fees will be paid.": "If the market is in monitoring auction, half of the infrastructure and liquidity fees will be paid.",
   "Infrastructure Fee": "Infrastructure Fee",
   "Market": "Market",
   "No fills": "No fills",

libs/i18n/src/locales/en/governance.json

@@ -298,8 +298,8 @@
   "liquidityOnsenIntro": "Earn rewards for providing liquidity on the",
   "liquidityOnsenLinkText": "SushiSwap Onsen Menu",
   "liquidityProviderVote": "Liquidity provider vote",
-  "liquidityProviderVotesAgainst": "LP share against",
-  "liquidityProviderVotesFor": "LP share for",
+  "liquidityProviderVotesAgainst": "LP votes against",
+  "liquidityProviderVotesFor": "LP votes for",
   "liquidityRewardsTitle": "Active liquidity rewards",
   "liquidityRewardsTitlePrevious": "Previous liquidity rewards",
   "liquidityStakedBalance": "SLP token balance",
@@ -383,7 +383,7 @@
   "MoreMarketsInfo": "To see Explorer data on existing markets visit",
   "MoreNetParamsInfo": "To see Explorer data on network params visit",
   "MoreProposalsInfo": "To see Explorer data on proposals visit",
-  "multisigContractIncorrect": "was incorrectly configured as at the end of the last epoch so rewards were penalised. Validator and delegator rewards will continue to be penalised until this is resolved.",
+  "multisigContractIncorrect": "is incorrectly configured. Validator and delegator rewards will be penalised until this is resolved.",
   "multisigContractLink": "Ethereum Multisig Contract",
   "multisigPenalty": "Multisig penalty",
   "myPendingStake": "My pending stake",
@@ -759,7 +759,7 @@
   "Total stake": "Total stake",
   "Total supply": "Total supply",
   "totalDistributed": "Total distributed",
-  "totalLiquidityProviderTokensVoted": "Total LP share voted",
+  "totalLiquidityProviderTokensVoted": "Total LP tokens voted",
   "totalPenalties": "Total penalties",
   "TotalPenaltiesDescription": "Total of penalties taking into account performance (considering proportion of blocks proposed against the number of blocks the validator was expected to propose) and any overstaking.",
   "totalStake": "Total stake",

libs/markets/src/lib/components/market-info/market-info-data-provider.ts

@@ -34,7 +34,6 @@ export const marketInfoProvider = makeDataProvider<
   query: MarketInfoDocument,
   getData,
   errorPolicyGuard: marketDataErrorPolicyGuard,
-  pollInterval: 5000,
 });
 
 export const marketInfoWithDataProvider = makeDerivedDataProvider<

libs/proposals/src/lib/protocol-upgrade-proposals/use-block-rising.ts

@@ -68,13 +68,10 @@ export const useBlockRising = (skip = false) => {
         }
       );
 
-      const heights = compact([...results.map((r) => r?.blockHeight)]);
-
-      // Handles TendermintErrorResponses
-      if (blockInfo && 'result' in blockInfo) {
-        heights.push(blockInfo.result.block.header.height);
-      }
-
+      const heights = compact([
+        ...results.map((r) => r?.blockHeight),
+        blockInfo?.result.block.header.height,
+      ]);
       const current = max(heights);
       if (current && Number(current) > prev) {
         setBlock(Number(current));

libs/react-helpers/src/hooks/use-fetch.ts

@@ -76,26 +76,16 @@ export const useFetch = <T>(
             ...options,
             body: body ? body : options?.body,
           });
-
-          data = (await response.json()) as T;
-
-          if (!response.ok && !data) {
+          if (!response.ok) {
             throw new Error(response.statusText);
           }
 
+          data = (await response.json()) as T;
           // @ts-ignore - 'error' in data
-          if (data && data.error) {
-            // Explicit check for TendermintErrorResponse style error
-            // @ts-ignore - 'error' in data
-            if (data.error.data) {
-              // @ts-ignore - 'error' in data
-
-              throw new Error(data.error.data);
-            }
+          if (data && 'error' in data) {
             // @ts-ignore - data.error
             throw new Error(data.error);
           }
-
           if (cancelRequest.current) return;
 
           dispatch({ type: ActionType.FETCHED, payload: data });

libs/tendermint/src/lib/use-block-info.ts

@@ -1,11 +1,6 @@
 import { useEnvironment } from '@vegaprotocol/environment';
 import { useFetch } from '@vegaprotocol/react-helpers';
-import type {
-  TendermintBlockResponse,
-  TendermintErrorResponse,
-} from '../types';
-
-type TendermintResponse = TendermintBlockResponse | TendermintErrorResponse;
+import { type TendermintBlockResponse } from '../types';
 
 export const useBlockInfo = (blockHeight?: number, canFetch = true) => {
   const { TENDERMINT_URL } = useEnvironment();
@@ -15,7 +10,7 @@ export const useBlockInfo = (blockHeight?: number, canFetch = true) => {
     TENDERMINT_URL && blockHeight && !isNaN(blockHeight) && canFetch
   );
 
-  const { state, refetch } = useFetch<TendermintResponse>(
+  const { state, refetch } = useFetch<TendermintBlockResponse>(
     url,
     { cache: 'force-cache' },
     canFetchData

libs/tendermint/src/types.ts

@@ -7,16 +7,6 @@ export type TendermintBlockResponse = {
   };
 };
 
-export type TendermintErrorResponse = {
-  jsonrpc: string;
-  id: number;
-  error: {
-    code: number;
-    message: string;
-    data: string;
-  };
-};
-
 type Id = {
   hash: string;
   parts: {
@@ -44,7 +34,7 @@ type Header = {
   proposer_address: string;
 };
 
-export type Block = {
+type Block = {
   header: Header;
   data: {
     txs: string[];