Compare commits
7
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
35a52f00da | ||
|
|
567345e7aa | ||
|
|
5ba4d57f1f | ||
|
|
7563c92df2 | ||
|
|
2002731c52 | ||
|
|
a49139f127 | ||
|
|
e216b23472 |
@@ -1,4 +1,4 @@
|
||||
export type HashProps = {
|
||||
export type HashProps = React.HTMLProps<HTMLSpanElement> & {
|
||||
text: string;
|
||||
truncate?: boolean;
|
||||
};
|
||||
|
||||
@@ -2,4 +2,5 @@ export { default as BlockLink } from './block-link/block-link';
|
||||
export { default as PartyLink } from './party-link/party-link';
|
||||
export { default as NodeLink } from './node-link/node-link';
|
||||
export { default as MarketLink } from './market-link/market-link';
|
||||
export { default as NetworkParameterLink } from './network-parameter-link/network-parameter-link';
|
||||
export * from './asset-link/asset-link';
|
||||
|
||||
+30
@@ -0,0 +1,30 @@
|
||||
import React from 'react';
|
||||
import { Routes } from '../../../routes/route-names';
|
||||
import { Link } from 'react-router-dom';
|
||||
|
||||
import type { ComponentProps } from 'react';
|
||||
import Hash from '../hash';
|
||||
|
||||
export type NetworkParameterLinkProps = Partial<ComponentProps<typeof Link>> & {
|
||||
parameter: string;
|
||||
};
|
||||
|
||||
/**
|
||||
* Links a given network parameter to the relevant page and anchor on the page
|
||||
*/
|
||||
const NetworkParameterLink = ({
|
||||
parameter,
|
||||
...props
|
||||
}: NetworkParameterLinkProps) => {
|
||||
return (
|
||||
<Link
|
||||
className="underline"
|
||||
{...props}
|
||||
to={`/${Routes.NETWORK_PARAMETERS}#${parameter}`}
|
||||
>
|
||||
<Hash text={parameter} />
|
||||
</Link>
|
||||
);
|
||||
};
|
||||
|
||||
export default NetworkParameterLink;
|
||||
@@ -26,7 +26,7 @@ const ProposalLink = ({ id, text }: ProposalLinkProps) => {
|
||||
>;
|
||||
|
||||
const base = ENV.dataSources.governanceUrl;
|
||||
const label = proposal?.rationale.title || id;
|
||||
const label = proposal?.rationale?.title || id;
|
||||
|
||||
return (
|
||||
<ExternalLink href={`${base}/proposals/${id}`}>
|
||||
|
||||
@@ -5,5 +5,10 @@ query ExplorerProposalStatus($id: ID!) {
|
||||
state
|
||||
rejectionReason
|
||||
}
|
||||
... on BatchProposal {
|
||||
id
|
||||
state
|
||||
rejectionReason
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+6
-1
@@ -8,7 +8,7 @@ export type ExplorerProposalStatusQueryVariables = Types.Exact<{
|
||||
}>;
|
||||
|
||||
|
||||
export type ExplorerProposalStatusQuery = { __typename?: 'Query', proposal?: { __typename?: 'BatchProposal' } | { __typename?: 'Proposal', id?: string | null, state: Types.ProposalState, rejectionReason?: Types.ProposalRejectionReason | null } | null };
|
||||
export type ExplorerProposalStatusQuery = { __typename?: 'Query', proposal?: { __typename?: 'BatchProposal', id?: string | null, state: Types.ProposalState, rejectionReason?: Types.ProposalRejectionReason | null } | { __typename?: 'Proposal', id?: string | null, state: Types.ProposalState, rejectionReason?: Types.ProposalRejectionReason | null } | null };
|
||||
|
||||
|
||||
export const ExplorerProposalStatusDocument = gql`
|
||||
@@ -19,6 +19,11 @@ export const ExplorerProposalStatusDocument = gql`
|
||||
state
|
||||
rejectionReason
|
||||
}
|
||||
... on BatchProposal {
|
||||
id
|
||||
state
|
||||
rejectionReason
|
||||
}
|
||||
}
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -0,0 +1,257 @@
|
||||
import { render, screen } from '@testing-library/react';
|
||||
import { BatchItem } from './batch-item';
|
||||
import { MemoryRouter } from 'react-router-dom';
|
||||
import { MockedProvider } from '@apollo/client/testing';
|
||||
import type { components } from '../../../../../types/explorer';
|
||||
type Item = components['schemas']['vegaBatchProposalTermsChange'];
|
||||
|
||||
describe('BatchItem', () => {
|
||||
it('Renders "Unknown proposal type" by default', () => {
|
||||
const item = {};
|
||||
render(<BatchItem item={item} />);
|
||||
expect(screen.getByText('Unknown proposal type')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('Renders "Unknown proposal type" for unknown items', () => {
|
||||
const item = {
|
||||
newLochNessMonster: {
|
||||
location: 'Loch Ness',
|
||||
},
|
||||
} as unknown as Item;
|
||||
render(<BatchItem item={item} />);
|
||||
expect(screen.getByText('Unknown proposal type')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('Renders "New spot market"', () => {
|
||||
const item = {
|
||||
newSpotMarket: {},
|
||||
};
|
||||
render(<BatchItem item={item} />);
|
||||
expect(screen.getByText('New spot market')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('Renders "Cancel transfer"', () => {
|
||||
const item = {
|
||||
cancelTransfer: {
|
||||
changes: {
|
||||
transferId: 'transfer123',
|
||||
},
|
||||
},
|
||||
};
|
||||
render(<BatchItem item={item} />);
|
||||
expect(screen.getByText('Cancel transfer')).toBeInTheDocument();
|
||||
expect(screen.getByText('transf')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('Renders "Cancel transfer" without an id', () => {
|
||||
const item = {
|
||||
cancelTransfer: {
|
||||
changes: {},
|
||||
},
|
||||
};
|
||||
render(<BatchItem item={item} />);
|
||||
expect(screen.getByText('Cancel transfer')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('Renders "New freeform"', () => {
|
||||
const item = {
|
||||
newFreeform: {},
|
||||
};
|
||||
render(<BatchItem item={item} />);
|
||||
expect(screen.getByText('New freeform proposal')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('Renders "New market"', () => {
|
||||
const item = {
|
||||
newMarket: {},
|
||||
};
|
||||
render(<BatchItem item={item} />);
|
||||
expect(screen.getByText('New market')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('Renders "New transfer"', () => {
|
||||
const item = {
|
||||
newTransfer: {},
|
||||
};
|
||||
render(<BatchItem item={item} />);
|
||||
expect(screen.getByText('New transfer')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('Renders "Update asset" with assetId', () => {
|
||||
const item = {
|
||||
updateAsset: {
|
||||
assetId: 'asset123',
|
||||
},
|
||||
};
|
||||
render(
|
||||
<MemoryRouter>
|
||||
<MockedProvider>
|
||||
<BatchItem item={item} />
|
||||
</MockedProvider>
|
||||
</MemoryRouter>
|
||||
);
|
||||
expect(screen.getByText('Update asset')).toBeInTheDocument();
|
||||
expect(screen.getByText('asset123')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('Renders "Update asset" even if assetId is not set', () => {
|
||||
const item = {
|
||||
updateAsset: {
|
||||
assetId: undefined,
|
||||
},
|
||||
};
|
||||
render(<BatchItem item={item} />);
|
||||
expect(screen.getByText('Update asset')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('Renders "Update market state" with marketId', () => {
|
||||
const item = {
|
||||
updateMarketState: {
|
||||
changes: {
|
||||
marketId: 'market123',
|
||||
},
|
||||
},
|
||||
};
|
||||
render(
|
||||
<MemoryRouter>
|
||||
<MockedProvider>
|
||||
<BatchItem item={item} />
|
||||
</MockedProvider>
|
||||
</MemoryRouter>
|
||||
);
|
||||
expect(screen.getByText('Update market state')).toBeInTheDocument();
|
||||
expect(screen.getByText('market123')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('Renders "Update market state" even if marketId is not set', () => {
|
||||
const item = {
|
||||
updateMarketState: {
|
||||
changes: {
|
||||
marketId: undefined,
|
||||
},
|
||||
},
|
||||
};
|
||||
render(
|
||||
<MemoryRouter>
|
||||
<MockedProvider>
|
||||
<BatchItem item={item} />
|
||||
</MockedProvider>
|
||||
</MemoryRouter>
|
||||
);
|
||||
expect(screen.getByText('Update market state')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('Renders "Update network parameter" with parameter', () => {
|
||||
const item = {
|
||||
updateNetworkParameter: {
|
||||
changes: {
|
||||
key: 'parameter123',
|
||||
},
|
||||
},
|
||||
};
|
||||
render(
|
||||
<MockedProvider>
|
||||
<MemoryRouter>
|
||||
<BatchItem item={item} />
|
||||
</MemoryRouter>
|
||||
</MockedProvider>
|
||||
);
|
||||
expect(screen.getByText('Update network parameter')).toBeInTheDocument();
|
||||
expect(screen.getByText('parameter123')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('Renders "Update network parameter" even if parameter is not set', () => {
|
||||
const item = {
|
||||
updateNetworkParameter: {
|
||||
changes: {
|
||||
key: undefined,
|
||||
},
|
||||
},
|
||||
};
|
||||
render(<BatchItem item={item} />);
|
||||
expect(screen.getByText('Update network parameter')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('Renders "Update referral program"', () => {
|
||||
const item = {
|
||||
updateReferralProgram: {},
|
||||
};
|
||||
render(<BatchItem item={item} />);
|
||||
expect(screen.getByText('Update referral program')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('Renders "Update spot market" with marketId', () => {
|
||||
const item = {
|
||||
updateSpotMarket: {
|
||||
marketId: 'market123',
|
||||
},
|
||||
};
|
||||
render(
|
||||
<MemoryRouter>
|
||||
<MockedProvider>
|
||||
<BatchItem item={item} />
|
||||
</MockedProvider>
|
||||
</MemoryRouter>
|
||||
);
|
||||
expect(screen.getByText('Update spot market')).toBeInTheDocument();
|
||||
expect(screen.getByText('market123')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('Renders "Update spot market" even if marketId is not set', () => {
|
||||
const item = {
|
||||
updateSpotMarket: {
|
||||
marketId: undefined,
|
||||
},
|
||||
};
|
||||
render(
|
||||
<MemoryRouter>
|
||||
<MockedProvider>
|
||||
<BatchItem item={item} />
|
||||
</MockedProvider>
|
||||
</MemoryRouter>
|
||||
);
|
||||
expect(screen.getByText('Update spot market')).toBeInTheDocument();
|
||||
});
|
||||
it('Renders "Update market" with marketId', () => {
|
||||
const item = {
|
||||
updateMarket: {
|
||||
marketId: 'market123',
|
||||
},
|
||||
};
|
||||
render(
|
||||
<MemoryRouter>
|
||||
<MockedProvider>
|
||||
<BatchItem item={item} />
|
||||
</MockedProvider>
|
||||
</MemoryRouter>
|
||||
);
|
||||
expect(screen.getByText('Update market')).toBeInTheDocument();
|
||||
expect(screen.getByText('market123')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('Renders "Update market" even if marketId is not set', () => {
|
||||
const item = {
|
||||
updateMarket: {
|
||||
marketId: undefined,
|
||||
},
|
||||
};
|
||||
render(
|
||||
<MemoryRouter>
|
||||
<MockedProvider>
|
||||
<BatchItem item={item} />
|
||||
</MockedProvider>
|
||||
</MemoryRouter>
|
||||
);
|
||||
expect(screen.getByText('Update market')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('Renders "Update volume discount program"', () => {
|
||||
const item = {
|
||||
updateVolumeDiscountProgram: {},
|
||||
};
|
||||
render(<BatchItem item={item} />);
|
||||
expect(
|
||||
screen.getByText('Update volume discount program')
|
||||
).toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,87 @@
|
||||
import { t } from '@vegaprotocol/i18n';
|
||||
import { AssetLink, MarketLink, NetworkParameterLink } from '../../../links';
|
||||
import type { components } from '../../../../../types/explorer';
|
||||
import Hash from '../../../links/hash';
|
||||
|
||||
type Item = components['schemas']['vegaBatchProposalTermsChange'];
|
||||
|
||||
export interface BatchItemProps {
|
||||
item: Item;
|
||||
}
|
||||
|
||||
/**
|
||||
* Produces a one line summary for an item in a batch proposal. Could
|
||||
* easily be adapted to summarise individual proposals, but there is no
|
||||
* place for that yet.
|
||||
*
|
||||
* Details (like IDs) should be shown and linked if available, but handled
|
||||
* if not available. This is adequate as the ProposalSummary component contains
|
||||
* a JSON viewer for the full proposal.
|
||||
*/
|
||||
export const BatchItem = ({ item }: BatchItemProps) => {
|
||||
if (item.cancelTransfer) {
|
||||
const transferId = item?.cancelTransfer?.changes?.transferId || false;
|
||||
return (
|
||||
<span>
|
||||
{t('Cancel transfer')}
|
||||
{transferId && (
|
||||
<Hash className="ml-1" truncate={true} text={transferId} />
|
||||
)}
|
||||
</span>
|
||||
);
|
||||
} else if (item.newFreeform) {
|
||||
return <span>{t('New freeform proposal')}</span>;
|
||||
} else if (item.newMarket) {
|
||||
return <span>{t('New market')}</span>;
|
||||
} else if (item.newSpotMarket) {
|
||||
return <span>{t('New spot market')}</span>;
|
||||
} else if (item.newTransfer) {
|
||||
return <span>{t('New transfer')}</span>;
|
||||
} else if (item.updateAsset) {
|
||||
const assetId = item?.updateAsset?.assetId || false;
|
||||
return (
|
||||
<span>
|
||||
{t('Update asset')}
|
||||
{assetId && <AssetLink className="ml-1" assetId={assetId} />}
|
||||
</span>
|
||||
);
|
||||
} else if (item.updateMarket) {
|
||||
const marketId = item?.updateMarket?.marketId || false;
|
||||
return (
|
||||
<span>
|
||||
{t('Update market')}{' '}
|
||||
{marketId && <MarketLink className="ml-1" id={marketId} />}
|
||||
</span>
|
||||
);
|
||||
} else if (item.updateMarketState) {
|
||||
const marketId = item?.updateMarketState?.changes?.marketId || false;
|
||||
return (
|
||||
<span>
|
||||
{t('Update market state')}
|
||||
{marketId && <MarketLink className="ml-1" id={marketId} />}
|
||||
</span>
|
||||
);
|
||||
} else if (item.updateNetworkParameter) {
|
||||
const param = item?.updateNetworkParameter?.changes?.key || false;
|
||||
return (
|
||||
<span>
|
||||
{t('Update network parameter')}
|
||||
{param && <NetworkParameterLink className="ml-1" parameter={param} />}
|
||||
</span>
|
||||
);
|
||||
} else if (item.updateReferralProgram) {
|
||||
return <span>{t('Update referral program')}</span>;
|
||||
} else if (item.updateSpotMarket) {
|
||||
const marketId = item?.updateSpotMarket?.marketId || '';
|
||||
return (
|
||||
<span>
|
||||
{t('Update spot market')}
|
||||
<MarketLink className="ml-1" id={marketId} />
|
||||
</span>
|
||||
);
|
||||
} else if (item.updateVolumeDiscountProgram) {
|
||||
return <span>{t('Update volume discount program')}</span>;
|
||||
}
|
||||
|
||||
return <span>{t('Unknown proposal type')}</span>;
|
||||
};
|
||||
@@ -1,6 +1,4 @@
|
||||
import type { ProposalTerms } from '../tx-proposal';
|
||||
import { useState } from 'react';
|
||||
import type { components } from '../../../../../types/explorer';
|
||||
import { JsonViewerDialog } from '../../../dialogs/json-viewer-dialog';
|
||||
import ProposalLink from '../../../links/proposal-link/proposal-link';
|
||||
import truncate from 'lodash/truncate';
|
||||
@@ -9,7 +7,12 @@ import ReactMarkdown from 'react-markdown';
|
||||
import { ProposalDate } from './proposal-date';
|
||||
import { t } from '@vegaprotocol/i18n';
|
||||
|
||||
import type { ProposalTerms } from '../tx-proposal';
|
||||
import type { components } from '../../../../../types/explorer';
|
||||
import { BatchItem } from './batch-item';
|
||||
|
||||
type Rationale = components['schemas']['vegaProposalRationale'];
|
||||
type Batch = components['schemas']['v1BatchProposalSubmissionTerms']['changes'];
|
||||
|
||||
type ProposalTermsDialog = {
|
||||
open: boolean;
|
||||
@@ -21,6 +24,7 @@ interface ProposalSummaryProps {
|
||||
id: string;
|
||||
rationale?: Rationale;
|
||||
terms?: ProposalTerms;
|
||||
batch?: Batch;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -31,6 +35,7 @@ export const ProposalSummary = ({
|
||||
id,
|
||||
rationale,
|
||||
terms,
|
||||
batch,
|
||||
}: ProposalSummaryProps) => {
|
||||
const [dialog, setDialog] = useState<ProposalTermsDialog>({
|
||||
open: false,
|
||||
@@ -72,6 +77,18 @@ export const ProposalSummary = ({
|
||||
</ReactMarkdown>
|
||||
</div>
|
||||
)}
|
||||
{batch && (
|
||||
<section className="pt-2 text-sm leading-tight my-3">
|
||||
<h2 className="text-lg pb-1">{t('Changes')}</h2>
|
||||
<ol>
|
||||
{batch.map((change, index) => (
|
||||
<li className="ml-4 list-decimal" key={`batch-${index}`}>
|
||||
<BatchItem item={change} />
|
||||
</li>
|
||||
))}
|
||||
</ol>
|
||||
</section>
|
||||
)}
|
||||
<div className="pt-5">
|
||||
<button className="underline max-md:hidden mr-5" onClick={openDialog}>
|
||||
{t('View terms')}
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
|
||||
import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
|
||||
import { sharedHeaderProps, TxDetailsShared } from './shared/tx-details-shared';
|
||||
import { TableCell, TableRow, TableWithTbody } from '../../table';
|
||||
import type { components } from '../../../../types/explorer';
|
||||
import { txSignatureToDeterministicId } from '../lib/deterministic-ids';
|
||||
import { ProposalSummary } from './proposal/summary';
|
||||
import Hash from '../../links/hash';
|
||||
import { t } from '@vegaprotocol/i18n';
|
||||
|
||||
export type Proposal = components['schemas']['v1BatchProposalSubmission'];
|
||||
export type ProposalTerms = components['schemas']['vegaProposalTerms'];
|
||||
|
||||
interface TxBatchProposalProps {
|
||||
txData: BlockExplorerTransactionResult | undefined;
|
||||
pubKey: string | undefined;
|
||||
blockData: TendermintBlocksResponse | undefined;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
export const TxBatchProposal = ({
|
||||
txData,
|
||||
pubKey,
|
||||
blockData,
|
||||
}: TxBatchProposalProps) => {
|
||||
if (!txData || !txData.command.batchProposalSubmission) {
|
||||
return <>{t('Awaiting Block Explorer transaction details')}</>;
|
||||
}
|
||||
let deterministicId = '';
|
||||
|
||||
const proposal: Proposal = txData.command.batchProposalSubmission;
|
||||
const sig = txData?.signature?.value;
|
||||
if (sig) {
|
||||
deterministicId = txSignatureToDeterministicId(sig);
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<TableWithTbody className="mb-8" allowWrap={true}>
|
||||
<TableRow modifier="bordered">
|
||||
<TableCell {...sharedHeaderProps}>{t('Type')}</TableCell>
|
||||
<TableCell>{t('Batch proposal')}</TableCell>
|
||||
</TableRow>
|
||||
<TxDetailsShared
|
||||
txData={txData}
|
||||
pubKey={pubKey}
|
||||
blockData={blockData}
|
||||
hideTypeRow={true}
|
||||
/>
|
||||
<TableRow modifier="bordered">
|
||||
<TableCell>{t('Batch size')}</TableCell>
|
||||
<TableCell>
|
||||
{proposal.terms?.changes?.length || t('No changes')}
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
<TableRow modifier="bordered">
|
||||
<TableCell>{t('Proposal ID')}</TableCell>
|
||||
<TableCell>
|
||||
<Hash text={deterministicId} />
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
</TableWithTbody>
|
||||
{proposal && (
|
||||
<ProposalSummary
|
||||
id={deterministicId}
|
||||
rationale={proposal?.rationale}
|
||||
terms={proposal.terms}
|
||||
batch={proposal.terms?.changes}
|
||||
/>
|
||||
)}
|
||||
</>
|
||||
);
|
||||
};
|
||||
@@ -32,6 +32,8 @@ import { TxDetailsCreateReferralSet } from './tx-create-referral-set';
|
||||
import { TxDetailsApplyReferralCode } from './tx-apply-referral-code';
|
||||
import { TxDetailsUpdateReferralSet } from './tx-update-referral-set';
|
||||
import { TxDetailsJoinTeam } from './tx-join-team';
|
||||
import { TxDetailsUpdateMarginMode } from './tx-update-margin-mode';
|
||||
import { TxBatchProposal } from './tx-batch-proposal';
|
||||
|
||||
interface TxDetailsWrapperProps {
|
||||
txData: BlockExplorerTransactionResult | undefined;
|
||||
@@ -133,6 +135,10 @@ function getTransactionComponent(txData?: BlockExplorerTransactionResult) {
|
||||
return TxDetailsApplyReferralCode;
|
||||
case 'Join Team':
|
||||
return TxDetailsJoinTeam;
|
||||
case 'Update Margin Mode':
|
||||
return TxDetailsUpdateMarginMode;
|
||||
case 'Batch Proposal':
|
||||
return TxBatchProposal;
|
||||
default:
|
||||
return TxDetailsGeneric;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
import { t } from '@vegaprotocol/i18n';
|
||||
import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
|
||||
import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
|
||||
import { TxDetailsShared } from './shared/tx-details-shared';
|
||||
import { TableCell, TableRow, TableWithTbody } from '../../table';
|
||||
import type { components } from '../../../../types/explorer';
|
||||
import { MarketLink } from '../../links';
|
||||
|
||||
interface TxDetailsUpdateMarginModeProps {
|
||||
txData: BlockExplorerTransactionResult | undefined;
|
||||
pubKey: string | undefined;
|
||||
blockData: TendermintBlocksResponse | undefined;
|
||||
}
|
||||
|
||||
type Mode = components['schemas']['UpdateMarginModeMode'];
|
||||
|
||||
const MarginModeLabels: Record<Mode, string> = {
|
||||
MODE_CROSS_MARGIN: t('Cross margin'),
|
||||
MODE_ISOLATED_MARGIN: t('Isolated margin'),
|
||||
MODE_UNSPECIFIED: t('Unspecified'),
|
||||
};
|
||||
|
||||
export const TxDetailsUpdateMarginMode = ({
|
||||
txData,
|
||||
pubKey,
|
||||
blockData,
|
||||
}: TxDetailsUpdateMarginModeProps) => {
|
||||
if (!txData || !txData.command.updateMarginMode) {
|
||||
return <>{t('Awaiting Block Explorer transaction details')}</>;
|
||||
}
|
||||
|
||||
const u: components['schemas']['v1UpdateMarginMode'] =
|
||||
txData.command.updateMarginMode;
|
||||
|
||||
return (
|
||||
<TableWithTbody className="mb-8" allowWrap={true}>
|
||||
<TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
|
||||
{u.marketId && (
|
||||
<TableRow modifier="bordered">
|
||||
<TableCell>{t('Market ID')}</TableCell>
|
||||
<TableCell>
|
||||
<MarketLink id={u.marketId} />
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
)}
|
||||
{u.mode && (
|
||||
<TableRow modifier="bordered">
|
||||
<TableCell>{t('New margin mode')}</TableCell>
|
||||
<TableCell>{MarginModeLabels[u.mode]}</TableCell>
|
||||
</TableRow>
|
||||
)}
|
||||
{u.marginFactor && (
|
||||
<TableRow modifier="bordered">
|
||||
<TableCell>{t('Margin factor')}</TableCell>
|
||||
<TableCell>{u.marginFactor}</TableCell>
|
||||
</TableRow>
|
||||
)}
|
||||
</TableWithTbody>
|
||||
);
|
||||
};
|
||||
@@ -20,6 +20,7 @@ export type FilterOption =
|
||||
| 'Amend Order'
|
||||
| 'Apply Referral Code'
|
||||
| 'Batch Market Instructions'
|
||||
| 'Batch Proposal'
|
||||
| 'Cancel LiquidityProvision Order'
|
||||
| 'Cancel Order'
|
||||
| 'Cancel Transfer Funds'
|
||||
@@ -44,6 +45,7 @@ export type FilterOption =
|
||||
| 'Transfer Funds'
|
||||
| 'Undelegate'
|
||||
| 'Update Referral Set'
|
||||
| 'Update Margin Mode'
|
||||
| 'Validator Heartbeat'
|
||||
| 'Vote on Proposal'
|
||||
| 'Withdraw';
|
||||
@@ -59,13 +61,20 @@ export const filterOptions: Record<string, FilterOption[]> = {
|
||||
'Stop Orders Submission',
|
||||
'Stop Orders Cancellation',
|
||||
'Submit Order',
|
||||
'Update Margin Mode',
|
||||
],
|
||||
'Transfers and Withdrawals': [
|
||||
'Transfer Funds',
|
||||
'Cancel Transfer Funds',
|
||||
'Withdraw',
|
||||
],
|
||||
Governance: ['Delegate', 'Undelegate', 'Vote on Proposal', 'Proposal'],
|
||||
Governance: [
|
||||
'Batch Proposal',
|
||||
'Delegate',
|
||||
'Undelegate',
|
||||
'Vote on Proposal',
|
||||
'Proposal',
|
||||
],
|
||||
Referrals: [
|
||||
'Apply Referral Code',
|
||||
'Create Referral Set',
|
||||
|
||||
@@ -7,6 +7,7 @@ import { AssetsDocument, type AssetsQuery } from './__generated__/Assets';
|
||||
import { AssetStatus } from '@vegaprotocol/types';
|
||||
import { type Asset } from './asset-data-provider';
|
||||
import { DENY_LIST } from './constants';
|
||||
import { type AssetFieldsFragment } from './__generated__/Asset';
|
||||
|
||||
export interface BuiltinAssetSource {
|
||||
__typename: 'BuiltinAsset';
|
||||
@@ -89,3 +90,24 @@ export const useEnabledAssets = () => {
|
||||
variables: undefined,
|
||||
});
|
||||
};
|
||||
|
||||
/** Wrapped ETH symbol */
|
||||
const WETH = 'WETH';
|
||||
type WETHDetails = Pick<AssetFieldsFragment, 'symbol' | 'decimals' | 'quantum'>;
|
||||
/**
|
||||
* Tries to find WETH asset configuration on Vega in order to provide its
|
||||
* details, otherwise it returns hardcoded values.
|
||||
*/
|
||||
export const useWETH = (): WETHDetails => {
|
||||
const { data } = useAssetsDataProvider();
|
||||
if (data) {
|
||||
const weth = data.find((a) => a.symbol.toUpperCase() === WETH);
|
||||
if (weth) return weth;
|
||||
}
|
||||
|
||||
return {
|
||||
symbol: WETH,
|
||||
decimals: 18,
|
||||
quantum: '500000000000000', // 1 WETH ~= 2000 qUSD
|
||||
};
|
||||
};
|
||||
|
||||
@@ -367,7 +367,8 @@
|
||||
"Use a comma separated list to allow only specific public keys to join the team": "Use a comma separated list to allow only specific public keys to join the team",
|
||||
"Vega chart": "Vega chart",
|
||||
"Vega Reward pot": "Vega Reward pot",
|
||||
"Vega Wallet <0>full featured<0>": "Vega Wallet <0>full featured<0>",
|
||||
"Vega Wallet <0>full featured</0>": "Vega Wallet <0>full featured</0>",
|
||||
"Vega chart": "Vega chart",
|
||||
"Vesting": "Vesting",
|
||||
"Vesting multiplier": "Vesting multiplier",
|
||||
"Vesting {{assetSymbol}}": "Vesting {{assetSymbol}}",
|
||||
|
||||
@@ -47,5 +47,11 @@
|
||||
"Withdrawals of {{threshold}} {{symbol}} or more will be delayed for {{delay}}.": "Withdrawals of {{threshold}} {{symbol}} or more will be delayed for {{delay}}.",
|
||||
"Withdrawals ready": "Withdrawals ready",
|
||||
"You have no assets to withdraw": "You have no assets to withdraw",
|
||||
"Your funds have been unlocked for withdrawal - <0>View in block explorer<0>": "Your funds have been unlocked for withdrawal - <0>View in block explorer<0>"
|
||||
"Your funds have been unlocked for withdrawal - <0>View in block explorer<0>": "Your funds have been unlocked for withdrawal - <0>View in block explorer<0>",
|
||||
"Gas fee": "Gas fee",
|
||||
"Estimated gas fee for the withdrawal transaction (refreshes each 15 seconds)": "Estimated gas fee for the withdrawal transaction (refreshes each 15 seconds)",
|
||||
"It seems that the current gas prices are exceeding the amount you're trying to withdraw": "It seems that the current gas prices are exceeding the amount you're trying to withdraw",
|
||||
"The current gas price range": "The current gas price range",
|
||||
"min": "min",
|
||||
"max": "max"
|
||||
}
|
||||
|
||||
@@ -113,6 +113,8 @@ export const filterAndSortClosedMarkets = (markets: MarketMaybeWithData[]) => {
|
||||
return [
|
||||
MarketState.STATE_SETTLED,
|
||||
MarketState.STATE_TRADING_TERMINATED,
|
||||
MarketState.STATE_CLOSED,
|
||||
MarketState.STATE_CANCELLED,
|
||||
].includes(m.data?.marketState || m.state);
|
||||
});
|
||||
};
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
import BigNumber from 'bignumber.js';
|
||||
import { EtherUnit, formatEther, unitiseEther } from './ether';
|
||||
|
||||
describe('unitiseEther', () => {
|
||||
it.each([
|
||||
[1, '1', EtherUnit.wei],
|
||||
[999, '999', EtherUnit.wei],
|
||||
[1000, '1', EtherUnit.kwei],
|
||||
[9999, '9.999', EtherUnit.kwei],
|
||||
[10000, '10', EtherUnit.kwei],
|
||||
[999999, '999.999', EtherUnit.kwei],
|
||||
[1000000, '1', EtherUnit.mwei],
|
||||
[999999999, '999.999999', EtherUnit.mwei],
|
||||
[1000000000, '1', EtherUnit.gwei],
|
||||
['999999999999999999', '999999999.999999999', EtherUnit.gwei], // max gwei
|
||||
[1e18, '1', EtherUnit.ether], // 1 ETH
|
||||
[1234e18, '1234', EtherUnit.ether], // 1234 ETH
|
||||
])('unitises %s to [%s, %s]', (value, expectedOutput, expectedUnit) => {
|
||||
const [output, unit] = unitiseEther(value);
|
||||
expect(output.toFixed()).toEqual(expectedOutput);
|
||||
expect(unit).toEqual(expectedUnit);
|
||||
});
|
||||
|
||||
it('unitises to requested unit', () => {
|
||||
const [output, unit] = unitiseEther(1, EtherUnit.kwei);
|
||||
expect(output).toEqual(BigNumber(0.001));
|
||||
expect(unit).toEqual(EtherUnit.kwei);
|
||||
});
|
||||
});
|
||||
|
||||
describe('formatEther', () => {
|
||||
it.each([
|
||||
[1, EtherUnit.wei, '1 wei'],
|
||||
[12, EtherUnit.kwei, '12 kwei'],
|
||||
[123, EtherUnit.gwei, '123 gwei'],
|
||||
[3, EtherUnit.ether, '3 ETH'],
|
||||
[234.67776331, EtherUnit.gwei, '235 gwei'],
|
||||
[12.12, EtherUnit.gwei, '12 gwei'],
|
||||
])('formats [%s, %s] to "%s"', (value, unit, expectedOutput) => {
|
||||
expect(formatEther([BigNumber(value), unit])).toEqual(expectedOutput);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,84 @@
|
||||
import { formatNumber, toBigNum } from './number';
|
||||
import type BigNumber from 'bignumber.js';
|
||||
|
||||
export enum EtherUnit {
|
||||
/** 1 wei = 10^-18 ETH */
|
||||
wei = '0',
|
||||
/** 1 kwei = 1000 wei */
|
||||
kwei = '3',
|
||||
/** 1 mwei = 1000 kwei */
|
||||
mwei = '6',
|
||||
/** 1 gwei = 1000 kwei */
|
||||
gwei = '9',
|
||||
|
||||
// other denominations:
|
||||
// microether = '12', // aka szabo, µETH
|
||||
// milliether = '15', // aka finney, mETH
|
||||
|
||||
/** 1 ETH = 1B gwei = 10^18 wei */
|
||||
ether = '18',
|
||||
}
|
||||
|
||||
export const etherUnitMapping: Record<EtherUnit, string> = {
|
||||
[EtherUnit.wei]: 'wei',
|
||||
[EtherUnit.kwei]: 'kwei',
|
||||
[EtherUnit.mwei]: 'mwei',
|
||||
[EtherUnit.gwei]: 'gwei',
|
||||
// [EtherUnit.microether]: 'µETH', // szabo
|
||||
// [EtherUnit.milliether]: 'mETH', // finney
|
||||
[EtherUnit.ether]: 'ETH',
|
||||
};
|
||||
|
||||
type InputValue = string | number | BigNumber;
|
||||
type UnitisedTuple = [value: BigNumber, unit: EtherUnit];
|
||||
|
||||
/**
|
||||
* Converts given raw value to the unitised tuple of amount and unit
|
||||
*/
|
||||
export const unitiseEther = (
|
||||
input: InputValue,
|
||||
forceUnit?: EtherUnit
|
||||
): UnitisedTuple => {
|
||||
const units = Object.values(EtherUnit).reverse();
|
||||
|
||||
let value = toBigNum(input, Number(forceUnit || EtherUnit.ether));
|
||||
let unit = forceUnit || EtherUnit.ether;
|
||||
|
||||
if (!forceUnit) {
|
||||
for (const u of units) {
|
||||
const v = toBigNum(input, Number(u));
|
||||
value = v;
|
||||
unit = u;
|
||||
if (v.isGreaterThanOrEqualTo(1)) break;
|
||||
}
|
||||
}
|
||||
|
||||
return [value, unit];
|
||||
};
|
||||
|
||||
/**
|
||||
* `formatNumber` wrapper for unitised ether values (attaches unit name)
|
||||
*/
|
||||
export const formatEther = (
|
||||
input: UnitisedTuple,
|
||||
decimals = 0,
|
||||
noUnit = false
|
||||
) => {
|
||||
const [value, unit] = input;
|
||||
const num = formatNumber(value, decimals);
|
||||
const unitName = noUnit ? '' : etherUnitMapping[unit];
|
||||
|
||||
return `${num} ${unitName}`.trim();
|
||||
};
|
||||
|
||||
/**
|
||||
* Utility function that formats given raw amount as ETH.
|
||||
* Example:
|
||||
* Given value of `1` this will return `0.000000000000000001 ETH`
|
||||
*/
|
||||
export const asETH = (input: InputValue, noUnit = false) =>
|
||||
formatEther(
|
||||
unitiseEther(input, EtherUnit.ether),
|
||||
Number(EtherUnit.ether),
|
||||
noUnit
|
||||
);
|
||||
@@ -4,3 +4,4 @@ export * from './range';
|
||||
export * from './size';
|
||||
export * from './strings';
|
||||
export * from './trigger';
|
||||
export * from './ether';
|
||||
|
||||
@@ -13,6 +13,7 @@ import {
|
||||
toDecimal,
|
||||
toNumberParts,
|
||||
formatNumberRounded,
|
||||
toQUSD,
|
||||
} from './number';
|
||||
|
||||
describe('number utils', () => {
|
||||
@@ -282,3 +283,22 @@ describe('formatNumberRounded', () => {
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe('toQUSD', () => {
|
||||
it.each([
|
||||
[0, 0, 0],
|
||||
[1, 1, 1],
|
||||
[1, 10, 0.1],
|
||||
[1, 100, 0.01],
|
||||
// real life examples
|
||||
[1000000, 1000000, 1], // USDC -> 1 USDC ~= 1 qUSD
|
||||
[500000, 1000000, 0.5], // USDC => 0.6 USDC ~= 0.5 qUSD
|
||||
[1e18, 1e18, 1], // VEGA -> 1 VEGA ~= 1 qUSD
|
||||
[123.45e18, 1e18, 123.45], // VEGA -> 1 VEGA ~= 1 qUSD
|
||||
[1e18, 5e14, 2000], // WETH -> 1 WETH ~= 2000 qUSD
|
||||
[1e9, 5e14, 0.000002], // gwei -> 1 gwei ~= 0.000002 qUSD
|
||||
[50000e9, 5e14, 0.1], // gwei -> 50000 gwei ~= 0.1 qUSD
|
||||
])('converts (%d, %d) to %d qUSD', (amount, quantum, expected) => {
|
||||
expect(toQUSD(amount, quantum).toNumber()).toEqual(expected);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -26,7 +26,7 @@ export function toDecimal(numberOfDecimals: number) {
|
||||
}
|
||||
|
||||
export function toBigNum(
|
||||
rawValue: string | number,
|
||||
rawValue: string | number | BigNumber,
|
||||
decimals: number
|
||||
): BigNumber {
|
||||
const divides = new BigNumber(10).exponentiatedBy(decimals);
|
||||
@@ -233,3 +233,24 @@ export const formatNumberRounded = (
|
||||
|
||||
return value;
|
||||
};
|
||||
|
||||
/**
|
||||
* Converts given amount in one asset (determined by raw amount
|
||||
* and quantum values) to qUSD.
|
||||
* @param amount The raw amount
|
||||
* @param quantum The quantum value of the asset.
|
||||
*/
|
||||
export const toQUSD = (
|
||||
amount: string | number | BigNumber,
|
||||
quantum: string | number
|
||||
) => {
|
||||
const value = new BigNumber(amount);
|
||||
let q = new BigNumber(quantum);
|
||||
|
||||
if (q.isNaN() || q.isLessThanOrEqualTo(0)) {
|
||||
q = new BigNumber(1);
|
||||
}
|
||||
|
||||
const qUSD = value.dividedBy(q);
|
||||
return qUSD;
|
||||
};
|
||||
|
||||
@@ -19,6 +19,7 @@ export * from './lib/use-ethereum-transaction';
|
||||
export * from './lib/use-ethereum-withdraw-approval-toasts';
|
||||
export * from './lib/use-ethereum-withdraw-approvals-manager';
|
||||
export * from './lib/use-ethereum-withdraw-approvals-store';
|
||||
export * from './lib/use-gas-price';
|
||||
export * from './lib/use-get-withdraw-delay';
|
||||
export * from './lib/use-get-withdraw-threshold';
|
||||
export * from './lib/use-token-contract';
|
||||
|
||||
@@ -0,0 +1,111 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { useWeb3React } from '@web3-react/core';
|
||||
import { useEthereumConfig } from './use-ethereum-config';
|
||||
import BigNumber from 'bignumber.js';
|
||||
|
||||
const DEFAULT_INTERVAL = 15000; // 15 seconds
|
||||
|
||||
/**
|
||||
* These are the hex values of the collateral bridge contract methods.
|
||||
*
|
||||
* Collateral bridge address: 0x23872549cE10B40e31D6577e0A920088B0E0666a
|
||||
* Etherscan: https://etherscan.io/address/0x23872549cE10B40e31D6577e0A920088B0E0666a#writeContract
|
||||
*/
|
||||
export enum ContractMethod {
|
||||
DEPOSIT_ASSET = '0xf7683932',
|
||||
EXEMPT_DEPOSITOR = '0xb76fbb75',
|
||||
GLOBAL_RESUME = '0xd72ed529',
|
||||
GLOBAL_STOP = '0x9dfd3c88',
|
||||
LIST_ASSET = '0x0ff3562c',
|
||||
REMOVE_ASSET = '0xc76de358',
|
||||
REVOKE_EXEMPT_DEPOSITOR = '0x6a1c6fa4',
|
||||
SET_ASSET_LIMITS = '0x41fb776d',
|
||||
SET_WITHDRAW_DELAY = '0x5a246728',
|
||||
WITHDRAW_ASSET = '0x3ad90635',
|
||||
}
|
||||
|
||||
export type GasData = {
|
||||
/** The base (minimum) price of 1 unit of gas */
|
||||
basePrice: BigNumber;
|
||||
/** The maximum price of 1 unit of gas */
|
||||
maxPrice: BigNumber;
|
||||
/** The amount of gas (units) needed to process a transaction */
|
||||
gas: BigNumber;
|
||||
};
|
||||
|
||||
type Provider = NonNullable<ReturnType<typeof useWeb3React>['provider']>;
|
||||
|
||||
const retrieveGasData = async (
|
||||
provider: Provider,
|
||||
account: string,
|
||||
contractAddress: string,
|
||||
contractMethod: ContractMethod
|
||||
) => {
|
||||
try {
|
||||
const data = await provider.getFeeData();
|
||||
const estGasAmount = await provider.estimateGas({
|
||||
to: account,
|
||||
from: contractAddress,
|
||||
data: contractMethod,
|
||||
});
|
||||
|
||||
if (data.lastBaseFeePerGas && data.maxFeePerGas) {
|
||||
return {
|
||||
// converts also form ethers BigNumber to "normal" BigNumber
|
||||
basePrice: BigNumber(data.lastBaseFeePerGas.toString()),
|
||||
maxPrice: BigNumber(data.maxFeePerGas.toString()),
|
||||
gas: BigNumber(estGasAmount.toString()),
|
||||
};
|
||||
}
|
||||
} catch (err) {
|
||||
// NOOP - could not get the estimated gas or the fee data from
|
||||
// the network. This could happen if there's an issue with transaction
|
||||
// request parameters (e.g. to/from mismatch)
|
||||
}
|
||||
|
||||
return undefined;
|
||||
};
|
||||
|
||||
/**
|
||||
* Gets the "current" gas price from the ethereum network.
|
||||
*/
|
||||
export const useGasPrice = (
|
||||
method: ContractMethod,
|
||||
interval = DEFAULT_INTERVAL
|
||||
): GasData | undefined => {
|
||||
const [gas, setGas] = useState<GasData | undefined>(undefined);
|
||||
const { provider, account } = useWeb3React();
|
||||
const { config } = useEthereumConfig();
|
||||
|
||||
useEffect(() => {
|
||||
if (!provider || !config || !account) return;
|
||||
|
||||
const retrieve = async () => {
|
||||
retrieveGasData(
|
||||
provider,
|
||||
account,
|
||||
config.collateral_bridge_contract.address,
|
||||
method
|
||||
).then((gasData) => {
|
||||
if (gasData) {
|
||||
setGas(gasData);
|
||||
}
|
||||
});
|
||||
};
|
||||
retrieve();
|
||||
|
||||
// Retrieves another estimation and prices in [interval] ms.
|
||||
let i: ReturnType<typeof setInterval>;
|
||||
if (interval > 0) {
|
||||
i = setInterval(() => {
|
||||
retrieve();
|
||||
}, interval);
|
||||
}
|
||||
|
||||
return () => {
|
||||
if (i) clearInterval(i);
|
||||
};
|
||||
}, [account, config, interval, method, provider]);
|
||||
|
||||
return gas;
|
||||
};
|
||||
@@ -27,6 +27,7 @@ import { useForm, Controller, useWatch } from 'react-hook-form';
|
||||
import { WithdrawLimits } from './withdraw-limits';
|
||||
import {
|
||||
ETHEREUM_EAGER_CONNECT,
|
||||
type GasData,
|
||||
useWeb3ConnectStore,
|
||||
useWeb3Disconnect,
|
||||
} from '@vegaprotocol/web3';
|
||||
@@ -56,6 +57,7 @@ export interface WithdrawFormProps {
|
||||
delay: number | undefined;
|
||||
onSelectAsset: (assetId: string) => void;
|
||||
submitWithdraw: (withdrawal: WithdrawalArgs) => void;
|
||||
gasPrice?: GasData;
|
||||
}
|
||||
|
||||
const WithdrawDelayNotification = ({
|
||||
@@ -117,6 +119,7 @@ export const WithdrawForm = ({
|
||||
delay,
|
||||
onSelectAsset,
|
||||
submitWithdraw,
|
||||
gasPrice,
|
||||
}: WithdrawFormProps) => {
|
||||
const t = useT();
|
||||
const ethereumAddress = useEthereumAddress();
|
||||
@@ -247,6 +250,7 @@ export const WithdrawForm = ({
|
||||
delay={delay}
|
||||
balance={balance}
|
||||
asset={selectedAsset}
|
||||
gas={gasPrice}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import type { Asset } from '@vegaprotocol/assets';
|
||||
import { CompactNumber } from '@vegaprotocol/react-helpers';
|
||||
import { WITHDRAW_THRESHOLD_TOOLTIP_TEXT } from '@vegaprotocol/assets';
|
||||
import { WITHDRAW_THRESHOLD_TOOLTIP_TEXT, useWETH } from '@vegaprotocol/assets';
|
||||
import {
|
||||
KeyValueTable,
|
||||
KeyValueTableRow,
|
||||
@@ -9,6 +9,16 @@ import {
|
||||
import BigNumber from 'bignumber.js';
|
||||
import { formatDistanceToNow } from 'date-fns';
|
||||
import { useT } from './use-t';
|
||||
import { type GasData } from '@vegaprotocol/web3';
|
||||
import {
|
||||
asETH,
|
||||
formatEther,
|
||||
formatNumber,
|
||||
removeDecimal,
|
||||
toQUSD,
|
||||
unitiseEther,
|
||||
} from '@vegaprotocol/utils';
|
||||
import classNames from 'classnames';
|
||||
|
||||
interface WithdrawLimitsProps {
|
||||
amount: string;
|
||||
@@ -16,6 +26,7 @@ interface WithdrawLimitsProps {
|
||||
balance: BigNumber;
|
||||
delay: number | undefined;
|
||||
asset: Asset;
|
||||
gas?: GasData;
|
||||
}
|
||||
|
||||
export const WithdrawLimits = ({
|
||||
@@ -24,6 +35,7 @@ export const WithdrawLimits = ({
|
||||
balance,
|
||||
delay,
|
||||
asset,
|
||||
gas,
|
||||
}: WithdrawLimitsProps) => {
|
||||
const t = useT();
|
||||
const delayTime =
|
||||
@@ -64,6 +76,24 @@ export const WithdrawLimits = ({
|
||||
label: t('Delay time'),
|
||||
value: threshold && delay ? delayTime : '-',
|
||||
},
|
||||
{
|
||||
key: 'GAS_FEE',
|
||||
tooltip: t(
|
||||
'Estimated gas fee for the withdrawal transaction (refreshes each 15 seconds)'
|
||||
),
|
||||
label: t('Gas fee'),
|
||||
value: gas ? (
|
||||
<GasPrice
|
||||
gasPrice={gas}
|
||||
amount={{
|
||||
value: removeDecimal(amount, asset.decimals),
|
||||
quantum: asset.quantum,
|
||||
}}
|
||||
/>
|
||||
) : (
|
||||
'-'
|
||||
),
|
||||
},
|
||||
];
|
||||
|
||||
return (
|
||||
@@ -91,3 +121,117 @@ export const WithdrawLimits = ({
|
||||
</KeyValueTable>
|
||||
);
|
||||
};
|
||||
|
||||
const GasPrice = ({
|
||||
gasPrice,
|
||||
amount,
|
||||
}: {
|
||||
gasPrice: WithdrawLimitsProps['gas'];
|
||||
amount: { value: string; quantum: string };
|
||||
}) => {
|
||||
const t = useT();
|
||||
const { quantum: wethQuantum } = useWETH();
|
||||
const { value, quantum } = amount;
|
||||
if (gasPrice) {
|
||||
const {
|
||||
basePrice: basePricePerGas,
|
||||
maxPrice: maxPricePerGas,
|
||||
gas,
|
||||
} = gasPrice;
|
||||
const basePrice = basePricePerGas.multipliedBy(gas);
|
||||
const maxPrice = maxPricePerGas.multipliedBy(gas);
|
||||
|
||||
const basePriceQUSD = toQUSD(basePrice, wethQuantum);
|
||||
const maxPriceQUSD = toQUSD(maxPrice, wethQuantum);
|
||||
|
||||
const withdrawalAmountQUSD = toQUSD(value, quantum);
|
||||
|
||||
const isExpensive =
|
||||
!withdrawalAmountQUSD.isLessThanOrEqualTo(0) &&
|
||||
withdrawalAmountQUSD.isLessThanOrEqualTo(maxPriceQUSD);
|
||||
const expensiveClassNames = {
|
||||
'text-vega-red-500':
|
||||
isExpensive && withdrawalAmountQUSD.isLessThanOrEqualTo(basePriceQUSD),
|
||||
'text-vega-orange-500':
|
||||
isExpensive &&
|
||||
withdrawalAmountQUSD.isGreaterThan(basePriceQUSD) &&
|
||||
withdrawalAmountQUSD.isLessThanOrEqualTo(maxPriceQUSD),
|
||||
};
|
||||
|
||||
const uBasePricePerGas = unitiseEther(basePricePerGas);
|
||||
const uMaxPricePerGas = unitiseEther(
|
||||
maxPricePerGas,
|
||||
uBasePricePerGas[1] // forces the same unit as min price
|
||||
);
|
||||
|
||||
const uBasePrice = unitiseEther(basePrice);
|
||||
const uMaxPrice = unitiseEther(maxPrice, uBasePrice[1]);
|
||||
|
||||
let range = (
|
||||
<span>
|
||||
{formatEther(uBasePrice, 0, true)} - {formatEther(uMaxPrice)}
|
||||
</span>
|
||||
);
|
||||
// displays range as ETH when it's greater that 1000000 gwei
|
||||
if (uBasePrice[0].isGreaterThan(1e6)) {
|
||||
range = (
|
||||
<span className="flex flex-col font-mono md:text-[11px]">
|
||||
<span>
|
||||
{t('min')}: {asETH(basePrice)}
|
||||
</span>
|
||||
<span>
|
||||
{t('max')}: {asETH(maxPrice)}
|
||||
</span>
|
||||
</span>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<div className={classNames('flex flex-col items-end self-end')}>
|
||||
<Tooltip description={t('The current gas price range')}>
|
||||
<span>
|
||||
{/* base price per gas unit */}
|
||||
{formatEther(uBasePricePerGas, 0, true)} -{' '}
|
||||
{formatEther(uMaxPricePerGas)} / gas
|
||||
</span>
|
||||
</Tooltip>
|
||||
<Tooltip
|
||||
description={
|
||||
<div className="flex flex-col gap-1">
|
||||
{isExpensive && (
|
||||
<span className={classNames(expensiveClassNames)}>
|
||||
{t(
|
||||
"It seems that the current gas prices are exceeding the amount you're trying to withdraw"
|
||||
)}{' '}
|
||||
<strong>
|
||||
(~{formatNumber(withdrawalAmountQUSD, 2)} qUSD)
|
||||
</strong>
|
||||
.
|
||||
</span>
|
||||
)}
|
||||
<span>
|
||||
{formatNumber(gas)} gas × {asETH(basePricePerGas)} <br />{' '}
|
||||
= {asETH(basePrice)}
|
||||
</span>
|
||||
<span>
|
||||
{formatNumber(gas)} gas × {asETH(maxPricePerGas)} <br /> ={' '}
|
||||
{asETH(maxPrice)}
|
||||
</span>
|
||||
</div>
|
||||
}
|
||||
>
|
||||
<span className={classNames(expensiveClassNames, 'text-xs')}>
|
||||
{range}
|
||||
</span>
|
||||
</Tooltip>
|
||||
|
||||
<span className="text-muted text-xs">
|
||||
~{formatNumber(basePriceQUSD, 2)} - {formatNumber(maxPriceQUSD, 2)}{' '}
|
||||
qUSD
|
||||
</span>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
return '-';
|
||||
};
|
||||
|
||||
@@ -38,6 +38,7 @@ jest.mock('@vegaprotocol/web3', () => ({
|
||||
useGetWithdrawDelay: () => {
|
||||
return () => Promise.resolve(10000);
|
||||
},
|
||||
useGasPrice: () => undefined,
|
||||
}));
|
||||
|
||||
describe('WithdrawManager', () => {
|
||||
|
||||
@@ -4,6 +4,7 @@ import { WithdrawForm } from './withdraw-form';
|
||||
import type { Asset } from '@vegaprotocol/assets';
|
||||
import type { AccountFieldsFragment } from '@vegaprotocol/accounts';
|
||||
import { useWithdrawAsset } from './use-withdraw-asset';
|
||||
import { ContractMethod, useGasPrice } from '@vegaprotocol/web3';
|
||||
|
||||
export interface WithdrawManagerProps {
|
||||
assets: Asset[];
|
||||
@@ -20,6 +21,8 @@ export const WithdrawManager = ({
|
||||
}: WithdrawManagerProps) => {
|
||||
const { asset, balance, min, threshold, delay, handleSelectAsset } =
|
||||
useWithdrawAsset(assets, accounts, assetId);
|
||||
const gasPrice = useGasPrice(ContractMethod.WITHDRAW_ASSET);
|
||||
|
||||
return (
|
||||
<WithdrawForm
|
||||
selectedAsset={asset}
|
||||
@@ -30,6 +33,7 @@ export const WithdrawManager = ({
|
||||
submitWithdraw={submit}
|
||||
threshold={threshold}
|
||||
delay={delay}
|
||||
gasPrice={gasPrice}
|
||||
/>
|
||||
);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user