chore: fix tests

.github/workflows/publish-dist.yml

@@ -119,7 +119,7 @@ jobs:
         run: |
           echo "Check ipfs-hash"
           docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat /ipfs-hash
-          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat /ipfs-hash > ${{ matrix.app }}-ipfs-hash
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat /ipfs-hash > ${{ matirx.app }}-ipfs-hash
           echo "List html directory"
           docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local sh -c 'apk add --update tree; tree /usr/share/nginx/html'
 

Makefile

@@ -1,20 +1,20 @@
 .PHONY: latest-release
 latest-release:
-	gh release list | head -n 1 | awk '{print $1}'
+  gh release list | head -n 1 | awk '{print $1}'
 
 .PHONY: show-latest-release
 show-latest-release:
-	gh release view `gh release list | head -n 1 | awk '{print $1}'`
+  gh release view `gh release list | head -n 1 | awk '{print $1}'`
 
 .PHONY: recalculate-ipfs
 recalculate-ipfs:
-	echo "ipfs hash inside the image"
-	docker run --rm ${TAG} cat /ipfs-hash
-	echo "recalculating ipfs hash"
-	docker run --rm ${TAG} ipfs add -rw /usr/share/nginx/html
+  echo "ipfs hash inside the image"
+  docker run --rm ${TAG} cat /ipfs-hash
+  echo "recalculating ipfs hash"
+  docker run --rm ${TAG} ipfs add -rw /usr/share/nginx/html
 
 .PHONY: eject-ipfs-hash
 unpack:
-	docker create --name=dist ${TAG}
-	docker cp dist:/usr/share/nginx/html dist
-	docker rm dist
+  docker create --name=dist ${TAG}
+  docker cp dist:/usr/share/nginx/html dist
+  docker rm dist

apps/explorer/.env.mainnet

@@ -2,7 +2,6 @@
 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
-NX_VEGA_URL=https://api.vega.community/graphql
 NX_VEGA_ENV=MAINNET
 NX_BLOCK_EXPLORER=https://be.vega.community/rest/
 NX_ETHERSCAN_URL=https://etherscan.io

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

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

