descriptionContent.length && {
- title: description,
- })}
- data-testid="proposal-description"
- >
- {descriptionContent}
+ {description && (
+
+ {description}
)}
{details &&
{details}
}
diff --git a/apps/trading-e2e/cypress.config.js b/apps/trading-e2e/cypress.config.js
index fb8640927..9d3b2a09f 100644
--- a/apps/trading-e2e/cypress.config.js
+++ b/apps/trading-e2e/cypress.config.js
@@ -30,7 +30,7 @@ module.exports = defineConfig({
viewportWidth: 1440,
viewportHeight: 900,
responseTimeout: 50000,
- requestTimeout: 10000,
+ requestTimeout: 20000,
},
env: {
TRADING_TEST_VEGA_WALLET_NAME: 'UI_Trading_Test',
diff --git a/apps/trading-e2e/src/support/mocks/generate-candles.ts b/apps/trading-e2e/src/support/mocks/generate-candles.ts
index 3ac1912f3..212e2994e 100644
--- a/apps/trading-e2e/src/support/mocks/generate-candles.ts
+++ b/apps/trading-e2e/src/support/mocks/generate-candles.ts
@@ -10,7 +10,7 @@ export const generateCandles = (
): CandlesQuery => {
const candles: CandleFieldsFragment[] = [
{
- datetime: '2022-04-06T09:15:00Z',
+ timestamp: '1661515200000000000',
high: '17481092',
low: '17403651',
open: '17458833',
@@ -19,7 +19,7 @@ export const generateCandles = (
__typename: 'Candle',
},
{
- datetime: '2022-04-06T09:30:00Z',
+ timestamp: '1661516100000000000',
high: '17491202',
low: '17361138',
open: '17446470',
@@ -28,7 +28,7 @@ export const generateCandles = (
__typename: 'Candle',
},
{
- datetime: '2022-04-06T09:45:00Z',
+ timestamp: '1661517000000000000',
high: '17424522',
low: '17337719',
open: '17367174',
diff --git a/apps/trading/.env.mainnet b/apps/trading/.env.mainnet
index c23385bad..c0983a9df 100644
--- a/apps/trading/.env.mainnet
+++ b/apps/trading/.env.mainnet
@@ -1,7 +1,7 @@
# App configuration variables
NX_VEGA_ENV=MAINNET
NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/mainnet-network.json
-NX_VEGA_URL=https://api.token.vega.xyz/query
+NX_VEGA_URL=https://api.vega.xyz/query
NX_VEGA_NETWORKS='{\"MAINNET\":\"https://alpha.console.vega.xyz\"}'
NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
NX_ETHERSCAN_URL=https://etherscan.io
diff --git a/apps/trading/lib/config/env.ts b/apps/trading/lib/config/env.ts
index c15bc1a5e..b153f0721 100644
--- a/apps/trading/lib/config/env.ts
+++ b/apps/trading/lib/config/env.ts
@@ -12,10 +12,9 @@ const windowOrDefault = (key: string, defaultValue?: string) => {
* So must provide the default with the key so that next can figure it out.
*/
export const ENV = {
+ envName: windowOrDefault('NX_VEGA_ENV', process.env['NX_VEGA_ENV']),
dsn: windowOrDefault(
'NX_TRADING_SENTRY_DSN',
process.env['NX_TRADING_SENTRY_DSN']
),
- envName: windowOrDefault('NX_VEGA_ENV', process.env['NX_VEGA_ENV']),
- vegaUrl: windowOrDefault('NX_VEGA_URL', process.env['NX_VEGA_URL']),
};
diff --git a/libs/candles-chart/src/lib/Candles.graphql b/libs/candles-chart/src/lib/Candles.graphql
index a53432b74..3b0110aac 100644
--- a/libs/candles-chart/src/lib/Candles.graphql
+++ b/libs/candles-chart/src/lib/Candles.graphql
@@ -1,5 +1,5 @@
fragment CandleFields on Candle {
- datetime
+ timestamp
high
low
open
diff --git a/libs/candles-chart/src/lib/__generated__/Candles.ts b/libs/candles-chart/src/lib/__generated__/Candles.ts
index 6762edcd5..c60224e57 100644
--- a/libs/candles-chart/src/lib/__generated__/Candles.ts
+++ b/libs/candles-chart/src/lib/__generated__/Candles.ts
@@ -3,7 +3,7 @@ import { Schema as Types } from '@vegaprotocol/types';
import { gql } from '@apollo/client';
import * as Apollo from '@apollo/client';
const defaultOptions = {} as const;
-export type CandleFieldsFragment = { __typename?: 'Candle', datetime: string, high: string, low: string, open: string, close: string, volume: string };
+export type CandleFieldsFragment = { __typename?: 'Candle', timestamp: string, high: string, low: string, open: string, close: string, volume: string };
export type CandlesQueryVariables = Types.Exact<{
marketId: Types.Scalars['ID'];
@@ -12,7 +12,7 @@ export type CandlesQueryVariables = Types.Exact<{
}>;
-export type CandlesQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, decimalPlaces: number, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string } }, candles?: Array<{ __typename?: 'Candle', datetime: string, high: string, low: string, open: string, close: string, volume: string } | null> | null } | null };
+export type CandlesQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, decimalPlaces: number, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string } }, candles?: Array<{ __typename?: 'Candle', timestamp: string, high: string, low: string, open: string, close: string, volume: string } | null> | null } | null };
export type CandlesEventsSubscriptionVariables = Types.Exact<{
marketId: Types.Scalars['ID'];
@@ -20,11 +20,11 @@ export type CandlesEventsSubscriptionVariables = Types.Exact<{
}>;
-export type CandlesEventsSubscription = { __typename?: 'Subscription', candles: { __typename?: 'Candle', datetime: string, high: string, low: string, open: string, close: string, volume: string } };
+export type CandlesEventsSubscription = { __typename?: 'Subscription', candles: { __typename?: 'Candle', timestamp: string, high: string, low: string, open: string, close: string, volume: string } };
export const CandleFieldsFragmentDoc = gql`
fragment CandleFields on Candle {
- datetime
+ timestamp
high
low
open
diff --git a/libs/candles-chart/src/lib/data-source.ts b/libs/candles-chart/src/lib/data-source.ts
index df3d7bec6..f600f93a9 100644
--- a/libs/candles-chart/src/lib/data-source.ts
+++ b/libs/candles-chart/src/lib/data-source.ts
@@ -199,7 +199,7 @@ function parseCandle(
decimalPlaces: number
): Candle {
return {
- date: new Date(candle.datetime),
+ date: new Date(Number(candle.timestamp) / 1_000_000),
high: Number(addDecimal(candle.high, decimalPlaces)),
low: Number(addDecimal(candle.low, decimalPlaces)),
open: Number(addDecimal(candle.open, decimalPlaces)),
diff --git a/libs/cypress/src/lib/eip1193-bridge.ts b/libs/cypress/src/lib/eip1193-bridge.ts
index 430a0008c..31531fe46 100644
--- a/libs/cypress/src/lib/eip1193-bridge.ts
+++ b/libs/cypress/src/lib/eip1193-bridge.ts
@@ -50,8 +50,9 @@ export class CustomizedBridge extends Eip1193Bridge {
// If from is present on eth_call it errors, removing it makes the library set
// from as the connected wallet which works fine
- if (params && params.length && params[0].from && method === 'eth_call')
+ if (params && params.length && params[0].from && method === 'eth_call') {
delete params[0].from;
+ }
let result;
// For sending a transaction if we call send it will error
// as it wants gasLimit in sendTransaction but hexlify sets the property gas
diff --git a/libs/environment/README.md b/libs/environment/README.md
index 0666759b5..d27f51a73 100644
--- a/libs/environment/README.md
+++ b/libs/environment/README.md
@@ -8,8 +8,6 @@ The environment variables needed to be present for any app consuming this librar
`NX_VEGA_ENV` is the name of the environment.
-`NX_VEGA_REST` is the REST endpoint for the environment.
-
`NX_VEGA_URL` OR `NX_VEGA_CONFIG_URL` - either the network configuration url or a url to a node to directly connect to
`NX_VEGA_WALLET_URL` the default vega wallet URL
diff --git a/libs/environment/src/hooks/use-config.spec.tsx b/libs/environment/src/hooks/use-config.spec.tsx
index a747ac219..5f4179b00 100644
--- a/libs/environment/src/hooks/use-config.spec.tsx
+++ b/libs/environment/src/hooks/use-config.spec.tsx
@@ -87,24 +87,6 @@ describe('useConfig hook', () => {
});
});
- it('caches the configuration', async () => {
- const { result: firstResult } = renderHook(() =>
- useConfig({ environment: mockEnvironment }, onError)
- );
-
- await waitFor(() => {
- expect(fetch).toHaveBeenCalledTimes(1);
- expect(firstResult.current.config).toEqual(mockConfig);
- });
-
- const { result: secondResult } = renderHook(() =>
- useConfig({ environment: mockEnvironment }, onError)
- );
-
- expect(fetch).toHaveBeenCalledTimes(1);
- expect(secondResult.current.config).toEqual(mockConfig);
- });
-
it('executes the error callback when the config endpoint fails', async () => {
// @ts-ignore typescript doesn't recognise the mocked instance
global.fetch.mockImplementation(() => Promise.reject());
diff --git a/libs/environment/src/hooks/use-config.tsx b/libs/environment/src/hooks/use-config.tsx
index 7ed2cbd58..bc1ee1277 100644
--- a/libs/environment/src/hooks/use-config.tsx
+++ b/libs/environment/src/hooks/use-config.tsx
@@ -1,11 +1,8 @@
import { useState, useEffect } from 'react';
-import { LocalStorage } from '@vegaprotocol/react-helpers';
import { ErrorType } from '../types';
-import type { Environment, Configuration, Networks } from '../types';
+import type { Environment, Configuration } from '../types';
import { validateConfiguration } from '../utils/validate-configuration';
-export const LOCAL_STORAGE_NETWORK_KEY = 'vegaNetworkConfig';
-
export type EnvironmentWithOptionalUrl = Partial
&
Omit;
@@ -16,36 +13,6 @@ const compileHosts = (hosts: string[], envUrl?: string) => {
return hosts;
};
-const getCacheKey = (env: Networks) => `${LOCAL_STORAGE_NETWORK_KEY}-${env}`;
-
-const getCachedConfig = (env: Networks, envUrl?: string) => {
- const cacheKey = getCacheKey(env);
- const value = LocalStorage.getItem(cacheKey);
-
- if (value) {
- try {
- const config = JSON.parse(value) as Configuration;
- const hasError = validateConfiguration(config);
-
- if (hasError) {
- throw new Error('Invalid configuration found in the storage.');
- }
-
- return {
- ...config,
- hosts: compileHosts(config.hosts, envUrl),
- };
- } catch (err) {
- LocalStorage.removeItem(cacheKey);
- console.warn(
- 'Malformed data found for network configuration. Removed cached configuration, continuing...'
- );
- }
- }
-
- return undefined;
-};
-
type UseConfigOptions = {
environment: EnvironmentWithOptionalUrl;
defaultConfig?: Configuration;
@@ -57,7 +24,7 @@ export const useConfig = (
) => {
const [loading, setLoading] = useState(false);
const [config, setConfig] = useState(
- defaultConfig ?? getCachedConfig(environment.VEGA_ENV, environment.VEGA_URL)
+ defaultConfig
);
useEffect(() => {
@@ -78,10 +45,6 @@ export const useConfig = (
const hosts = compileHosts(configData.hosts, environment.VEGA_URL);
isMounted && setConfig({ hosts });
- LocalStorage.setItem(
- getCacheKey(environment.VEGA_ENV),
- JSON.stringify({ hosts })
- );
isMounted && setLoading(false);
} catch (err) {
if (isMounted) {
diff --git a/libs/market-depth/src/lib/orderbook-data.ts b/libs/market-depth/src/lib/orderbook-data.ts
index 1bb1341e3..58aabfd98 100644
--- a/libs/market-depth/src/lib/orderbook-data.ts
+++ b/libs/market-depth/src/lib/orderbook-data.ts
@@ -284,7 +284,7 @@ export const updateCompactedRows = (
);
});
- // update cummulative ask only below hihgest modified price level
+ // update cumulative ask only below highest modified price level
if (sellModifiedIndex !== -1) {
for (let i = Math.min(sellModifiedIndex, data.length - 2); i >= 0; i--) {
data[i] = {
@@ -296,7 +296,7 @@ export const updateCompactedRows = (
};
}
}
- // update cummulative bid only above lowest modified price level
+ // update cumulative bid only above lowest modified price level
if (buyModifiedIndex !== data.length) {
for (let i = Math.max(buyModifiedIndex, 1), l = data.length; i < l; i++) {
data[i] = {
diff --git a/libs/market-depth/src/lib/orderbook-row.tsx b/libs/market-depth/src/lib/orderbook-row.tsx
index 5e8f018a3..f38ac7c04 100644
--- a/libs/market-depth/src/lib/orderbook-row.tsx
+++ b/libs/market-depth/src/lib/orderbook-row.tsx
@@ -61,6 +61,7 @@ export const OrderbookRow = React.memo(
/>
{
onRowClicked={(rowEvent: RowClickedEvent) => {
const { data, event } = rowEvent;
// filters out clicks on the symbol column because it should display asset details
- if ((event?.target as HTMLElement).tagName.toUpperCase() === 'BUTTON')
+ if (
+ (event?.target as HTMLElement).tagName.toUpperCase() === 'BUTTON'
+ ) {
return;
+ }
onSelect((data as MarketWithData).id);
}}
/>
diff --git a/libs/network-stats/README.md b/libs/network-stats/README.md
index 6bf3a76db..788522b3e 100644
--- a/libs/network-stats/README.md
+++ b/libs/network-stats/README.md
@@ -8,8 +8,6 @@ Two environment variables need to be present for any app consuming this library.
`NX_VEGA_ENV` is the name of the environment.
-`NX_VEGA_REST` is the REST endpoint for the environment.
-
For examples, see Block Explorer's .env files [here](../../apps/explorer)
## Running unit tests
diff --git a/libs/network-stats/src/components/stats-manager/__generated__/NetworkStats.ts b/libs/network-stats/src/components/stats-manager/__generated__/NetworkStats.ts
index 1f4e6990f..f925889b6 100644
--- a/libs/network-stats/src/components/stats-manager/__generated__/NetworkStats.ts
+++ b/libs/network-stats/src/components/stats-manager/__generated__/NetworkStats.ts
@@ -25,10 +25,6 @@ export interface NetworkStats_nodeData {
* Number of nodes validating
*/
validatingNodes: number;
- /**
- * Total uptime for all epochs across all nodes. Or specify a number of epochs
- */
- uptime: number;
}
export interface NetworkStats_statistics {
@@ -81,6 +77,10 @@ export interface NetworkStats_statistics {
* Current chain ID
*/
chainId: string;
+ /**
+ * RFC3339Nano uptime of the node
+ */
+ upTime: string;
}
export interface NetworkStats {
diff --git a/libs/network-stats/src/components/stats-manager/stats-manager.tsx b/libs/network-stats/src/components/stats-manager/stats-manager.tsx
index b033bd268..43d414d40 100644
--- a/libs/network-stats/src/components/stats-manager/stats-manager.tsx
+++ b/libs/network-stats/src/components/stats-manager/stats-manager.tsx
@@ -24,7 +24,6 @@ const STATS_QUERY = gql`
totalNodes
inactiveNodes
validatingNodes
- uptime
}
statistics {
status
@@ -39,6 +38,7 @@ const STATS_QUERY = gql`
appVersion
chainVersion
chainId
+ upTime
}
}
`;
diff --git a/libs/network-stats/src/config/stats-fields.ts b/libs/network-stats/src/config/stats-fields.ts
index ffed3dda9..553acf3dd 100644
--- a/libs/network-stats/src/config/stats-fields.ts
+++ b/libs/network-stats/src/config/stats-fields.ts
@@ -140,7 +140,7 @@ export const statsFields: { [key in keyof Stats]: StatFields[] } = {
description: t('Tendermint software version on this node'),
},
],
- uptime: [
+ upTime: [
{
title: t('Uptime'),
formatter: (t: string) => {
diff --git a/libs/react-helpers/src/lib/format/number.ts b/libs/react-helpers/src/lib/format/number.ts
index e7c2bc1e3..4a13c067e 100644
--- a/libs/react-helpers/src/lib/format/number.ts
+++ b/libs/react-helpers/src/lib/format/number.ts
@@ -1,5 +1,6 @@
import { BigNumber } from 'bignumber.js';
import { BigNumber as EthersBigNumber } from 'ethers';
+import isNil from 'lodash/isNil';
import memoize from 'lodash/memoize';
import React from 'react';
import { getUserLocale } from './utils';
@@ -23,6 +24,9 @@ export function addDecimal(
decimalPrecision = decimals
): string {
if (!decimals) return value.toString();
+ if (!decimalPrecision || decimalPrecision < 0) {
+ return toBigNum(value, decimals).toFixed(0);
+ }
return toBigNum(value, decimals).toFixed(decimalPrecision);
}
@@ -32,13 +36,15 @@ export function removeDecimal(value: string, decimals: number): string {
}
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/NumberFormat
-export const getNumberFormat = memoize(
- (digits: number) =>
- new Intl.NumberFormat(getUserLocale(), {
- minimumFractionDigits: digits,
- maximumFractionDigits: digits,
- })
-);
+export const getNumberFormat = memoize((digits: number) => {
+ if (isNil(digits) || digits < 0) {
+ return new Intl.NumberFormat(getUserLocale());
+ }
+ return new Intl.NumberFormat(getUserLocale(), {
+ minimumFractionDigits: Math.max(0, digits),
+ maximumFractionDigits: Math.max(0, digits),
+ });
+});
export const getDecimalSeparator = memoize(
() =>
diff --git a/libs/react-helpers/src/lib/grid/cumulative-vol-cell.tsx b/libs/react-helpers/src/lib/grid/cumulative-vol-cell.tsx
index 955e69aa0..0e4d0c948 100644
--- a/libs/react-helpers/src/lib/grid/cumulative-vol-cell.tsx
+++ b/libs/react-helpers/src/lib/grid/cumulative-vol-cell.tsx
@@ -2,6 +2,7 @@ import React from 'react';
import type { ICellRendererParams } from 'ag-grid-community';
import classNames from 'classnames';
import { BID_COLOR, ASK_COLOR } from './vol-cell';
+import { addDecimalsFormatNumber } from '../format';
export interface CumulativeVolProps {
ask?: number;
@@ -11,6 +12,7 @@ export interface CumulativeVolProps {
indicativeVolume?: string;
testId?: string;
className?: string;
+ positionDecimalPlaces: number;
}
export interface ICumulativeVolCellProps extends ICellRendererParams {
@@ -26,6 +28,7 @@ export const CumulativeVol = React.memo(
indicativeVolume,
testId,
className,
+ positionDecimalPlaces,
}: CumulativeVolProps) => {
const askBar = relativeAsk ? (
({indicativeVolume})
+
+ ({addDecimalsFormatNumber(indicativeVolume, positionDecimalPlaces ?? 0)}
+ )
+
) : (
- {ask ? ask : null}
+ {ask ? addDecimalsFormatNumber(ask, positionDecimalPlaces ?? 0) : null}
{ask && bid ? '/' : null}
- {bid ? bid : null}
+ {bid ? addDecimalsFormatNumber(bid, positionDecimalPlaces ?? 0) : null}
);
return (
{askBar}
{bidBar}
diff --git a/libs/wallet/src/wallet-types.ts b/libs/wallet/src/wallet-types.ts
index 8d71eb0ec..17caf9394 100644
--- a/libs/wallet/src/wallet-types.ts
+++ b/libs/wallet/src/wallet-types.ts
@@ -90,7 +90,7 @@ interface ProposalNewMarketTerms {
future: {
settlementAsset: string;
quoteName: string;
- settlementPriceDecimals: number;
+ settlementDataDecimals: number;
oracleSpecForSettlementPrice: OracleSpecFor;
oracleSpecForTradingTermination: OracleSpecFor;
oracleSpecBinding: OracleSpecBinding;
@@ -127,7 +127,7 @@ interface ProposalUpdateMarketTerms {
code: string;
future: {
quoteName: string;
- settlementPriceDecimals: number;
+ settlementDataDecimals: number;
oracleSpecForSettlementPrice: OracleSpecFor;
oracleSpecForTradingTermination: OracleSpecFor;
oracleSpecBinding: OracleSpecBinding;
diff --git a/libs/web3/src/lib/web3-connect-dialog.tsx b/libs/web3/src/lib/web3-connect-dialog.tsx
index 9ec13fdca..bc01fd653 100644
--- a/libs/web3/src/lib/web3-connect-dialog.tsx
+++ b/libs/web3/src/lib/web3-connect-dialog.tsx
@@ -49,15 +49,17 @@ export const Web3ConnectDialog = ({
};
function getConnectorInfo(connector: Connector) {
- if (connector instanceof MetaMask)
+ if (connector instanceof MetaMask) {
return {
name: 'MetaMask',
text: t('MetaMask, Brave or other injected web wallet'),
};
- if (connector instanceof WalletConnect)
+ }
+ if (connector instanceof WalletConnect) {
return {
name: 'WalletConnect',
text: t('WalletConnect'),
};
+ }
return { name: 'Unknown', text: t('Unknown') };
}
diff --git a/vegacapsule/genesis.tmpl b/vegacapsule/genesis.tmpl
index 1db7246b9..d590a9ca8 100644
--- a/vegacapsule/genesis.tmpl
+++ b/vegacapsule/genesis.tmpl
@@ -213,7 +213,7 @@
"spam.protection.proposal.min.tokens": "1000000000000000000",
"spam.protection.voting.min.tokens": "1000000000000000000",
"validators.delegation.minAmount": "100000000000000000",
- "validators.epoch.length": "6s",
+ "validators.epoch.length": "5s",
"validators.vote.required": "0.67"
},
"network_limits": {
diff --git a/workspace.json b/workspace.json
index 16a7ce752..e6dcf11f1 100644
--- a/workspace.json
+++ b/workspace.json
@@ -15,6 +15,8 @@
"fills": "libs/fills",
"governance": "libs/governance",
"liquidity": "libs/liquidity",
+ "liquidity-provision-dashboard": "apps/liquidity-provision-dashboard",
+ "liquidity-provision-dashboard-e2e": "apps/liquidity-provision-dashboard-e2e",
"market-depth": "libs/market-depth",
"market-info": "libs/market-info",
"market-list": "libs/market-list",