feat: add marketCreationQuantumMultiple into tooltip

apps/governance/src/i18n/translations/dev.json

@@ -458,7 +458,7 @@
   "rewardsColLiquidityProvisionHeader": "LIQUIDITY PROVISION",
   "rewardsColLiquidityProvisionTooltip": "Liquidity provision rewards are distributed based on how much you have earned in liquidity fees, funded by a liquidity reward pool for that market",
   "rewardsColMarketCreationHeader": "MARKET CREATION",
-  "rewardsColMarketCreationTooltip": "Market creation rewards are paid out to the creator of any market that exceeds a set threshold of cumulative volume in a given epoch, currently [rewards.marketCreationQuantumMultiple]",
+  "rewardsColMarketCreationTooltip": "Market creation rewards are paid out to the creator of any market that exceeds a set threshold of cumulative volume in a given epoch, currently {{marketCreationQuantumMultiple}}",
   "rewardsColTotalHeader": "TOTAL",
   "ofTotalDistributed": "of total distributed",
   "checkBackSoon": "Check back soon",

apps/governance/src/routes/rewards/epoch-individual-rewards/epoch-individual-rewards-table.spec.tsx

@@ -42,7 +42,10 @@ describe('EpochIndividualRewardsTable', () => {
   it('should render correctly', () => {
     const { getByTestId } = render(
       <AppStateProvider>
-        <EpochIndividualRewardsTable data={mockData} />
+        <EpochIndividualRewardsTable
+          data={mockData}
+          marketCreationQuantumMultiple={'1000'}
+        />
       </AppStateProvider>
     );
     expect(getByTestId('epoch-individual-rewards-table')).toBeInTheDocument();

apps/governance/src/routes/rewards/epoch-individual-rewards/epoch-individual-rewards-table.tsx

@@ -10,6 +10,7 @@ import { useTranslation } from 'react-i18next';
 
 interface EpochIndividualRewardsGridProps {
   data: EpochIndividualReward;
+  marketCreationQuantumMultiple: string | null;
 }
 
 interface RewardItemProps {
@@ -80,9 +81,11 @@ const RewardItem = ({
 
 export const EpochIndividualRewardsTable = ({
   data,
+  marketCreationQuantumMultiple,
 }: EpochIndividualRewardsGridProps) => {
   return (
     <RewardsTable
+      marketCreationQuantumMultiple={marketCreationQuantumMultiple}
       dataTestId="epoch-individual-rewards-table"
       epoch={Number(data.epoch)}
     >

apps/governance/src/routes/rewards/epoch-individual-rewards/epoch-individual-rewards.tsx

@@ -9,6 +9,7 @@ import { useVegaWallet } from '@vegaprotocol/wallet';
 import { EpochIndividualRewardsTable } from './epoch-individual-rewards-table';
 import { generateEpochIndividualRewardsList } from './generate-epoch-individual-rewards-list';
 import { calculateEpochOffset } from '../../../lib/epoch-pagination';
+import { useNetworkParam } from '@vegaprotocol/network-parameters';
 
 const EPOCHS_PAGE_SIZE = 10;
 
@@ -26,6 +27,9 @@ export const EpochIndividualRewards = ({
   const { t } = useTranslation();
   const { pubKey } = useVegaWallet();
   const { delegationsPagination } = ENV;
+  const { param: marketCreationQuantumMultiple } = useNetworkParam(
+    'rewards_marketCreationQuantumMultiple'
+  );
 
   const { data, loading, error, refetch } = useRewardsQuery({
     notifyOnNetworkStatusChange: true,
@@ -96,6 +100,7 @@ export const EpochIndividualRewards = ({
           {epochIndividualRewardSummaries.map(
             (epochIndividualRewardSummary) => (
               <EpochIndividualRewardsTable
+                marketCreationQuantumMultiple={marketCreationQuantumMultiple}
                 data={epochIndividualRewardSummary}
               />
             )

apps/governance/src/routes/rewards/epoch-total-rewards/epoch-total-rewards-table.spec.tsx

@@ -65,7 +65,10 @@ describe('EpochTotalRewardsTable', () => {
   it('should render correctly', () => {
     const { getByTestId } = render(
       <AppStateProvider>
-        <EpochTotalRewardsTable data={mockData} />
+        <EpochTotalRewardsTable
+          data={mockData}
+          marketCreationQuantumMultiple={'1000'}
+        />
       </AppStateProvider>
     );
     expect(getByTestId('epoch-total-rewards-table')).toBeInTheDocument();

apps/governance/src/routes/rewards/epoch-total-rewards/epoch-total-rewards-table.tsx

@@ -9,6 +9,7 @@ import type { EpochTotalSummary } from './generate-epoch-total-rewards-list';
 
 interface EpochTotalRewardsGridProps {
   data: EpochTotalSummary;
+  marketCreationQuantumMultiple: string | null;
 }
 
 interface RewardItemProps {
@@ -45,9 +46,14 @@ const RewardItem = ({ value, dataTestId, last }: RewardItemProps) => (
 
 export const EpochTotalRewardsTable = ({
   data,
+  marketCreationQuantumMultiple,
 }: EpochTotalRewardsGridProps) => {
   return (
-    <RewardsTable dataTestId="epoch-total-rewards-table" epoch={data.epoch}>
+    <RewardsTable
+      marketCreationQuantumMultiple={marketCreationQuantumMultiple}
+      dataTestId="epoch-total-rewards-table"
+      epoch={data.epoch}
+    >
       {Array.from(data.assetRewards.values()).map(
         ({ name, rewards, totalAmount }, i) => (
           <div className="contents" key={i}>

apps/governance/src/routes/rewards/epoch-total-rewards/epoch-total-rewards.tsx

@@ -6,6 +6,7 @@ import { useEpochAssetsRewardsQuery } from '../home/__generated__/Rewards';
 import { generateEpochTotalRewardsList } from './generate-epoch-total-rewards-list';
 import { EpochTotalRewardsTable } from './epoch-total-rewards-table';
 import { calculateEpochOffset } from '../../../lib/epoch-pagination';
+import { useNetworkParam } from '@vegaprotocol/network-parameters';
 
 const EPOCHS_PAGE_SIZE = 10;
 
@@ -18,6 +19,10 @@ export const EpochTotalRewards = ({ currentEpoch }: EpochTotalRewardsProps) => {
   const epochId = Number(currentEpoch.id) - 1;
   const totalPages = Math.ceil(epochId / EPOCHS_PAGE_SIZE);
   const { t } = useTranslation();
+  const { param: marketCreationQuantumMultiple } = useNetworkParam(
+    'rewards_marketCreationQuantumMultiple'
+  );
+  console.log(marketCreationQuantumMultiple);
   const [page, setPage] = useState(1);
   const { data, loading, error, refetch } = useEpochAssetsRewardsQuery({
     notifyOnNetworkStatusChange: true,
@@ -70,7 +75,11 @@ export const EpochTotalRewards = ({ currentEpoch }: EpochTotalRewardsProps) => {
         >
           {Array.from(epochTotalRewardSummaries.values()).map(
             (epochTotalSummary, index) => (
-              <EpochTotalRewardsTable data={epochTotalSummary} key={index} />
+              <EpochTotalRewardsTable
+                marketCreationQuantumMultiple={marketCreationQuantumMultiple}
+                data={epochTotalSummary}
+                key={index}
+              />
             )
           )}
           <Pagination

apps/governance/src/routes/rewards/shared-rewards-table-assets/shared-rewards-table-assets.tsx

@@ -77,7 +77,11 @@ const ColumnHeader = ({
   </div>
 );
 
-const ColumnHeaders = () => {
+const ColumnHeaders = ({
+  marketCreationQuantumMultiple,
+}: {
+  marketCreationQuantumMultiple: string | null;
+}) => {
   const { t } = useTranslation();
   return (
     <div className="contents">
@@ -89,7 +93,9 @@ const ColumnHeaders = () => {
         <ColumnHeader
           key={columnTitle}
           title={t(columnTitle)}
-          tooltipContent={t(description)}
+          tooltipContent={t(description, {
+            marketCreationQuantumMultiple,
+          })}
           className={headerGridItemStyles()}
         />
       ))}
@@ -105,6 +111,7 @@ export interface RewardTableProps {
   dataTestId: string;
   epoch: number;
   children: ReactNode;
+  marketCreationQuantumMultiple: string | null;
 }
 
 // Rewards table children will be the row items. Make sure they contain
@@ -113,12 +120,15 @@ export const RewardsTable = ({
   dataTestId,
   epoch,
   children,
+  marketCreationQuantumMultiple,
 }: RewardTableProps) => (
   <div data-testid={dataTestId} className="mb-12">
     <SubHeading title={`EPOCH ${epoch}`} />
 
     <div className={gridStyles}>
-      <ColumnHeaders />
+      <ColumnHeaders
+        marketCreationQuantumMultiple={marketCreationQuantumMultiple}
+      />
       {children}
     </div>
   </div>

libs/candles-chart/src/lib/data-source.spec.ts

@@ -1,280 +0,0 @@
-import { VegaDataSource } from './data-source';
-import type { ApolloClient } from '@apollo/client';
-import { Interval } from 'pennant';
-import type {
-  CandleFieldsFragment,
-  CandlesQuery,
-} from './__generated__/Candles';
-import * as Schema from '@vegaprotocol/types';
-
-const returnDataMocks = (nodes: CandleFieldsFragment[]): CandlesQuery => {
-  return {
-    data: {
-      market: {
-        decimalPlaces: 1,
-        positionDecimalPlaces: 1,
-        candlesConnection: {
-          edges: nodes.map((node) => ({ node })),
-        },
-      },
-    },
-  } as CandlesQuery;
-};
-
-const dataMocks: { [key in Schema.Interval]: Partial<CandleFieldsFragment>[] } =
-  {
-    [Schema.Interval.INTERVAL_I1M]: [
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T12:00:00Z',
-        lastUpdateInPeriod: '',
-        close: '10',
-        volume: '1',
-      },
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T12:05:00Z',
-        lastUpdateInPeriod: '',
-        close: '5',
-        volume: '2',
-      },
-    ],
-    [Schema.Interval.INTERVAL_I5M]: [
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T12:00:00Z',
-        lastUpdateInPeriod: '',
-        close: '10',
-        volume: '1',
-      },
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T12:25:00Z',
-        lastUpdateInPeriod: '',
-        close: '5',
-        volume: '2',
-      },
-    ],
-    [Schema.Interval.INTERVAL_I15M]: [
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T12:00:00Z',
-        lastUpdateInPeriod: '',
-        close: '10',
-        volume: '1',
-      },
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T13:15:00Z',
-        lastUpdateInPeriod: '',
-        close: '5',
-        volume: '2',
-      },
-    ],
-    [Schema.Interval.INTERVAL_I1H]: [
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T12:00:00Z',
-        lastUpdateInPeriod: '',
-        close: '10',
-        volume: '1',
-      },
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T17:00:00Z',
-        lastUpdateInPeriod: '',
-        close: '5',
-        volume: '2',
-      },
-    ],
-    [Schema.Interval.INTERVAL_I6H]: [
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T12:00:00Z',
-        lastUpdateInPeriod: '',
-        close: '10',
-        volume: '1',
-      },
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-11T18:00:00Z',
-        lastUpdateInPeriod: '',
-        close: '5',
-        volume: '2',
-      },
-    ],
-    [Schema.Interval.INTERVAL_I1D]: [
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T00:00:00Z',
-        lastUpdateInPeriod: '',
-        close: '10',
-        volume: '1',
-      },
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-15T00:00:00Z',
-        lastUpdateInPeriod: '',
-        close: '5',
-        volume: '2',
-      },
-    ],
-    [Schema.Interval.INTERVAL_BLOCK]: [],
-  };
-
-describe('VegaDataSource', () => {
-  const marketId = 'marketId';
-  const partyId = 'partyId';
-  const client = {
-    query: jest.fn().mockImplementation(({ variables: { interval } }) => {
-      return returnDataMocks(
-        dataMocks[interval as Schema.Interval] as CandleFieldsFragment[]
-      );
-    }),
-  } as unknown as ApolloClient<object>;
-
-  it('should be properly initialized', () => {
-    const dataSource = new VegaDataSource(client, marketId, partyId);
-    expect(dataSource).toBeInstanceOf(VegaDataSource);
-    expect(dataSource.onReady).toBeDefined();
-    expect(dataSource.query).toBeDefined();
-    expect(dataSource.subscribeData).toBeDefined();
-    expect(dataSource.unsubscribeData).toBeDefined();
-    expect(dataSource.decimalPlaces).toBeDefined();
-    expect(dataSource.positionDecimalPlaces).toBeDefined();
-  });
-
-  describe('query should return continuous data', () => {
-    it('when interval is I1M', async () => {
-      const dataSource = new VegaDataSource(client, marketId, partyId);
-      const data = await dataSource.query(Interval.I1M, '');
-      expect(data).toHaveLength(6);
-      expect(data[1]).toStrictEqual({
-        date: new Date('2023-05-10T12:01:00Z'),
-        high: 1,
-        low: 1,
-        open: 1,
-        close: 1,
-        volume: 0,
-      });
-      expect(data[2]).toStrictEqual({
-        date: new Date('2023-05-10T12:02:00Z'),
-        high: 1,
-        low: 1,
-        open: 1,
-        close: 1,
-        volume: 0,
-      });
-    });
-
-    it('when interval is I5M', async () => {
-      const dataSource = new VegaDataSource(client, marketId, partyId);
-      const data = await dataSource.query(Interval.I5M, '');
-      expect(data).toHaveLength(6);
-      expect(data[1]).toStrictEqual({
-        date: new Date('2023-05-10T12:05:00Z'),
-        high: 1,
-        low: 1,
-        open: 1,
-        close: 1,
-        volume: 0,
-      });
-      expect(data[2]).toStrictEqual({
-        date: new Date('2023-05-10T12:10:00Z'),
-        high: 1,
-        low: 1,
-        open: 1,
-        close: 1,
-        volume: 0,
-      });
-    });
-
-    it('when interval is I15M', async () => {
-      const dataSource = new VegaDataSource(client, marketId, partyId);
-      const data = await dataSource.query(Interval.I15M, '');
-      expect(data).toHaveLength(6);
-      expect(data[1]).toStrictEqual({
-        date: new Date('2023-05-10T12:15:00Z'),
-        high: 1,
-        low: 1,
-        open: 1,
-        close: 1,
-        volume: 0,
-      });
-      expect(data[2]).toStrictEqual({
-        date: new Date('2023-05-10T12:30:00Z'),
-        high: 1,
-        low: 1,
-        open: 1,
-        close: 1,
-        volume: 0,
-      });
-    });
-
-    it('when interval is I1H', async () => {
-      const dataSource = new VegaDataSource(client, marketId, partyId);
-      const data = await dataSource.query(Interval.I1H, '');
-      expect(data).toHaveLength(6);
-      expect(data[1]).toStrictEqual({
-        date: new Date('2023-05-10T13:00:00Z'),
-        high: 1,
-        low: 1,
-        open: 1,
-        close: 1,
-        volume: 0,
-      });
-      expect(data[2]).toStrictEqual({
-        date: new Date('2023-05-10T14:00:00Z'),
-        high: 1,
-        low: 1,
-        open: 1,
-        close: 1,
-        volume: 0,
-      });
-    });
-
-    it('when interval is I6H', async () => {
-      const dataSource = new VegaDataSource(client, marketId, partyId);
-      const data = await dataSource.query(Interval.I6H, '');
-      expect(data).toHaveLength(6);
-      expect(data[1]).toStrictEqual({
-        date: new Date('2023-05-10T18:00:00Z'),
-        high: 1,
-        low: 1,
-        open: 1,
-        close: 1,
-        volume: 0,
-      });
-      expect(data[2]).toStrictEqual({
-        date: new Date('2023-05-11T00:00:00Z'),
-        high: 1,
-        low: 1,
-        open: 1,
-        close: 1,
-        volume: 0,
-      });
-    });
-
-    it('when interval is I1D', async () => {
-      const dataSource = new VegaDataSource(client, marketId, partyId);
-      const data = await dataSource.query(Interval.I1D, '');
-      expect(data).toHaveLength(6);
-      expect(data[1]).toStrictEqual({
-        date: new Date('2023-05-11T00:00:00Z'),
-        high: 1,
-        low: 1,
-        open: 1,
-        close: 1,
-        volume: 0,
-      });
-      expect(data[2]).toStrictEqual({
-        date: new Date('2023-05-12T00:00:00Z'),
-        high: 1,
-        low: 1,
-        open: 1,
-        close: 1,
-        volume: 0,
-      });
-    });
-  });
-});

libs/candles-chart/src/lib/data-source.ts

@@ -1,11 +1,4 @@
 import type { ApolloClient } from '@apollo/client';
-import type { Duration } from 'date-fns';
-import {
-  add,
-  differenceInDays,
-  differenceInHours,
-  differenceInMinutes,
-} from 'date-fns';
 import type { Candle, DataSource } from 'pennant';
 import { Interval as PennantInterval } from 'pennant';
 
@@ -160,6 +153,7 @@ export class VegaDataSource implements DataSource {
         },
         fetchPolicy: 'no-cache',
       });
+
       if (data?.market?.candlesConnection?.edges) {
         const decimalPlaces = data.market.decimalPlaces;
         const positionDecimalPlaces = data.market.positionDecimalPlaces;
@@ -169,8 +163,8 @@ export class VegaDataSource implements DataSource {
           .filter((node): node is CandleFieldsFragment => !!node)
           .map((node) =>
             parseCandle(node, decimalPlaces, positionDecimalPlaces)
-          )
-          .reduce(checkGranulationContinuity(interval), []);
+          );
+
         return candles;
       } else {
         return [];
@@ -219,85 +213,6 @@ export class VegaDataSource implements DataSource {
   }
 }
 
-const getDuration = (
-  interval: PennantInterval,
-  multiplier: number
-): Duration => {
-  switch (interval) {
-    case 'I1D':
-      return {
-        days: 1 * multiplier,
-      };
-    case 'I1H':
-      return {
-        hours: 1 * multiplier,
-      };
-    case 'I1M':
-      return {
-        minutes: 1 * multiplier,
-      };
-    case 'I5M':
-      return {
-        minutes: 5 * multiplier,
-      };
-    case 'I6H':
-      return {
-        hours: 6 * multiplier,
-      };
-    case 'I15M':
-      return {
-        minutes: 15 * multiplier,
-      };
-  }
-};
-
-const getDifference = (
-  interval: PennantInterval,
-  dateLeft: Date,
-  dateRight: Date
-): number => {
-  switch (interval) {
-    case 'I1D':
-      return differenceInDays(dateRight, dateLeft);
-    case 'I6H':
-      return differenceInHours(dateRight, dateLeft) / 6;
-    case 'I1H':
-      return differenceInHours(dateRight, dateLeft);
-    case 'I15M':
-      return differenceInMinutes(dateRight, dateLeft) / 15;
-    case 'I5M':
-      return differenceInMinutes(dateRight, dateLeft) / 5;
-    case 'I1M':
-      return differenceInMinutes(dateRight, dateLeft);
-  }
-};
-
-const checkGranulationContinuity =
-  (interval: PennantInterval) =>
-  (agg: Candle[], candle: Candle, i: number): Candle[] => {
-    if (agg.length && i) {
-      const previous = agg[agg.length - 1];
-      const difference = getDifference(interval, previous.date, candle.date);
-      if (difference > 1) {
-        for (let j = 1; j < difference; j++) {
-          const duration = getDuration(interval, j);
-          const newStartDate = add(previous.date, duration);
-          const newParsedCandle: Candle = {
-            date: newStartDate,
-            high: previous.close,
-            low: previous.close,
-            open: previous.close,
-            close: previous.close,
-            volume: 0,
-          };
-          agg.push(newParsedCandle);
-        }
-      }
-    }
-    agg.push(candle);
-    return agg;
-  };
-
 function parseCandle(
   candle: CandleFieldsFragment,
   decimalPlaces: number,

libs/network-parameters/src/use-network-params.ts

@@ -8,6 +8,8 @@ import {
 export const NetworkParams = {
   blockchains_ethereumConfig: 'blockchains_ethereumConfig',
   reward_asset: 'reward_asset',
+  rewards_marketCreationQuantumMultiple:
+    'rewards_marketCreationQuantumMultiple',
   reward_staking_delegation_payoutDelay:
     'reward_staking_delegation_payoutDelay',
   governance_proposal_market_minVoterBalance: