chore: add genesis validation script

apps/governance-e2e/src/fixtures/mocks/proposals.ts

@@ -133,7 +133,7 @@ export const proposalsData = {
               instrument: {
                 name: 'UNIDAI Monthly (Dec 2022)',
                 code: 'UNIDAI.MF21',
-                product: {
+                futureProduct: {
                   settlementAsset: { symbol: 'tDAI', __typename: 'Asset' },
                   __typename: 'FutureProduct',
                 },
@@ -240,7 +240,7 @@ export const proposalsData = {
               instrument: {
                 name: 'ETHBTC Quarterly (Feb 2023)',
                 code: 'ETHBTC.QM21',
-                product: {
+                futureProduct: {
                   settlementAsset: { symbol: 'tBTC', __typename: 'Asset' },
                   __typename: 'FutureProduct',
                 },

apps/governance/.env

@@ -35,5 +35,6 @@ NX_SUCCESSOR_MARKETS=true
 NX_METAMASK_SNAPS=true
 NX_PRODUCT_PERPETUALS=false
 NX_UPDATE_MARKET_STATE=false
-NX_REFERRALS=true
+NX_REFERRALS=false
 NX_GOVERNANCE_TRANSFERS=false
+NX_VOLUME_DISCOUNTS=false

apps/governance/.env.capsule

@@ -31,8 +31,9 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
 CYPRESS_FAIRGROUND=false
 
 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=true
+NX_SUCCESSOR_MARKETS=false
 NX_METAMASK_SNAPS=false
 NX_PRODUCT_PERPETUALS=true
 NX_UPDATE_MARKET_STATE=true
 NX_REFERRALS=true
+NX_VOLUME_DISCOUNTS=true

apps/governance/.env.devnet

@@ -28,3 +28,4 @@ NX_METAMASK_SNAPS=true
 NX_PRODUCT_PERPETUALS=true
 NX_UPDATE_MARKET_STATE=true
 NX_REFERRALS=true
+NX_VOLUME_DISCOUNTS=true

apps/governance/.env.mainnet

@@ -22,8 +22,9 @@ NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
 
 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=true
+NX_SUCCESSOR_MARKETS=false
 NX_METAMASK_SNAPS=false
-NX_PRODUCT_PERPETUALS=true
-NX_UPDATE_MARKET_STATE=true
-NX_REFERRALS=true
+NX_PRODUCT_PERPETUALS=false
+NX_UPDATE_MARKET_STATE=false
+NX_REFERRALS=false
+NX_VOLUME_DISCOUNTS=false

apps/governance/.env.mainnet-mirror

@@ -21,8 +21,9 @@ NX_TENDERMINT_URL=https://be.mainnet-mirror.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket
 
 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=true
+NX_SUCCESSOR_MARKETS=false
 NX_METAMASK_SNAPS=false
-NX_PRODUCT_PERPETUALS=true
-NX_UPDATE_MARKET_STATE=true
-NX_REFERRALS=true
+NX_PRODUCT_PERPETUALS=false
+NX_UPDATE_MARKET_STATE=false
+NX_REFERRALS=false
+NX_VOLUME_DISCOUNTS=false

apps/governance/.env.stagnet1

@@ -25,3 +25,4 @@ NX_PRODUCT_PERPETUALS=true
 NX_UPDATE_MARKET_STATE=true
 NX_REFERRALS=true
 NX_GOVERNANCE_TRANSFERS=true
+NX_VOLUME_DISCOUNTS=true

apps/governance/.env.testnet

@@ -29,3 +29,4 @@ NX_METAMASK_SNAPS=true
 NX_PRODUCT_PERPETUALS=true
 NX_UPDATE_MARKET_STATE=true
 NX_REFERRALS=true
+NX_VOLUME_DISCOUNTS=true

apps/governance/.env.validators-testnet

@@ -20,8 +20,9 @@ NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.
 
 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=true
+NX_SUCCESSOR_MARKETS=false
 NX_METAMASK_SNAPS=false
-NX_PRODUCT_PERPETUALS=true
-NX_UPDATE_MARKET_STATE=true
-NX_REFERRALS=true
+NX_PRODUCT_PERPETUALS=false
+NX_UPDATE_MARKET_STATE=false
+NX_REFERRALS=false
+NX_VOLUME_DISCOUNTS=false

apps/governance/src/components/vega-wallet/hooks.ts

@@ -8,7 +8,6 @@ import { ENV } from '../../config';
 
 import noIcon from '../../images/token-no-icon.png';
 import vegaBlack from '../../images/vega_black.png';
-import vegaVesting from '../../images/vega_vesting.png';
 import { BigNumber } from '../../lib/bignumber';
 import type { WalletCardAssetProps } from '../wallet-card';
 import { useVegaWallet } from '@vegaprotocol/wallet';
@@ -103,10 +102,7 @@ export const usePollForDelegations = () => {
             setAccounts(
               accounts
                 .filter(
-                  (a) =>
-                    a.type === Schema.AccountType.ACCOUNT_TYPE_GENERAL ||
-                    a.type === Schema.AccountType.ACCOUNT_TYPE_VESTED_REWARDS ||
-                    a.type === Schema.AccountType.ACCOUNT_TYPE_VESTING_REWARDS
+                  (a) => a.type === Schema.AccountType.ACCOUNT_TYPE_GENERAL
                 )
                 .map((a) => {
                   const isVega =
@@ -119,23 +115,14 @@ export const usePollForDelegations = () => {
                     subheading: isVega ? t('collateral') : a.asset.symbol,
                     symbol: a.asset.symbol,
                     decimals: a.asset.decimals,
-                    assetId: a.asset.id,
                     balance: new BigNumber(
                       addDecimal(a.balance, a.asset.decimals)
                     ),
-                    image: isVega
-                      ? vegaBlack
-                      : a.type ===
-                          Schema.AccountType.ACCOUNT_TYPE_VESTED_REWARDS ||
-                        a.type ===
-                          Schema.AccountType.ACCOUNT_TYPE_VESTING_REWARDS
-                      ? vegaVesting
-                      : noIcon,
+                    image: isVega ? vegaBlack : noIcon,
                     border: isVega,
                     address: isAssetTypeERC20(a.asset)
                       ? a.asset.source.contractAddress
                       : undefined,
-                    type: a.type,
                   };
                 })
                 .sort((a, b) => {

apps/governance/src/components/wallet-card/wallet-card.tsx

@@ -1,18 +1,9 @@
-import React, { useMemo } from 'react';
+import React from 'react';
 import { Link } from 'react-router-dom';
 
 import { useAnimateValue } from '../../hooks/use-animate-value';
 import type { BigNumber } from '../../lib/bignumber';
 import { useNumberParts } from '@vegaprotocol/react-helpers';
-import * as Schema from '@vegaprotocol/types';
-import { useTranslation } from 'react-i18next';
-import { AnchorButton, Tooltip } from '@vegaprotocol/ui-toolkit';
-import {
-  CONSOLE_TRANSFER_ASSET,
-  DApp,
-  useLinks,
-} from '@vegaprotocol/environment';
-import { useNetworkParam } from '@vegaprotocol/network-parameters';
 
 interface WalletCardProps {
   children: React.ReactNode;
@@ -109,10 +100,8 @@ export interface WalletCardAssetProps {
   symbol: string;
   balance: BigNumber;
   decimals: number;
-  assetId?: string;
   border?: boolean;
   subheading?: string;
-  type?: Schema.AccountType;
 }
 
 export const WalletCardAsset = ({
@@ -121,37 +110,16 @@ export const WalletCardAsset = ({
   symbol,
   balance,
   decimals,
-  assetId,
   border,
   subheading,
-  type,
 }: WalletCardAssetProps) => {
   const [integers, decimalsPlaces, separator] = useNumberParts(
     balance,
     decimals
   );
-  const { t } = useTranslation();
-  const consoleLink = useLinks(DApp.Console);
-  const transferAssetLink = (assetId: string) =>
-    consoleLink(CONSOLE_TRANSFER_ASSET.replace(':assetId', assetId));
-  const { param: baseRate } = useNetworkParam('rewards_vesting_baseRate');
-
-  const isRedeemable =
-    type === Schema.AccountType.ACCOUNT_TYPE_VESTED_REWARDS && assetId;
-
-  const accountTypeTooltip = useMemo(() => {
-    if (type === Schema.AccountType.ACCOUNT_TYPE_VESTED_REWARDS) {
-      return t('VestedRewardsTooltip');
-    }
-    if (type === Schema.AccountType.ACCOUNT_TYPE_VESTING_REWARDS && baseRate) {
-      return t('VestingRewardsTooltip', { baseRate });
-    }
-
-    return null;
-  }, [baseRate, t, type]);
 
   return (
-    <div className="flex flex-nowrap gap-2 mt-2 mb-4">
+    <div className="flex flex-nowrap mt-2 mb-4">
       <img
         alt="Vega"
         src={image}
@@ -161,37 +129,15 @@ export const WalletCardAsset = ({
       />
       <div>
         <div
-          className="flex align-center items-baseline text-base gap-2"
+          className="flex align-center text-base"
           data-testid="currency-title"
         >
-          <div className="mb-0 uppercase">{name}</div>
+          <div className="mb-0 px-2 uppercase">{name}</div>
           <div className="mb-0 uppercase text-neutral-400">
             {subheading || symbol}
           </div>
         </div>
-        {type ? (
-          <div className="mb-[2px] flex gap-2 items-baseline">
-            <Tooltip description={accountTypeTooltip}>
-              <span className="px-2 py-1 leading-none text-xs bg-vega-cdark-700 rounded">
-                {Schema.AccountTypeMapping[type]}
-              </span>
-            </Tooltip>
-            {isRedeemable ? (
-              <Tooltip description={t('RedeemRewardsTooltip')}>
-                <AnchorButton
-                  variant="primary"
-                  size="xs"
-                  href={transferAssetLink(assetId)}
-                  target="_blank"
-                  className="px-2 py-1 leading-none text-xs bg-vega-yellow text-black rounded"
-                >
-                  {t('Redeem')}
-                </AnchorButton>
-              </Tooltip>
-            ) : null}
-          </div>
-        ) : null}
-        <div className="basis-full font-mono" data-testid="currency-value">
+        <div className="px-2 basis-full font-mono" data-testid="currency-value">
           <span>
             {integers}
             {separator}

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

@@ -953,8 +953,5 @@
   "ACCOUNT_TYPE_REWARD_RELATIVE_RETURN": "Relative return reward account",
   "ACCOUNT_TYPE_REWARD_RETURN_VOLATILITY": "Return volatility reward account",
   "ACCOUNT_TYPE_REWARD_VALIDATOR_RANKING": "Validator ranking reward account",
-  "ACCOUNT_TYPE_PENDING_FEE_REFERRAL_REWARD": "Pending fee referral reward account",
-  "VestingRewardsTooltip": "Vesting rewards will be moved to vested account at a rate of {{baseRate}} per epoch.",
-  "VestedRewardsTooltip": "Vested rewards can be redeemed using Console",
-  "RedeemRewardsTooltip": "Click to redeem vested rewards in Console"
+  "ACCOUNT_TYPE_PENDING_FEE_REFERRAL_REWARD": "Pending fee referral reward account"
 }

apps/governance/src/routes/home/index.tsx

@@ -189,6 +189,7 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
       includeNewMarketProductFields: !!FLAGS.PRODUCT_PERPETUALS,
       includeUpdateMarketStates: !!FLAGS.UPDATE_MARKET_STATE,
       includeUpdateReferralPrograms: !!FLAGS.REFERRALS,
+      includeUpdateVolumeDiscountPrograms: !!FLAGS.VOLUME_DISCOUNTS,
     },
   });
 

apps/governance/src/routes/proposals/components/proposal-detail-header/proposal-header.spec.tsx

@@ -77,7 +77,7 @@ describe('Proposal header', () => {
               __typename: 'InstrumentConfiguration',
               name: 'Some market',
               code: 'FX:BTCUSD/DEC99',
-              product: {
+              futureProduct: {
                 __typename: 'FutureProduct',
                 settlementAsset: {
                   __typename: 'Asset',

apps/governance/src/routes/proposals/components/proposal-detail-header/proposal-header.tsx

@@ -39,18 +39,6 @@ export const ProposalHeader = ({
 
   const titleContent = shorten(title ?? '', 100);
 
-  const getAsset = (proposal: ProposalQuery['proposal']) => {
-    const terms = proposal?.terms;
-    if (
-      terms?.change.__typename === 'NewMarket' &&
-      (terms.change.instrument.product?.__typename === 'FutureProduct' ||
-        terms.change.instrument.product?.__typename === 'PerpetualProduct')
-    ) {
-      return terms.change.instrument.product.settlementAsset;
-    }
-    return undefined;
-  };
-
   switch (change?.__typename) {
     case 'NewMarket': {
       proposalType =
@@ -66,10 +54,10 @@ export const ProposalHeader = ({
           <span>
             {t('Code')}: {change.instrument.code}.
           </span>{' '}
-          {proposal?.terms && getAsset(proposal)?.symbol ? (
+          {change.instrument.futureProduct?.settlementAsset.symbol ? (
             <>
               <span className="font-semibold">
-                {getAsset(proposal)?.symbol}
+                {change.instrument.futureProduct.settlementAsset.symbol}
               </span>{' '}
               {t('settled future')}.
             </>

apps/governance/src/routes/proposals/components/proposal-volume-discount-program-details/proposal-volume-discount-program-details.tsx

@@ -78,7 +78,7 @@ export const ProposalVolumeDiscountProgramDetails = ({
               {t('BenefitTiers')}
             </h3>
             <KeyValueTable>
-              {[...benefitTiers]
+              {benefitTiers
                 .sort(
                   (a, b) =>
                     Number(a.minimumRunningNotionalTakerVolume) -

apps/governance/src/routes/proposals/proposal/Proposal.graphql

@@ -84,6 +84,7 @@ query Proposal(
   $includeNewMarketProductField: Boolean!
   $includeUpdateMarketState: Boolean!
   $includeUpdateReferralProgram: Boolean!
+  $includeUpdateVolumeDiscountProgram: Boolean!
 ) {
   proposal(id: $proposalId) {
     id
@@ -103,6 +104,7 @@ query Proposal(
     ...UpdateMarketState @include(if: $includeUpdateMarketState)
     ...UpdateReferralProgram @include(if: $includeUpdateReferralProgram)
     ...UpdateVolumeDiscountProgram
+      @include(if: $includeUpdateVolumeDiscountProgram)
     terms {
       closingDatetime
       enactmentDatetime
@@ -130,25 +132,46 @@ query Proposal(
           instrument {
             name
             code
-            product {
-              ... on FutureProduct {
-                settlementAsset {
-                  id
-                  name
-                  symbol
-                  decimals
-                  quantum
-                }
-                quoteName
-                dataSourceSpecBinding {
-                  settlementDataProperty
-                  tradingTerminationProperty
-                }
-                dataSourceSpecForSettlementData {
-                  sourceType {
-                    ... on DataSourceDefinitionInternal {
-                      sourceType {
-                        ... on DataSourceSpecConfigurationTime {
+            futureProduct {
+              settlementAsset {
+                id
+                name
+                symbol
+                decimals
+                quantum
+              }
+              quoteName
+
+              dataSourceSpecForSettlementData {
+                sourceType {
+                  ... on DataSourceDefinitionInternal {
+                    sourceType {
+                      ... on DataSourceSpecConfigurationTime {
+                        conditions {
+                          operator
+                          value
+                        }
+                      }
+                    }
+                  }
+                  ... on DataSourceDefinitionExternal {
+                    sourceType {
+                      ... on DataSourceSpecConfiguration {
+                        signers {
+                          signer {
+                            ... on PubKey {
+                              key
+                            }
+                            ... on ETHAddress {
+                              address
+                            }
+                          }
+                        }
+                        filters {
+                          key {
+                            name
+                            type
+                          }
                           conditions {
                             operator
                             value
@@ -156,44 +179,52 @@ query Proposal(
                         }
                       }
                     }
-                    ... on DataSourceDefinitionExternal {
-                      sourceType {
-                        ... on DataSourceSpecConfiguration {
-                          signers {
-                            signer {
-                              ... on PubKey {
-                                key
-                              }
-                              ... on ETHAddress {
-                                address
-                              }
-                            }
-                          }
-                          filters {
-                            key {
-                              name
-                              type
-                            }
-                            conditions {
-                              operator
-                              value
-                            }
-                          }
-                        }
-                      }
-                    }
                   }
                 }
               }
-              ... on PerpetualProduct {
-                settlementAsset {
-                  id
-                  name
-                  symbol
-                  decimals
-                  quantum
-                }
-                quoteName
+              # dataSourceSpecForTradingTermination {
+              #   sourceType {
+              #     ... on DataSourceDefinitionInternal {
+              #       sourceType {
+              #         ... on DataSourceSpecConfigurationTime {
+              #           conditions {
+              #             operator
+              #             value
+              #           }
+              #         }
+              #       }
+              #     }
+              #     ... on DataSourceDefinitionExternal {
+              #       sourceType {
+              #         ... on DataSourceSpecConfiguration {
+              #           signers {
+              #             signer {
+              #               ... on PubKey {
+              #                 key
+              #               }
+              #               ... on ETHAddress {
+              #                 address
+              #               }
+              #             }
+              #           }
+              #           filters {
+              #             key {
+              #               name
+              #               type
+              #             }
+              #             conditions {
+              #               operator
+              #               value
+              #             }
+              #           }
+              #         }
+              #       }
+              #     }
+              #   }
+              # }
+              dataSourceSpecBinding {
+                settlementDataProperty
+                tradingTerminationProperty
               }
             }
           }

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

@@ -62,6 +62,7 @@ export const ProposalContainer = () => {
       includeNewMarketProductField: !!FLAGS.PRODUCT_PERPETUALS,
       includeUpdateMarketState: !!FLAGS.UPDATE_MARKET_STATE,
       includeUpdateReferralProgram: !!FLAGS.REFERRALS,
+      includeUpdateVolumeDiscountProgram: !!FLAGS.VOLUME_DISCOUNTS,
     },
     skip: !params.proposalId,
   });

apps/governance/src/routes/proposals/proposals/Proposals.graphql

@@ -101,16 +101,9 @@ fragment ProposalFields on Proposal {
         instrument {
           name
           code
-          product {
-            ... on FutureProduct {
-              settlementAsset {
-                symbol
-              }
-            }
-            ... on PerpetualProduct {
-              settlementAsset {
-                symbol
-              }
+          futureProduct {
+            settlementAsset {
+              symbol
             }
           }
         }
@@ -171,6 +164,7 @@ query Proposals(
   $includeNewMarketProductFields: Boolean!
   $includeUpdateMarketStates: Boolean!
   $includeUpdateReferralPrograms: Boolean!
+  $includeUpdateVolumeDiscountPrograms: Boolean!
 ) {
   proposalsConnection {
     edges {
@@ -180,6 +174,7 @@ query Proposals(
         ...UpdateMarketStates @include(if: $includeUpdateMarketStates)
         ...UpdateReferralPrograms @include(if: $includeUpdateReferralPrograms)
         ...UpdateVolumeDiscountPrograms
+          @include(if: $includeUpdateVolumeDiscountPrograms)
       }
     }
   }

apps/governance/src/routes/proposals/proposals/__generated__/Proposals.ts

@@ -11,16 +11,17 @@ export type UpdateReferralProgramsFragment = { __typename?: 'Proposal', terms: {
 
 export type UpdateVolumeDiscountProgramsFragment = { __typename?: 'Proposal', terms: { __typename?: 'ProposalTerms', change: { __typename?: 'CancelTransfer' } | { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket' } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset' } | { __typename?: 'UpdateMarket' } | { __typename?: 'UpdateMarketState' } | { __typename?: 'UpdateNetworkParameter' } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram', endOfProgramTimestamp: any, windowLength: number, benefitTiers: Array<{ __typename?: 'VolumeBenefitTier', minimumRunningNotionalTakerVolume: string, volumeDiscountFactor: string }> } } };
 
-export type ProposalFieldsFragment = { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string }, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'CancelTransfer' } | { __typename: 'NewAsset', name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename?: 'ERC20', contractAddress: string, withdrawThreshold: string, lifetimeLimit: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, product?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | { __typename?: 'PerpetualProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | { __typename?: 'SpotProduct' } | null } } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset', quantum: string, assetId: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateMarketState' } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram' } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string } } };
+export type ProposalFieldsFragment = { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string }, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'CancelTransfer' } | { __typename: 'NewAsset', name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename?: 'ERC20', contractAddress: string, withdrawThreshold: string, lifetimeLimit: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | null } } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset', quantum: string, assetId: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateMarketState' } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram' } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string } } };
 
 export type ProposalsQueryVariables = Types.Exact<{
   includeNewMarketProductFields: Types.Scalars['Boolean'];
   includeUpdateMarketStates: Types.Scalars['Boolean'];
   includeUpdateReferralPrograms: Types.Scalars['Boolean'];
+  includeUpdateVolumeDiscountPrograms: Types.Scalars['Boolean'];
 }>;
 
 
-export type ProposalsQuery = { __typename?: 'Query', proposalsConnection?: { __typename?: 'ProposalsConnection', edges?: Array<{ __typename?: 'ProposalEdge', node: { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string }, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'CancelTransfer' } | { __typename: 'NewAsset', name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename?: 'ERC20', contractAddress: string, withdrawThreshold: string, lifetimeLimit: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, product?: { __typename: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | { __typename: 'PerpetualProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | { __typename: 'SpotProduct' } | null } } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset', quantum: string, assetId: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateMarketState', updateType: Types.MarketUpdateType, price?: string | null, market: { __typename?: 'Market', decimalPlaces: number, id: string, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, code: string, product: { __typename: 'Future', quoteName: string } | { __typename: 'Perpetual', quoteName: string } | { __typename: 'Spot' } } } } } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } | { __typename?: 'UpdateReferralProgram', windowLength: number, endOfProgram: any, benefitTiers: Array<{ __typename?: 'BenefitTier', minimumEpochs: number, minimumRunningNotionalTakerVolume: string, referralDiscountFactor: string, referralRewardFactor: string }>, stakingTiers: Array<{ __typename?: 'StakingTier', minimumStakedTokens: string, referralRewardMultiplier: string }> } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram', endOfProgramTimestamp: any, windowLength: number, benefitTiers: Array<{ __typename?: 'VolumeBenefitTier', minimumRunningNotionalTakerVolume: string, volumeDiscountFactor: string }> } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string } } } } | null> | null } | null };
+export type ProposalsQuery = { __typename?: 'Query', proposalsConnection?: { __typename?: 'ProposalsConnection', edges?: Array<{ __typename?: 'ProposalEdge', node: { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string }, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'CancelTransfer' } | { __typename: 'NewAsset', name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename?: 'ERC20', contractAddress: string, withdrawThreshold: string, lifetimeLimit: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | null, product?: { __typename: 'FutureProduct' } | { __typename: 'PerpetualProduct' } | { __typename: 'SpotProduct' } | null } } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset', quantum: string, assetId: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateMarketState', updateType: Types.MarketUpdateType, price?: string | null, market: { __typename?: 'Market', decimalPlaces: number, id: string, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, code: string, product: { __typename: 'Future', quoteName: string } | { __typename: 'Perpetual', quoteName: string } | { __typename: 'Spot' } } } } } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } | { __typename?: 'UpdateReferralProgram', windowLength: number, endOfProgram: any, benefitTiers: Array<{ __typename?: 'BenefitTier', minimumEpochs: number, minimumRunningNotionalTakerVolume: string, referralDiscountFactor: string, referralRewardFactor: string }>, stakingTiers: Array<{ __typename?: 'StakingTier', minimumStakedTokens: string, referralRewardMultiplier: string }> } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram', endOfProgramTimestamp: any, windowLength: number, benefitTiers: Array<{ __typename?: 'VolumeBenefitTier', minimumRunningNotionalTakerVolume: string, volumeDiscountFactor: string }> } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string } } } } | null> | null } | null };
 
 export const NewMarketProductFieldsFragmentDoc = gql`
     fragment NewMarketProductFields on Proposal {
@@ -130,16 +131,9 @@ export const ProposalFieldsFragmentDoc = gql`
         instrument {
           name
           code
-          product {
-            ... on FutureProduct {
-              settlementAsset {
-                symbol
-              }
-            }
-            ... on PerpetualProduct {
-              settlementAsset {
-                symbol
-              }
+          futureProduct {
+            settlementAsset {
+              symbol
             }
           }
         }
@@ -197,7 +191,7 @@ export const ProposalFieldsFragmentDoc = gql`
 }
     `;
 export const ProposalsDocument = gql`
-    query Proposals($includeNewMarketProductFields: Boolean!, $includeUpdateMarketStates: Boolean!, $includeUpdateReferralPrograms: Boolean!) {
+    query Proposals($includeNewMarketProductFields: Boolean!, $includeUpdateMarketStates: Boolean!, $includeUpdateReferralPrograms: Boolean!, $includeUpdateVolumeDiscountPrograms: Boolean!) {
   proposalsConnection {
     edges {
       node {
@@ -205,7 +199,7 @@ export const ProposalsDocument = gql`
         ...NewMarketProductFields @include(if: $includeNewMarketProductFields)
         ...UpdateMarketStates @include(if: $includeUpdateMarketStates)
         ...UpdateReferralPrograms @include(if: $includeUpdateReferralPrograms)
-        ...UpdateVolumeDiscountPrograms
+        ...UpdateVolumeDiscountPrograms @include(if: $includeUpdateVolumeDiscountPrograms)
       }
     }
   }
@@ -231,6 +225,7 @@ ${UpdateVolumeDiscountProgramsFragmentDoc}`;
  *      includeNewMarketProductFields: // value for 'includeNewMarketProductFields'
  *      includeUpdateMarketStates: // value for 'includeUpdateMarketStates'
  *      includeUpdateReferralPrograms: // value for 'includeUpdateReferralPrograms'
+ *      includeUpdateVolumeDiscountPrograms: // value for 'includeUpdateVolumeDiscountPrograms'
  *   },
  * });
  */

apps/governance/src/routes/proposals/proposals/proposals-container.tsx

@@ -50,6 +50,7 @@ export const ProposalsContainer = () => {
       includeNewMarketProductFields: !!FLAGS.PRODUCT_PERPETUALS,
       includeUpdateMarketStates: !!FLAGS.UPDATE_MARKET_STATE,
       includeUpdateReferralPrograms: !!FLAGS.REFERRALS,
+      includeUpdateVolumeDiscountPrograms: !!FLAGS.VOLUME_DISCOUNTS,
     },
   });
 

apps/governance/src/routes/proposals/rejected/rejected-proposals-container.tsx

@@ -42,6 +42,7 @@ export const RejectedProposalsContainer = () => {
       includeNewMarketProductFields: !!FLAGS.PRODUCT_PERPETUALS,
       includeUpdateMarketStates: !!FLAGS.UPDATE_MARKET_STATE,
       includeUpdateReferralPrograms: !!FLAGS.REFERRALS,
+      includeUpdateVolumeDiscountPrograms: !!FLAGS.VOLUME_DISCOUNTS,
     },
   });
 

apps/trading/client-pages/markets/markets-sidebar.tsx

@@ -1,5 +1,7 @@
-import { Route, Routes } from 'react-router-dom';
+import { Route, Routes, useParams } from 'react-router-dom';
+import { MarketState } from '@vegaprotocol/types';
 import { t } from '@vegaprotocol/i18n';
+import { useMarket } from '@vegaprotocol/markets';
 import { VegaIconNames } from '@vegaprotocol/ui-toolkit';
 import {
   SidebarButton,
@@ -9,7 +11,12 @@ import {
 import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
 
 export const MarketsSidebar = () => {
+  const { marketId } = useParams();
   const currentRouteId = useGetCurrentRouteId();
+  const { data } = useMarket(marketId);
+  const active =
+    data &&
+    [MarketState.STATE_ACTIVE, MarketState.STATE_PENDING].includes(data.state);
 
   return (
     <>
@@ -37,12 +44,14 @@ export const MarketsSidebar = () => {
           element={
             <>
               <SidebarDivider />
-              <SidebarButton
-                view={ViewType.Order}
-                icon={VegaIconNames.TICKET}
-                tooltip={t('Order')}
-                routeId={currentRouteId}
-              />
+              {active && (
+                <SidebarButton
+                  view={ViewType.Order}
+                  icon={VegaIconNames.TICKET}
+                  tooltip={t('Order')}
+                  routeId={currentRouteId}
+                />
+              )}
               <SidebarButton
                 view={ViewType.Info}
                 icon={VegaIconNames.BREAKDOWN}

apps/trading/client-pages/transfer/transfer.spec.tsx

@@ -8,7 +8,7 @@ jest.mock('@vegaprotocol/accounts', () => ({
   ),
 }));
 
-jest.mock('../../components/welcome-dialog/get-started', () => ({
+jest.mock('../../components/welcome-dialog/get-started.ts', () => ({
   GetStarted: () => <div>GetStarted</div>,
 }));
 

apps/trading/client-pages/withdraw/withdraw.spec.tsx

@@ -8,7 +8,7 @@ jest.mock('../../components/withdraw-container', () => ({
   ),
 }));
 
-jest.mock('../../components/welcome-dialog/get-started', () => ({
+jest.mock('../../components/welcome-dialog/get-started.ts', () => ({
   GetStarted: () => <div>GetStarted</div>,
 }));
 

apps/trading/components/fees-container/Fees.graphql

@@ -36,22 +36,6 @@ query Fees(
       }
     }
   }
-  referrer: referralSets(referrer: $partyId) {
-    edges {
-      node {
-        id
-        referrer
-      }
-    }
-  }
-  referee: referralSets(referee: $partyId) {
-    edges {
-      node {
-        id
-        referrer
-      }
-    }
-  }
   referralSetReferees(referee: $partyId) {
     edges {
       node {

apps/trading/components/fees-container/__generated__/Fees.ts

@@ -15,7 +15,7 @@ export type FeesQueryVariables = Types.Exact<{
 }>;
 
 
-export type FeesQuery = { __typename?: 'Query', epoch: { __typename?: 'Epoch', id: string }, volumeDiscountStats: { __typename?: 'VolumeDiscountStatsConnection', edges: Array<{ __typename?: 'VolumeDiscountStatsEdge', node: { __typename?: 'VolumeDiscountStats', atEpoch: number, discountFactor: string, runningVolume: string } } | null> }, referrer: { __typename?: 'ReferralSetConnection', edges: Array<{ __typename?: 'ReferralSetEdge', node: { __typename?: 'ReferralSet', id: string, referrer: string } } | null> }, referee: { __typename?: 'ReferralSetConnection', edges: Array<{ __typename?: 'ReferralSetEdge', node: { __typename?: 'ReferralSet', id: string, referrer: string } } | null> }, referralSetReferees: { __typename?: 'ReferralSetRefereeConnection', edges: Array<{ __typename?: 'ReferralSetRefereeEdge', node: { __typename?: 'ReferralSetReferee', atEpoch: number } } | null> }, referralSetStats: { __typename?: 'ReferralSetStatsConnection', edges: Array<{ __typename?: 'ReferralSetStatsEdge', node: { __typename?: 'ReferralSetStats', atEpoch: number, discountFactor: string, referralSetRunningNotionalTakerVolume: string } } | null> } };
+export type FeesQuery = { __typename?: 'Query', epoch: { __typename?: 'Epoch', id: string }, volumeDiscountStats: { __typename?: 'VolumeDiscountStatsConnection', edges: Array<{ __typename?: 'VolumeDiscountStatsEdge', node: { __typename?: 'VolumeDiscountStats', atEpoch: number, discountFactor: string, runningVolume: string } } | null> }, referralSetReferees: { __typename?: 'ReferralSetRefereeConnection', edges: Array<{ __typename?: 'ReferralSetRefereeEdge', node: { __typename?: 'ReferralSetReferee', atEpoch: number } } | null> }, referralSetStats: { __typename?: 'ReferralSetStatsConnection', edges: Array<{ __typename?: 'ReferralSetStatsEdge', node: { __typename?: 'ReferralSetStats', atEpoch: number, discountFactor: string, referralSetRunningNotionalTakerVolume: string } } | null> } };
 
 
 export const DiscountProgramsDocument = gql`
@@ -81,22 +81,6 @@ export const FeesDocument = gql`
       }
     }
   }
-  referrer: referralSets(referrer: $partyId) {
-    edges {
-      node {
-        id
-        referrer
-      }
-    }
-  }
-  referee: referralSets(referee: $partyId) {
-    edges {
-      node {
-        id
-        referrer
-      }
-    }
-  }
   referralSetReferees(referee: $partyId) {
     edges {
       node {

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

@@ -17,14 +17,6 @@ import { useReferralStats } from './use-referral-stats';
 import { formatPercentage, getAdjustedFee } from './utils';
 import { Table, Td, Th, THead, Tr } from './table';
 import BigNumber from 'bignumber.js';
-import { Links } from '../../lib/links';
-import { Link } from 'react-router-dom';
-import {
-  Tooltip,
-  VegaIcon,
-  VegaIconNames,
-  truncateMiddle,
-} from '@vegaprotocol/ui-toolkit';
 
 export const FeesContainer = () => {
   const { pubKey } = useVegaWallet();
@@ -64,25 +56,16 @@ export const FeesContainer = () => {
     referralTierIndex,
     referralTiers,
     epochsInSet,
-    code,
-    isReferrer,
   } = useReferralStats(
     feesData?.referralSetStats,
     feesData?.referralSetReferees,
     programData?.currentReferralProgram,
-    feesData?.epoch,
-    feesData?.referrer,
-    feesData?.referee
+    feesData?.epoch
   );
 
   const loading = paramsLoading || feesLoading || programLoading;
   const isConnected = Boolean(pubKey);
 
-  const isReferralProgramRunning = Boolean(programData?.currentReferralProgram);
-  const isVolumeDiscountProgramRunning = Boolean(
-    programData?.currentVolumeDiscountProgram
-  );
-
   return (
     <div className="grid auto-rows-min grid-cols-4 gap-3">
       {isConnected && (
@@ -107,8 +90,6 @@ export const FeesContainer = () => {
             <TotalDiscount
               referralDiscount={referralDiscount}
               volumeDiscount={volumeDiscount}
-              isReferralProgramRunning={isReferralProgramRunning}
-              isVolumeDiscountProgramRunning={isVolumeDiscountProgramRunning}
             />
           </FeeCard>
           <FeeCard
@@ -116,37 +97,23 @@ export const FeesContainer = () => {
             className="sm:col-span-2"
             loading={loading}
           >
-            {isVolumeDiscountProgramRunning ? (
-              <CurrentVolume
-                tiers={volumeTiers}
-                tierIndex={volumeTierIndex}
-                windowLengthVolume={volumeInWindow}
-                windowLength={volumeDiscountWindowLength}
-              />
-            ) : (
-              <p className="pt-3 text-sm text-muted">
-                {t('No volume discount program active')}
-              </p>
-            )}
+            <CurrentVolume
+              tiers={volumeTiers}
+              tierIndex={volumeTierIndex}
+              windowLengthVolume={volumeInWindow}
+              windowLength={volumeDiscountWindowLength}
+            />
           </FeeCard>
           <FeeCard
             title={t('Referral benefits')}
             className="sm:col-span-2"
             loading={loading}
           >
-            {isReferrer ? (
-              <ReferrerInfo code={code} />
-            ) : isReferralProgramRunning ? (
-              <ReferralBenefits
-                setRunningNotionalTakerVolume={referralVolumeInWindow}
-                epochsInSet={epochsInSet}
-                epochs={referralDiscountWindowLength}
-              />
-            ) : (
-              <p className="pt-3 text-sm text-muted">
-                {t('No referral program active')}
-              </p>
-            )}
+            <ReferralBenefits
+              setRunningNotionalTakerVolume={referralVolumeInWindow}
+              epochsInSet={epochsInSet}
+              epochs={referralDiscountWindowLength}
+            />
           </FeeCard>
         </>
       )}
@@ -175,7 +142,7 @@ export const FeesContainer = () => {
         />
       </FeeCard>
       <FeeCard
-        title={t('Fees by market')}
+        title={t('Liquidity fees')}
         className="lg:col-span-full"
         loading={marketsLoading}
       >
@@ -358,64 +325,26 @@ const ReferralBenefits = ({
 const TotalDiscount = ({
   referralDiscount,
   volumeDiscount,
-  isReferralProgramRunning,
-  isVolumeDiscountProgramRunning,
 }: {
   referralDiscount: number;
   volumeDiscount: number;
-  isReferralProgramRunning: boolean;
-  isVolumeDiscountProgramRunning: boolean;
 }) => {
-  const totalDiscount = 1 - (1 - volumeDiscount) * (1 - referralDiscount);
-  const totalDiscountDescription = t(
-    'The total discount is calculated according to the following formula: '
-  );
-  const formula = (
-    <span className="italic">
-      1 - (1 - d<sub>volume</sub>) ⋇ (1 - d<sub>referral</sub>)
-    </span>
-  );
-
   return (
     <div>
       <Stat
-        description={
-          <>
-            {totalDiscountDescription}
-            {formula}
-          </>
-        }
-        value={formatPercentage(totalDiscount) + '%'}
+        value={formatPercentage(referralDiscount + volumeDiscount) + '%'}
         highlight={true}
       />
       <table className="w-full mt-0.5 text-xs text-muted">
         <tbody>
           <tr>
             <th className="font-normal text-left">{t('Volume discount')}</th>
-            <td className="text-right">
-              {formatPercentage(volumeDiscount)}%
-              {!isVolumeDiscountProgramRunning && (
-                <Tooltip description={t('No active volume discount programme')}>
-                  <span className="cursor-help">
-                    {' '}
-                    <VegaIcon name={VegaIconNames.INFO} size={12} />
-                  </span>
-                </Tooltip>
-              )}
-            </td>
+            <td className="text-right">{formatPercentage(volumeDiscount)}%</td>
           </tr>
           <tr>
             <th className="font-normal text-left ">{t('Referral discount')}</th>
             <td className="text-right">
               {formatPercentage(referralDiscount)}%
-              {!isReferralProgramRunning && (
-                <Tooltip description={t('No active referral programme')}>
-                  <span className="cursor-help">
-                    {' '}
-                    <VegaIcon name={VegaIconNames.INFO} size={12} />
-                  </span>
-                </Tooltip>
-              )}
             </td>
           </tr>
         </tbody>
@@ -562,31 +491,3 @@ const YourTier = () => {
     </span>
   );
 };
-
-const ReferrerInfo = ({ code }: { code?: string }) => (
-  <div className="pt-3 text-sm text-vega-clight-200 dark:vega-cdark-200">
-    <p className="mb-1">
-      {t('Connected key is owner of the referral set')}
-      {code && (
-        <>
-          {' '}
-          <span className="text-transparent bg-rainbow bg-clip-text">
-            {truncateMiddle(code)}
-          </span>
-        </>
-      )}
-      {'. '}
-      {t('As owner, it is eligible for commission not fee discounts.')}
-    </p>
-    <p>
-      {t('See')}{' '}
-      <Link
-        className="underline text-black dark:text-white"
-        to={Links.REFERRALS()}
-      >
-        {t('Referrals')}
-      </Link>{' '}
-      {t('for more information.')}
-    </p>
-  </div>
-);

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

@@ -1,31 +1,23 @@
-import { Tooltip } from '@vegaprotocol/ui-toolkit';
 import classNames from 'classnames';
-import type { ReactNode } from 'react';
 
 export const Stat = ({
   value,
   text,
   highlight,
-  description,
 }: {
   value: string | number;
   text?: string;
   highlight?: boolean;
-  description?: ReactNode;
 }) => {
-  const val = (
-    <span
-      className={classNames('inline-block text-3xl leading-none', {
-        'text-transparent bg-rainbow bg-clip-text': highlight,
-        'cursor-help': description,
-      })}
-    >
-      {value}
-    </span>
-  );
   return (
     <p className="pt-3 leading-none first:pt-6">
-      {description ? <Tooltip description={description}>{val}</Tooltip> : val}
+      <span
+        className={classNames('inline-block text-3xl leading-none', {
+          'text-transparent bg-rainbow bg-clip-text': highlight,
+        })}
+      >
+        {value}
+      </span>
       {text && (
         <small className="block mt-0.5 text-xs text-muted">{text}</small>
       )}

apps/trading/components/fees-container/use-referral-stats.spec.ts

@@ -73,8 +73,6 @@ describe('useReferralStats', () => {
       referralTierIndex: -1,
       referralTiers: [],
       epochsInSet: 0,
-      code: undefined,
-      isReferrer: false,
     });
   });
 
@@ -95,8 +93,6 @@ describe('useReferralStats', () => {
       referralTierIndex: 1,
       referralTiers: program.benefitTiers,
       epochsInSet: Number(epoch.id) - set.atEpoch,
-      code: undefined,
-      isReferrer: false,
     });
   });
 

apps/trading/components/fees-container/use-referral-stats.ts

@@ -2,15 +2,12 @@ import compact from 'lodash/compact';
 import maxBy from 'lodash/maxBy';
 import { getReferralBenefitTier } from './utils';
 import type { DiscountProgramsQuery, FeesQuery } from './__generated__/Fees';
-import { first } from 'lodash';
 
 export const useReferralStats = (
   setStats?: FeesQuery['referralSetStats'],
   setReferees?: FeesQuery['referralSetReferees'],
   program?: DiscountProgramsQuery['currentReferralProgram'],
-  epoch?: FeesQuery['epoch'],
-  setIfReferrer?: FeesQuery['referrer'],
-  setIfReferee?: FeesQuery['referee']
+  epoch?: FeesQuery['epoch']
 ) => {
   const referralTiers = program?.benefitTiers || [];
 
@@ -21,18 +18,9 @@ export const useReferralStats = (
       referralTierIndex: -1,
       referralTiers,
       epochsInSet: 0,
-      code: undefined,
-      isReferrer: false,
     };
   }
 
-  const setIfReferrerData = first(
-    compact(setIfReferrer?.edges).map((e) => e.node)
-  );
-  const setIfRefereeData = first(
-    compact(setIfReferee?.edges).map((e) => e.node)
-  );
-
   const referralSetsStats = compact(setStats.edges).map((e) => e.node);
   const referralSets = compact(setReferees.edges).map((e) => e.node);
 
@@ -60,7 +48,5 @@ export const useReferralStats = (
     referralTierIndex,
     referralTiers,
     epochsInSet,
-    code: (setIfReferrerData || setIfRefereeData)?.id,
-    isReferrer: Boolean(setIfReferrerData),
   };
 };

apps/trading/components/fees-container/utils.spec.ts

@@ -21,7 +21,7 @@ describe('getAdjustedFee', () => {
       new BigNumber(referralDiscount),
     ];
 
-    // 1 - 0.5 = 0.5
+    // 1 - 0.5 - 0.5
     const v = new BigNumber(1).minus(new BigNumber(volumeDiscount));
 
     // 1 - 0.5 = 0.5
@@ -34,15 +34,13 @@ describe('getAdjustedFee', () => {
     // 0.1 + 0.1 + 0.1 = 0.3
     const totalFees = fees.reduce((sum, x) => sum.plus(x), new BigNumber(0));
 
-    // (1 - 0.3) * 0.75 = 0.525
-    const expected = new BigNumber(totalFees)
-      .times(new BigNumber(1).minus(factor))
-      .toNumber();
+    // 0.3 * 0.75 = 0.225
+    const expected = new BigNumber(totalFees).times(factor).toNumber();
 
     expect(getAdjustedFee(fees, discounts)).toBe(expected);
   });
 
-  it('combines discount factors multiplicatively', () => {
+  it('combines discount factors multiplicativly', () => {
     const volumeDiscount = 0.4;
     const referralDiscount = 0.1;
 
@@ -69,9 +67,7 @@ describe('getAdjustedFee', () => {
     // summed fees
     const totalFees = fees.reduce((sum, x) => sum.plus(x), new BigNumber(0));
 
-    const expected = new BigNumber(totalFees)
-      .times(new BigNumber(1).minus(factor))
-      .toNumber();
+    const expected = new BigNumber(totalFees).times(factor).toNumber();
 
     expect(getAdjustedFee(fees, discounts)).toBe(expected);
   });

apps/trading/components/fees-container/utils.ts

@@ -12,9 +12,7 @@ export const formatPercentage = (num: number) => {
   const pct = new BigNumber(num).times(100);
   const dps = pct.decimalPlaces();
   const formatter = new Intl.NumberFormat(getUserLocale(), {
-    // set to 0 in order to remove the "trailing zeroes" for numbers such as:
-    // 0.123456789 -non-zero-min-> 12.3456800% -zero-min-> 12.34568%
-    minimumFractionDigits: 0,
+    minimumFractionDigits: dps || 0,
     maximumFractionDigits: dps || 0,
   });
   return formatter.format(parseFloat(pct.toFixed(5)));
@@ -103,7 +101,5 @@ export const getAdjustedFee = (fees: BigNumber[], discounts: BigNumber[]) => {
 
   const totalFactor = new BigNumber(1).minus(combinedFactors);
 
-  return totalFee
-    .times(new BigNumber(1).minus(BigNumber.max(0, totalFactor)))
-    .toNumber();
+  return totalFee.times(BigNumber.max(0, totalFactor)).toNumber();
 };

docker/prepare-dist.sh

@@ -1,11 +1,11 @@
 #!/bin/bash -e
 yarn --pure-lockfile
 app=${1:-trading}
-envCmd="envCmd="yarn -f ./apps/${app}/.env.${2:-mainnet}"
+envCmd="envCmd="yarn env-cmd -f ./apps/${app}/.env.${2:-mainnet}"
 yarn install
 if [ "${app}" = "trading" ]; then
   $envCmd yarn nx export trading
-  DIST_LOCATION=dist/apps/trading/exported/
+  DIST_LOCATION=dist/apps/trading/exported
 else
   $envCmd yarn nx build ${app}
   DIST_LOCATION=dist/apps/${app}

libs/accounts/src/lib/accounts-table.spec.tsx

@@ -1,23 +1,10 @@
-import { act, render, screen, within } from '@testing-library/react';
+import { act, render, screen } from '@testing-library/react';
 import * as Types from '@vegaprotocol/types';
 import type { AccountFields } from './accounts-data-provider';
 import { getAccountData } from './accounts-data-provider';
 import { AccountTable } from './accounts-table';
 import userEvent from '@testing-library/user-event';
-const asset1 = {
-  __typename: 'Asset',
-  id: 'asset-1',
-  symbol: 'tBTC',
-  decimals: 5,
-  name: 'T BTC',
-};
-const asset2 = {
-  __typename: 'Asset',
-  id: 'asset-2',
-  symbol: 'aBTC',
-  decimals: 5,
-  name: 'A BTC',
-};
+
 const singleRow = {
   __typename: 'AccountBalance',
   type: Types.AccountType.ACCOUNT_TYPE_MARGIN,
@@ -26,7 +13,12 @@ const singleRow = {
     __typename: 'Market',
     id: '10cd0a793ad2887b340940337fa6d97a212e0e517fe8e9eab2b5ef3a38633f35',
   },
-  asset: asset1,
+  asset: {
+    __typename: 'Asset',
+    id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
+    symbol: 'tBTC',
+    decimals: 5,
+  },
   available: '125600000',
   used: '125600000',
   total: '251200000',
@@ -41,7 +33,12 @@ const secondRow = {
     __typename: 'Market',
     id: '10cd0a793ad2887b340940337fa6d97a212e0e517fe8e9eab2b5ef3a38633f35',
   },
-  asset: asset2,
+  asset: {
+    __typename: 'Asset',
+    id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
+    symbol: 'aBTC',
+    decimals: 5,
+  },
   available: '125600001',
   used: '125600001',
   total: '251200002',
@@ -137,7 +134,7 @@ describe('AccountsTable', () => {
 
   it('should sort assets', async () => {
     // 7001-COLL-010
-    render(
+    const { container } = render(
       <AccountTable
         rowData={multiRowData}
         onClickAsset={() => null}
@@ -145,13 +142,13 @@ describe('AccountsTable', () => {
       />
     );
 
-    const headerCell = screen
-      .getAllByRole('columnheader')
-      .find((h) => h?.getAttribute('col-id') === 'asset.symbol') as HTMLElement;
-
-    await userEvent.click(within(headerCell).getByText(/asset/i));
-
-    expect(headerCell).toHaveAttribute('aria-sort', 'ascending');
+    const headerCell = screen.getByText('Asset');
+    await userEvent.click(headerCell);
+    const rows = container.querySelectorAll(
+      '.ag-center-cols-container .ag-row'
+    );
+    expect(rows[0].textContent).toContain('aBTC');
+    expect(rows[1].textContent).toContain('tBTC');
   });
 
   it('should apply correct formatting in view as user mode', async () => {
@@ -179,7 +176,12 @@ describe('AccountsTable', () => {
         rowData={singleRowData}
         onClickAsset={() => null}
         isReadOnly={false}
-        pinnedAsset={asset1}
+        pinnedAsset={{
+          decimals: 5,
+          id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
+          symbol: 'tBTC',
+          name: 'tBTC',
+        }}
       />
     );
     await screen.findAllByRole('rowgroup');
@@ -211,13 +213,23 @@ describe('AccountsTable', () => {
     const result = getAccountData([singleRow]);
     const expected = [
       {
-        asset: asset1,
+        asset: {
+          __typename: 'Asset',
+          decimals: 5,
+          id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
+          symbol: 'tBTC',
+        },
         available: '0',
         balance: '0',
         breakdown: [
           {
             __typename: 'AccountBalance',
-            asset: asset1,
+            asset: {
+              __typename: 'Asset',
+              decimals: 5,
+              id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
+              symbol: 'tBTC',
+            },
             available: '0',
             balance: '125600000',
             total: '125600000',

libs/accounts/src/lib/transfer-container.tsx

@@ -1,10 +1,9 @@
-import sortBy from 'lodash/sortBy';
 import * as Schema from '@vegaprotocol/types';
 import { truncateByChars } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import {
   NetworkParams,
-  useNetworkParams,
+  useNetworkParam,
 } from '@vegaprotocol/network-parameters';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import type { Transfer } from '@vegaprotocol/wallet';
@@ -22,11 +21,7 @@ export const ALLOWED_ACCOUNTS = [
 
 export const TransferContainer = ({ assetId }: { assetId?: string }) => {
   const { pubKey, pubKeys } = useVegaWallet();
-  const { params } = useNetworkParams([
-    NetworkParams.transfer_fee_factor,
-    NetworkParams.transfer_minTransferQuantumMultiple,
-  ]);
-
+  const { param } = useNetworkParam(NetworkParams.transfer_fee_factor);
   const { data } = useDataProvider({
     dataProvider: accountsDataProvider,
     variables: { partyId: pubKey || '' },
@@ -45,7 +40,6 @@ export const TransferContainer = ({ assetId }: { assetId?: string }) => {
   const accounts = data
     ? data.filter((account) => ALLOWED_ACCOUNTS.includes(account.type))
     : [];
-  const sortedAccounts = sortBy(accounts, (a) => a.asset.symbol.toLowerCase());
 
   return (
     <>
@@ -65,10 +59,9 @@ export const TransferContainer = ({ assetId }: { assetId?: string }) => {
         pubKey={pubKey}
         pubKeys={pubKeys ? pubKeys?.map((pk) => pk.publicKey) : null}
         assetId={assetId}
-        feeFactor={params.transfer_fee_factor}
-        minQuantumMultiple={params.transfer_minTransferQuantumMultiple}
+        feeFactor={param}
         submitTransfer={transfer}
-        accounts={sortedAccounts}
+        accounts={accounts}
       />
     </>
   );

libs/accounts/src/lib/transfer-form.spec.tsx

@@ -1,26 +1,11 @@
-import {
-  fireEvent,
-  render,
-  screen,
-  waitFor,
-  within,
-} from '@testing-library/react';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import BigNumber from 'bignumber.js';
-import {
-  AddressField,
-  TransferFee,
-  TransferForm,
-  type TransferFormProps,
-} from './transfer-form';
-import { AccountType, AccountTypeMapping } from '@vegaprotocol/types';
+import { AddressField, TransferFee, TransferForm } from './transfer-form';
+import { AccountType } from '@vegaprotocol/types';
 import { removeDecimal } from '@vegaprotocol/utils';
 
 describe('TransferForm', () => {
-  const renderComponent = (props: TransferFormProps) => {
-    return render(<TransferForm {...props} />);
-  };
-
   const submit = async () => {
     await userEvent.click(
       screen.getByRole('button', { name: 'Confirm transfer' })
@@ -45,17 +30,20 @@ describe('TransferForm', () => {
   };
 
   const amount = '100';
-  const pubKey = '1'.repeat(64);
+  const pubKey =
+    '70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680';
   const asset = {
     id: 'eur',
     symbol: '€',
     name: 'EUR',
     decimals: 2,
-    quantum: '1',
   };
   const props = {
     pubKey,
-    pubKeys: [pubKey, '2'.repeat(64)],
+    pubKeys: [
+      pubKey,
+      'a4b6e3de5d7ef4e31ae1b090be49d1a2ef7bcefff60cccf7658a0d4922651cce',
+    ],
     feeFactor: '0.001',
     submitTransfer: jest.fn(),
     accounts: [
@@ -67,10 +55,9 @@ describe('TransferForm', () => {
       {
         type: AccountType.ACCOUNT_TYPE_VESTED_REWARDS,
         asset,
-        balance: '10000',
+        balance: '100000',
       },
     ],
-    minQuantumMultiple: '1',
   };
 
   it('form tooltips correctly displayed', async () => {
@@ -79,7 +66,7 @@ describe('TransferForm', () => {
     // 1003-TRAN-017
     // 1003-TRAN-018
     // 1003-TRAN-019
-    renderComponent(props);
+    render(<TransferForm {...props} />);
     // Select a pubkey
     await userEvent.selectOptions(
       screen.getByLabelText('To Vega key'),
@@ -126,9 +113,9 @@ describe('TransferForm', () => {
     // 1003-TRAN-012
     // 1003-TRAN-013
     // 1003-TRAN-004
-    renderComponent(props);
+    render(<TransferForm {...props} />);
     await submit();
-    expect(await screen.findAllByText('Required')).toHaveLength(2); // pubkey is set as default value
+    expect(await screen.findAllByText('Required')).toHaveLength(3); // pubkey is set as default value
     const toggle = screen.getByText('Enter manually');
     await userEvent.click(toggle);
     // has switched to input
@@ -141,18 +128,18 @@ describe('TransferForm', () => {
       screen.getByLabelText('To Vega key'),
       'invalid-address'
     );
-    expect(screen.getAllByTestId('input-error-text')[1]).toHaveTextContent(
+    expect(screen.getAllByTestId('input-error-text')[0]).toHaveTextContent(
       'Invalid Vega key'
     );
   });
 
-  it('sends transfer from general accounts', async () => {
+  it('validates fields and submits', async () => {
     // 1003-TRAN-002
     // 1003-TRAN-003
     // 1002-WITH-010
     // 1003-TRAN-011
     // 1003-TRAN-014
-    renderComponent(props);
+    render(<TransferForm {...props} />);
 
     // check current pubkey not shown
     const keySelect = screen.getByLabelText<HTMLSelectElement>('To Vega key');
@@ -164,7 +151,7 @@ describe('TransferForm', () => {
     ]);
 
     await submit();
-    expect(await screen.findAllByText('Required')).toHaveLength(2); // pubkey is set as default value
+    expect(await screen.findAllByText('Required')).toHaveLength(3); // pubkey is set as default value
 
     // Select a pubkey
     await userEvent.selectOptions(
@@ -177,20 +164,15 @@ describe('TransferForm', () => {
 
     await userEvent.selectOptions(
       screen.getByLabelText('From account'),
-      `${AccountType.ACCOUNT_TYPE_GENERAL}-${asset.id}`
+      AccountType.ACCOUNT_TYPE_VESTED_REWARDS
     );
 
     const amountInput = screen.getByLabelText('Amount');
 
-    // Test use max button
-    await userEvent.click(screen.getByRole('button', { name: 'Use max' }));
-    expect(amountInput).toHaveValue('1000.00');
-
     // Test amount validation
-    await userEvent.clear(amountInput);
-    await userEvent.type(amountInput, '0.001'); // Below quantum multiple amount
+    await userEvent.type(amountInput, '0.00000001');
     expect(
-      await screen.findByText(/Amount below minimum requirement/)
+      await screen.findByText('Value is below minimum')
     ).toBeInTheDocument();
 
     await userEvent.clear(amountInput);
@@ -211,7 +193,7 @@ describe('TransferForm', () => {
     await waitFor(() => {
       expect(props.submitTransfer).toHaveBeenCalledTimes(1);
       expect(props.submitTransfer).toHaveBeenCalledWith({
-        fromAccountType: AccountType.ACCOUNT_TYPE_GENERAL,
+        fromAccountType: AccountType.ACCOUNT_TYPE_VESTED_REWARDS,
         toAccountType: AccountType.ACCOUNT_TYPE_GENERAL,
         to: props.pubKeys[1],
         asset: asset.id,
@@ -221,169 +203,10 @@ describe('TransferForm', () => {
     });
   });
 
-  it('sends transfer from vested accounts', async () => {
-    const mockSubmit = jest.fn();
-    renderComponent({
-      ...props,
-      submitTransfer: mockSubmit,
-      minQuantumMultiple: '100000',
-    });
-
-    // check current pubkey not shown
-    const keySelect: HTMLSelectElement = screen.getByLabelText('To Vega key');
-    const pubKeyOptions = ['', pubKey, props.pubKeys[1]];
-    expect(keySelect.children).toHaveLength(pubKeyOptions.length);
-    expect(Array.from(keySelect.options).map((o) => o.value)).toEqual(
-      pubKeyOptions
-    );
-
-    await submit();
-    expect(await screen.findAllByText('Required')).toHaveLength(2); // pubkey set as default value
-
-    // Select a pubkey
-    await userEvent.selectOptions(
-      screen.getByLabelText('To Vega key'),
-      props.pubKeys[1] // Use not current pubkey so we can check it switches to current pubkey later
-    );
-
-    // Select asset
-    await selectAsset(asset);
-
-    await userEvent.selectOptions(
-      screen.getByLabelText('From account'),
-      `${AccountType.ACCOUNT_TYPE_VESTED_REWARDS}-${asset.id}`
-    );
-
-    // Check switch back to connected key
-    expect(screen.getByLabelText('To Vega key')).toHaveValue(props.pubKey);
-
-    const amountInput = screen.getByLabelText('Amount');
-
-    const checkbox = screen.getByTestId('include-transfer-fee');
-    expect(checkbox).not.toBeChecked();
-
-    await userEvent.clear(amountInput);
-    await userEvent.type(amountInput, '50');
-
-    expect(await screen.findByText(/Use max to bypass/)).toBeInTheDocument();
-
-    // Test use max button
-    await userEvent.click(screen.getByRole('button', { name: 'Use max' }));
-    expect(amountInput).toHaveValue('100.00');
-
-    // If transfering from a vested account 'include fees' checkbox should
-    // be disabled and fees should be 0
-    expect(checkbox).not.toBeChecked();
-    expect(checkbox).toBeDisabled();
-    const expectedFee = '0';
-    const total = new BigNumber(amount).plus(expectedFee).toFixed();
-
-    expect(screen.getByTestId('transfer-fee')).toHaveTextContent(expectedFee);
-    expect(screen.getByTestId('transfer-amount')).toHaveTextContent(amount);
-    expect(screen.getByTestId('total-transfer-fee')).toHaveTextContent(total);
-
-    await submit();
-
-    await waitFor(() => {
-      // 1003-TRAN-023
-      expect(mockSubmit).toHaveBeenCalledTimes(1);
-      expect(mockSubmit).toHaveBeenCalledWith({
-        fromAccountType: AccountType.ACCOUNT_TYPE_VESTED_REWARDS,
-        toAccountType: AccountType.ACCOUNT_TYPE_GENERAL,
-        to: props.pubKey,
-        asset: asset.id,
-        amount: removeDecimal(amount, asset.decimals),
-        oneOff: {},
-      });
-    });
-  });
-
-  it('handles lots of decimal places', async () => {
-    const balance = '904195168829277777';
-    const expectedBalance = '0.904195168829277777';
-
-    const longDecimalAsset = {
-      id: 'assetId',
-      symbol: 'VEGA',
-      name: 'VEGA',
-      decimals: 18,
-      quantum: '1',
-    };
-
-    const account = {
-      type: AccountType.ACCOUNT_TYPE_VESTED_REWARDS,
-      asset: longDecimalAsset,
-      balance,
-    };
-
-    const mockSubmit = jest.fn();
-
-    renderComponent({
-      ...props,
-      accounts: [account],
-      submitTransfer: mockSubmit,
-      minQuantumMultiple: '100000',
-    });
-
-    // Select a pubkey
-    await userEvent.selectOptions(
-      screen.getByLabelText('To Vega key'),
-      props.pubKeys[1] // Use not current pubkey so we can check it switches to current pubkey later
-    );
-
-    // Select asset
-    await selectAsset(longDecimalAsset);
-
-    const accountSelect = screen.getByLabelText('From account');
-    const option = within(accountSelect)
-      .getAllByRole('option')
-      .find(
-        (o) => o.getAttribute('value') === `${account.type}-${account.asset.id}`
-      );
-    // plus one for disabled 'please select' option
-
-    expect(option).toHaveTextContent(
-      `${AccountTypeMapping[account.type]} (${expectedBalance} ${
-        account.asset.symbol
-      })`
-    );
-
-    await userEvent.selectOptions(
-      accountSelect,
-      `${AccountType.ACCOUNT_TYPE_VESTED_REWARDS}-${longDecimalAsset.id}`
-    );
-
-    expect(accountSelect).toHaveValue(
-      `${AccountType.ACCOUNT_TYPE_VESTED_REWARDS}-${longDecimalAsset.id}`
-    );
-
-    // Check switch back to connected key
-    const amountInput = screen.getByLabelText('Amount');
-
-    // Test use max button
-    await userEvent.click(screen.getByRole('button', { name: 'Use max' }));
-    expect(amountInput).toHaveValue(expectedBalance);
-
-    await submit();
-
-    await waitFor(() => {
-      // 1003-TRAN-023
-      expect(mockSubmit).toHaveBeenCalledTimes(1);
-      expect(mockSubmit).toHaveBeenCalledWith({
-        fromAccountType: AccountType.ACCOUNT_TYPE_VESTED_REWARDS,
-        toAccountType: AccountType.ACCOUNT_TYPE_GENERAL,
-        to: props.pubKey,
-        asset: longDecimalAsset.id,
-        amount: balance,
-        oneOff: {},
-      });
-    });
-  });
-
   describe('IncludeFeesCheckbox', () => {
     it('validates fields and submits when checkbox is checked', async () => {
       const mockSubmit = jest.fn();
-      renderComponent({ ...props, submitTransfer: mockSubmit });
+      render(<TransferForm {...props} submitTransfer={mockSubmit} />);
 
       // check current pubkey not shown
       const keySelect = screen.getByLabelText<HTMLSelectElement>('To Vega key');
@@ -394,7 +217,7 @@ describe('TransferForm', () => {
       );
 
       await submit();
-      expect(await screen.findAllByText('Required')).toHaveLength(2); // pubkey set as default value
+      expect(await screen.findAllByText('Required')).toHaveLength(3); // pubkey set as default value
 
       // Select a pubkey
       await userEvent.selectOptions(
@@ -407,7 +230,7 @@ describe('TransferForm', () => {
 
       await userEvent.selectOptions(
         screen.getByLabelText('From account'),
-        `${AccountType.ACCOUNT_TYPE_GENERAL}-${asset.id}`
+        AccountType.ACCOUNT_TYPE_VESTED_REWARDS
       );
 
       const amountInput = screen.getByLabelText('Amount');
@@ -441,7 +264,7 @@ describe('TransferForm', () => {
         // 1003-TRAN-023
         expect(mockSubmit).toHaveBeenCalledTimes(1);
         expect(mockSubmit).toHaveBeenCalledWith({
-          fromAccountType: AccountType.ACCOUNT_TYPE_GENERAL,
+          fromAccountType: AccountType.ACCOUNT_TYPE_VESTED_REWARDS,
           toAccountType: AccountType.ACCOUNT_TYPE_GENERAL,
           to: props.pubKeys[1],
           asset: asset.id,
@@ -452,7 +275,7 @@ describe('TransferForm', () => {
     });
 
     it('validates fields when checkbox is not checked', async () => {
-      renderComponent(props);
+      render(<TransferForm {...props} />);
 
       // check current pubkey not shown
       const keySelect: HTMLSelectElement = screen.getByLabelText('To Vega key');
@@ -463,7 +286,7 @@ describe('TransferForm', () => {
       );
 
       await submit();
-      expect(await screen.findAllByText('Required')).toHaveLength(2); // pubkey set as default value
+      expect(await screen.findAllByText('Required')).toHaveLength(3); // pubkey set as default value
 
       // Select a pubkey
       await userEvent.selectOptions(
@@ -474,11 +297,6 @@ describe('TransferForm', () => {
       // Select asset
       await selectAsset(asset);
 
-      await userEvent.selectOptions(
-        screen.getByLabelText('From account'),
-        `${AccountType.ACCOUNT_TYPE_GENERAL}-${asset.id}`
-      );
-
       const amountInput = screen.getByLabelText('Amount');
       const checkbox = screen.getByTestId('include-transfer-fee');
       expect(checkbox).not.toBeChecked();
@@ -498,28 +316,26 @@ describe('TransferForm', () => {
 
   describe('AddressField', () => {
     const props = {
-      mode: 'select' as const,
       select: <div>select</div>,
       input: <div>input</div>,
       onChange: jest.fn(),
     };
 
-    it('renders correct content by mode prop and calls onChange', async () => {
+    it('toggles content and calls onChange', async () => {
       const mockOnChange = jest.fn();
-      const { rerender } = render(
-        <AddressField {...props} onChange={mockOnChange} />
-      );
+      render(<AddressField {...props} onChange={mockOnChange} />);
 
       // select should be shown by default
       expect(screen.getByText('select')).toBeInTheDocument();
       expect(screen.queryByText('input')).not.toBeInTheDocument();
       await userEvent.click(screen.getByText('Enter manually'));
-      expect(mockOnChange).toHaveBeenCalled();
-
-      rerender(<AddressField {...props} mode="input" />);
-
       expect(screen.queryByText('select')).not.toBeInTheDocument();
       expect(screen.getByText('input')).toBeInTheDocument();
+      expect(mockOnChange).toHaveBeenCalledTimes(1);
+      await userEvent.click(screen.getByText('Select from wallet'));
+      expect(screen.getByText('select')).toBeInTheDocument();
+      expect(screen.queryByText('input')).not.toBeInTheDocument();
+      expect(mockOnChange).toHaveBeenCalledTimes(2);
     });
   });
 

libs/accounts/src/lib/transfer-form.tsx

@@ -1,11 +1,12 @@
 import sortBy from 'lodash/sortBy';
 import {
+  minSafe,
   maxSafe,
   required,
   vegaPublicKey,
   addDecimal,
   formatNumber,
-  toBigNum,
+  addDecimalsFormatNumber,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import {
@@ -29,30 +30,21 @@ import { AccountType, AccountTypeMapping } from '@vegaprotocol/types';
 
 interface FormFields {
   toVegaKey: string;
-  asset: string; // This is used to simply filter the from account list, the fromAccount type should be used in the tx
+  asset: string;
   amount: string;
-  fromAccount: string; // AccountType-AssetId
+  fromAccount: AccountType;
 }
 
-interface Asset {
-  id: string;
-  symbol: string;
-  name: string;
-  decimals: number;
-  quantum: string;
-}
-
-export interface TransferFormProps {
+interface TransferFormProps {
   pubKey: string | null;
   pubKeys: string[] | null;
   accounts: Array<{
     type: AccountType;
     balance: string;
-    asset: Asset;
+    asset: { id: string; symbol: string; name: string; decimals: number };
   }>;
   assetId?: string;
   feeFactor: string | null;
-  minQuantumMultiple: string | null;
   submitTransfer: (transfer: Transfer) => void;
 }
 
@@ -63,7 +55,6 @@ export const TransferForm = ({
   feeFactor,
   submitTransfer,
   accounts,
-  minQuantumMultiple,
 }: TransferFormProps) => {
   const {
     control,
@@ -79,58 +70,43 @@ export const TransferForm = ({
     },
   });
 
-  const [toVegaKeyMode, setToVegaKeyMode] = useState<ToVegaKeyMode>('select');
-
   const assets = sortBy(
     accounts
-      .filter(
-        (a) =>
-          a.type === AccountType.ACCOUNT_TYPE_GENERAL ||
-          a.type === AccountType.ACCOUNT_TYPE_VESTED_REWARDS
-      )
-      // Sum the general and vested account balances so the value shown in the asset
-      // dropdown is correct for all transferable accounts
-      .reduce((merged, account) => {
-        const existing = merged.findIndex(
-          (m) => m.asset.id === account.asset.id
-        );
-        if (existing > -1) {
-          const balance = new BigNumber(merged[existing].balance)
-            .plus(new BigNumber(account.balance))
-            .toString();
-          merged[existing] = { ...merged[existing], balance };
-          return merged;
-        }
-        return [...merged, account];
-      }, [] as typeof accounts)
+      .filter((a) => a.type === AccountType.ACCOUNT_TYPE_GENERAL)
       .map((account) => ({
-        key: account.asset.id,
         ...account.asset,
         balance: addDecimal(account.balance, account.asset.decimals),
       })),
-    (a) => a.symbol.toLowerCase()
+    'name'
   );
 
   const selectedPubKey = watch('toVegaKey');
   const amount = watch('amount');
   const fromAccount = watch('fromAccount');
-  const selectedAssetId = watch('asset');
+  const assetId = watch('asset');
 
-  // Convert the account type (Type-AssetId) into separate values
-  const [accountType, accountAssetId] = fromAccount
-    ? parseFromAccount(fromAccount)
-    : [undefined, undefined];
-  const fromVested = accountType === AccountType.ACCOUNT_TYPE_VESTED_REWARDS;
-  const asset = assets.find((a) => a.id === accountAssetId);
+  const asset = assets.find((a) => a.id === assetId);
 
   const account = accounts.find(
-    (a) => a.asset.id === accountAssetId && a.type === accountType
+    (a) => a.asset.id === assetId && a.type === fromAccount
   );
   const accountBalance =
     account && addDecimal(account.balance, account.asset.decimals);
 
+  // General account for the selected asset
+  const generalAccount = accounts.find((a) => {
+    return (
+      a.asset.id === assetId && a.type === AccountType.ACCOUNT_TYPE_GENERAL
+    );
+  });
+
   const [includeFee, setIncludeFee] = useState(false);
 
+  // Min viable amount given asset decimals EG for WEI 0.000000000000000001
+  const min = asset
+    ? new BigNumber(addDecimal('1', asset.decimals))
+    : new BigNumber(0);
+
   // Max amount given selected asset and from account
   const max = accountBalance ? new BigNumber(accountBalance) : new BigNumber(0);
 
@@ -154,21 +130,16 @@ export const TransferForm = ({
 
   const onSubmit = useCallback(
     (fields: FormFields) => {
-      if (!transferAmount) {
-        throw new Error('Submitted transfer with no amount selected');
-      }
-
-      const [type, assetId] = parseFromAccount(fields.fromAccount);
-      const asset = assets.find((a) => a.id === assetId);
-
       if (!asset) {
         throw new Error('Submitted transfer with no asset selected');
       }
-
+      if (!transferAmount) {
+        throw new Error('Submitted transfer with no amount selected');
+      }
       const transfer = normalizeTransfer(
         fields.toVegaKey,
         transferAmount,
-        type,
+        fields.fromAccount,
         AccountType.ACCOUNT_TYPE_GENERAL, // field is readonly in the form
         {
           id: asset.id,
@@ -177,7 +148,7 @@ export const TransferForm = ({
       );
       submitTransfer(transfer);
     },
-    [submitTransfer, transferAmount, assets]
+    [asset, submitTransfer, transferAmount]
   );
 
   // reset for placeholder workaround https://github.com/radix-ui/primitives/issues/1569
@@ -193,120 +164,11 @@ export const TransferForm = ({
       className="text-sm"
       data-testid="transfer-form"
     >
-      <TradingFormGroup label={t('Asset')} labelFor="asset">
-        <Controller
-          control={control}
-          name="asset"
-          render={({ field }) => (
-            <TradingRichSelect
-              data-testid="select-asset"
-              id={field.name}
-              name={field.name}
-              onValueChange={(value) => {
-                field.onChange(value);
-                setValue('fromAccount', '');
-              }}
-              placeholder={t('Please select an asset')}
-              value={field.value}
-            >
-              {assets.map((a) => (
-                <AssetOption
-                  key={a.key}
-                  asset={a}
-                  balance={<Balance balance={a.balance} symbol={a.symbol} />}
-                />
-              ))}
-            </TradingRichSelect>
-          )}
-        />
-        {errors.asset?.message && (
-          <TradingInputError forInput="asset">
-            {errors.asset.message}
-          </TradingInputError>
-        )}
-      </TradingFormGroup>
-      <TradingFormGroup label={t('From account')} labelFor="fromAccount">
-        <Controller
-          control={control}
-          name="fromAccount"
-          rules={{
-            validate: {
-              required,
-              sameAccount: (value) => {
-                if (
-                  pubKey === selectedPubKey &&
-                  value === AccountType.ACCOUNT_TYPE_GENERAL
-                ) {
-                  return t(
-                    'Cannot transfer to the same account type for the connected key'
-                  );
-                }
-                return true;
-              },
-            },
-          }}
-          render={({ field }) => (
-            <TradingSelect
-              id="fromAccount"
-              defaultValue=""
-              {...field}
-              onChange={(e) => {
-                field.onChange(e);
-
-                const [type] = parseFromAccount(e.target.value);
-
-                // Enforce that if transferring from a vested rewards account it must go to
-                // the current connected general account
-                if (
-                  type === AccountType.ACCOUNT_TYPE_VESTED_REWARDS &&
-                  pubKey
-                ) {
-                  setValue('toVegaKey', pubKey);
-                  setToVegaKeyMode('select');
-                  setIncludeFee(false);
-                }
-              }}
-            >
-              <option value="" disabled={true}>
-                {t('Please select')}
-              </option>
-              {accounts
-                .filter((a) => {
-                  if (!selectedAssetId) return true;
-                  return selectedAssetId === a.asset.id;
-                })
-                .map((a) => {
-                  const id = `${a.type}-${a.asset.id}`;
-                  return (
-                    <option value={id} key={id}>
-                      {AccountTypeMapping[a.type]} (
-                      {addDecimal(a.balance, a.asset.decimals)} {a.asset.symbol}
-                      )
-                    </option>
-                  );
-                })}
-            </TradingSelect>
-          )}
-        />
-        {errors.fromAccount?.message && (
-          <TradingInputError forInput="fromAccount">
-            {errors.fromAccount.message}
-          </TradingInputError>
-        )}
-      </TradingFormGroup>
       <TradingFormGroup label="To Vega key" labelFor="toVegaKey">
         <AddressField
-          onChange={() => {
-            setValue('toVegaKey', '');
-            setToVegaKeyMode((curr) => (curr === 'input' ? 'select' : 'input'));
-          }}
-          mode={toVegaKeyMode}
+          onChange={() => setValue('toVegaKey', '')}
           select={
-            <TradingSelect
-              {...register('toVegaKey')}
-              disabled={fromVested}
-              id="toVegaKey"
-            >
+            <TradingSelect {...register('toVegaKey')} id="toVegaKey">
               <option value="" disabled={true}>
                 {t('Please select')}
               </option>
@@ -322,21 +184,18 @@ export const TransferForm = ({
             </TradingSelect>
           }
           input={
-            fromVested ? null : (
-              <TradingInput
-                // eslint-disable-next-line jsx-a11y/no-autofocus
-                autoFocus={true} // focus input immediately after is shown
-                id="toVegaKey"
-                type="text"
-                disabled={fromVested}
-                {...register('toVegaKey', {
-                  validate: {
-                    required,
-                    vegaPublicKey,
-                  },
-                })}
-              />
-            )
+            <TradingInput
+              // eslint-disable-next-line jsx-a11y/no-autofocus
+              autoFocus={true} // focus input immediately after is shown
+              id="toVegaKey"
+              type="text"
+              {...register('toVegaKey', {
+                validate: {
+                  required,
+                  vegaPublicKey,
+                },
+              })}
+            />
           }
         />
         {errors.toVegaKey?.message && (
@@ -345,6 +204,109 @@ export const TransferForm = ({
           </TradingInputError>
         )}
       </TradingFormGroup>
+      <TradingFormGroup label={t('Asset')} labelFor="asset">
+        <Controller
+          control={control}
+          name="asset"
+          rules={{
+            validate: {
+              required,
+            },
+          }}
+          render={({ field }) => (
+            <TradingRichSelect
+              data-testid="select-asset"
+              id={field.name}
+              name={field.name}
+              onValueChange={(value) => {
+                field.onChange(value);
+              }}
+              placeholder={t('Please select an asset')}
+              value={field.value}
+            >
+              {assets.map((a) => (
+                <AssetOption
+                  key={a.id}
+                  asset={a}
+                  balance={
+                    <Balance
+                      balance={formatNumber(a.balance, a.decimals)}
+                      symbol={a.symbol}
+                    />
+                  }
+                />
+              ))}
+            </TradingRichSelect>
+          )}
+        />
+        {errors.asset?.message && (
+          <TradingInputError forInput="asset">
+            {errors.asset.message}
+          </TradingInputError>
+        )}
+      </TradingFormGroup>
+      <TradingFormGroup label={t('From account')} labelFor="fromAccount">
+        <TradingSelect
+          id="fromAccount"
+          defaultValue=""
+          {...register('fromAccount', {
+            validate: {
+              required,
+              sameAccount: (value) => {
+                if (
+                  pubKey === selectedPubKey &&
+                  value === AccountType.ACCOUNT_TYPE_GENERAL
+                ) {
+                  return t(
+                    'Cannot transfer to the same account type for the connected key'
+                  );
+                }
+                return true;
+              },
+            },
+          })}
+        >
+          <option value="" disabled={true}>
+            {t('Please select')}
+          </option>
+          {accounts
+            .filter((a) => {
+              if (!assetId) return true;
+              return assetId === a.asset.id;
+            })
+            .map((a) => {
+              return (
+                <option value={a.type} key={`${a.type}-${a.asset.id}`}>
+                  {AccountTypeMapping[a.type]} (
+                  {addDecimalsFormatNumber(a.balance, a.asset.decimals)}{' '}
+                  {a.asset.symbol})
+                </option>
+              );
+            })}
+        </TradingSelect>
+        {errors.fromAccount?.message && (
+          <TradingInputError forInput="fromAccount">
+            {errors.fromAccount.message}
+          </TradingInputError>
+        )}
+      </TradingFormGroup>
+      <TradingFormGroup label={t('To account')} labelFor="toAccount">
+        <TradingSelect
+          id="toAccount"
+          defaultValue={AccountType.ACCOUNT_TYPE_GENERAL}
+        >
+          <option value={AccountType.ACCOUNT_TYPE_GENERAL}>
+            {generalAccount
+              ? `${
+                  AccountTypeMapping[AccountType.ACCOUNT_TYPE_GENERAL]
+                } (${addDecimalsFormatNumber(
+                  generalAccount.balance,
+                  generalAccount.asset.decimals
+                )} ${generalAccount.asset.symbol})`
+              : AccountTypeMapping[AccountType.ACCOUNT_TYPE_GENERAL]}
+          </option>
+        </TradingSelect>
+      </TradingFormGroup>
       <TradingFormGroup label="Amount" labelFor="amount">
         <TradingInput
           id="amount"
@@ -355,43 +317,7 @@ export const TransferForm = ({
           {...register('amount', {
             validate: {
               required,
-              minSafe: (v) => {
-                if (!asset || !minQuantumMultiple) return true;
-
-                const value = new BigNumber(v);
-
-                if (value.isZero()) {
-                  return t('Amount cannot be 0');
-                }
-
-                const minByQuantumMultiple = toBigNum(
-                  minQuantumMultiple,
-                  asset.decimals
-                );
-
-                if (fromVested) {
-                  // special conditions which let you bypass min transfer rules set by quantum multiple
-                  if (value.isGreaterThanOrEqualTo(max)) {
-                    return true;
-                  }
-
-                  if (value.isLessThan(minByQuantumMultiple)) {
-                    return t(
-                      'Amount below minimum requirements for partial transfer. Use max to bypass'
-                    );
-                  }
-
-                  return true;
-                } else {
-                  if (value.isLessThan(minByQuantumMultiple)) {
-                    return t(
-                      'Amount below minimum requirement set by transfer.minTransferQuantumMultiple'
-                    );
-                  }
-                }
-
-                return true;
-              },
+              minSafe: (value) => minSafe(new BigNumber(min))(value),
               maxSafe: (v) => {
                 const value = new BigNumber(v);
                 if (value.isGreaterThan(max)) {
@@ -407,9 +333,7 @@ export const TransferForm = ({
             type="button"
             className="absolute top-0 right-0 ml-auto text-xs underline"
             onClick={() =>
-              setValue('amount', accountBalance, {
-                shouldValidate: true,
-              })
+              setValue('amount', parseFloat(accountBalance).toString())
             }
           >
             {t('Use max')}
@@ -430,10 +354,10 @@ export const TransferForm = ({
           <div>
             <TradingCheckbox
               name="include-transfer-fee"
-              disabled={!transferAmount || fromVested}
+              disabled={!transferAmount}
               label={t('Include transfer fee')}
               checked={includeFee}
-              onCheckedChange={() => setIncludeFee((x) => !x)}
+              onCheckedChange={() => setIncludeFee(!includeFee)}
             />
           </div>
         </Tooltip>
@@ -443,7 +367,7 @@ export const TransferForm = ({
           amount={transferAmount}
           transferAmount={transferAmount}
           feeFactor={feeFactor}
-          fee={fromVested ? '0' : fee}
+          fee={fee}
           decimals={asset?.decimals}
         />
       )}
@@ -525,38 +449,32 @@ export const TransferFee = ({
   );
 };
 
-type ToVegaKeyMode = 'input' | 'select';
-
 interface AddressInputProps {
   select: ReactNode;
   input: ReactNode;
-  mode: ToVegaKeyMode;
   onChange: () => void;
 }
 
 export const AddressField = ({
   select,
   input,
-  mode,
   onChange,
 }: AddressInputProps) => {
-  const isInput = mode === 'input';
+  const [isInput, setIsInput] = useState(false);
+
   return (
     <>
       {isInput ? input : select}
-      {select && input && (
-        <button
-          type="button"
-          onClick={onChange}
-          className="absolute top-0 right-0 ml-auto text-xs underline"
-        >
-          {isInput ? t('Select from wallet') : t('Enter manually')}
-        </button>
-      )}
+      <button
+        type="button"
+        onClick={() => {
+          setIsInput((curr) => !curr);
+          onChange();
+        }}
+        className="absolute top-0 right-0 ml-auto text-xs underline"
+      >
+        {isInput ? t('Select from wallet') : t('Enter manually')}
+      </button>
     </>
   );
 };
-
-const parseFromAccount = (fromAccountStr: string) => {
-  return fromAccountStr.split('-') as [AccountType, string];
-};

libs/deal-ticket/src/components/deal-ticket/deal-ticket-fee-details.tsx

@@ -72,11 +72,15 @@ export const DealTicketFeeDetails = ({
 
   return (
     <KeyValue
-      label={
+      label={t('Fees')}
+      value={
+        totalDiscountedFeeAmount &&
+        `~${formatValue(totalDiscountedFeeAmount, assetDecimals)}`
+      }
+      formattedValue={
         <>
-          {t('Fees')}
           {totalDiscountFactor ? (
-            <Pill size="xxs" intent={Intent.Info} className="ml-1">
+            <Pill size="xxs" intent={Intent.Warning} className="mr-1">
               -
               {formatNumberPercentage(
                 new BigNumber(totalDiscountFactor).multipliedBy(100),
@@ -84,16 +88,10 @@ export const DealTicketFeeDetails = ({
               )}
             </Pill>
           ) : null}
+          {totalDiscountedFeeAmount &&
+            `~${formatValue(totalDiscountedFeeAmount, assetDecimals, quantum)}`}
         </>
       }
-      value={
-        totalDiscountedFeeAmount &&
-        `~${formatValue(totalDiscountedFeeAmount, assetDecimals)}`
-      }
-      formattedValue={
-        totalDiscountedFeeAmount &&
-        `~${formatValue(totalDiscountedFeeAmount, assetDecimals, quantum)}`
-      }
       labelDescription={
         <div className="flex flex-col gap-2">
           <p>
@@ -151,7 +149,6 @@ export const DealTicketMarginDetails = ({
   const { decimals: assetDecimals, quantum } = asset;
   let marginRequiredBestCase: string | undefined = undefined;
   let marginRequiredWorstCase: string | undefined = undefined;
-
   if (marginEstimate) {
     if (currentMargins) {
       marginRequiredBestCase = (
@@ -289,7 +286,7 @@ export const DealTicketMarginDetails = ({
   const quoteName = getQuoteName(market);
 
   return (
-    <div className="flex flex-col w-full gap-2 pt-2">
+    <div className="flex flex-col w-full gap-2">
       <Accordion>
         <AccordionPanel
           itemId="margin"
@@ -297,7 +294,7 @@ export const DealTicketMarginDetails = ({
             <AccordionPrimitive.Trigger
               data-testid="accordion-toggle"
               className={classNames(
-                'w-full',
+                'w-full pt-2',
                 'flex items-center gap-2 text-xs',
                 'group'
               )}

libs/deal-ticket/src/components/fees-breakdown/fees-breakdown.tsx

@@ -79,11 +79,7 @@ export const FeesBreakdown = ({
     volumeDiscountFactor
   );
 
-  const {
-    discountedFee: discountedTotalFeeAmount,
-    volumeDiscount,
-    referralDiscount,
-  } = getDiscountedFee(
+  const { volumeDiscount, referralDiscount } = getDiscountedFee(
     totalFeeAmount,
     referralDiscountFactor,
     volumeDiscountFactor
@@ -135,7 +131,7 @@ export const FeesBreakdown = ({
       <FeesBreakdownItem
         label={t('Total fees')}
         factor={feeFactors ? sumFeesFactors(feeFactors)?.toString() : undefined}
-        value={discountedTotalFeeAmount}
+        value={totalFeeAmount}
         symbol={symbol}
         decimals={decimals}
       />

libs/environment/src/components/node-switcher/row-data.spec.tsx

@@ -1,12 +1,6 @@
 import type { MockedResponse } from '@apollo/react-testing';
 import { MockedProvider } from '@apollo/react-testing';
-import {
-  act,
-  render,
-  renderHook,
-  screen,
-  waitFor,
-} from '@testing-library/react';
+import { act, render, screen, waitFor } from '@testing-library/react';
 import { RadioGroup } from '@vegaprotocol/ui-toolkit';
 import type {
   NodeCheckTimeUpdateSubscription,
@@ -17,33 +11,30 @@ import {
   NodeCheckTimeUpdateDocument,
 } from '../../utils/__generated__/NodeCheck';
 import type { RowDataProps } from './row-data';
-import {
-  POLL_INTERVAL,
-  Result,
-  SUBSCRIPTION_TIMEOUT,
-  useNodeBasicStatus,
-  useNodeSubscriptionStatus,
-  useResponseTime,
-} from './row-data';
+import { POLL_INTERVAL } from './row-data';
 import { BLOCK_THRESHOLD, RowData } from './row-data';
+import type { HeaderEntry } from '@vegaprotocol/apollo-client';
+import { useHeaderStore } from '@vegaprotocol/apollo-client';
 import { CUSTOM_NODE_KEY } from '../../types';
 
-const mockStatsQuery = (
-  blockHeight = '1234'
-): MockedResponse<NodeCheckQuery> => ({
+jest.mock('@vegaprotocol/apollo-client', () => ({
+  useHeaderStore: jest.fn().mockReturnValue({}),
+}));
+
+const statsQueryMock: MockedResponse<NodeCheckQuery> = {
   request: {
     query: NodeCheckDocument,
   },
   result: {
     data: {
       statistics: {
-        blockHeight,
+        blockHeight: '1234', // the actual value used in the component is the value from the header store
         vegaTime: new Date().toISOString(),
         chainId: 'test-chain-id',
       },
     },
   },
-});
+};
 
 const subMock: MockedResponse<NodeCheckTimeUpdateSubscription> = {
   request: {
@@ -68,6 +59,18 @@ global.performance.getEntriesByName = jest.fn().mockReturnValue([
   },
 ]);
 
+const mockHeaders = (
+  url: string,
+  headers: Partial<HeaderEntry> = {
+    blockHeight: 100,
+    timestamp: new Date(),
+  }
+) => {
+  (useHeaderStore as unknown as jest.Mock).mockReturnValue({
+    [url]: headers,
+  });
+};
+
 const renderComponent = (
   props: RowDataProps,
   queryMock: MockedResponse<NodeCheckQuery>,
@@ -83,98 +86,6 @@ const renderComponent = (
   );
 };
 
-describe('useNodeSubscriptionStatus', () => {
-  beforeAll(() => {
-    jest.useFakeTimers();
-  });
-  afterAll(() => {
-    jest.useRealTimers();
-  });
-  const mockWrapper =
-    (withData = false) =>
-    ({ children }: { children: React.ReactNode }) =>
-      (
-        <MockedProvider mocks={withData ? [subMock, subMock, subMock] : []}>
-          {children}
-        </MockedProvider>
-      );
-  it('results initially as loading', async () => {
-    const { result } = renderHook(() => useNodeSubscriptionStatus(), {
-      wrapper: mockWrapper(true),
-    });
-    expect(result.current.status).toBe(Result.Loading);
-  });
-  it('results as successful when data received', async () => {
-    const { result } = renderHook(() => useNodeSubscriptionStatus(), {
-      wrapper: mockWrapper(true),
-    });
-    expect(result.current.status).toBe(Result.Loading);
-    await act(() => {
-      jest.advanceTimersByTime(SUBSCRIPTION_TIMEOUT);
-    });
-    expect(result.current.status).toBe(Result.Successful);
-  });
-  it('result as failed when no data received', async () => {
-    const { result } = renderHook(() => useNodeSubscriptionStatus(), {
-      wrapper: mockWrapper(false),
-    });
-    expect(result.current.status).toBe(Result.Loading);
-    await act(() => {
-      jest.advanceTimersByTime(SUBSCRIPTION_TIMEOUT);
-    });
-    expect(result.current.status).toBe(Result.Failed);
-  });
-});
-
-describe('useNodeBasicStatus', () => {
-  const mockWrapper =
-    (withData = false) =>
-    ({ children }: { children: React.ReactNode }) =>
-      (
-        <MockedProvider mocks={withData ? [mockStatsQuery('1234')] : []}>
-          {children}
-        </MockedProvider>
-      );
-  it('results initially as loading', async () => {
-    const { result } = renderHook(() => useNodeBasicStatus(), {
-      wrapper: mockWrapper(true),
-    });
-    expect(result.current.status).toBe(Result.Loading);
-    expect(result.current.currentBlockHeight).toBeNaN();
-  });
-  it('results as successful when data received', async () => {
-    const { result } = renderHook(() => useNodeBasicStatus(), {
-      wrapper: mockWrapper(true),
-    });
-    await waitFor(() => {
-      expect(result.current.status).toBe(Result.Successful);
-      expect(result.current.currentBlockHeight).toBe(1234);
-    });
-  });
-  it('result as failed when no data received', async () => {
-    const { result } = renderHook(() => useNodeBasicStatus(), {
-      wrapper: mockWrapper(false),
-    });
-    await waitFor(() => {
-      expect(result.current.status).toBe(Result.Failed);
-      expect(result.current.currentBlockHeight).toBeNaN();
-    });
-  });
-});
-
-describe('useResponseTime', () => {
-  it('returns response time when url is valid', () => {
-    const { result } = renderHook(() =>
-      useResponseTime('https://localhost:1234')
-    );
-    expect(result.current.responseTime).toBe(50);
-  });
-  it('does not return response time when url is invalid', () => {
-    const { result } = renderHook(() => useResponseTime('nope'));
-    expect(result.current.responseTime).toBeUndefined();
-  });
-});
-
 describe('RowData', () => {
   const props = {
     id: '0',
@@ -183,13 +94,9 @@ describe('RowData', () => {
     onBlockHeight: jest.fn(),
   };
 
-  afterAll(() => {
-    jest.useRealTimers();
-    jest.resetAllMocks();
-  });
-
   it('radio button enabled after stats query successful', async () => {
-    render(renderComponent(props, mockStatsQuery('100'), subMock));
+    mockHeaders(props.url);
+    render(renderComponent(props, statsQueryMock, subMock));
 
     // radio should be enabled until query resolves
     expect(
@@ -220,6 +127,8 @@ describe('RowData', () => {
   });
 
   it('radio button still enabled if query fails', async () => {
+    mockHeaders(props.url, {});
+
     const failedQueryMock: MockedResponse<NodeCheckQuery> = {
       request: {
         query: NodeCheckDocument,
@@ -269,11 +178,12 @@ describe('RowData', () => {
 
   it('highlights rows with a slow block height', async () => {
     const blockHeight = 100;
+    mockHeaders(props.url, { blockHeight });
 
     const { rerender } = render(
       renderComponent(
         { ...props, highestBlock: blockHeight + BLOCK_THRESHOLD },
-        mockStatsQuery(String(blockHeight)),
+        statsQueryMock,
         subMock
       )
     );
@@ -291,7 +201,7 @@ describe('RowData', () => {
     rerender(
       renderComponent(
         { ...props, highestBlock: blockHeight + BLOCK_THRESHOLD + 1 },
-        mockStatsQuery(String(blockHeight)),
+        statsQueryMock,
         subMock
       )
     );
@@ -306,7 +216,7 @@ describe('RowData', () => {
           ...props,
           id: CUSTOM_NODE_KEY,
         },
-        mockStatsQuery('1234'),
+        statsQueryMock,
         subMock
       )
     );
@@ -320,17 +230,16 @@ describe('RowData', () => {
   it('updates highest block after new header received', async () => {
     const mockOnBlockHeight = jest.fn();
     const blockHeight = 200;
+    mockHeaders(props.url, { blockHeight });
     render(
       renderComponent(
         { ...props, onBlockHeight: mockOnBlockHeight },
-        mockStatsQuery(String(blockHeight)),
+        statsQueryMock,
         subMock
       )
     );
 
-    await waitFor(() => {
-      expect(mockOnBlockHeight).toHaveBeenCalledWith(blockHeight);
-    });
+    expect(mockOnBlockHeight).toHaveBeenCalledWith(blockHeight);
   });
 
   it('should poll the query unless an errors is returned', async () => {
@@ -366,6 +275,7 @@ describe('RowData', () => {
       };
     };
 
+    mockHeaders(props.url);
     const statsQueryMock1 = createStatsQueryMock('1234');
     const statsQueryMock2 = createStatsQueryMock('1235');
     const statsQueryMock3 = createFailedStatsQueryMock();

libs/environment/src/components/node-switcher/row-data.tsx

@@ -1,3 +1,5 @@
+import type { ApolloError } from '@apollo/client';
+import { useHeaderStore } from '@vegaprotocol/apollo-client';
 import { isValidUrl } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { TradingRadio } from '@vegaprotocol/ui-toolkit';
@@ -10,7 +12,6 @@ import {
 import { LayoutCell } from './layout-cell';
 
 export const POLL_INTERVAL = 1000;
-export const SUBSCRIPTION_TIMEOUT = 3000;
 export const BLOCK_THRESHOLD = 3;
 
 export interface RowDataProps {
@@ -20,39 +21,15 @@ export interface RowDataProps {
   onBlockHeight: (blockHeight: number) => void;
 }
 
-export enum Result {
-  Successful,
-  Failed,
-  Loading,
-}
-
-export const useNodeSubscriptionStatus = () => {
-  const [status, setStatus] = useState<Result>(Result.Loading);
-  const { data, error } = useNodeCheckTimeUpdateSubscription();
-  useEffect(() => {
-    if (error) {
-      setStatus(Result.Failed);
-    }
-    if (data?.busEvents && data.busEvents.length > 0) {
-      setStatus(Result.Successful);
-    }
-    // set as failed when no data received after SUBSCRIPTION_TIMEOUT ms
-    const timeout = setTimeout(() => {
-      if (!data || error) {
-        setStatus(Result.Failed);
-      }
-    }, SUBSCRIPTION_TIMEOUT);
-    return () => {
-      clearTimeout(timeout);
-    };
-  }, [data, error]);
-
-  return { status };
-};
-
-export const useNodeBasicStatus = () => {
-  const [status, setStatus] = useState<Result>(Result.Loading);
-
+export const RowData = ({
+  id,
+  url,
+  highestBlock,
+  onBlockHeight,
+}: RowDataProps) => {
+  const [subFailed, setSubFailed] = useState(false);
+  const [time, setTime] = useState<number>();
+  // no use of data here as we need the data nodes reference to block height
   const { data, error, loading, startPolling, stopPolling } = useNodeCheckQuery(
     {
       pollInterval: POLL_INTERVAL,
@@ -61,7 +38,28 @@ export const useNodeBasicStatus = () => {
       ssr: false,
     }
   );
+  const headerStore = useHeaderStore();
+  const headers = headerStore[url];
 
+  const {
+    data: subData,
+    error: subError,
+    loading: subLoading,
+  } = useNodeCheckTimeUpdateSubscription();
+
+  useEffect(() => {
+    const timeout = setTimeout(() => {
+      if (!subData) {
+        setSubFailed(true);
+      }
+    }, 3000);
+
+    return () => {
+      clearTimeout(timeout);
+    };
+  }, [subData]);
+
+  // handle polling
   useEffect(() => {
     const handleStartPoll = () => {
       if (error) return;
@@ -85,57 +83,56 @@ export const useNodeBasicStatus = () => {
     };
   }, [startPolling, stopPolling, error]);
 
-  const currentBlockHeight = parseInt(
-    data?.statistics.blockHeight || 'NONE',
-    10
-  );
-
-  useEffect(() => {
-    if (loading) {
-      setStatus(Result.Loading);
-      return;
-    }
-    if (!error && !isNaN(currentBlockHeight)) {
-      setStatus(Result.Successful);
-      return;
-    }
-    setStatus(Result.Failed);
-  }, [currentBlockHeight, error, loading]);
-
-  return {
-    status,
-    currentBlockHeight,
-  };
-};
-
-export const useResponseTime = (url: string, trigger?: unknown) => {
-  const [responseTime, setResponseTime] = useState<number>();
+  // measure response time
   useEffect(() => {
     if (!isValidUrl(url)) return;
     if (typeof window.performance.getEntriesByName !== 'function') return; // protection for test environment
+    // every time we get data measure response speed
     const requestUrl = new URL(url);
     const requests = window.performance.getEntriesByName(requestUrl.href);
     const { duration } =
       (requests.length && requests[requests.length - 1]) || {};
-    setResponseTime(duration);
-  }, [url, trigger]);
-  return { responseTime };
-};
+    setTime(duration);
+  }, [url, data]);
 
-export const RowData = ({
-  id,
-  url,
-  highestBlock,
-  onBlockHeight,
-}: RowDataProps) => {
-  const { status: subStatus } = useNodeSubscriptionStatus();
-  const { status, currentBlockHeight } = useNodeBasicStatus();
-  const { responseTime } = useResponseTime(url, currentBlockHeight); // measure response time (ms) every time we get data (block height)
   useEffect(() => {
-    if (!isNaN(currentBlockHeight)) {
-      onBlockHeight(currentBlockHeight);
+    if (headers?.blockHeight) {
+      onBlockHeight(headers.blockHeight);
     }
-  }, [currentBlockHeight, onBlockHeight]);
+  }, [headers?.blockHeight, onBlockHeight]);
+
+  const getHasError = () => {
+    // the stats query errored
+    if (error) {
+      return true;
+    }
+
+    // if we are still awaiting a header entry its not an error
+    // we are still waiting for the query to resolve
+    if (!headers) {
+      return false;
+    }
+
+    // highlight this node as 'error' if its more than BLOCK_THRESHOLD blocks behind the most
+    // advanced node
+    if (
+      highestBlock !== null &&
+      headers.blockHeight < highestBlock - BLOCK_THRESHOLD
+    ) {
+      return true;
+    }
+
+    return false;
+  };
+
+  const getSubFailed = (
+    subError: ApolloError | undefined,
+    subFailed: boolean
+  ) => {
+    if (subError) return true;
+    if (subFailed) return true;
+    return false;
+  };
 
   return (
     <>
@@ -146,58 +143,72 @@ export const RowData = ({
       )}
       <LayoutCell
         label={t('Response time')}
-        isLoading={status === Result.Loading}
-        hasError={status === Result.Failed}
+        isLoading={!error && loading}
+        hasError={Boolean(error)}
         dataTestId="response-time-cell"
       >
-        {display(status, formatResponseTime(responseTime))}
+        {getResponseTimeDisplayValue(time, error)}
       </LayoutCell>
       <LayoutCell
         label={t('Block')}
-        isLoading={status === Result.Loading}
-        hasError={
-          status === Result.Failed ||
-          (highestBlock != null &&
-            !isNaN(currentBlockHeight) &&
-            currentBlockHeight < highestBlock - BLOCK_THRESHOLD)
-        }
+        isLoading={loading}
+        hasError={getHasError()}
         dataTestId="block-height-cell"
       >
         <span
           data-testid="query-block-height"
           data-query-block-height={
-            status === Result.Failed ? 'failed' : currentBlockHeight
+            error ? 'failed' : data?.statistics.blockHeight
           }
         >
-          {display(status, currentBlockHeight)}
+          {getBlockDisplayValue(headers?.blockHeight, error)}
         </span>
       </LayoutCell>
       <LayoutCell
         label={t('Subscription')}
-        isLoading={subStatus === Result.Loading}
-        hasError={subStatus === Result.Failed}
+        isLoading={subFailed ? false : subLoading}
+        hasError={getSubFailed(subError, subFailed)}
         dataTestId="subscription-cell"
       >
-        {display(subStatus, t('Yes'), t('No'))}
+        {getSubscriptionDisplayValue(subFailed, subData?.busEvents, subError)}
       </LayoutCell>
     </>
   );
 };
 
-const formatResponseTime = (time: number | undefined) =>
-  time != null ? `${Number(time).toFixed(2)}ms` : '-';
-
-const display = (
-  status: Result,
-  yes: string | number | undefined,
-  no = t('n/a')
+const getResponseTimeDisplayValue = (
+  responseTime?: number,
+  error?: ApolloError
 ) => {
-  switch (status) {
-    case Result.Successful:
-      return yes;
-    case Result.Failed:
-      return no;
-    default:
-      return '-';
+  if (error) {
+    return t('n/a');
   }
+  if (typeof responseTime === 'number') {
+    return `${Number(responseTime).toFixed(2)}ms`;
+  }
+  return '-';
+};
+
+const getBlockDisplayValue = (block?: number, error?: ApolloError) => {
+  if (error) {
+    return t('n/a');
+  }
+  if (block) {
+    return block;
+  }
+  return '-';
+};
+
+const getSubscriptionDisplayValue = (
+  subFailed: boolean,
+  events?: { id: string }[] | null,
+  error?: ApolloError
+) => {
+  if (subFailed || error) {
+    return t('No');
+  }
+  if (events?.length) {
+    return t('Yes');
+  }
+  return '-';
 };

libs/environment/src/hooks/use-links.ts

@@ -126,11 +126,6 @@ export const useEtherscanLink = () => {
   return link;
 };
 
-// Console pages
-export const CONSOLE_TRANSFER = '#/portfolio/assets/transfer';
-export const CONSOLE_TRANSFER_ASSET =
-  '#/portfolio/assets/transfer?assetId=:assetId';
-
 // Governance pages
 export const TOKEN_NEW_MARKET_PROPOSAL = '/proposals/propose/new-market';
 export const TOKEN_NEW_NETWORK_PARAM_PROPOSAL =

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

@@ -289,30 +289,17 @@ describe('FeesDiscountBreakdownTooltip', () => {
     const { container } = render(<FeesDiscountBreakdownTooltip {...props} />);
     const dt = container.querySelectorAll('dt');
     const dd = container.querySelectorAll('dd');
-    const expectedDt = [
-      'Infrastructure Fee',
-      'Referral Discount',
-      'Volume Discount',
-      'Liquidity Fee',
-      'Referral Discount',
-      'Volume Discount',
-      'Maker Fee',
-      'Referral Discount',
-      'Volume Discount',
+    const expected = [
+      { label: 'Infrastructure Fee Referral Discount', value: '0.05 BTC' },
+      { label: 'Infrastructure Fee Volume Discount', value: '0.06 BTC' },
+      { label: 'Liquidity Fee Referral Discount', value: '0.01 BTC' },
+      { label: 'Liquidity Fee Volume Discount', value: '0.02 BTC' },
+      { label: 'Maker Fee Referral Discount', value: '0.03 BTC' },
+      { label: 'Maker Fee Volume Discount', value: '0.04 BTC' },
     ];
-    const expectedDD = [
-      '0.05 BTC',
-      '0.06 BTC',
-      '0.01 BTC',
-      '0.02 BTC',
-      '0.03 BTC',
-      '0.04 BTC',
-    ];
-    expectedDt.forEach((label, i) => {
+    expected.forEach(({ label, value }, i) => {
       expect(dt[i]).toHaveTextContent(label);
-    });
-    expectedDD.forEach((label, i) => {
-      expect(dd[i]).toHaveTextContent(label);
+      expect(dd[i]).toHaveTextContent(value);
     });
   });
 });

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

@@ -391,7 +391,7 @@ const FeesDiscountBreakdownTooltipItem = ({
   label: string;
   asset: ReturnType<typeof getAsset>;
 }) =>
-  value && value !== '0' ? (
+  value ? (
     <>
       <dt className="col-span-1">{label}</dt>
       <dd className="text-right col-span-1">
@@ -418,47 +418,34 @@ export const FeesDiscountBreakdownTooltip = ({
       className="max-w-sm bg-vega-light-100 dark:bg-vega-dark-100 border border-vega-light-200 dark:border-vega-dark-200 px-4 py-2 z-20 rounded text-sm break-word text-black dark:text-white"
     >
       <dl className="grid grid-cols-2 gap-x-1">
-        {(fees.infrastructureFeeReferralDiscount || '0') !== '0' ||
-        (fees.infrastructureFeeVolumeDiscount || '0') !== '0' ? (
-          <dt className="col-span-2">{t('Infrastructure Fee')}</dt>
-        ) : null}
         <FeesDiscountBreakdownTooltipItem
           value={fees.infrastructureFeeReferralDiscount}
-          label={t('Referral Discount')}
+          label={t('Infrastructure Fee Referral Discount')}
           asset={asset}
         />
         <FeesDiscountBreakdownTooltipItem
           value={fees.infrastructureFeeVolumeDiscount}
-          label={t('Volume Discount')}
+          label={t('Infrastructure Fee Volume Discount')}
           asset={asset}
         />
-        {(fees.liquidityFeeReferralDiscount || '0') !== '0' ||
-        (fees.liquidityFeeVolumeDiscount || '0') !== '0' ? (
-          <dt className="col-span-2">{t('Liquidity Fee')}</dt>
-        ) : null}
-
         <FeesDiscountBreakdownTooltipItem
           value={fees.liquidityFeeReferralDiscount}
-          label={t('Referral Discount')}
+          label={t('Liquidity Fee Referral Discount')}
           asset={asset}
         />
         <FeesDiscountBreakdownTooltipItem
           value={fees.liquidityFeeVolumeDiscount}
-          label={t('Volume Discount')}
+          label={t('Liquidity Fee Volume Discount')}
           asset={asset}
         />
-        {(fees.makerFeeReferralDiscount || '0') !== '0' ||
-        (fees.makerFeeVolumeDiscount || '0') !== '0' ? (
-          <dt className="col-span-2">{t('Maker Fee')}</dt>
-        ) : null}
         <FeesDiscountBreakdownTooltipItem
           value={fees.makerFeeReferralDiscount}
-          label={t('Referral Discount')}
+          label={t('Maker Fee Referral Discount')}
           asset={asset}
         />
         <FeesDiscountBreakdownTooltipItem
           value={fees.makerFeeVolumeDiscount}
-          label={t('Volume Discount')}
+          label={t('Maker Fee Volume Discount')}
           asset={asset}
         />
       </dl>

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

@@ -2,6 +2,7 @@ import { useMemo } from 'react';
 import {
   addDecimalsFormatNumber,
   addDecimalsFormatNumberQuantum,
+  formatNumberPercentage,
   getDateTimeFormat,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
@@ -28,12 +29,6 @@ import { LiquidityProvisionStatus } from '@vegaprotocol/types';
 import { LiquidityProvisionStatusMapping } from '@vegaprotocol/types';
 import type { LiquidityProvisionData } from './liquidity-data-provider';
 
-const formatNumberPercentage = (value: BigNumber, decimals?: number) => {
-  const decimalPlaces =
-    typeof decimals === 'undefined' ? value.dp() || 0 : decimals;
-  return `${value.toFixed(decimalPlaces, 1)}%`;
-};
-
 const percentageFormatter = ({ value }: ValueFormatterParams) => {
   if (!value) return '-';
   return formatNumberPercentage(new BigNumber(value).times(100), 2) || '-';
@@ -131,11 +126,11 @@ export const LiquidityTable = ({
               new BigNumber(data.sla.currentEpochFractionOfTimeOnBook).times(
                 100
               ),
-              4
+              2
             ),
             formatNumberPercentage(
               new BigNumber(data.commitmentMinTimeFraction).times(100),
-              4
+              2
             ),
           ]
         );
@@ -148,7 +143,7 @@ export const LiquidityTable = ({
               new BigNumber(data.sla.currentEpochFractionOfTimeOnBook).times(
                 100
               ),
-              4
+              2
             ),
           ]
         );
@@ -399,7 +394,7 @@ export const LiquidityTable = ({
             headerTooltip: t(
               `The liquidity fees accrued by each provider, which will be distributed at the end of the epoch after applying any penalties.`
             ),
-            valueFormatter: assetDecimalsQuantumFormatter,
+            valueFormatter: stakeToCcyVolumeQuantumFormatter,
             tooltipValueGetter: feesAccruedTooltip,
             cellClassRules: {
               'text-warning': ({ data }: { data: LiquidityProvisionData }) => {

libs/markets/src/lib/__generated__/index.ts

@@ -6,4 +6,4 @@ export * from './markets-candles';
 export * from './markets-data';
 export * from './OracleMarketsSpec';
 export * from './OracleSpecDataConnection';
-export * from './SuccessorMarket'
+export * from './SuccessorMarket'

libs/markets/src/lib/market-utils.ts

@@ -28,22 +28,6 @@ export const getAsset = (market: Partial<Market>) => {
   throw new Error('Failed to retrieve asset. Invalid product type');
 };
 
-export const getProductType = (market: Partial<Market>) => {
-  if (!market.tradableInstrument?.instrument.product) {
-    throw new Error(
-      'Failed to retrieve product type. Invalid tradable instrument'
-    );
-  }
-
-  const type = market.tradableInstrument.instrument.product.__typename;
-
-  if (!type) {
-    throw new Error('Failed to retrieve asset. Invalid product type');
-  }
-
-  return type;
-};
-
 export const getQuoteName = (market: Partial<Market>) => {
   if (!market.tradableInstrument?.instrument.product) {
     throw new Error(

libs/markets/src/lib/markets-candles.graphql

@@ -1,3 +1,12 @@
+fragment MarketCandlesFields on Candle {
+  high
+  low
+  open
+  close
+  volume
+  periodStart
+}
+
 query MarketsCandles($interval: Interval!, $since: String!) {
   marketsConnection {
     edges {

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

@@ -12,7 +12,6 @@ export const NetworkParams = {
     'rewards_marketCreationQuantumMultiple',
   reward_staking_delegation_payoutDelay:
     'reward_staking_delegation_payoutDelay',
-  rewards_vesting_baseRate: 'rewards_vesting_baseRate',
   governance_proposal_market_minVoterBalance:
     'governance_proposal_market_minVoterBalance',
   governance_proposal_market_minClose: 'governance_proposal_market_minClose',
@@ -176,7 +175,6 @@ export const NetworkParams = {
   market_liquidity_feeCalculationTimeStep:
     'market_liquidity_feeCalculationTimeStep',
   transfer_fee_factor: 'transfer_fee_factor',
-  transfer_minTransferQuantumMultiple: 'transfer_minTransferQuantumMultiple',
   network_validators_incumbentBonus: 'network_validators_incumbentBonus',
 } as const;
 

libs/proposals/src/components/proposals-list/proposal-list.spec.tsx

@@ -85,6 +85,7 @@ describe('ProposalsList', () => {
       'Settlement asset',
       'State',
       'Parent market',
+      'Voting',
       'Closing date',
       'Enactment date',
       '', // actions col

libs/proposals/src/components/proposals-list/use-column-defs.tsx

@@ -1,6 +1,8 @@
 import { useMemo } from 'react';
+import BigNumber from 'bignumber.js';
 import type { ColDef } from 'ag-grid-community';
 import {
+  CenteredGridCellWrapper,
   COL_DEFS,
   DateRangeFilter,
   SetFilter,
@@ -9,18 +11,33 @@ import {
 import compact from 'lodash/compact';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
+import {
+  NetworkParams,
+  useNetworkParams,
+} from '@vegaprotocol/network-parameters';
 import type {
   VegaICellRendererParams,
   VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
 import {
-  ProposalProductTypeShortName,
+  ProductTypeMapping,
+  ProductTypeShortName,
   ProposalStateMapping,
 } from '@vegaprotocol/types';
 import type { ProposalListFieldsFragment } from '../../lib/proposals-data-provider/__generated__/Proposals';
+import { VoteProgress } from '../voting-progress';
 import { ProposalActionsDropdown } from '../proposal-actions-dropdown';
 
 export const useColumnDefs = () => {
+  const { params } = useNetworkParams([
+    NetworkParams.governance_proposal_market_requiredMajority,
+  ]);
+  const requiredMajorityPercentage = useMemo(() => {
+    const requiredMajority =
+      params?.governance_proposal_market_requiredMajority ?? 1;
+    return new BigNumber(requiredMajority).times(100);
+  }, [params?.governance_proposal_market_requiredMajority]);
+
   const columnDefs: ColDef[] = useMemo(() => {
     return compact([
       {
@@ -37,38 +54,27 @@ export const useColumnDefs = () => {
         }) => {
           if (!value || !data) return '-';
 
-          const getProductType = (data: ProposalListFieldsFragment) => {
-            if (
-              data.terms.__typename === 'ProposalTerms' &&
-              data.terms.change.__typename === 'NewMarket'
-            ) {
-              return data.terms.change.instrument.product?.__typename;
-            }
-            return undefined;
-          };
-
-          const productType = getProductType(data);
+          // TODO: update when we switch to ProductConfiguration
+          const productType = 'Future';
           return (
-            productType && (
-              <StackedCell
-                primary={value}
-                secondary={
-                  <span
-                    title={ProposalProductTypeShortName[productType]}
-                    className="uppercase"
-                  >
-                    {ProposalProductTypeShortName[productType]}
-                  </span>
-                }
-              />
-            )
+            <StackedCell
+              primary={value}
+              secondary={
+                <span
+                  title={ProductTypeMapping[productType]}
+                  className="uppercase"
+                >
+                  {ProductTypeShortName[productType]}
+                </span>
+              }
+            />
           );
         },
       },
       {
         colId: 'asset',
         headerName: t('Settlement asset'),
-        field: 'terms.change.instrument.product.settlementAsset.symbol',
+        field: 'terms.change.instrument.futureProduct.settlementAsset.symbol',
       },
       {
         colId: 'state',
@@ -88,6 +94,32 @@ export const useColumnDefs = () => {
         field: 'terms.change.successorConfiguration.parentMarketId',
         cellRenderer: 'ParentMarketCell',
       },
+      {
+        colId: 'voting',
+        headerName: t('Voting'),
+        cellRenderer: ({
+          data,
+        }: VegaICellRendererParams<ProposalListFieldsFragment>) => {
+          if (data) {
+            const yesTokens = new BigNumber(data.votes.yes.totalTokens);
+            const noTokens = new BigNumber(data.votes.no.totalTokens);
+            const totalTokensVoted = yesTokens.plus(noTokens);
+            const yesPercentage = totalTokensVoted.isZero()
+              ? new BigNumber(0)
+              : yesTokens.multipliedBy(100).dividedBy(totalTokensVoted);
+            return (
+              <CenteredGridCellWrapper>
+                <VoteProgress
+                  threshold={requiredMajorityPercentage}
+                  progress={yesPercentage}
+                />
+              </CenteredGridCellWrapper>
+            );
+          }
+          return '-';
+        },
+        filter: false,
+      },
       {
         colId: 'closing-date',
         headerName: t('Closing date'),
@@ -124,7 +156,7 @@ export const useColumnDefs = () => {
         },
       },
     ]);
-  }, []);
+  }, [requiredMajorityPercentage]);
 
   return columnDefs;
 };

libs/proposals/src/lib/proposals-data-provider/Proposals.graphql

@@ -16,90 +16,78 @@ fragment NewMarketFields on NewMarket {
   instrument {
     name
     code
-    product {
-      ... on FutureProduct {
-        settlementAsset {
-          id
-          name
-          symbol
-          decimals
-          quantum
-        }
-        quoteName
-        dataSourceSpecForSettlementData {
-          sourceType {
-            ... on DataSourceDefinitionExternal {
-              sourceType {
-                ... on DataSourceSpecConfiguration {
-                  signers {
-                    signer {
-                      ... on PubKey {
-                        key
-                      }
-                      ... on ETHAddress {
-                        address
-                      }
+    futureProduct {
+      settlementAsset {
+        id
+        name
+        symbol
+        decimals
+        quantum
+      }
+      quoteName
+      dataSourceSpecForSettlementData {
+        sourceType {
+          ... on DataSourceDefinitionExternal {
+            sourceType {
+              ... on DataSourceSpecConfiguration {
+                signers {
+                  signer {
+                    ... on PubKey {
+                      key
+                    }
+                    ... on ETHAddress {
+                      address
                     }
                   }
-                  filters {
-                    key {
-                      name
-                      type
-                    }
-                    conditions {
-                      operator
-                      value
-                    }
+                }
+                filters {
+                  key {
+                    name
+                    type
+                  }
+                  conditions {
+                    operator
+                    value
                   }
                 }
               }
             }
           }
         }
-        dataSourceSpecForTradingTermination {
-          sourceType {
-            ... on DataSourceDefinitionExternal {
-              sourceType {
-                ... on DataSourceSpecConfiguration {
-                  signers {
-                    signer {
-                      ... on PubKey {
-                        key
-                      }
-                      ... on ETHAddress {
-                        address
-                      }
-                    }
-                  }
-                  filters {
-                    key {
-                      name
-                      type
-                    }
-                    conditions {
-                      operator
-                      value
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-        dataSourceSpecBinding {
-          settlementDataProperty
-          tradingTerminationProperty
-        }
       }
-      ... on PerpetualProduct {
-        settlementAsset {
-          id
-          name
-          symbol
-          decimals
-          quantum
+      dataSourceSpecForTradingTermination {
+        sourceType {
+          ... on DataSourceDefinitionExternal {
+            sourceType {
+              ... on DataSourceSpecConfiguration {
+                signers {
+                  signer {
+                    ... on PubKey {
+                      key
+                    }
+                    ... on ETHAddress {
+                      address
+                    }
+                  }
+                }
+                filters {
+                  key {
+                    name
+                    type
+                  }
+                  conditions {
+                    operator
+                    value
+                  }
+                }
+              }
+            }
+          }
         }
-        quoteName
+      }
+      dataSourceSpecBinding {
+        settlementDataProperty
+        tradingTerminationProperty
       }
     }
   }

libs/proposals/src/lib/proposals-data-provider/proposals.mock.ts

@@ -128,7 +128,7 @@ export const createProposalListFieldsFragment = (
     instrument: {
       code: 'ETHUSD',
       name: 'ETHUSD',
-      product: {
+      futureProduct: {
         settlementAsset: {
           id: 'b340c130096819428a62e5df407fd6abe66e444b89ad64f670beb98621c9c663',
           name: 'tDAI TEST',
@@ -262,7 +262,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
         instrument: {
           code: 'ETHUSD',
           name: 'ETHUSD',
-          product: {
+          futureProduct: {
             settlementAsset: {
               id: 'b340c130096819428a62e5df407fd6abe66e444b89ad64f670beb98621c9c663',
               name: 'tDAI TEST',
@@ -352,7 +352,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
         instrument: {
           code: 'LINKUSD',
           name: 'LINKUSD',
-          product: {
+          futureProduct: {
             settlementAsset: {
               id: 'eb30d55e90e1f9e5c4727d6fa2a5a8cd36ab9ae9738eb8f3faf53e2bee4861ee',
               name: 'mUSDT-II',
@@ -442,7 +442,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
         instrument: {
           code: 'LINKUSD',
           name: 'LINKUSD',
-          product: {
+          futureProduct: {
             settlementAsset: {
               id: 'eb30d55e90e1f9e5c4727d6fa2a5a8cd36ab9ae9738eb8f3faf53e2bee4861ee',
               name: 'mUSDT-II',
@@ -532,7 +532,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
         instrument: {
           code: 'ETHUSD',
           name: 'ETHUSD',
-          product: {
+          futureProduct: {
             settlementAsset: {
               id: 'b340c130096819428a62e5df407fd6abe66e444b89ad64f670beb98621c9c663',
               name: 'tDAI TEST',
@@ -622,7 +622,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
         instrument: {
           code: 'LINKUSD',
           name: 'LINKUSD',
-          product: {
+          futureProduct: {
             settlementAsset: {
               id: 'eb30d55e90e1f9e5c4727d6fa2a5a8cd36ab9ae9738eb8f3faf53e2bee4861ee',
               name: 'mUSDT-II',
@@ -712,7 +712,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
         instrument: {
           code: 'ETHDAI.MF21',
           name: 'ETHDAI Monthly (Dec 2022)',
-          product: {
+          futureProduct: {
             settlementAsset: {
               id: 'b340c130096819428a62e5df407fd6abe66e444b89ad64f670beb98621c9c663',
               name: 'tDAI TEST',
@@ -802,7 +802,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
         instrument: {
           code: 'AAPL.MF21',
           name: 'Apple Monthly (Dec 2022)',
-          product: {
+          futureProduct: {
             settlementAsset: {
               id: 'c9fe6fc24fce121b2cc72680543a886055abb560043fda394ba5376203b7527d',
               name: 'tUSDC TEST',
@@ -892,7 +892,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
         instrument: {
           code: 'BTCUSD.MF21',
           name: 'BTCUSD Monthly (Dec 2022)',
-          product: {
+          futureProduct: {
             settlementAsset: {
               id: 'b340c130096819428a62e5df407fd6abe66e444b89ad64f670beb98621c9c663',
               name: 'tDAI TEST',
@@ -982,7 +982,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
         instrument: {
           code: 'TSLA.QM21',
           name: 'Tesla Quarterly (Feb 2023)',
-          product: {
+          futureProduct: {
             settlementAsset: {
               id: '177e8f6c25a955bd18475084b99b2b1d37f28f3dec393fab7755a7e69c3d8c3b',
               name: 'tEURO TEST',
@@ -1072,7 +1072,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
         instrument: {
           code: 'AAVEDAI.MF21',
           name: 'AAVEDAI Monthly (Dec 2022)',
-          product: {
+          futureProduct: {
             settlementAsset: {
               id: 'b340c130096819428a62e5df407fd6abe66e444b89ad64f670beb98621c9c663',
               name: 'tDAI TEST',
@@ -1162,7 +1162,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
         instrument: {
           code: 'ETHBTC.QM21',
           name: 'ETHBTC Quarterly (Feb 2023)',
-          product: {
+          futureProduct: {
             settlementAsset: {
               id: 'cee709223217281d7893b650850ae8ee8a18b7539b5658f9b4cc24de95dd18ad',
               name: 'tBTC TEST',
@@ -1252,7 +1252,7 @@ const proposalListFields: ProposalListFieldsFragment[] = [
         instrument: {
           code: 'UNIDAI.MF21',
           name: 'UNIDAI Monthly (Dec 2022)',
-          product: {
+          futureProduct: {
             settlementAsset: {
               id: 'b340c130096819428a62e5df407fd6abe66e444b89ad64f670beb98621c9c663',
               name: 'tDAI TEST',

package.json

@@ -71,7 +71,7 @@
     "jsondiffpatch": "^0.4.1",
     "lodash": "^4.17.21",
     "next": "13.3.0",
-    "pennant": "^1.14.1",
+    "pennant": "1.14.0",
     "react": "18.2.0",
     "react-copy-to-clipboard": "^5.0.4",
     "react-dom": "18.2.0",

vegacapsule/.gitignore

@@ -0,0 +1,2 @@
+genesis.json
+genesis.tmp

vegacapsule/genesis.tmpl

@@ -2,11 +2,10 @@
 	"app_state": {
 	  "assets": {
 		"73174a6fb1d5802ba0ac7bd7ab79e0a3a4837b262de0a4e80815a55442692bd0": {
-		  "min_lp_stake": "1",
 		  "decimals": 5,
 		  "name": "BTC (fake)",
+      "quantum": "1",
 		  "symbol": "fBTC",
-		  "total_supply": "21000000",
 		  "source": {
 			"builtin_asset": {
 			  "max_faucet_amount_mint": "1000000"
@@ -14,11 +13,10 @@
 		  }
 		},
 		"8566db7257222b5b7ef2886394ad28b938b28680a54a169bbc795027b89d6665": {
-		  "min_lp_stake": "1",
 		  "decimals": 5,
 		  "name": "DAI (fake)",
+      "quantum": "1",
 		  "symbol": "fDAI",
-		  "total_supply": "1000000000",
 		  "source": {
 			"builtin_asset": {
 			  "max_faucet_amount_mint": "10000000000"
@@ -26,11 +24,10 @@
 		  }
 		},
 		"e02d4c15d790d1d2dffaf2dcd1cf06a1fe656656cf4ed18c8ce99f9e83643567": {
-		  "min_lp_stake": "1",
 		  "decimals": 5,
 		  "name": "EURO (fake)",
 		  "symbol": "fEURO",
-		  "total_supply": "1000000000",
+      "quantum": "1",
 		  "source": {
 			"builtin_asset": {
 			  "max_faucet_amount_mint": "10000000000"
@@ -38,11 +35,10 @@
 		  }
 		},
 		"816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc": {
-		  "min_lp_stake": "1",
 		  "decimals": 5,
 		  "name": "USDC (fake)",
 		  "symbol": "fUSDC",
-		  "total_supply": "1000000000",
+      "quantum": "1",
 		  "source": {
 			"builtin_asset": {
 			  "max_faucet_amount_mint": "1000000000000"
@@ -50,11 +46,10 @@
 		  }
 		},
 		"62dfb1ab1cd488862b416cf163c75bc9a279226c65ac287c0dd67650daa444ee": {
-		  "min_lp_stake": "1",
 		  "decimals": 5,
 		  "name": "XYZ (α alpha)",
+      "quantum": "1",
 		  "symbol": "XYZalpha",
-		  "total_supply": "1000000000",
 		  "source": {
 			"builtin_asset": {
 			  "max_faucet_amount_mint": "100000000000"
@@ -62,11 +57,10 @@
 		  }
 		},
 		"dedb3c42e7bc88d98a7fe0d73c7b9870b34c62c79a713071bd4d645ef7c216ee": {
-		  "min_lp_stake": "1",
 		  "decimals": 5,
 		  "name": "XYZ (β beta)",
+      "quantum": "1",
 		  "symbol": "XYZbeta",
-		  "total_supply": "1000000000",
 		  "source": {
 			"builtin_asset": {
 			  "max_faucet_amount_mint": "100000000000"
@@ -74,11 +68,10 @@
 		  }
 		},
 		"a0ea8a48eb5cb024e66be5777bea75165ffcaf0be82d9047e376ce352e202f76": {
-		  "min_lp_stake": "1",
 		  "decimals": 5,
 		  "name": "XYZ (γ gamma)",
+      "quantum": "1",
 		  "symbol": "XYZgamma",
-		  "total_supply": "1000000000",
 		  "source": {
 			"builtin_asset": {
 			  "max_faucet_amount_mint": "100000000000"
@@ -86,11 +79,10 @@
 		  }
 		},
 		"9ed5dd08c88e38f1c92cb8f056bd9d0507512c9ea4e6f308936f73646187b8e9": {
-		  "min_lp_stake": "1",
 		  "decimals": 5,
 		  "name": "XYZ (δ delta)",
+      "quantum": "1",
 		  "symbol": "XYZdelta",
-		  "total_supply": "1000000000",
 		  "source": {
 			"builtin_asset": {
 			  "max_faucet_amount_mint": "100000000000"
@@ -98,11 +90,10 @@
 		  }
 		},
 		"bdcde894dcc4ffa11d6192065d84f9dcc75814cf24760ff4f3e50d64eaddbc02": {
-		  "min_lp_stake": "1",
 		  "decimals": 5,
 		  "name": "XYZ (ε epsilon)",
+      "quantum": "1",
 		  "symbol": "XYZepsilon",
-		  "total_supply": "1000000000",
 		  "source": {
 			"builtin_asset": {
 			  "max_faucet_amount_mint": "100000000000"
@@ -110,11 +101,10 @@
 		  }
 		},
 		"{{.GetVegaContractID "tBTC"}}": {
-			"min_lp_stake": "1",
 			"decimals": 5,
 			"name": "BTC (local)",
+      "quantum": "1",
 			"symbol": "tBTC",
-			"total_supply": "0",
 			"source": {
 				"erc20": {
 					"contract_address": "{{.GetEthContractAddr "tBTC"}}"
@@ -122,11 +112,10 @@
 			}
 		},
 		"{{.GetVegaContractID "tDAI"}}": {
-			"min_lp_stake": "1",
 			"decimals": 5,
+      "quantum": "1",
 			"name": "DAI (local)",
 			"symbol": "tDAI",
-			"total_supply": "0",
 			"source": {
 				"erc20": {
 					"contract_address": "{{.GetEthContractAddr "tDAI"}}"
@@ -134,11 +123,10 @@
 			}
 		},
 		"{{.GetVegaContractID "tEURO"}}": {
-			"min_lp_stake": "1",
+      "quantum": "1",
 			"decimals": 5,
 			"name": "EURO (local)",
 			"symbol": "tEURO",
-			"total_supply": "0",
 			"source": {
 				"erc20": {
 					"contract_address": "{{.GetEthContractAddr "tEURO"}}"
@@ -146,11 +134,10 @@
 			}
 		},
 		"{{.GetVegaContractID "tUSDC"}}": {
-			"min_lp_stake": "1",
+      "quantum": "1",
 			"decimals": 5,
 			"name": "USDC (local)",
 			"symbol": "tUSDC",
-			"total_supply": "0",
 			"source": {
 				"erc20": {
 					"contract_address": "{{.GetEthContractAddr "tUSDC"}}"
@@ -158,11 +145,10 @@
 			}
 		},
 		"{{.GetVegaContractID "VEGA"}}": {
-			"min_lp_stake": "1",
+      "quantum": "1",
 			"decimals": 18,
 			"name": "Vega",
 			"symbol": "VEGA",
-			"total_supply": "64999723000000000000000000",
 			"source": {
 				"erc20": {
 				"contract_address": "{{.GetEthContractAddr "VEGA"}}"
@@ -171,7 +157,7 @@
 		}
 	  },
 	  "network": {
-		"ReplayAttackThreshold": 30
+		"replay_attack_threshold": 30
 	  },
 	  "network_parameters": {
       "blockchains.ethereumConfig": "{\"network_id\": \"{{ .NetworkID }}\", \"chain_id\": \"{{ .ChainID }}\", \"collateral_bridge_contract\": { \"address\": \"{{.GetEthContractAddr "erc20_bridge_1"}}\" }, \"confirmations\": 3, \"staking_bridge_contract\": { \"address\": \"{{.GetEthContractAddr "staking_bridge"}}\", \"deployment_block_height\": 0}, \"token_vesting_contract\": { \"address\": \"{{.GetEthContractAddr "erc20_vesting"}}\", \"deployment_block_height\": 0 }, \"multisig_control_contract\": { \"address\": \"{{.GetEthContractAddr "MultisigControl"}}\", \"deployment_block_height\": 0 }}",
@@ -194,17 +180,17 @@
 		"market.auction.minimumDuration": "3s",
 		"market.fee.factors.infrastructureFee": "0.001",
 		"market.fee.factors.makerFee": "0.004",
+    "market.stake.target.timeWindow": "1h0m0s",
+    "market.stake.target.scalingFactor": "10",
 		"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",
 		"reward.staking.delegation.delegatorShare": "0.883",
 		"reward.staking.delegation.maxPayoutPerParticipant": "700000000000000000000",
+    "reward.staking.delegation.maxPayoutPerEpoch": "7000000000000000000000",
 		"reward.staking.delegation.minimumValidatorStake": "3000000000000000000000",
-		"reward.staking.delegation.payoutDelay": "10s",
-		"reward.staking.delegation.payoutFraction": "0.007",
 		"spam.protection.delegation.min.tokens": "1000000000000000000",
 		"spam.protection.max.delegations": "390",
 		"spam.protection.max.proposals": "100",

vegacapsule/verify-genesis.sh

@@ -0,0 +1,63 @@
+#!/bin/bash
+run_indented() {
+  local indent=${INDENT:-"    "}
+  { "$@" 2> >(sed "s/^/$indent/g" >&2); } | sed "s/^/$indent/g"
+}
+bold=$(tput bold)
+normal=$(tput sgr0)
+
+# The name of the application to check.
+APPLICATION="vega"
+DEBUG=false
+
+
+for arg in "$@"; do
+  if [ "$arg" = "debug" ]; then
+    # Set the flag to false if 'notidyup' is found
+    DEBUG=true
+    break
+  fi
+done
+
+
+echo "${bold}# Setup${normal}"
+# Check if the application exists.
+if command -v "$APPLICATION" &> /dev/null; then
+    # Run the application if it exists.
+    run_indented "$APPLICATION" version
+else
+    # Print an error message if the application doesn't exist.
+    echo "Error: $APPLICATION is not installed."
+    # Exit with a non-zero exit code to indicate failure.
+    exit 1
+fi
+
+echo ""
+echo "${bold}# Generating genesis${normal}"
+run_indented vegacapsule template genesis --path genesis.tmpl > genesis.tmp
+run_indented tail -n +3 genesis.tmp > genesis.json
+run_indented rm genesis.tmp
+
+if jq empty "genesis.json" &> /dev/null; then
+    run_indented echo ""
+    run_indented echo "${bold}The genesis.json file is valid JSON.${normal}"
+else
+    run_indented echo ""
+    run_indented echo "${bold}The genesis.json file is invalid JSON.${normal}"
+    # Exit with a non-zero exit code to indicate failure
+    exit 1
+fi
+
+if $DEBUG; then
+  run_indented cat genesis.json
+fi
+
+echo ""
+echo "${bold}# Verifying genesis${normal}"
+run_indented vega verify genesis genesis.json
+echo ""
+
+# Tidy up
+if [[ "$DEBUG" == "false" ]]; then
+  run_indented rm genesis.json
+fi

yarn.lock

@@ -20500,10 +20500,10 @@ pend@~1.2.0:
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
   integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
 
-pennant@^1.14.1:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/pennant/-/pennant-1.14.1.tgz#8e7a53256095e398b03397af31c831b02a56032b"
-  integrity sha512-rjzo/tlFanO96OKhJiyjQtjug7sY6pjVZqVbieD3Tf4zt20bqIb6m4L2JfwOXEe0jqP/yddgCNPY+vlkVuJW1Q==
+pennant@1.14.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/pennant/-/pennant-1.14.0.tgz#4100c25a6d836d6f0ff425181fb6f812f9fe5778"
+  integrity sha512-9H0zWzFUSbD1BlDXnHFmKwkAxXGb1xTxjkUD+RwaMygtSwPXzQEyk2ScVyMqxdcz0RuJmI5HCVmZTOjdr1NwuA==
   dependencies:
     "@babel/runtime" "^7.13.10"
     "@d3fc/d3fc-technical-indicator" "^8.0.1"