{row?.asset?.symbol} {t('usage breakdown')}
diff --git a/libs/cypress/src/lib/capsule/contants.ts b/libs/cypress/src/lib/capsule/contants.ts
index 224bcadf4..449e18253 100644
--- a/libs/cypress/src/lib/capsule/contants.ts
+++ b/libs/cypress/src/lib/capsule/contants.ts
@@ -1 +1,4 @@
-export const ASSET_ID_FOR_MARKET = 'fUSDC';
+export const ASSET_ID_FOR_MARKET =
+ '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc';
+
+export const ASSET_SYMBOL = 'fUSDC';
diff --git a/libs/cypress/src/lib/capsule/propose-market.ts b/libs/cypress/src/lib/capsule/propose-market.ts
index 095379bcf..1ad7c0c9f 100644
--- a/libs/cypress/src/lib/capsule/propose-market.ts
+++ b/libs/cypress/src/lib/capsule/propose-market.ts
@@ -4,7 +4,7 @@ import { createLog } from './logging';
import type { ProposalSubmissionBody } from '@vegaprotocol/wallet';
import { getProposal } from './get-proposal';
import { sendVegaTx } from './wallet-client';
-import { ASSET_ID_FOR_MARKET } from './contants';
+import { ASSET_ID_FOR_MARKET, ASSET_SYMBOL } from './contants';
const log = createLog('propose-market');
@@ -43,7 +43,7 @@ function createNewMarketProposal(): ProposalSubmissionBody {
code: 'TEST.24h',
future: {
settlementAsset: ASSET_ID_FOR_MARKET,
- quoteName: ASSET_ID_FOR_MARKET,
+ quoteName: ASSET_SYMBOL,
dataSourceSpecForSettlementData: {
external: {
oracle: {
diff --git a/libs/cypress/src/lib/commands/get-assets.ts b/libs/cypress/src/lib/commands/get-assets.ts
index 6d4f9d152..c2ea51845 100644
--- a/libs/cypress/src/lib/commands/get-assets.ts
+++ b/libs/cypress/src/lib/commands/get-assets.ts
@@ -66,7 +66,7 @@ export function addGetAssets() {
cy.request({
method: 'POST',
- url: 'http://localhost:3028/query',
+ url: 'http://localhost:3008/graphql',
body: {
query: print(query),
},
diff --git a/libs/cypress/src/lib/commands/get-network-parameters.ts b/libs/cypress/src/lib/commands/get-network-parameters.ts
index 9fa5e8871..1f12d67d6 100644
--- a/libs/cypress/src/lib/commands/get-network-parameters.ts
+++ b/libs/cypress/src/lib/commands/get-network-parameters.ts
@@ -24,7 +24,7 @@ export function addGetNetworkParameters() {
}`;
cy.request({
method: 'POST',
- url: `http://localhost:3028/query`,
+ url: `http://localhost:3008/graphql`,
body: {
query: mutation,
},
diff --git a/libs/cypress/src/lib/commands/get-nodes.ts b/libs/cypress/src/lib/commands/get-nodes.ts
index d7206df7b..454ad1aba 100644
--- a/libs/cypress/src/lib/commands/get-nodes.ts
+++ b/libs/cypress/src/lib/commands/get-nodes.ts
@@ -43,7 +43,7 @@ export function addGetNodes() {
cy.request({
method: 'POST',
- url: `http://localhost:3028/query`,
+ url: `http://localhost:3008/graphql`,
body: {
query: print(query),
},
diff --git a/libs/environment/src/components/network-switcher/network-switcher.tsx b/libs/environment/src/components/network-switcher/network-switcher.tsx
index 8302a384b..4f7392342 100644
--- a/libs/environment/src/components/network-switcher/network-switcher.tsx
+++ b/libs/environment/src/components/network-switcher/network-switcher.tsx
@@ -70,7 +70,7 @@ const NetworkLabel = ({
isCurrent = false,
isAvailable = false,
}: NetworkLabelProps) => (
-
+
{getLabelText({ isCurrent, isAvailable })}
);
@@ -111,9 +111,12 @@ export const NetworkSwitcher = ({
trigger={
- {envTriggerMapping[current]}
+ {envTriggerMapping[current]}
}
>
diff --git a/libs/fills/src/lib/fills-table.spec.tsx b/libs/fills/src/lib/fills-table.spec.tsx
index f1ee45630..797dc2391 100644
--- a/libs/fills/src/lib/fills-table.spec.tsx
+++ b/libs/fills/src/lib/fills-table.spec.tsx
@@ -120,6 +120,40 @@ describe('FillsTable', () => {
expect(amountCell).toHaveClass('text-vega-pink');
});
+ it('should format cells correctly for side unspecified', async () => {
+ const partyId = 'party-id';
+ const buyerFill = generateFill({
+ ...defaultFill,
+ seller: {
+ id: partyId,
+ },
+ aggressor: Schema.Side.SIDE_UNSPECIFIED,
+ sellerFee: {
+ makerFee: '1',
+ infrastructureFee: '1',
+ liquidityFee: '1',
+ },
+ });
+ render() => {
- const taker = t('Taker');
- const maker = t('Maker');
- if (data?.buyer.id === partyId) {
- if (value === Schema.Side.SIDE_BUY) {
- return taker;
- } else {
- return maker;
- }
- } else if (data?.seller.id === partyId) {
- if (value === Schema.Side.SIDE_SELL) {
- return taker;
- } else {
- return maker;
- }
- } else {
- return '-';
- }
+ return ({ data }: VegaValueFormatterParams) => {
+ if (!data) return '-';
+ const { role } = getRoleAndFees({ data, partyId });
+ return role;
};
};
@@ -222,6 +210,15 @@ const formatFee = (partyId: string) => {
};
};
+export const isEmptyFeeObj = (feeObj: Schema.TradeFee) => {
+ if (!feeObj) return true;
+ return (
+ feeObj.liquidityFee === '0' &&
+ feeObj.makerFee === '0' &&
+ feeObj.infrastructureFee === '0'
+ );
+};
+
export const getRoleAndFees = ({
data,
partyId,
@@ -232,14 +229,30 @@ export const getRoleAndFees = ({
>;
partyId?: string;
}) => {
- let role;
+ let role: Role;
let feesObj;
if (data?.buyer.id === partyId) {
- role = data.aggressor === Schema.Side.SIDE_BUY ? TAKER : MAKER;
- feesObj = role === TAKER ? data?.buyerFee : data.sellerFee;
+ if (data.aggressor === Schema.Side.SIDE_BUY) {
+ role = TAKER;
+ feesObj = data?.buyerFee;
+ } else if (data.aggressor === Schema.Side.SIDE_SELL) {
+ role = MAKER;
+ feesObj = data?.sellerFee;
+ } else {
+ role = '-';
+ feesObj = !isEmptyFeeObj(data?.buyerFee) ? data.buyerFee : data.sellerFee;
+ }
} else if (data?.seller.id === partyId) {
- role = data.aggressor === Schema.Side.SIDE_SELL ? TAKER : MAKER;
- feesObj = role === TAKER ? data?.sellerFee : data.buyerFee;
+ if (data.aggressor === Schema.Side.SIDE_SELL) {
+ role = TAKER;
+ feesObj = data?.sellerFee;
+ } else if (data.aggressor === Schema.Side.SIDE_BUY) {
+ role = MAKER;
+ feesObj = data?.buyerFee;
+ } else {
+ role = '-';
+ feesObj = !isEmptyFeeObj(data.sellerFee) ? data.sellerFee : data.buyerFee;
+ }
} else {
return { role: '-', feesObj: '-' };
}
@@ -270,11 +283,6 @@ const FeesBreakdownTooltip = ({
{role === MAKER && (
<>
{t('The maker will receive the maker fee.')}
-
- {t(
- 'If the market is in monitoring auction the maker will pay half of the infrastructure and liquidity fees.'
- )}
-
{t(
'If the market is active the maker will pay zero infrastructure and liquidity fees.'
@@ -283,14 +291,14 @@ const FeesBreakdownTooltip = ({
)}
{role === TAKER && (
- <>
-
{t('Fees to be paid by the taker.')}
-
- {t(
- 'If the market is in monitoring auction the taker will pay half of the infrastructure and liquidity fees.'
- )}
-
-
+ {t('Fees to be paid by the taker.')}
+ )}
+ {role === '-' && (
+
+ {t(
+ 'If the market is in monitoring auction, half of the infrastructure and liquidity fees will be paid.'
+ )}
+
)}
{t('Infrastructure fee')}
@@ -316,7 +324,7 @@ const FeesBreakdownTooltip = ({
};
export const getFeesBreakdown = (
- role: string,
+ role: Role,
feesObj: {
__typename?: 'TradeFee' | undefined;
makerFee: string;
@@ -328,6 +336,7 @@ export const getFeesBreakdown = (
role === MAKER
? new BigNumber(feesObj.makerFee).times(-1).toString()
: feesObj.makerFee;
+
const infrastructureFee = feesObj.infrastructureFee;
const liquidityFee = feesObj.liquidityFee;
diff --git a/libs/ledger/jest.config.ts b/libs/ledger/jest.config.ts
index deafd8379..3c3e0b5cd 100644
--- a/libs/ledger/jest.config.ts
+++ b/libs/ledger/jest.config.ts
@@ -12,4 +12,5 @@ export default {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
coverageDirectory: '../../coverage/libs/ledger',
+ setupFilesAfterEnv: ['./src/setup-tests.ts'],
};
diff --git a/libs/ledger/src/lib/ledger-entries-data-provider.ts b/libs/ledger/src/lib/ledger-entries-data-provider.ts
index 0f8a31f69..893214335 100644
--- a/libs/ledger/src/lib/ledger-entries-data-provider.ts
+++ b/libs/ledger/src/lib/ledger-entries-data-provider.ts
@@ -30,7 +30,10 @@ export type LedgerEntry = LedgerEntryFragment & {
};
export type AggregatedLedgerEntriesEdge = Schema.AggregatedLedgerEntriesEdge;
-export type AggregatedLedgerEntriesNode = AggregatedLedgerEntriesEdge & {
+export type AggregatedLedgerEntriesNode = Omit<
+ AggregatedLedgerEntriesEdge,
+ 'node'
+> & {
node: LedgerEntry;
};
diff --git a/libs/ledger/src/lib/ledger-entries.mock.ts b/libs/ledger/src/lib/ledger-entries.mock.ts
index 8e31a31e9..1033a8c0c 100644
--- a/libs/ledger/src/lib/ledger-entries.mock.ts
+++ b/libs/ledger/src/lib/ledger-entries.mock.ts
@@ -32,7 +32,7 @@ export const ledgerEntriesQuery = (
return merge(defaultResult, override);
};
-const ledgerEntries: LedgerEntryFragment[] = [
+export const ledgerEntries: LedgerEntryFragment[] = [
{
vegaTime: '1669224476734364000',
quantity: '0',
@@ -180,7 +180,6 @@ const ledgerEntries: LedgerEntryFragment[] = [
toAccountBalance: '0',
fromAccountBalance: '0',
},
-
{
vegaTime: '2022-11-24T12:41:22.054428Z',
quantity: '1000000000',
diff --git a/libs/ledger/src/lib/ledger-export-link.spec.tsx b/libs/ledger/src/lib/ledger-export-link.spec.tsx
new file mode 100644
index 000000000..8c623ccfa
--- /dev/null
+++ b/libs/ledger/src/lib/ledger-export-link.spec.tsx
@@ -0,0 +1,85 @@
+import { act, render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { LedgerExportLink } from './ledger-export-link';
+import * as Types from '@vegaprotocol/types';
+import { ledgerEntries } from './ledger-entries.mock';
+import type { LedgerEntry } from './ledger-entries-data-provider';
+
+const VEGA_URL = 'https://vega-url.co.uk/querystuff';
+const mockEnvironment = jest.fn(() => VEGA_URL);
+jest.mock('@vegaprotocol/environment', () => ({
+ useEnvironment: jest.fn(() => mockEnvironment()),
+}));
+
+const asset = {
+ id: 'assetID',
+ name: 'assetName',
+ symbol: 'assetSymbol',
+ decimals: 1,
+ quantum: '1',
+ status: Types.AssetStatus,
+ source: {
+ __typename: 'ERC20',
+ contractAddress: 'contractAddres',
+ lifetimeLimit: 'lifetimeLimit',
+ withdrawThreshold: 'withdraw',
+ },
+};
+
+describe('LedgerExportLink', () => {
+ const partyId = 'partyId';
+ const entries = ledgerEntries.map((entry) => {
+ return {
+ ...entry,
+ asset: entry.assetId
+ ? {
+ ...asset,
+ id: entry.assetId,
+ name: `name ${entry.assetId}`,
+ symbol: `symbol ${entry.assetId}`,
+ }
+ : null,
+ marketSender: null,
+ marketReceiver: null,
+ } as LedgerEntry;
+ });
+
+ it('should be properly rendered', async () => {
+ render();
+ const [assetId, setAssetId] = useState(Object.keys(assets)[0]);
+ const VEGA_URL = useEnvironment((store) => store.VEGA_URL);
+ const protohost = VEGA_URL ? getProtoHost(VEGA_URL) : '';
+
+ const assetDropDown = useMemo(() => {
+ return (
+ {assets[assetId]}}
+ >
+
+ {Object.keys(assets).map((assetKey) => (
+ setAssetId(assetKey)}
+ >
+ {assets[assetKey]}
+
+ ))}
+
+
+ );
+ }, [assetId, assets]);
+
+ if (!protohost) {
+ return null;
+ }
+ return (
+
+
Export all
+ {assetDropDown}
+
+
{t('Download')}
+
+
(null);
const [filter, setFilter] = useState(defaultFilter);
@@ -55,6 +57,9 @@ export const LedgerManager = ({ partyId }: { partyId: string }) => {
rowData={extractedData}
onFilterChanged={onFilterChanged}
/>
+ {extractedData && (
+
(
(props, ref) => {
return (
{
marketInfo.tradableInstrument.instrument.product
.dataSourceSpecForSettlementData.data;
return data.find((provider) =>
- provider.proofs.some(
- (proof) =>
- (proof.type === 'eth_address' &&
- dataSource.sourceType.__typename ===
- 'DataSourceDefinitionExternal' &&
- dataSource.sourceType.sourceType.signers?.some(
- (signer) =>
- signer.signer.__typename === 'ETHAddress' &&
- signer.signer.address === proof.eth_address
- )) ||
- (proof.type === 'public_key' &&
- dataSource.sourceType.__typename ===
- 'DataSourceDefinitionExternal' &&
- dataSource.sourceType.sourceType.signers?.some(
- (signer) =>
- signer.signer.__typename === 'PubKey' &&
- signer.signer.key === proof.public_key
- ))
- )
+ provider.proofs.some((proof) => {
+ if (
+ proof.type === 'eth_address' &&
+ dataSource.sourceType.__typename === 'DataSourceDefinitionExternal'
+ ) {
+ return dataSource.sourceType.sourceType.signers?.some(
+ (signer) =>
+ signer.signer.__typename === 'ETHAddress' &&
+ signer.signer.address === proof.eth_address
+ );
+ }
+ if (
+ proof.type === 'public_key' &&
+ dataSource.sourceType.__typename === 'DataSourceDefinitionExternal'
+ ) {
+ return dataSource.sourceType.sourceType.signers?.some(
+ (signer) =>
+ signer.signer.__typename === 'PubKey' &&
+ signer.signer.key === proof.public_key
+ );
+ }
+ return false;
+ })
)?.oracle;
}, [data, marketInfo]);
};
diff --git a/libs/network-stats/src/components/stats-manager/Stats.graphql b/libs/network-stats/src/components/stats-manager/Stats.graphql
index 348d64156..3be3c5840 100644
--- a/libs/network-stats/src/components/stats-manager/Stats.graphql
+++ b/libs/network-stats/src/components/stats-manager/Stats.graphql
@@ -1,4 +1,7 @@
query Stats {
+ epoch {
+ id
+ }
nodeData {
stakedTotal
totalNodes
diff --git a/libs/network-stats/src/components/stats-manager/__generated__/Stats.ts b/libs/network-stats/src/components/stats-manager/__generated__/Stats.ts
index 6c2275fa7..d253da9c7 100644
--- a/libs/network-stats/src/components/stats-manager/__generated__/Stats.ts
+++ b/libs/network-stats/src/components/stats-manager/__generated__/Stats.ts
@@ -6,11 +6,14 @@ const defaultOptions = {} as const;
export type StatsQueryVariables = Types.Exact<{ [key: string]: never; }>;
-export type StatsQuery = { __typename?: 'Query', nodeData?: { __typename?: 'NodeData', stakedTotal: string, totalNodes: number, inactiveNodes: number } | null, statistics: { __typename?: 'Statistics', status: string, blockHeight: string, blockDuration: string, backlogLength: string, txPerBlock: string, tradesPerSecond: string, ordersPerSecond: string, averageOrdersPerBlock: string, vegaTime: any, appVersion: string, chainVersion: string, chainId: string, genesisTime: any } };
+export type StatsQuery = { __typename?: 'Query', epoch: { __typename?: 'Epoch', id: string }, nodeData?: { __typename?: 'NodeData', stakedTotal: string, totalNodes: number, inactiveNodes: number } | null, statistics: { __typename?: 'Statistics', status: string, blockHeight: string, blockDuration: string, backlogLength: string, txPerBlock: string, tradesPerSecond: string, ordersPerSecond: string, averageOrdersPerBlock: string, vegaTime: any, appVersion: string, chainVersion: string, chainId: string, genesisTime: any } };
export const StatsDocument = gql`
query Stats {
+ epoch {
+ id
+ }
nodeData {
stakedTotal
totalNodes
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 2a88d56be..b1de0ff6e 100644
--- a/libs/network-stats/src/components/stats-manager/stats-manager.tsx
+++ b/libs/network-stats/src/components/stats-manager/stats-manager.tsx
@@ -19,10 +19,14 @@ export const StatsManager = ({ className }: StatsManagerProps) => {
return () => stopPolling();
}, [startPolling, stopPolling]);
- const getValue = (field: keyof NodeData | keyof Statistics) =>
- ['stakedTotal', 'totalNodes', 'inactiveNodes'].includes(field)
- ? data?.nodeData?.[field as keyof NodeData]
- : data?.statistics?.[field as keyof Statistics];
+ const getValue = (field: keyof NodeData | keyof Statistics | 'epoch') => {
+ if (['stakedTotal', 'totalNodes', 'inactiveNodes'].includes(field)) {
+ return data?.nodeData?.[field as keyof NodeData];
+ } else if (field === 'epoch') {
+ return data?.epoch.id;
+ }
+ return data?.statistics?.[field as keyof Statistics];
+ };
const panels = fieldsDefinition.map(
({ field, title, description, formatter, goodThreshold }) => ({
@@ -50,7 +54,7 @@ export const StatsManager = ({ className }: StatsManagerProps) => {
className={classNames(
'border rounded p-2 relative border-vega-light-200 dark:border-vega-dark-200',
{
- 'col-span-2': field === 'chainId' || field === 'status',
+ 'col-span-2': field === 'chainId',
},
{
'bg-transparent border-vega-light-200 dark:border-vega-dark-200':
diff --git a/libs/network-stats/src/config/stats-fields.ts b/libs/network-stats/src/config/stats-fields.ts
index 96f8be4e5..f6b315d84 100644
--- a/libs/network-stats/src/config/stats-fields.ts
+++ b/libs/network-stats/src/config/stats-fields.ts
@@ -20,7 +20,7 @@ export type FieldValue = any;
export type GoodThreshold = (...args: FieldValue[]) => boolean;
export interface Stats {
- field: keyof NodeData | keyof Statistics;
+ field: keyof NodeData | keyof Statistics | 'epoch';
title: string;
goodThreshold?: GoodThreshold;
// eslint-disable-next-line
@@ -161,6 +161,11 @@ const VEGA_TIME: Stats = {
description: t('The time on the blockchain'),
};
+const EPOCH: Stats = {
+ field: 'epoch',
+ title: 'Epoch',
+};
+
const APP_VERSION: Stats = {
field: 'appVersion',
title: t('App'),
@@ -217,6 +222,7 @@ const CHAIN_ID: Stats = {
export const fieldsDefinition: Stats[] = [
STATUS,
+ EPOCH,
BLOCK_HEIGHT,
UPTIME,
TOTAL_NODES,
diff --git a/libs/react-helpers/src/hooks/use-logger.ts b/libs/react-helpers/src/hooks/use-logger.ts
index cf62cf218..759d3f3b8 100644
--- a/libs/react-helpers/src/hooks/use-logger.ts
+++ b/libs/react-helpers/src/hooks/use-logger.ts
@@ -1,24 +1,18 @@
import { useRef } from 'react';
-import { BrowserTracing } from '@sentry/tracing';
-import * as Sentry from '@sentry/browser';
import type { LocalLogger, LoggerConf } from '@vegaprotocol/utils';
-import { localLoggerFactory } from '@vegaprotocol/utils';
+import { localLoggerFactory, SentryInit } from '@vegaprotocol/utils';
-interface Props extends LoggerConf {
+export interface LoggerProps extends LoggerConf {
dsn?: string;
+ env?: string;
}
-export const useLogger = ({ dsn, ...props }: Props) => {
+export const useLogger = ({ dsn, env, ...props }: LoggerProps) => {
const logger = useRef(null);
if (!logger.current) {
logger.current = localLoggerFactory(props);
if (dsn) {
- Sentry.init({
- dsn,
- integrations: [new BrowserTracing()],
- tracesSampleRate: 1,
- defaultIntegrations: false,
- });
+ SentryInit(dsn, env);
}
}
return logger.current;
diff --git a/libs/types/src/__generated__/types.ts b/libs/types/src/__generated__/types.ts
index aa926b374..cc785d575 100644
--- a/libs/types/src/__generated__/types.ts
+++ b/libs/types/src/__generated__/types.ts
@@ -796,6 +796,67 @@ export type ETHAddress = {
address?: Maybe;
};
+/** List of all entities created by transaction hash */
+export type Entities = {
+ __typename?: 'Entities';
+ /** List of accounts created by the transaction hash */
+ accounts?: Maybe>>;
+ /** List of assets created by the transaction hash */
+ assets?: Maybe>>;
+ /** List of balance changes created by the transaction hash */
+ balanceChanges?: Maybe>>;
+ /** List of delegations created by the transaction hash */
+ delegations?: Maybe>>;
+ /** List of deposits created by the transaction hash */
+ deposits?: Maybe>>;
+ /** List of ERC-20 multisig signer added bundles created by the transaction hash */
+ erc20MultiSigSignerAddedBundles?: Maybe>>;
+ /** List of ERC-20 multisig signer removed bundles created by the transaction hash */
+ erc20MultiSigSignerRemovedBundles?: Maybe>>;
+ /** List of ethereum key rotations created by the transaction hash */
+ ethereumKeyRotations?: Maybe>>;
+ /** List of key rotations created by the transaction hash */
+ keyRotations?: Maybe>>;
+ /** List of ledger entries created by the transaction hash */
+ ledgerEntries?: Maybe>>;
+ /** List of liquidity provisions created by the transaction hash */
+ liquidityProvisions?: Maybe>>;
+ /** List of margin levels created by the transaction hash */
+ marginLevels?: Maybe>>;
+ /** List of markets created by the transaction hash */
+ markets?: Maybe>>;
+ /** List of network parameters created by the transaction hash */
+ networkParameters?: Maybe>>;
+ /** List of node signatures created by the transaction hash */
+ nodeSignatures?: Maybe>>;
+ /** List of nodes created by the transaction hash */
+ nodes?: Maybe>>;
+ /** List of oracle data created by the transaction hash */
+ oracleData?: Maybe>>;
+ /** List of oracle specs created by the transaction hash */
+ oracleSpecs?: Maybe>>;
+ /** List of orders created by the transaction hash */
+ orders?: Maybe>>;
+ /** List of parties created by the transaction hash */
+ parties?: Maybe>>;
+ /** List of positions created by the transaction hash */
+ positions?: Maybe>>;
+ /** List of proposals created by the transaction hash */
+ proposals?: Maybe>>;
+ /** List of protocol upgrade proposals created by the transaction hash */
+ protocolUpgradeProposals?: Maybe>>;
+ /** List of rewards created by the transaction hash */
+ rewards?: Maybe>>;
+ /** List of trades created by the transaction hash */
+ trades?: Maybe>>;
+ /** List of transfers created by the transaction hash */
+ transfers?: Maybe>>;
+ /** List of votes created by the transaction hash */
+ votes?: Maybe>>;
+ /** List of withdrawals created by the transaction hash */
+ withdrawals?: Maybe>>;
+};
+
/** Epoch describes a specific period of time in the Vega network */
export type Epoch = {
__typename?: 'Epoch';
@@ -988,6 +1049,15 @@ export type ExternalDataSourceSpec = {
spec: DataSourceSpec;
};
+/** An estimate of the fee to be paid for the order */
+export type FeeEstimate = {
+ __typename?: 'FeeEstimate';
+ /** The estimated fees if the order was to trade */
+ fees: TradeFee;
+ /** The total estimated amount of fees if the order was to trade */
+ totalFeeAmount: Scalars['String'];
+};
+
/** The factors applied to calculate the fees */
export type FeeFactors = {
__typename?: 'FeeFactors';
@@ -1178,6 +1248,26 @@ export type LedgerEntryFilter = {
TransferTypes?: InputMaybe>>;
};
+/** Liquidation estimate for both worst and best case possible */
+export type LiquidationEstimate = {
+ __typename?: 'LiquidationEstimate';
+ /** Liquidation price estimate assuming no slippage */
+ bestCase: LiquidationPrice;
+ /** Liquidation price estimate assuming slippage cap is applied */
+ worstCase: LiquidationPrice;
+};
+
+/** Liquidation price estimate for either only the current open volume and position given some or all buy orders get filled, or position given some or all sell orders get filled */
+export type LiquidationPrice = {
+ __typename?: 'LiquidationPrice';
+ /** Liquidation price assuming buy orders start getting filled */
+ including_buy_orders: Scalars['String'];
+ /** Liquidation price assuming sell orders start getting filled */
+ including_sell_orders: Scalars['String'];
+ /** Liquidation price for current open volume ignoring any active orders */
+ open_volume_only: Scalars['String'];
+};
+
/** Configuration of a market liquidity monitoring parameters */
export type LiquidityMonitoringParameters = {
__typename?: 'LiquidityMonitoringParameters';
@@ -1367,6 +1457,15 @@ export type MarginEdge = {
node: MarginLevels;
};
+/** Margin level estimate for both worst and best case possible */
+export type MarginEstimate = {
+ __typename?: 'MarginEstimate';
+ /** Margin level estimate assuming no slippage */
+ bestCase: MarginLevels;
+ /** Margin level estimate assuming slippage cap is applied */
+ worstCase: MarginLevels;
+};
+
/** Margins for a given a party */
export type MarginLevels = {
__typename?: 'MarginLevels';
@@ -1377,7 +1476,7 @@ export type MarginLevels = {
* the general account of the party for the given asset.
*/
collateralReleaseLevel: Scalars['String'];
- /** This is the minimum margin required for a party to place a new order on the network (unsigned integer) */
+ /** This is the minimum margin required for a party to place a new order on the network, expressed as unsigned integer */
initialLevel: Scalars['String'];
/** Minimal margin for the position to be maintained in the network (unsigned integer) */
maintenanceLevel: Scalars['String'];
@@ -1385,7 +1484,7 @@ export type MarginLevels = {
market: Market;
/** The party for this margin */
party: Party;
- /** If the margin is between maintenance and search, the network will initiate a collateral search (unsigned integer) */
+ /** If the margin is between maintenance and search, the network will initiate a collateral search, expressed as unsigned integer */
searchLevel: Scalars['String'];
/** RFC3339Nano time from at which this margin level was relevant */
timestamp: Scalars['Timestamp'];
@@ -1483,6 +1582,7 @@ export type Market = {
state: MarketState;
/** An instance of, or reference to, a tradable instrument. */
tradableInstrument: TradableInstrument;
+ /** @deprecated Simplify and consolidate trades query and remove nesting. Use trades query instead */
tradesConnection?: Maybe;
/** Current mode of execution of the market */
tradingMode: MarketTradingMode;
@@ -1894,6 +1994,28 @@ export type NodedelegationsConnectionArgs = {
partyId?: InputMaybe;
};
+export type NodeBasic = {
+ __typename?: 'NodeBasic';
+ /** The URL of an avatar */
+ avatarUrl?: Maybe;
+ /** Ethereum public key of the node */
+ ethereumAddress: Scalars['String'];
+ /** The node URL, for example n01.vega.xyz */
+ id: Scalars['ID'];
+ /** URL that provides more information about the node */
+ infoUrl: Scalars['String'];
+ /** Country code for the location of the node */
+ location: Scalars['String'];
+ /** The name of the node operator */
+ name: Scalars['String'];
+ /** Public key of the node operator */
+ pubkey: Scalars['String'];
+ /** Validator status of the node */
+ status: NodeStatus;
+ /** Tendermint public key of the node */
+ tmPubkey: Scalars['String'];
+};
+
/** Summary of data across all nodes */
export type NodeData = {
__typename?: 'NodeData';
@@ -2107,18 +2229,6 @@ export type ObservableMarketDepthUpdate = {
sequenceNumber: Scalars['String'];
};
-export type OffsetPagination = {
- /**
- * Descending reverses the order of the records returned
- * default is true, if false the results will be returned in ascending order
- */
- descending: Scalars['Boolean'];
- /** Limit the number of returned records to the value specified, default is 50 */
- limit: Scalars['Int'];
- /** Skip the number of records specified, default is 0 */
- skip: Scalars['Int'];
-};
-
/** The specific details for a one-off transfer */
export type OneOffTransfer = {
__typename?: 'OneOffTransfer';
@@ -2213,7 +2323,10 @@ export type Order = {
status: OrderStatus;
/** The timeInForce of order (determines how and if it executes, and whether it persists on the book) */
timeInForce: OrderTimeInForce;
- /** Trades relating to this order */
+ /**
+ * Trades relating to this order
+ * @deprecated Simplify and consolidate trades query and remove nesting. Use trades query instead
+ */
tradesConnection?: Maybe;
/** The order type */
type?: Maybe;
@@ -2279,11 +2392,28 @@ export type OrderFilter = {
/** Date range to retrieve orders from/to. Start and end time should be expressed as an integer value of nano-seconds past the Unix epoch */
dateRange?: InputMaybe;
excludeLiquidity?: InputMaybe;
+ /**
+ * If true, only orders that are live will be returned. Orders are live if they have STATUS_ACTIVE or STATUS_PARKED
+ * as per https://github.com/vegaprotocol/specs-internal/blob/master/protocol/0024-OSTA-order_status.md
+ */
+ liveOnly?: InputMaybe;
status?: InputMaybe>;
timeInForce?: InputMaybe>;
types?: InputMaybe>;
};
+/** Basic description of an order */
+export type OrderInfo = {
+ /** Boolean indicating a market order */
+ isMarketOrder: Scalars['Boolean'];
+ /** Price for the order */
+ price: Scalars['String'];
+ /** Number of units remaining of the total that have not yet been bought or sold (uint64) */
+ remaining: Scalars['String'];
+ /** Whether the order is to buy or sell */
+ side: Side;
+};
+
/** Why the order was rejected by the core node */
export enum OrderRejectionReason {
/** Amending the order failed */
@@ -2304,6 +2434,8 @@ export enum OrderRejectionReason {
ORDER_ERROR_CANNOT_HAVE_GTC_AND_EXPIRYAT = 'ORDER_ERROR_CANNOT_HAVE_GTC_AND_EXPIRYAT',
/** Cannot send FOK orders during an auction */
ORDER_ERROR_CANNOT_SEND_FOK_ORDER_DURING_AUCTION = 'ORDER_ERROR_CANNOT_SEND_FOK_ORDER_DURING_AUCTION',
+ /** Good for Auction order received during continuous trading */
+ ORDER_ERROR_CANNOT_SEND_GFA_ORDER_DURING_CONTINUOUS_TRADING = 'ORDER_ERROR_CANNOT_SEND_GFA_ORDER_DURING_CONTINUOUS_TRADING',
/** Good for Normal order received during an auction */
ORDER_ERROR_CANNOT_SEND_GFN_ORDER_DURING_AN_AUCTION = 'ORDER_ERROR_CANNOT_SEND_GFN_ORDER_DURING_AN_AUCTION',
/** Cannot send IOC orders during an auction */
@@ -2312,8 +2444,8 @@ export enum OrderRejectionReason {
ORDER_ERROR_EDIT_NOT_ALLOWED = 'ORDER_ERROR_EDIT_NOT_ALLOWED',
/** Attempt to amend expiry time to a value before time order was created */
ORDER_ERROR_EXPIRYAT_BEFORE_CREATEDAT = 'ORDER_ERROR_EXPIRYAT_BEFORE_CREATEDAT',
- /** Good for Auction order received during continuous trading */
- ORDER_ERROR_GFA_CANNOT_SEND_ORDER_DURING_CONTINUOUS_TRADING = 'ORDER_ERROR_GFA_CANNOT_SEND_ORDER_DURING_CONTINUOUS_TRADING',
+ /** Order was submitted with an incorrect or invalid market type */
+ ORDER_ERROR_INCORRECT_MARKET_TYPE = 'ORDER_ERROR_INCORRECT_MARKET_TYPE',
/** Insufficient balance to submit the order (no deposit made) */
ORDER_ERROR_INSUFFICIENT_ASSET_BALANCE = 'ORDER_ERROR_INSUFFICIENT_ASSET_BALANCE',
/** Insufficient funds to pay fees */
@@ -2360,6 +2492,10 @@ export enum OrderRejectionReason {
ORDER_ERROR_OFFSET_MUST_BE_GREATER_THAN_ZERO = 'ORDER_ERROR_OFFSET_MUST_BE_GREATER_THAN_ZERO',
/** Order is out of sequence */
ORDER_ERROR_OUT_OF_SEQUENCE = 'ORDER_ERROR_OUT_OF_SEQUENCE',
+ /** A post-only order would produce an aggressive trade and thus it has been rejected */
+ ORDER_ERROR_POST_ONLY_ORDER_WOULD_TRADE = 'ORDER_ERROR_POST_ONLY_ORDER_WOULD_TRADE',
+ /** A reduce-ony order would not reduce the party's position and thus it has been rejected */
+ ORDER_ERROR_REDUCE_ONLY_ORDER_WOULD_NOT_REDUCE = 'ORDER_ERROR_REDUCE_ONLY_ORDER_WOULD_NOT_REDUCE',
/** Unable to remove the order */
ORDER_ERROR_REMOVAL_FAILURE = 'ORDER_ERROR_REMOVAL_FAILURE',
/** Order cannot be filled because it would require self trading */
@@ -2368,6 +2504,8 @@ export enum OrderRejectionReason {
ORDER_ERROR_SELL_CANNOT_REFERENCE_BEST_BID_PRICE = 'ORDER_ERROR_SELL_CANNOT_REFERENCE_BEST_BID_PRICE',
/** Time has failed us */
ORDER_ERROR_TIME_FAILURE = 'ORDER_ERROR_TIME_FAILURE',
+ /** Unable to submit pegged order, temporarily too many pegged orders across all markets */
+ ORDER_ERROR_TOO_MANY_PEGGED_ORDERS = 'ORDER_ERROR_TOO_MANY_PEGGED_ORDERS',
/** Unable to amend pegged order price */
ORDER_ERROR_UNABLE_TO_AMEND_PRICE_ON_PEGGED_ORDER = 'ORDER_ERROR_UNABLE_TO_AMEND_PRICE_ON_PEGGED_ORDER',
/** Unable to reprice a pegged order */
@@ -2526,6 +2664,7 @@ export type Party = {
rewardsConnection?: Maybe;
/** The staking information for this Party */
stakingSummary: StakingSummary;
+ /** @deprecated Simplify and consolidate trades query and remove nesting. Use trades query instead */
tradesConnection?: Maybe;
/** All transfers for a public key */
transfersConnection?: Maybe;
@@ -2754,6 +2893,15 @@ export type PositionEdge = {
node: Position;
};
+/** Response for the estimate of the margin level and, if available, collateral was provided in the request, liqudation price for the specified position */
+export type PositionEstimate = {
+ __typename?: 'PositionEstimate';
+ /** Liquidation price range estimate for the specified position. Only populated if available collateral was specified in the request */
+ liquidation?: Maybe;
+ /** Margin level range estimate for the specified position */
+ margin: MarginEstimate;
+};
+
export type PositionResolution = {
__typename?: 'PositionResolution';
/** Number of parties closed out */
@@ -2770,6 +2918,8 @@ export type PositionResolution = {
export enum PositionStatus {
/** The position was distressed, and had to be closed out entirely - orders were removed from the book, and the open volume was closed out by the network */
POSITION_STATUS_CLOSED_OUT = 'POSITION_STATUS_CLOSED_OUT',
+ /** The position was distressed, but could not be closed out - orders were removed from the book, and the open volume will be closed out once there is sufficient volume on the book */
+ POSITION_STATUS_DISTRESSED = 'POSITION_STATUS_DISTRESSED',
/** The position was distressed, but removing open orders from the book brought the margin level back to a point where the open position could be maintained */
POSITION_STATUS_ORDERS_CLOSED = 'POSITION_STATUS_ORDERS_CLOSED',
/** The position is either healthy, or if closed out, was closed out normally */
@@ -2923,9 +3073,9 @@ export type Proposal = {
reference: Scalars['String'];
/** Why the proposal was rejected by the core */
rejectionReason?: Maybe;
- /** Required liquidity provider equity like share majority for this proposal to succeed */
+ /** Equity-like share required for a market amendment proposal to be enacted (if not met, the proposal will not be enacted), represented as a fraction that can be converted to a percentage */
requiredLpMajority?: Maybe;
- /** Required liquidity provider equity like share participation for this proposal to succeed */
+ /** The market share of LPs' equity-like share that must take part in the market amendment vote for the proposal to pass. This means the votes of LPs that have submitted more liquidity to that market, or have been LPs from the start carry more weight. If it requires 50% of a market's equity-like share for a majority, and the proposal receives only YES votes but only LPs with 49% of the equity-like share voted, the proposal will not pass */
requiredLpParticipation?: Maybe;
/** Required majority for this proposal to succeed */
requiredMajority: Scalars['String'];
@@ -2941,6 +3091,36 @@ export type Proposal = {
export type ProposalChange = NewAsset | NewFreeform | NewMarket | UpdateAsset | UpdateMarket | UpdateNetworkParameter;
+export type ProposalDetail = {
+ __typename?: 'ProposalDetail';
+ /** RFC3339Nano time and date when the proposal reached the Vega network */
+ datetime: Scalars['Timestamp'];
+ /** Error details of the rejectionReason */
+ errorDetails?: Maybe;
+ /** Proposal ID that is provided by Vega once proposal reaches the network */
+ id?: Maybe;
+ /** Party that prepared the proposal */
+ party: Party;
+ /** Rationale behind the proposal */
+ rationale: ProposalRationale;
+ /** A UUID reference to aid tracking proposals on Vega */
+ reference: Scalars['String'];
+ /** Why the proposal was rejected by the core */
+ rejectionReason?: Maybe;
+ /** Equity-like share required for a market amendment proposal to be enacted (if not met, the proposal will not be enacted), represented as a fraction that can be converted to a percentage */
+ requiredLpMajority?: Maybe;
+ /** The market share of LPs' equity-like share that must take part in the market amendment vote for the proposal to pass. This means the votes of LPs that have submitted more liquidity to that market, or have been LPs from the start carry more weight. If it requires 50% of a market's equity-like share for a majority, and the proposal receives only YES votes but only LPs with 49% of the equity-like share voted, the proposal will not pass */
+ requiredLpParticipation?: Maybe;
+ /** Required majority for this proposal to succeed */
+ requiredMajority: Scalars['String'];
+ /** Required participation for this proposal to succeed */
+ requiredParticipation: Scalars['String'];
+ /** State of the proposal */
+ state: ProposalState;
+ /** Terms of the proposal */
+ terms: ProposalTerms;
+};
+
/** Edge type containing the proposals and cursor information returned by a ProposalsConnection */
export type ProposalEdge = {
__typename?: 'ProposalEdge';
@@ -3234,6 +3414,8 @@ export type Query = {
deposit?: Maybe;
/** Fetch all deposits */
deposits?: Maybe;
+ /** Fetch all entities for a given transaction hash */
+ entities: Entities;
/** Get data for a specific epoch, if ID omitted it gets the current epoch. If the string is 'next', fetch the next epoch */
epoch: Epoch;
/** List reward summary per epoch by asset, market, reward type */
@@ -3249,15 +3431,17 @@ export type Query = {
/** Find an erc20 withdrawal approval using its withdrawal ID */
erc20WithdrawalApproval?: Maybe;
/** Return an estimation of the potential cost for a new order */
+ estimateFees: FeeEstimate;
+ /**
+ * Return an estimation of the potential cost for a new order
+ * @deprecated Use estimateFees and estimatePosition instead
+ */
estimateOrder: OrderEstimate;
+ /** Return a margin range for the specified position and liquidation price range if available collateral is supplied */
+ estimatePosition?: Maybe;
/** Query for historic ethereum key rotations */
ethereumKeyRotations: EthereumKeyRotationsConnection;
- /**
- * Get market data history for a specific market. If no dates are given, the latest snapshot will be returned. If only the start date is provided, all history from the given date will be provided, and if only the end date is provided, all history from the start up to and including the end date will be provided.
- * @deprecated Use getMarketDataHistoryConnectionByID instead
- */
- getMarketDataHistoryByID?: Maybe>>;
- /** Get market data history for a specific market. If no dates are given, the latest snapshot will be returned. If only the start date is provided all history from the given date will be provided, and if only the end date is provided, all history from the start up to and including the end date will be provided. Pagination is provided using a cursor based pagination model */
+ /** Get market data history for a specific market. If no dates are given, the latest snapshot will be returned. If only the start date is provided all history from the given date will be provided, and if only the end date is provided, all history from the start up to and including the end date will be provided. */
getMarketDataHistoryConnectionByID?: Maybe;
/** Query for historic key rotations */
keyRotationsConnection: KeyRotationConnection;
@@ -3315,6 +3499,8 @@ export type Query = {
protocolUpgradeStatus?: Maybe;
/** Get statistics about the Vega node */
statistics: Statistics;
+ /** Get a list of all trades and apply any given filters to the results */
+ trades?: Maybe;
/** Get a list of all transfers for a public key */
transfersConnection?: Maybe;
/** Find a withdrawal using its ID */
@@ -3364,6 +3550,12 @@ export type QuerydepositsArgs = {
};
+/** Queries allow a caller to read data and filter data via GraphQL. */
+export type QueryentitiesArgs = {
+ txHash: Scalars['String'];
+};
+
+
/** Queries allow a caller to read data and filter data via GraphQL. */
export type QueryepochArgs = {
id?: InputMaybe;
@@ -3413,6 +3605,19 @@ export type Queryerc20WithdrawalApprovalArgs = {
};
+/** Queries allow a caller to read data and filter data via GraphQL. */
+export type QueryestimateFeesArgs = {
+ expiration?: InputMaybe;
+ marketId: Scalars['ID'];
+ partyId: Scalars['ID'];
+ price?: InputMaybe;
+ side: Side;
+ size: Scalars['String'];
+ timeInForce: OrderTimeInForce;
+ type: OrderType;
+};
+
+
/** Queries allow a caller to read data and filter data via GraphQL. */
export type QueryestimateOrderArgs = {
expiration?: InputMaybe;
@@ -3427,19 +3632,17 @@ export type QueryestimateOrderArgs = {
/** Queries allow a caller to read data and filter data via GraphQL. */
-export type QueryethereumKeyRotationsArgs = {
- nodeId?: InputMaybe;
+export type QueryestimatePositionArgs = {
+ collateralAvailable?: InputMaybe;
+ marketId: Scalars['ID'];
+ openVolume: Scalars['String'];
+ orders?: InputMaybe>;
};
/** Queries allow a caller to read data and filter data via GraphQL. */
-export type QuerygetMarketDataHistoryByIDArgs = {
- end?: InputMaybe;
- first?: InputMaybe;
- id: Scalars['ID'];
- last?: InputMaybe;
- skip?: InputMaybe;
- start?: InputMaybe;
+export type QueryethereumKeyRotationsArgs = {
+ nodeId?: InputMaybe;
};
@@ -3600,6 +3803,14 @@ export type QueryprotocolUpgradeProposalsArgs = {
};
+/** Queries allow a caller to read data and filter data via GraphQL. */
+export type QuerytradesArgs = {
+ dateRange?: InputMaybe;
+ filter?: InputMaybe;
+ pagination?: InputMaybe;
+};
+
+
/** Queries allow a caller to read data and filter data via GraphQL. */
export type QuerytransfersConnectionArgs = {
direction?: InputMaybe;
@@ -3798,7 +4009,9 @@ export enum Side {
/** The placer of the order is aiming to buy */
SIDE_BUY = 'SIDE_BUY',
/** The placer of the order is aiming to sell */
- SIDE_SELL = 'SIDE_SELL'
+ SIDE_SELL = 'SIDE_SELL',
+ /** Unspecified is only used for trades at the end of an auction, where neither party acts as the aggressor. */
+ SIDE_UNSPECIFIED = 'SIDE_UNSPECIFIED'
}
/** Signer is the authorized signature used for the data. */
@@ -3978,8 +4191,6 @@ export type Subscription = {
busEvents?: Maybe>;
/** Subscribe to the candles updates */
candles: Candle;
- /** Subscribe to delegation data */
- delegations: Delegation;
/** Subscribe to liquidity provisioning data */
liquidityProvisions?: Maybe>;
/** Subscribe to the margin changes */
@@ -3996,10 +4207,13 @@ export type Subscription = {
positions: Array;
/** Subscribe to proposals. Leave out all arguments to receive all proposals */
proposals: Proposal;
- /** Subscribe to reward details data */
- rewards: Reward;
- /** Subscribe to the trades updates */
+ /**
+ * Subscribe to the trades updates
+ * @deprecated Use tradesStream instead as it allows for filtering multiple markets and/or parties at once
+ */
trades?: Maybe>;
+ /** Subscribe to the trades updates */
+ tradesStream?: Maybe>;
/** Subscribe to votes, either by proposal ID or party ID */
votes: ProposalVote;
};
@@ -4030,13 +4244,6 @@ export type SubscriptioncandlesArgs = {
};
-/** Subscriptions allow a caller to receive new information as it is available from the Vega network. */
-export type SubscriptiondelegationsArgs = {
- nodeId?: InputMaybe;
- partyId?: InputMaybe;
-};
-
-
/** Subscriptions allow a caller to receive new information as it is available from the Vega network. */
export type SubscriptionliquidityProvisionsArgs = {
marketId?: InputMaybe;
@@ -4089,16 +4296,15 @@ export type SubscriptionproposalsArgs = {
/** Subscriptions allow a caller to receive new information as it is available from the Vega network. */
-export type SubscriptionrewardsArgs = {
- assetId?: InputMaybe;
+export type SubscriptiontradesArgs = {
+ marketId?: InputMaybe;
partyId?: InputMaybe;
};
/** Subscriptions allow a caller to receive new information as it is available from the Vega network. */
-export type SubscriptiontradesArgs = {
- marketId?: InputMaybe;
- partyId?: InputMaybe;
+export type SubscriptiontradesStreamArgs = {
+ filter: TradesSubscriptionFilter;
};
@@ -4251,6 +4457,19 @@ export type TradeUpdate = {
type: TradeType;
};
+/** Filter to apply to the trade connection query */
+export type TradesFilter = {
+ marketIds?: InputMaybe>;
+ orderIds?: InputMaybe>;
+ partyIds?: InputMaybe>;
+};
+
+/** Filter to apply to the trade subscription request */
+export type TradesSubscriptionFilter = {
+ marketIds?: InputMaybe>;
+ partyIds?: InputMaybe>;
+};
+
/** The result from processing a transaction */
export type TransactionResult = {
__typename?: 'TransactionResult';
diff --git a/libs/types/src/global-types-mappings.ts b/libs/types/src/global-types-mappings.ts
index eaf84b1e0..9eb11448e 100644
--- a/libs/types/src/global-types-mappings.ts
+++ b/libs/types/src/global-types-mappings.ts
@@ -172,7 +172,7 @@ export const OrderRejectionReasonMapping: {
'Cannot send IOC order during auction',
ORDER_ERROR_EDIT_NOT_ALLOWED: 'Edit not allowed',
ORDER_ERROR_EXPIRYAT_BEFORE_CREATEDAT: 'Expiry time before creation time',
- ORDER_ERROR_GFA_CANNOT_SEND_ORDER_DURING_CONTINUOUS_TRADING:
+ ORDER_ERROR_CANNOT_SEND_GFA_ORDER_DURING_CONTINUOUS_TRADING:
'Cannot send GFA order during continuous trading',
ORDER_ERROR_INSUFFICIENT_ASSET_BALANCE: 'Insufficient asset balance',
ORDER_ERROR_INSUFFICIENT_FUNDS_TO_PAY_FEES: 'Insufficient funds to pay fees',
@@ -209,6 +209,11 @@ export const OrderRejectionReasonMapping: {
'Unable to amend price on pegged order',
ORDER_ERROR_UNABLE_TO_REPRICE_PEGGED_ORDER: 'Unable to reprice pegged order',
ORDER_ERROR_WITHOUT_REFERENCE_PRICE: 'Without reference price',
+ ORDER_ERROR_INCORRECT_MARKET_TYPE: 'Incorrect market type',
+ ORDER_ERROR_POST_ONLY_ORDER_WOULD_TRADE: 'Post only order would trade',
+ ORDER_ERROR_REDUCE_ONLY_ORDER_WOULD_NOT_REDUCE:
+ 'Reduce only order would not reduce',
+ ORDER_ERROR_TOO_MANY_PEGGED_ORDERS: 'Too many pegged orders',
};
/**
@@ -345,6 +350,7 @@ export const SideMapping: {
} = {
SIDE_BUY: 'Long',
SIDE_SELL: 'Short',
+ SIDE_UNSPECIFIED: 'Unspecified',
};
/**
@@ -458,6 +464,7 @@ export const PositionStatusMapping: {
POSITION_STATUS_CLOSED_OUT: 'Closed by network',
POSITION_STATUS_ORDERS_CLOSED: 'Maintained by network',
POSITION_STATUS_UNSPECIFIED: 'Normal',
+ POSITION_STATUS_DISTRESSED: 'Distressed',
};
export const ConditionOperatorMapping: { [C in ConditionOperator]: string } = {
diff --git a/libs/ui-toolkit/src/components/dialog/dialog.tsx b/libs/ui-toolkit/src/components/dialog/dialog.tsx
index 2b886b42a..21918b352 100644
--- a/libs/ui-toolkit/src/components/dialog/dialog.tsx
+++ b/libs/ui-toolkit/src/components/dialog/dialog.tsx
@@ -62,7 +62,7 @@ export function Dialog({
onChange?.(x)}>
;
+
+const Template: ComponentStory = (args) => {
+ return (
+
+ );
+};
+
+export const Default = Template.bind({});
+Default.args = {};
+
+export const Vertical = Template.bind({});
+Vertical.args = {
+ orientation: 'vertical',
+};
diff --git a/libs/ui-toolkit/src/components/divider/divider.tsx b/libs/ui-toolkit/src/components/divider/divider.tsx
new file mode 100644
index 000000000..136cc3d46
--- /dev/null
+++ b/libs/ui-toolkit/src/components/divider/divider.tsx
@@ -0,0 +1,19 @@
+import { forwardRef } from 'react';
+import * as Separator from '@radix-ui/react-separator';
+
+interface DividerProps {
+ orientation?: 'horizontal' | 'vertical';
+ decorative?: boolean;
+}
+
+export const Divider = forwardRef(
+ ({ orientation = 'horizontal', decorative }, ref) => {
+ return (
+ ,
- React.ComponentProps
->(({ className, children, ...props }, forwardedRef) => {
- const triggerClasses = classNames(
- className,
- 'text-sm py-1 px-2 rounded bg-transparent border border-neutral-500 whitespace-nowrap',
- 'hover:bg-neutral-500/20 dark:hover:bg-neutral-500/40'
- );
+ DropdownTriggerProps
+>(({ className, children, iconName, ...props }, forwardedRef) => {
+ const defaultClasses =
+ 'text-sm py-1 px-2 rounded bg-transparent border border-vega-dark-200 whitespace-nowrap dark:hover:bg-vega-dark-500/20 hover:bg-vega-light-500/40';
+
return (
- {children}
);
@@ -73,7 +77,7 @@ export const DropdownMenuContent = forwardRef<
& {
inset?: boolean;
}
->(({ className, inset = false, ...radioItemprops }, forwardedRef) => (
+>(({ className, inset = false, ...radioItemProps }, forwardedRef) => (
+
+ );
+};
diff --git a/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-copy.tsx b/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-copy.tsx
new file mode 100644
index 000000000..8873fa553
--- /dev/null
+++ b/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-copy.tsx
@@ -0,0 +1,18 @@
+export const IconCopy = ({ size = 16 }: { size: number }) => {
+ return (
+
+
+ );
+};
diff --git a/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-deposit.tsx b/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-deposit.tsx
new file mode 100644
index 000000000..c0d15dc2d
--- /dev/null
+++ b/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-deposit.tsx
@@ -0,0 +1,17 @@
+export const IconDeposit = ({ size = 16 }: { size: number }) => {
+ return (
+
+
+ );
+};
diff --git a/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-edit.tsx b/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-edit.tsx
new file mode 100644
index 000000000..fadb9a59f
--- /dev/null
+++ b/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-edit.tsx
@@ -0,0 +1,18 @@
+export const IconEdit = ({ size = 16 }: { size: number }) => {
+ return (
+
+
+ );
+};
diff --git a/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-forum.tsx b/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-forum.tsx
new file mode 100644
index 000000000..6874233e5
--- /dev/null
+++ b/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-forum.tsx
@@ -0,0 +1,18 @@
+export const IconForum = ({ size = 24 }: { size: number }) => {
+ return (
+
+
+ );
+};
diff --git a/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-globe.tsx b/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-globe.tsx
new file mode 100644
index 000000000..64137f532
--- /dev/null
+++ b/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-globe.tsx
@@ -0,0 +1,18 @@
+export const IconGlobe = ({ size = 24 }: { size: number }) => {
+ return (
+
+
+ );
+};
diff --git a/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-linkedin.tsx b/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-linkedin.tsx
new file mode 100644
index 000000000..589b59a45
--- /dev/null
+++ b/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-linkedin.tsx
@@ -0,0 +1,16 @@
+export const IconLinkedIn = ({ size = 24 }: { size: number }) => {
+ return (
+
+
+ );
+};
diff --git a/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-moon.tsx b/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-moon.tsx
new file mode 100644
index 000000000..038695aa6
--- /dev/null
+++ b/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-moon.tsx
@@ -0,0 +1,23 @@
+export const IconMoon = ({ size = 16 }: { size: number }) => {
+ return (
+
+
+ );
+};
diff --git a/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-open-external.tsx b/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-open-external.tsx
new file mode 100644
index 000000000..70ce980ec
--- /dev/null
+++ b/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-open-external.tsx
@@ -0,0 +1,16 @@
+export const IconOpenExternal = ({ size = 24 }: { size: number }) => {
+ return (
+
+
+ );
+};
diff --git a/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-question-mark.tsx b/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-question-mark.tsx
new file mode 100644
index 000000000..f329f012c
--- /dev/null
+++ b/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-question-mark.tsx
@@ -0,0 +1,18 @@
+export const IconQuestionMark = ({ size = 16 }: { size: number }) => {
+ return (
+
+
+ );
+};
diff --git a/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-transfer.tsx b/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-transfer.tsx
new file mode 100644
index 000000000..1542a9633
--- /dev/null
+++ b/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-transfer.tsx
@@ -0,0 +1,20 @@
+export const IconTransfer = ({ size = 16 }: { size: number }) => {
+ return (
+
+
+ );
+};
diff --git a/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-twitter.tsx b/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-twitter.tsx
new file mode 100644
index 000000000..893025e51
--- /dev/null
+++ b/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-twitter.tsx
@@ -0,0 +1,16 @@
+export const IconTwitter = ({ size = 24 }: { size: number }) => {
+ return (
+
+
+ );
+};
diff --git a/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-withdraw.tsx b/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-withdraw.tsx
new file mode 100644
index 000000000..e2d89b1ae
--- /dev/null
+++ b/libs/ui-toolkit/src/components/icon/vega-icons/svg-icons/icon-withdraw.tsx
@@ -0,0 +1,17 @@
+export const IconWithdraw = ({ size = 16 }: { size: number }) => {
+ return (
+
+
+ );
+};
diff --git a/libs/ui-toolkit/src/components/icon/vega-icons/vega-icon-record.ts b/libs/ui-toolkit/src/components/icon/vega-icons/vega-icon-record.ts
new file mode 100644
index 000000000..2b4723cbb
--- /dev/null
+++ b/libs/ui-toolkit/src/components/icon/vega-icons/vega-icon-record.ts
@@ -0,0 +1,48 @@
+import { IconBreakdown } from './svg-icons/icon-breakdown';
+import { IconCopy } from './svg-icons/icon-copy';
+import { IconDeposit } from './svg-icons/icon-deposit';
+import { IconWithdraw } from './svg-icons/icon-withdraw';
+import { IconTransfer } from './svg-icons/icon-transfer';
+import { IconEdit } from './svg-icons/icon-edit';
+import { IconMoon } from './svg-icons/icon-moon';
+import { IconGlobe } from './svg-icons/icon-globe';
+import { IconLinkedIn } from './svg-icons/icon-linkedin';
+import { IconTwitter } from './svg-icons/icon-twitter';
+import { IconQuestionMark } from './svg-icons/icon-question-mark';
+import { IconForum } from './svg-icons/icon-forum';
+import { IconOpenExternal } from './svg-icons/icon-open-external';
+
+export enum VegaIconNames {
+ BREAKDOWN = 'breakdown',
+ COPY = 'copy',
+ DEPOSIT = 'deposit',
+ WITHDRAW = 'withdraw',
+ EDIT = 'edit',
+ TRANSFER = 'transfer',
+ FORUM = 'forum',
+ GLOBE = 'globe',
+ LINKEDIN = 'linkedin',
+ TWITTER = 'twitter',
+ MOON = 'moon',
+ OPEN_EXTERNAL = 'open-external',
+ QUESTION_MARK = 'question-mark',
+}
+
+export const VegaIconNameMap: Record<
+ VegaIconNames,
+ ({ size }: { size: number }) => JSX.Element
+> = {
+ breakdown: IconBreakdown,
+ copy: IconCopy,
+ deposit: IconDeposit,
+ withdraw: IconWithdraw,
+ transfer: IconTransfer,
+ edit: IconEdit,
+ moon: IconMoon,
+ globe: IconGlobe,
+ linkedin: IconLinkedIn,
+ twitter: IconTwitter,
+ 'question-mark': IconQuestionMark,
+ forum: IconForum,
+ 'open-external': IconOpenExternal,
+};
diff --git a/libs/ui-toolkit/src/components/icon/vega-icons/vega-icon.spec.tsx b/libs/ui-toolkit/src/components/icon/vega-icons/vega-icon.spec.tsx
new file mode 100644
index 000000000..4faaee577
--- /dev/null
+++ b/libs/ui-toolkit/src/components/icon/vega-icons/vega-icon.spec.tsx
@@ -0,0 +1,11 @@
+import { render } from '@testing-library/react';
+
+import { VegaIcon } from './vega-icon';
+import { VegaIconNames } from './vega-icon-record';
+
+describe('VegaIcon', () => {
+ it('should render successfully', () => {
+ const { baseElement } = render( = (args) =>
+
+ );
+};
diff --git a/libs/ui-toolkit/src/components/index.ts b/libs/ui-toolkit/src/components/index.ts
index c2ef46544..2e2fb84fc 100644
--- a/libs/ui-toolkit/src/components/index.ts
+++ b/libs/ui-toolkit/src/components/index.ts
@@ -9,6 +9,7 @@ export * from './callout';
export * from './checkbox';
export * from './copy-with-tooltip';
export * from './dialog';
+export * from './divider';
export * from './drawer';
export * from './dropdown-menu';
export * from './form-group';
@@ -37,6 +38,7 @@ export * from './simple-grid';
export * from './slider';
export * from './sparkline';
export * from './splash';
+export * from './switch';
export * from './syntax-highlighter';
export * from './tabs';
export * from './text-area';
diff --git a/libs/ui-toolkit/src/components/switch/index.ts b/libs/ui-toolkit/src/components/switch/index.ts
new file mode 100644
index 000000000..675ddba51
--- /dev/null
+++ b/libs/ui-toolkit/src/components/switch/index.ts
@@ -0,0 +1 @@
+export { Switch } from './switch';
diff --git a/libs/ui-toolkit/src/components/switch/switch.stories.tsx b/libs/ui-toolkit/src/components/switch/switch.stories.tsx
new file mode 100644
index 000000000..f3c0f8289
--- /dev/null
+++ b/libs/ui-toolkit/src/components/switch/switch.stories.tsx
@@ -0,0 +1,31 @@
+import type { Story, ComponentMeta } from '@storybook/react';
+import type { SwitchProps } from './switch';
+import { Switch } from './switch';
+import { useState } from 'react';
+
+export default {
+ component: Switch,
+ title: 'Switch',
+} as ComponentMeta;
+
+const Template: Story = (args) => {
+ const [checked, setChecked] = useState(args.checked || false);
+ return (
+ setChecked(checked)}
+ />
+ );
+};
+
+export const Default = Template.bind({});
+Default.args = {
+ name: 'switch',
+};
+
+export const WithTextLabel = Template.bind({});
+WithTextLabel.args = {
+ name: 'switch',
+ labelText: 'Light mode',
+};
diff --git a/libs/ui-toolkit/src/components/switch/switch.tsx b/libs/ui-toolkit/src/components/switch/switch.tsx
new file mode 100644
index 000000000..f20a0daf6
--- /dev/null
+++ b/libs/ui-toolkit/src/components/switch/switch.tsx
@@ -0,0 +1,38 @@
+import type { ReactNode } from 'react';
+import { forwardRef } from 'react';
+import * as RootSwitch from '@radix-ui/react-switch';
+
+export interface SwitchProps {
+ name?: string;
+ onCheckedChange?: (checked: boolean) => void;
+ checked?: boolean;
+ disabled?: boolean;
+ labelText?: ReactNode | string;
+}
+
+export const Switch = forwardRef(
+ (
+ { name = 'switch', labelText, onCheckedChange, checked = false, disabled },
+ ref
+ ) => {
+ return (
+
+
+
+ {labelText && (
+
+ {labelText}
+
+ )}
+
+ );
+ }
+);
diff --git a/libs/ui-toolkit/src/components/theme-switcher/theme-switcher.tsx b/libs/ui-toolkit/src/components/theme-switcher/theme-switcher.tsx
index 6ca96ecc6..1b065f75e 100644
--- a/libs/ui-toolkit/src/components/theme-switcher/theme-switcher.tsx
+++ b/libs/ui-toolkit/src/components/theme-switcher/theme-switcher.tsx
@@ -17,6 +17,7 @@ export const ThemeSwitcher = ({
onClick={() => setTheme()}
className={className}
data-testid="theme-switcher"
+ id="theme-switcher"
>
{theme === 'dark' &&