@@ -10,7 +10,6 @@ import { useTranslation } from 'react-i18next';
 
 interface EpochIndividualRewardsGridProps {
   data: EpochIndividualReward;
-  marketCreationQuantumMultiple: string | null;
 }
 
 interface RewardItemProps {
@@ -81,11 +80,9 @@ 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,7 +9,6 @@ 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;
 
@@ -27,9 +26,6 @@ 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,
@@ -100,7 +96,6 @@ 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,10 +65,7 @@ describe('EpochTotalRewardsTable', () => {
   it('should render correctly', () => {
     const { getByTestId } = render(
       <AppStateProvider>
-        <EpochTotalRewardsTable
-          data={mockData}
-          marketCreationQuantumMultiple={'1000'}
-        />
+        <EpochTotalRewardsTable data={mockData} />
       </AppStateProvider>
     );
     expect(getByTestId('epoch-total-rewards-table')).toBeInTheDocument();

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

@@ -9,7 +9,6 @@ import type { EpochTotalSummary } from './generate-epoch-total-rewards-list';
 
 interface EpochTotalRewardsGridProps {
   data: EpochTotalSummary;
-  marketCreationQuantumMultiple: string | null;
 }
 
 interface RewardItemProps {
@@ -46,14 +45,9 @@ const RewardItem = ({ value, dataTestId, last }: RewardItemProps) => (
 
 export const EpochTotalRewardsTable = ({
   data,
-  marketCreationQuantumMultiple,
 }: EpochTotalRewardsGridProps) => {
   return (
-    <RewardsTable
-      marketCreationQuantumMultiple={marketCreationQuantumMultiple}
-      dataTestId="epoch-total-rewards-table"
-      epoch={data.epoch}
-    >
+    <RewardsTable 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,7 +6,6 @@ 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;
 
@@ -19,10 +18,6 @@ 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,
@@ -75,11 +70,7 @@ export const EpochTotalRewards = ({ currentEpoch }: EpochTotalRewardsProps) => {
         >
           {Array.from(epochTotalRewardSummaries.values()).map(
             (epochTotalSummary, index) => (
-              <EpochTotalRewardsTable
-                marketCreationQuantumMultiple={marketCreationQuantumMultiple}
-                data={epochTotalSummary}
-                key={index}
-              />
+              <EpochTotalRewardsTable data={epochTotalSummary} key={index} />
             )
           )}
           <Pagination

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

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

apps/static/src/assets/mainnet-tranches.json

@@ -48,8 +48,8 @@
     "tranche_start": "2023-04-20T00:00:00.000Z",
     "tranche_end": "2023-05-20T00:00:00.000Z",
     "total_added": "19242.125",
-    "total_removed": "1979.64045368475",
-    "locked_amount": "6088.8928113908174973875",
+    "total_removed": "1523.8177488329475",
+    "locked_amount": "6570.0201729841825026125",
     "deposits": [
       {
         "amount": "188",
@@ -228,16 +228,6 @@
         "user": "0xDd7a98557586ce21f770662319C2047C5a3bD605",
         "tx": "0x2b3571c143ecebddf91fb62f402d516d51110edfe37b13200a6e5cf682dc5bb0"
       },
-      {
-        "amount": "336.4580555509875",
-        "user": "0xf915Da10e5136352Ba049acB0545Deb119054256",
-        "tx": "0x7af5942634e236f5f9c580f4ed042794ed309e83885f652a55ab37793ea2e85c"
-      },
-      {
-        "amount": "119.364649300815",
-        "user": "0xDd7a98557586ce21f770662319C2047C5a3bD605",
-        "tx": "0x47f5bf2c758c5270dd1b6519ac649ddabef8199f8a0bae319e36f8ac5c9c142e"
-      },
       {
         "amount": "202.093666077975",
         "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
@@ -372,12 +362,6 @@
             "tranche_id": 56,
             "tx": "0x2b3571c143ecebddf91fb62f402d516d51110edfe37b13200a6e5cf682dc5bb0"
           },
-          {
-            "amount": "119.364649300815",
-            "user": "0xDd7a98557586ce21f770662319C2047C5a3bD605",
-            "tranche_id": 56,
-            "tx": "0x47f5bf2c758c5270dd1b6519ac649ddabef8199f8a0bae319e36f8ac5c9c142e"
-          },
           {
             "amount": "195.89040769089",
             "user": "0xDd7a98557586ce21f770662319C2047C5a3bD605",
@@ -386,8 +370,8 @@
           }
         ],
         "total_tokens": "914.25",
-        "withdrawn_tokens": "624.076855605525",
-        "remaining_tokens": "290.173144394475"
+        "withdrawn_tokens": "504.71220630471",
+        "remaining_tokens": "409.53779369529"
       },
       {
         "address": "0x9573BDF7FfC5519912d293e4D1f750eab2E471E7",
@@ -721,12 +705,6 @@
           }
         ],
         "withdrawals": [
-          {
-            "amount": "336.4580555509875",
-            "user": "0xf915Da10e5136352Ba049acB0545Deb119054256",
-            "tranche_id": 56,
-            "tx": "0x7af5942634e236f5f9c580f4ed042794ed309e83885f652a55ab37793ea2e85c"
-          },
           {
             "amount": "422.1034736680125",
             "user": "0xf915Da10e5136352Ba049acB0545Deb119054256",
@@ -735,8 +713,8 @@
           }
         ],
         "total_tokens": "1121.25",
-        "withdrawn_tokens": "758.561529219",
-        "remaining_tokens": "362.688470781"
+        "withdrawn_tokens": "422.1034736680125",
+        "remaining_tokens": "699.1465263319875"
       },
       {
         "address": "0x237D23FcA6d7B2530C7614a9cB921CF27924911E",
@@ -899,7 +877,7 @@
     "tranche_start": "2023-04-06T00:00:00.000Z",
     "tranche_end": "2023-05-06T00:00:00.000Z",
     "total_added": "14610",
-    "total_removed": "6675.45090157707",
+    "total_removed": "6141.45090157707",
     "locked_amount": "0",
     "deposits": [
       {
@@ -1099,11 +1077,6 @@
         "user": "0x9E53F72210479BF46aE7ABF77c48B0d611b3c3dB",
         "tx": "0x1dbcf713b48965a82aa2e17cb3e7db9a491668d859d408a39c8a74b0ea860b6b"
       },
-      {
-        "amount": "534",
-        "user": "0x2586bA83696a92b5467Aaa0CF9EEC052F28F2c02",
-        "tx": "0x5aa922056cad64f97a7dfa750da57d63abfdaea4499192d4d57958bfb4fba2ea"
-      },
       {
         "amount": "106.53500000286",
         "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
@@ -1227,17 +1200,10 @@
             "tx": "0xf970ea0ce3e36fa0014d24bb830dd2ea0dbea06f6e53af486de5ee7e1c63e540"
           }
         ],
-        "withdrawals": [
-          {
-            "amount": "534",
-            "user": "0x2586bA83696a92b5467Aaa0CF9EEC052F28F2c02",
-            "tranche_id": 54,
-            "tx": "0x5aa922056cad64f97a7dfa750da57d63abfdaea4499192d4d57958bfb4fba2ea"
-          }
-        ],
+        "withdrawals": [],
         "total_tokens": "534",
-        "withdrawn_tokens": "534",
-        "remaining_tokens": "0"
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "534"
       },
       {
         "address": "0xBf1AaB792D729fA125e6D7122D4b916a1E1C44B1",
@@ -1860,7 +1826,7 @@
     "tranche_start": "2023-03-06T00:00:00.000Z",
     "tranche_end": "2023-04-06T00:00:00.000Z",
     "total_added": "14099",
-    "total_removed": "3785.49002352036",
+    "total_removed": "3722.49002352036",
     "locked_amount": "0",
     "deposits": [
       {
@@ -2625,11 +2591,6 @@
       }
     ],
     "withdrawals": [
-      {
-        "amount": "63",
-        "user": "0x2a65Ae527C6Ff4665e048B0E0883c486A7BA4DBc",
-        "tx": "0xb0edcc25e422bc3db3ad8027dfdfc0928abd7a8af8957a1699e4cf2dc8cee8f7"
-      },
       {
         "amount": "30",
         "user": "0xBe9F912Ad481C61B653463E8F1D2b2b310D49861",
@@ -3668,17 +3629,10 @@
             "tx": "0xd4a269b070cbaaff7e29a99f6b3997117d765f69512bb760e28bade799fcbba4"
           }
         ],
-        "withdrawals": [
-          {
-            "amount": "63",
-            "user": "0x2a65Ae527C6Ff4665e048B0E0883c486A7BA4DBc",
-            "tranche_id": 53,
-            "tx": "0xb0edcc25e422bc3db3ad8027dfdfc0928abd7a8af8957a1699e4cf2dc8cee8f7"
-          }
-        ],
+        "withdrawals": [],
         "total_tokens": "63",
-        "withdrawn_tokens": "63",
-        "remaining_tokens": "0"
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "63"
       },
       {
         "address": "0xc3B1eB0feE837Db0A3ded5bf16A050726955195B",
@@ -4907,7 +4861,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "86666.297",
     "total_removed": "0",
-    "locked_amount": "49504.9919953353951513585",
+    "locked_amount": "49683.1009092296761910951",
     "deposits": [
       {
         "amount": "86666.297",
@@ -4973,7 +4927,7 @@
     "tranche_end": "2023-06-01T00:00:00.000Z",
     "total_added": "2500",
     "total_removed": "0",
-    "locked_amount": "295.23443859381355",
+    "locked_amount": "305.538226241351125",
     "deposits": [
       {
         "amount": "2500",
@@ -5006,7 +4960,7 @@
     "tranche_end": "2023-11-01T00:00:00.000Z",
     "total_added": "15000.000000000000015",
     "total_removed": "0",
-    "locked_amount": "14224.9782986111115142249782986111115",
+    "locked_amount": "14286.1290383454105142861290383454105",
     "deposits": [
       {
         "amount": "1.5e-14",
@@ -5094,7 +5048,7 @@
     "tranche_end": "2023-09-01T00:00:00.000Z",
     "total_added": "17500",
     "total_removed": "0",
-    "locked_amount": "10794.17758026368775",
+    "locked_amount": "10865.52010995370325",
     "deposits": [
       {
         "amount": "12500",
@@ -5361,7 +5315,7 @@
     "tranche_end": "2023-08-01T00:00:00.000Z",
     "total_added": "37500",
     "total_removed": "18077.0118744",
-    "locked_amount": "17091.10506829343025",
+    "locked_amount": "17246.515788060160125",
     "deposits": [
       {
         "amount": "7500",
@@ -5780,7 +5734,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "129999.45",
     "total_removed": "0",
-    "locked_amount": "49459.824919096584707505",
+    "locked_amount": "49637.7713310174637779075",
     "deposits": [
       {
         "amount": "129999.45",
@@ -5813,7 +5767,7 @@
     "tranche_end": "2024-04-01T00:00:00.000Z",
     "total_added": "54144.7663",
     "total_removed": "0",
-    "locked_amount": "48300.2481374426486922947",
+    "locked_amount": "48411.21764968406449080437",
     "deposits": [
       {
         "amount": "54144.7663",
@@ -5846,7 +5800,7 @@
     "tranche_end": "2023-09-03T00:00:00.000Z",
     "total_added": "62600",
     "total_removed": "0",
-    "locked_amount": "19807.852061136476024",
+    "locked_amount": "19936.502048452562182",
     "deposits": [
       {
         "amount": "10000",
@@ -6039,7 +5993,7 @@
     "tranche_end": "2023-09-17T00:00:00.000Z",
     "total_added": "5000",
     "total_removed": "0",
-    "locked_amount": "1773.87763191273475",
+    "locked_amount": "1784.15319000507335",
     "deposits": [
       {
         "amount": "5000",
@@ -7108,7 +7062,7 @@
     "tranche_end": "2023-06-02T00:00:00.000Z",
     "total_added": "1939928.38",
     "total_removed": "1709370.7872515768348",
-    "locked_amount": "119547.7788438730317094704",
+    "locked_amount": "123534.5481966065072434858",
     "deposits": [
       {
         "amount": "1852091.69",
@@ -40980,7 +40934,7 @@
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "3732368.4671",
     "total_removed": "715655.108029600523393",
-    "locked_amount": "208204.638696483881349131871",
+    "locked_amount": "214330.915145972181008792886",
     "deposits": [
       {
         "amount": "1998.95815",
@@ -42373,7 +42327,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "15870102.715470999700000001",
     "total_removed": "872635.89843522227071852",
-    "locked_amount": "6037967.8664430882362406121449295313314409",
+    "locked_amount": "6059691.24938843042043456221192312067585835",
     "deposits": [
       {
         "amount": "16249.93",
@@ -59149,7 +59103,7 @@
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "472355.6199999996",
     "total_removed": "44544.1737890903416",
-    "locked_amount": "32991.215149911803725776786707268",
+    "locked_amount": "33961.958672622378193436739320136",
     "deposits": [
       {
         "amount": "3000",

docker/prepare-dist.sh

@@ -1,7 +1,7 @@
 #!/bin/bash -e
 yarn --pure-lockfile
-app=${1:-trading}
-flags="--env=${2:-mainnet}"
+app={$1:-trading}
+flags="--env=${$2:-mainnet}"
 yarn install
 if [ "${app}" = "trading" ]; then
   yarn nx export trading $flags

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

@@ -8,8 +8,6 @@ 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: