Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Dariusz Majcherczyk
|
d6eb59d3c7 | ||
|
Dariusz Majcherczyk
|
5cdda535c0 | ||
 mattrussell36
|
5d613396e1 |
@@ -3,7 +3,6 @@ import React from 'react';
|
||||
import classnames from 'classnames';
|
||||
|
||||
interface TableProps {
|
||||
allowWrap?: boolean;
|
||||
children: React.ReactNode;
|
||||
className?: string;
|
||||
}
|
||||
@@ -26,15 +25,8 @@ interface TableCellProps extends ThHTMLAttributes<HTMLTableCellElement> {
|
||||
modifier?: 'bordered' | 'background';
|
||||
}
|
||||
|
||||
export const Table = ({
|
||||
allowWrap,
|
||||
children,
|
||||
className,
|
||||
...props
|
||||
}: TableProps) => {
|
||||
const classes = allowWrap
|
||||
? className
|
||||
: classnames(className, 'overflow-x-auto whitespace-nowrap');
|
||||
export const Table = ({ children, className, ...props }: TableProps) => {
|
||||
const classes = classnames(className, 'overflow-x-auto whitespace-nowrap');
|
||||
return (
|
||||
<div className={classes}>
|
||||
<table className="w-full" {...props}>
|
||||
@@ -45,14 +37,11 @@ export const Table = ({
|
||||
};
|
||||
|
||||
export const TableWithTbody = ({
|
||||
allowWrap,
|
||||
children,
|
||||
className,
|
||||
...props
|
||||
}: TableProps) => {
|
||||
const classes = allowWrap
|
||||
? className
|
||||
: classnames(className, 'overflow-x-auto whitespace-nowrap');
|
||||
const classes = classnames(className, 'overflow-x-auto whitespace-nowrap');
|
||||
return (
|
||||
<div className={classes}>
|
||||
<table className="w-full" {...props}>
|
||||
|
||||
@@ -1,108 +0,0 @@
|
||||
import { getValues } from './bound-factors';
|
||||
import type { components } from '../../../../../types/explorer';
|
||||
|
||||
type KeyValueBundle = components['schemas']['vegaKeyValueBundle'][];
|
||||
|
||||
describe('getValues', () => {
|
||||
it('handles an empty array by returning a dashed template', () => {
|
||||
const res = getValues([]);
|
||||
expect(res).toHaveProperty('down');
|
||||
expect(res.down).toHaveProperty('tolerance', '-');
|
||||
expect(res.down).toHaveProperty('value', '-');
|
||||
expect(res).toHaveProperty('up');
|
||||
expect(res.up).toHaveProperty('tolerance', '-');
|
||||
expect(res.up).toHaveProperty('value', '-');
|
||||
});
|
||||
|
||||
it('handles undefined', () => {
|
||||
const res = getValues(undefined as unknown as KeyValueBundle);
|
||||
expect(res).toHaveProperty('down');
|
||||
expect(res.down).toHaveProperty('tolerance', '-');
|
||||
expect(res.down).toHaveProperty('value', '-');
|
||||
expect(res).toHaveProperty('up');
|
||||
expect(res.up).toHaveProperty('tolerance', '-');
|
||||
expect(res.up).toHaveProperty('value', '-');
|
||||
});
|
||||
|
||||
it('handles a kvb that only has one side (should not happen)', () => {
|
||||
const k: KeyValueBundle = [
|
||||
{
|
||||
key: 'up',
|
||||
tolerance: '0.1',
|
||||
value: { vectorVal: { value: ['0.123'] } },
|
||||
},
|
||||
];
|
||||
|
||||
const res = getValues(k);
|
||||
expect(res).toHaveProperty('down');
|
||||
expect(res.down).toHaveProperty('tolerance', '-');
|
||||
expect(res.down).toHaveProperty('value', '-');
|
||||
expect(res).toHaveProperty('up');
|
||||
expect(res.up).toHaveProperty('tolerance', '0.1');
|
||||
expect(res.up).toHaveProperty('value', '0.123');
|
||||
});
|
||||
|
||||
it('handles a kvb that has a matrixVal instead of a scalarval by ignoring it', () => {
|
||||
const k: KeyValueBundle = [
|
||||
{
|
||||
key: 'up',
|
||||
tolerance: '0.1',
|
||||
value: { matrixVal: { value: [{ value: ['0.123'] }] } },
|
||||
},
|
||||
];
|
||||
|
||||
const res = getValues(k);
|
||||
expect(res).toHaveProperty('down');
|
||||
expect(res.down).toHaveProperty('tolerance', '-');
|
||||
expect(res.down).toHaveProperty('value', '-');
|
||||
expect(res).toHaveProperty('up');
|
||||
expect(res.up).toHaveProperty('tolerance', '0.1');
|
||||
expect(res.up).toHaveProperty('value', '-');
|
||||
});
|
||||
|
||||
it('ignores unexpected extra values in the kvb', () => {
|
||||
const k: KeyValueBundle = [
|
||||
{
|
||||
key: 'up',
|
||||
tolerance: '0.1',
|
||||
value: { vectorVal: { value: ['0.123', '0.77'] } },
|
||||
},
|
||||
{
|
||||
key: 'down',
|
||||
tolerance: '0.001',
|
||||
value: { vectorVal: { value: ['0.321'] } },
|
||||
},
|
||||
];
|
||||
|
||||
const res = getValues(k);
|
||||
expect(res).toHaveProperty('down');
|
||||
expect(res.down).toHaveProperty('tolerance', '0.001');
|
||||
expect(res.down).toHaveProperty('value', '0.321');
|
||||
expect(res).toHaveProperty('up');
|
||||
expect(res.up).toHaveProperty('tolerance', '0.1');
|
||||
expect(res.up).toHaveProperty('value', '0.123');
|
||||
});
|
||||
|
||||
it('handles a full kvb', () => {
|
||||
const k: KeyValueBundle = [
|
||||
{
|
||||
key: 'up',
|
||||
tolerance: '0.1',
|
||||
value: { vectorVal: { value: ['0.123'] } },
|
||||
},
|
||||
{
|
||||
key: 'down',
|
||||
tolerance: '0.001',
|
||||
value: { vectorVal: { value: ['0.321'] } },
|
||||
},
|
||||
];
|
||||
|
||||
const res = getValues(k);
|
||||
expect(res).toHaveProperty('down');
|
||||
expect(res.down).toHaveProperty('tolerance', '0.001');
|
||||
expect(res.down).toHaveProperty('value', '0.321');
|
||||
expect(res).toHaveProperty('up');
|
||||
expect(res.up).toHaveProperty('tolerance', '0.1');
|
||||
expect(res.up).toHaveProperty('value', '0.123');
|
||||
});
|
||||
});
|
||||
@@ -1,87 +0,0 @@
|
||||
import { t } from '@vegaprotocol/react-helpers';
|
||||
import type { components } from '../../../../../types/explorer';
|
||||
import { Table, TableRow, TableHeader, TableCell } from '../../../table';
|
||||
|
||||
interface StateVariableProposalBoundFactorsProps {
|
||||
kvb: readonly components['schemas']['vegaKeyValueBundle'][];
|
||||
}
|
||||
|
||||
/**
|
||||
* A dumb as rocks function completely tied to what the structure of this variable should be
|
||||
* @param kvb The key/value bundle
|
||||
* @returns Object
|
||||
*/
|
||||
export function getValues(kvb: StateVariableProposalBoundFactorsProps['kvb']) {
|
||||
const template = {
|
||||
up: {
|
||||
tolerance: '-',
|
||||
value: '-',
|
||||
},
|
||||
down: {
|
||||
tolerance: '-',
|
||||
value: '-',
|
||||
},
|
||||
};
|
||||
|
||||
if (kvb && kvb.length > 0) {
|
||||
kvb.forEach((v) => {
|
||||
if (v.key === 'up') {
|
||||
template.up.tolerance = v.tolerance || '-';
|
||||
template.up.value = v.value?.vectorVal?.value
|
||||
? v.value?.vectorVal.value[0]
|
||||
: '-';
|
||||
} else if (v.key === 'down') {
|
||||
template.down.tolerance = v.tolerance || '-';
|
||||
template.down.value = v.value?.vectorVal?.value
|
||||
? v.value?.vectorVal.value[0]
|
||||
: '-';
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
return template;
|
||||
}
|
||||
|
||||
/**
|
||||
* State Variable proposals updating Bound Factors. This contains two bundles,
|
||||
* an up vector and a down vector
|
||||
*
|
||||
* This is nearly identical to risk factors.
|
||||
*/
|
||||
export const StateVariableProposalBoundFactors = ({
|
||||
kvb,
|
||||
}: StateVariableProposalBoundFactorsProps) => {
|
||||
const v = getValues(kvb);
|
||||
|
||||
return (
|
||||
<Table allowWrap={true} className="w-1/3">
|
||||
<thead>
|
||||
<TableRow modifier="bordered">
|
||||
<TableHeader align="left">{t('Parameter')}</TableHeader>
|
||||
<TableHeader align="center">{t('New value')}</TableHeader>
|
||||
<TableHeader align="right">{t('Tolerance')}</TableHeader>
|
||||
</TableRow>
|
||||
</thead>
|
||||
<tbody>
|
||||
<TableRow modifier="bordered">
|
||||
<TableCell>{t('Up')}</TableCell>
|
||||
<TableCell align="right" className="font-mono">
|
||||
{v.up.value}
|
||||
</TableCell>
|
||||
<TableCell align="right" className="font-mono">
|
||||
{v.up.tolerance}
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
<TableRow modifier="bordered">
|
||||
<TableCell>{t('Down')}</TableCell>
|
||||
<TableCell align="right" className="font-mono">
|
||||
{v.down.value}
|
||||
</TableCell>
|
||||
<TableCell align="right" className="font-mono">
|
||||
{v.down.tolerance}
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
</tbody>
|
||||
</Table>
|
||||
);
|
||||
};
|
||||
@@ -1,31 +0,0 @@
|
||||
import type { components } from '../../../../../types/explorer';
|
||||
import { StateVariableProposalUnknown } from './unknown';
|
||||
import { StateVariableProposalBoundFactors } from './bound-factors';
|
||||
import { StateVariableProposalRiskFactors } from './risk-factors';
|
||||
|
||||
interface StateVariableProposalWrapperProps {
|
||||
stateVariable: string | undefined;
|
||||
kvb: readonly components['schemas']['vegaKeyValueBundle'][] | undefined;
|
||||
}
|
||||
|
||||
/**
|
||||
* State Variable proposals
|
||||
*/
|
||||
export const StateVariableProposalWrapper = ({
|
||||
stateVariable,
|
||||
kvb,
|
||||
}: StateVariableProposalWrapperProps) => {
|
||||
if (!stateVariable || !kvb || kvb.length === 0) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (stateVariable.indexOf('bound-factors') !== -1) {
|
||||
return <StateVariableProposalBoundFactors kvb={kvb} />;
|
||||
} else if (stateVariable.indexOf('risk-factors') !== -1) {
|
||||
return <StateVariableProposalRiskFactors kvb={kvb} />;
|
||||
} else if (stateVariable.indexOf('probability_of_trading') !== -1) {
|
||||
return <StateVariableProposalRiskFactors kvb={kvb} />;
|
||||
} else {
|
||||
return <StateVariableProposalUnknown kvb={kvb} />;
|
||||
}
|
||||
};
|
||||
@@ -1,124 +0,0 @@
|
||||
import { t } from '@vegaprotocol/react-helpers';
|
||||
import zip from 'lodash/zip';
|
||||
import type { components } from '../../../../../types/explorer';
|
||||
import { Table, TableRow, TableHeader, TableCell } from '../../../table';
|
||||
import { StateVariableProposalUnknown } from './unknown';
|
||||
|
||||
interface StateVariableProposalRiskFactorsProps {
|
||||
kvb: readonly components['schemas']['vegaKeyValueBundle'][];
|
||||
}
|
||||
|
||||
/**
|
||||
* A dumb as rocks function completely tied to what the structure of this variable should be
|
||||
*
|
||||
* @param kvb The key/value bundle
|
||||
* @returns Object
|
||||
*/
|
||||
export function getValues(kvb: StateVariableProposalRiskFactorsProps['kvb']) {
|
||||
try {
|
||||
const template = {
|
||||
bid: {
|
||||
offsetTolerance: '-',
|
||||
probabilityTolerance: '-',
|
||||
offset: [] as Readonly<string[]>,
|
||||
probability: [] as Readonly<string[]>,
|
||||
rows: [] as [string | undefined, string | undefined][],
|
||||
},
|
||||
ask: {
|
||||
offsetTolerance: '-',
|
||||
probabilityTolerance: '-',
|
||||
offset: [] as Readonly<string[]>,
|
||||
probability: [] as Readonly<string[]>,
|
||||
rows: [] as [string | undefined, string | undefined][],
|
||||
},
|
||||
};
|
||||
|
||||
kvb.forEach((v) => {
|
||||
if (v.key === 'bidOffset') {
|
||||
template.bid.offsetTolerance = v.tolerance || '-';
|
||||
template.bid.offset = v.value?.vectorVal?.value
|
||||
? v.value?.vectorVal?.value
|
||||
: ['0'];
|
||||
} else if (v.key === 'bidProbability') {
|
||||
template.bid.probabilityTolerance = v.tolerance || '-';
|
||||
template.bid.probability = v.value?.vectorVal?.value
|
||||
? v.value?.vectorVal?.value
|
||||
: ['0'];
|
||||
} else if (v.key === 'askOffset') {
|
||||
template.ask.offsetTolerance = v.tolerance || '-';
|
||||
template.ask.offset = v.value?.vectorVal?.value
|
||||
? v.value?.vectorVal?.value
|
||||
: ['0'];
|
||||
} else if (v.key === 'askProbability') {
|
||||
template.ask.probabilityTolerance = v.tolerance || '-';
|
||||
template.ask.probability = v.value?.vectorVal?.value
|
||||
? v.value?.vectorVal?.value
|
||||
: ['0'];
|
||||
}
|
||||
});
|
||||
|
||||
// Bundles up offset and probability in to a row
|
||||
if (template.bid.offset.length > 0 && template.bid.probability.length > 0) {
|
||||
template.bid.rows = zip(template.bid.offset, template.bid.probability);
|
||||
}
|
||||
if (template.ask.offset.length > 0 && template.ask.probability.length > 0) {
|
||||
template.ask.rows = zip(template.ask.offset, template.ask.probability);
|
||||
}
|
||||
|
||||
return template;
|
||||
} catch (e) {
|
||||
// This will result in the table not being rendered
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* State Variable proposals updating Risk Factors. This contains two bundles,
|
||||
* a long vector and a short vector
|
||||
*/
|
||||
export const StateVariableProposalRiskFactors = ({
|
||||
kvb,
|
||||
}: StateVariableProposalRiskFactorsProps) => {
|
||||
const v = getValues(kvb);
|
||||
const all = v ? zip(v.bid.rows, v.ask.rows) : [];
|
||||
|
||||
if (all.length === 0) {
|
||||
// Give up, do a JSON view
|
||||
return <StateVariableProposalUnknown kvb={kvb} />;
|
||||
}
|
||||
|
||||
return (
|
||||
<Table allowWrap={true} className="text-xs lg:text-base max-w-2xl">
|
||||
<thead>
|
||||
<TableRow modifier="bordered">
|
||||
<TableHeader align="left">{t('Mid offset')}</TableHeader>
|
||||
<TableHeader align="right">{t('Bid probability')}</TableHeader>
|
||||
<TableHeader align="right" className="pl-2">
|
||||
{t('Ask probability')}
|
||||
</TableHeader>
|
||||
</TableRow>
|
||||
</thead>
|
||||
<tbody>
|
||||
{all.map((r) => {
|
||||
// Simple remapping of the data to protect against undefineds
|
||||
const row = {
|
||||
o: r[0] ? r[0][0] : r[1] ? r[1][0] : '-',
|
||||
b: r[0] ? r[0][1] : '-',
|
||||
a: r[1] ? r[1][1] : '-',
|
||||
};
|
||||
return (
|
||||
<TableRow key={`${row.o}${row.b}${row.a}`}>
|
||||
<TableCell align="left">{row.o}</TableCell>
|
||||
<TableCell align="right" className="font-mono">
|
||||
{row.b}
|
||||
</TableCell>
|
||||
<TableCell align="right" className="pl-2 font-mono">
|
||||
{row.a}
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
);
|
||||
})}
|
||||
</tbody>
|
||||
</Table>
|
||||
);
|
||||
};
|
||||
@@ -1,168 +0,0 @@
|
||||
import { getValues, StateVariableProposalRiskFactors } from './risk-factors';
|
||||
import type { components } from '../../../../../types/explorer';
|
||||
import { render } from '@testing-library/react';
|
||||
|
||||
type kvb = components['schemas']['vegaKeyValueBundle'][];
|
||||
|
||||
describe('Risk Factors: getValues', () => {
|
||||
it('returns null if null is passed in', () => {
|
||||
const res = getValues(null as unknown as kvb);
|
||||
expect(res).toBeNull();
|
||||
});
|
||||
|
||||
it('returns a blank template if kvb is empty', () => {
|
||||
const res = getValues([]);
|
||||
expect(res).not.toBeNull();
|
||||
expect(res?.bid.offsetTolerance).toEqual('-');
|
||||
expect(res?.bid.probabilityTolerance).toEqual('-');
|
||||
expect(res?.bid.probability).toEqual([]);
|
||||
expect(res?.bid.offset).toEqual([]);
|
||||
expect(res?.bid.rows.length).toEqual(0);
|
||||
|
||||
expect(res?.ask.offsetTolerance).toEqual('-');
|
||||
expect(res?.ask.probabilityTolerance).toEqual('-');
|
||||
expect(res?.ask.probability).toEqual([]);
|
||||
expect(res?.ask.offset).toEqual([]);
|
||||
expect(res?.ask.rows.length).toEqual(0);
|
||||
});
|
||||
|
||||
it('parses out a correct bid offset and probability', () => {
|
||||
const k: kvb = [
|
||||
{
|
||||
key: 'bidOffset',
|
||||
value: { vectorVal: { value: ['1'] } },
|
||||
},
|
||||
{
|
||||
key: 'bidProbability',
|
||||
value: { vectorVal: { value: ['2'] } },
|
||||
},
|
||||
];
|
||||
|
||||
const res = getValues(k);
|
||||
expect(res?.bid.offset).toEqual(['1']);
|
||||
expect(res?.bid.probability).toEqual(['2']);
|
||||
expect(res?.bid.rows).toEqual([['1', '2']]);
|
||||
});
|
||||
|
||||
it('parses out a correct ask offset and probability', () => {
|
||||
const k: kvb = [
|
||||
{
|
||||
key: 'askOffset',
|
||||
value: { vectorVal: { value: ['1'] } },
|
||||
},
|
||||
{
|
||||
key: 'askProbability',
|
||||
value: { vectorVal: { value: ['2'] } },
|
||||
},
|
||||
];
|
||||
|
||||
const res = getValues(k);
|
||||
expect(res?.ask.offset).toEqual(['1']);
|
||||
expect(res?.ask.probability).toEqual(['2']);
|
||||
expect(res?.ask.rows).toEqual([['1', '2']]);
|
||||
});
|
||||
|
||||
it('parses out a correct ask/bid offset and probability', () => {
|
||||
const k: kvb = [
|
||||
{
|
||||
key: 'askOffset',
|
||||
value: { vectorVal: { value: ['1'] } },
|
||||
},
|
||||
{
|
||||
key: 'askProbability',
|
||||
value: { vectorVal: { value: ['2'] } },
|
||||
},
|
||||
{
|
||||
key: 'bidOffset',
|
||||
value: { vectorVal: { value: ['3'] } },
|
||||
},
|
||||
{
|
||||
key: 'bidProbability',
|
||||
value: { vectorVal: { value: ['4'] } },
|
||||
},
|
||||
];
|
||||
|
||||
const res = getValues(k);
|
||||
expect(res?.ask.rows).toEqual([['1', '2']]);
|
||||
expect(res?.bid.rows).toEqual([['3', '4']]);
|
||||
});
|
||||
});
|
||||
|
||||
describe('Risk Factors: component', () => {
|
||||
it('renders 3 rows correctly', () => {
|
||||
const k: kvb = [
|
||||
{
|
||||
key: 'askOffset',
|
||||
value: { vectorVal: { value: ['1.1', '1.2', '1.3'] } },
|
||||
},
|
||||
{
|
||||
key: 'askProbability',
|
||||
value: { vectorVal: { value: ['2.2', '2.3', '2.4'] } },
|
||||
},
|
||||
{
|
||||
key: 'bidOffset',
|
||||
value: { vectorVal: { value: ['1.1', '1.2', '1.3'] } },
|
||||
},
|
||||
{
|
||||
key: 'bidProbability',
|
||||
value: { vectorVal: { value: ['4.4', '4.5', '4.6'] } },
|
||||
},
|
||||
];
|
||||
|
||||
const screen = render(<StateVariableProposalRiskFactors kvb={k} />);
|
||||
expect(screen.getByText('Mid offset')).toBeInTheDocument();
|
||||
expect(screen.getByText('Bid probability')).toBeInTheDocument();
|
||||
expect(screen.getByText('Ask probability')).toBeInTheDocument();
|
||||
// First row
|
||||
expect(screen.getByText('1.1')).toBeInTheDocument();
|
||||
expect(screen.getByText('2.2')).toBeInTheDocument();
|
||||
expect(screen.getByText('4.4')).toBeInTheDocument();
|
||||
// Second row
|
||||
expect(screen.getByText('1.2')).toBeInTheDocument();
|
||||
expect(screen.getByText('2.3')).toBeInTheDocument();
|
||||
expect(screen.getByText('4.5')).toBeInTheDocument();
|
||||
// Third row
|
||||
expect(screen.getByText('1.3')).toBeInTheDocument();
|
||||
expect(screen.getByText('2.4')).toBeInTheDocument();
|
||||
expect(screen.getByText('4.6')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('renders uneven row counts correctly', () => {
|
||||
const k: kvb = [
|
||||
{
|
||||
key: 'askOffset',
|
||||
value: { vectorVal: { value: ['1.1'] } },
|
||||
},
|
||||
{
|
||||
key: 'askProbability',
|
||||
value: { vectorVal: { value: ['2.2'] } },
|
||||
},
|
||||
{
|
||||
key: 'bidOffset',
|
||||
value: { vectorVal: { value: ['1.1', '1.2', '1.3'] } },
|
||||
},
|
||||
{
|
||||
key: 'bidProbability',
|
||||
value: { vectorVal: { value: ['4.4', '4.5', '4.6'] } },
|
||||
},
|
||||
];
|
||||
|
||||
const screen = render(<StateVariableProposalRiskFactors kvb={k} />);
|
||||
expect(screen.getByText('Mid offset')).toBeInTheDocument();
|
||||
expect(screen.getByText('Bid probability')).toBeInTheDocument();
|
||||
expect(screen.getByText('Ask probability')).toBeInTheDocument();
|
||||
// First row, as previous test
|
||||
expect(screen.getByText('1.1')).toBeInTheDocument();
|
||||
expect(screen.getByText('2.2')).toBeInTheDocument();
|
||||
expect(screen.getByText('4.4')).toBeInTheDocument();
|
||||
// Second row - offset comes from bid, not ask
|
||||
expect(screen.getByText('1.2')).toBeInTheDocument();
|
||||
expect(screen.getByText('4.5')).toBeInTheDocument();
|
||||
// Third row
|
||||
expect(screen.getByText('1.3')).toBeInTheDocument();
|
||||
expect(screen.getByText('4.6')).toBeInTheDocument();
|
||||
|
||||
// The askOffset levels without a probability render -
|
||||
expect(screen.getAllByText('-')).toHaveLength(2);
|
||||
});
|
||||
});
|
||||
@@ -1,52 +0,0 @@
|
||||
import { t } from '@vegaprotocol/react-helpers';
|
||||
import type { components } from '../../../../../types/explorer';
|
||||
import { Table, TableRow, TableHeader, TableCell } from '../../../table';
|
||||
import { getValues } from './bound-factors';
|
||||
|
||||
interface StateVariableProposalBoundFactorsProps {
|
||||
kvb: readonly components['schemas']['vegaKeyValueBundle'][];
|
||||
}
|
||||
|
||||
/**
|
||||
* State Variable proposals updating Bound Factors. This contains two bundles,
|
||||
* an up vector and a down vector
|
||||
*
|
||||
* This is nearly identical to risk factors.
|
||||
*/
|
||||
export const StateVariableProposalBoundFactors = ({
|
||||
kvb,
|
||||
}: StateVariableProposalBoundFactorsProps) => {
|
||||
const v = getValues(kvb);
|
||||
|
||||
return (
|
||||
<Table allowWrap={true} className="w-1/3">
|
||||
<thead>
|
||||
<TableRow modifier="bordered">
|
||||
<TableHeader align="left">{t('Parameter')}</TableHeader>
|
||||
<TableHeader align="center">{t('New value')}</TableHeader>
|
||||
<TableHeader align="right">{t('Tolerance')}</TableHeader>
|
||||
</TableRow>
|
||||
</thead>
|
||||
<tbody>
|
||||
<TableRow modifier="bordered">
|
||||
<TableCell>{t('Up')}</TableCell>
|
||||
<TableCell align="right" className="font-mono">
|
||||
{v.up.value}
|
||||
</TableCell>
|
||||
<TableCell align="right" className="font-mono">
|
||||
{v.up.tolerance}
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
<TableRow modifier="bordered">
|
||||
<TableCell>{t('Down')}</TableCell>
|
||||
<TableCell align="right" className="font-mono">
|
||||
{v.down.value}
|
||||
</TableCell>
|
||||
<TableCell align="right" className="font-mono">
|
||||
{v.down.tolerance}
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
</tbody>
|
||||
</Table>
|
||||
);
|
||||
};
|
||||
@@ -1,16 +0,0 @@
|
||||
import { SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
|
||||
import type { components } from '../../../../../types/explorer';
|
||||
|
||||
interface StateVariableProposalUnknownProps {
|
||||
kvb: readonly components['schemas']['vegaKeyValueBundle'][];
|
||||
}
|
||||
|
||||
/**
|
||||
* State Variable proposals of an unknown type. Let's just dump
|
||||
* it out.
|
||||
*/
|
||||
export const StateVariableProposalUnknown = ({
|
||||
kvb,
|
||||
}: StateVariableProposalUnknownProps) => {
|
||||
return <SyntaxHighlighter data={kvb} />;
|
||||
};
|
||||
@@ -53,7 +53,7 @@ export const TxDetailsBatch = ({
|
||||
let index = 0;
|
||||
return (
|
||||
<div key={`tx-${index}`}>
|
||||
<TableWithTbody className="mb-8" allowWrap={true}>
|
||||
<TableWithTbody className="mb-8">
|
||||
<TxDetailsShared
|
||||
txData={txData}
|
||||
pubKey={pubKey}
|
||||
|
||||
@@ -32,7 +32,7 @@ export const TxDetailsChainEvent = ({
|
||||
}
|
||||
|
||||
return (
|
||||
<TableWithTbody className="mb-8" allowWrap={true}>
|
||||
<TableWithTbody className="mb-8">
|
||||
<TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
|
||||
<ChainEvent txData={txData} />
|
||||
</TableWithTbody>
|
||||
|
||||
@@ -38,7 +38,7 @@ export const TxDetailsDataSubmission = ({
|
||||
|
||||
return (
|
||||
<>
|
||||
<TableWithTbody className="mb-8" allowWrap={true}>
|
||||
<TableWithTbody className="mb-8">
|
||||
<TxDetailsShared
|
||||
txData={txData}
|
||||
pubKey={pubKey}
|
||||
|
||||
@@ -35,7 +35,7 @@ export const TxDetailsDelegate = ({
|
||||
txData.command.delegateSubmission;
|
||||
|
||||
return (
|
||||
<TableWithTbody className="mb-8" allowWrap={true}>
|
||||
<TableWithTbody className="mb-8">
|
||||
<TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
|
||||
{d.nodeId ? (
|
||||
<TableRow modifier="bordered">
|
||||
|
||||
@@ -21,7 +21,6 @@ import { TxDetailsDataSubmission } from './tx-data-submission';
|
||||
import { TxProposalVote } from './tx-proposal-vote';
|
||||
import { TxDetailsProtocolUpgrade } from './tx-details-protocol-upgrade';
|
||||
import { TxDetailsIssueSignatures } from './tx-issue-signatures';
|
||||
import { TxDetailsStateVariable } from './tx-state-variable-proposal';
|
||||
|
||||
interface TxDetailsWrapperProps {
|
||||
txData: BlockExplorerTransactionResult | undefined;
|
||||
@@ -103,8 +102,6 @@ function getTransactionComponent(txData?: BlockExplorerTransactionResult) {
|
||||
return TxDetailsDelegate;
|
||||
case 'Undelegate':
|
||||
return TxDetailsUndelegate;
|
||||
case 'State Variable Proposal':
|
||||
return TxDetailsStateVariable;
|
||||
default:
|
||||
return TxDetailsGeneric;
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@ export const TxDetailsGeneric = ({
|
||||
}
|
||||
|
||||
return (
|
||||
<TableWithTbody className="mb-8" allowWrap={true}>
|
||||
<TableWithTbody className="mb-8">
|
||||
<TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
|
||||
</TableWithTbody>
|
||||
);
|
||||
|
||||
@@ -60,7 +60,7 @@ export const TxDetailsHeartbeat = ({
|
||||
const blockHeight = txData.command.blockHeight || '';
|
||||
|
||||
return (
|
||||
<TableWithTbody className="mb-8" allowWrap={true}>
|
||||
<TableWithTbody className="mb-8">
|
||||
<TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
|
||||
<TableRow modifier="bordered">
|
||||
<TableCell>{t('Node')}</TableCell>
|
||||
|
||||
@@ -36,7 +36,7 @@ export const TxDetailsLiquidityAmendment = ({
|
||||
|
||||
return (
|
||||
<>
|
||||
<TableWithTbody className="mb-8" allowWrap={true}>
|
||||
<TableWithTbody className="mb-8">
|
||||
<TxDetailsShared
|
||||
txData={txData}
|
||||
pubKey={pubKey}
|
||||
|
||||
@@ -37,7 +37,7 @@ export const TxDetailsLiquidityCancellation = ({
|
||||
const marketId: string = cancel.marketId || '-';
|
||||
|
||||
return (
|
||||
<TableWithTbody className="mb-8" allowWrap={true}>
|
||||
<TableWithTbody className="mb-8">
|
||||
<TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
|
||||
<TableRow modifier="bordered">
|
||||
<TableCell>{t('Market')}</TableCell>
|
||||
|
||||
@@ -35,7 +35,7 @@ export const TxDetailsLiquiditySubmission = ({
|
||||
|
||||
return (
|
||||
<>
|
||||
<TableWithTbody className="mb-8" allowWrap={true}>
|
||||
<TableWithTbody className="mb-8">
|
||||
<TxDetailsShared
|
||||
txData={txData}
|
||||
pubKey={pubKey}
|
||||
|
||||
@@ -42,7 +42,7 @@ export const TxDetailsNodeVote = ({
|
||||
}
|
||||
|
||||
return (
|
||||
<TableWithTbody className="mb-8" allowWrap={true}>
|
||||
<TableWithTbody className="mb-8">
|
||||
<TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
|
||||
{data && !!data.deposit
|
||||
? TxDetailsNodeVoteDeposit({ deposit: data })
|
||||
|
||||
@@ -29,7 +29,7 @@ export const TxDetailsOrderAmend = ({
|
||||
|
||||
return (
|
||||
<>
|
||||
<TableWithTbody className="mb-8" allowWrap={true}>
|
||||
<TableWithTbody className="mb-8">
|
||||
<TxDetailsShared
|
||||
txData={txData}
|
||||
pubKey={pubKey}
|
||||
|
||||
@@ -29,7 +29,7 @@ export const TxDetailsOrderCancel = ({
|
||||
|
||||
return (
|
||||
<>
|
||||
<TableWithTbody className="mb-8" allowWrap={true}>
|
||||
<TableWithTbody className="mb-8">
|
||||
<TxDetailsShared
|
||||
txData={txData}
|
||||
pubKey={pubKey}
|
||||
|
||||
@@ -39,7 +39,7 @@ export const TxDetailsOrder = ({
|
||||
|
||||
return (
|
||||
<>
|
||||
<TableWithTbody className="mb-8" allowWrap={true}>
|
||||
<TableWithTbody className="mb-8">
|
||||
<TxDetailsShared
|
||||
txData={txData}
|
||||
pubKey={pubKey}
|
||||
|
||||
@@ -32,7 +32,7 @@ export const TxProposalVote = ({
|
||||
|
||||
const vote = txData.command.voteSubmission.value ? '👍' : '👎';
|
||||
return (
|
||||
<TableWithTbody className="mb-8" allowWrap={true}>
|
||||
<TableWithTbody className="mb-8">
|
||||
<TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
|
||||
<TableRow modifier="bordered">
|
||||
<TableCell>{t('Proposal ID')}</TableCell>
|
||||
|
||||
@@ -1,57 +0,0 @@
|
||||
import {
|
||||
hackyGetMarketFromStateVariable,
|
||||
hackyGetVariableFromStateVariable,
|
||||
} from './tx-state-variable-proposal';
|
||||
|
||||
describe('Hacky Get market from state variable', () => {
|
||||
it('Extracts a market id from a known state variable proposal id', () => {
|
||||
const knownId =
|
||||
'84fff099818dc4f5319477f0812b4341565cfb32ccf735beede734e386b8108f_5d69ff4a485a9f963272c8614c1d0d84bb8ea57886f5b11aad53f0ccc77731ba_probability_of_trading';
|
||||
const res = hackyGetMarketFromStateVariable(knownId);
|
||||
expect(res).toEqual(
|
||||
'5d69ff4a485a9f963272c8614c1d0d84bb8ea57886f5b11aad53f0ccc77731ba'
|
||||
);
|
||||
});
|
||||
|
||||
it('Returns null if the string looks a bit like the known one, but with different segments', () => {
|
||||
const knownId =
|
||||
'5d69ff4a485a9f963272c8614c1d0d84bb8ea57886f5b11aad53f0ccc77731ba_probability_of_trading';
|
||||
const res = hackyGetMarketFromStateVariable(knownId);
|
||||
expect(res).toEqual(null);
|
||||
});
|
||||
|
||||
it('Handles empty/weird data', () => {
|
||||
expect(hackyGetMarketFromStateVariable(null as unknown as string)).toEqual(
|
||||
null
|
||||
);
|
||||
expect(hackyGetMarketFromStateVariable('')).toEqual(null);
|
||||
expect(
|
||||
hackyGetMarketFromStateVariable(undefined as unknown as string)
|
||||
).toEqual(null);
|
||||
expect(hackyGetMarketFromStateVariable(2 as unknown as string)).toEqual(
|
||||
null
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe('Hacky Get Variable from state variable proposal id', () => {
|
||||
it('Extracts an variable name from a known state variable proposal id', () => {
|
||||
const knownId =
|
||||
'84fff099818dc4f5319477f0812b4341565cfb32ccf735beede734e386b8108f_5d69ff4a485a9f963272c8614c1d0d84bb8ea57886f5b11aad53f0ccc77731ba_probability_of_trading';
|
||||
const res = hackyGetVariableFromStateVariable(knownId);
|
||||
expect(res).toEqual('probability of trading');
|
||||
});
|
||||
|
||||
it('Handles empty/weird data', () => {
|
||||
expect(
|
||||
hackyGetVariableFromStateVariable(null as unknown as string)
|
||||
).toEqual(null);
|
||||
expect(hackyGetVariableFromStateVariable('')).toEqual(null);
|
||||
expect(
|
||||
hackyGetVariableFromStateVariable(undefined as unknown as string)
|
||||
).toEqual(null);
|
||||
expect(hackyGetVariableFromStateVariable(2 as unknown as string)).toEqual(
|
||||
null
|
||||
);
|
||||
});
|
||||
});
|
||||
@@ -1,113 +0,0 @@
|
||||
import { t } from '@vegaprotocol/react-helpers';
|
||||
import { TxDetailsShared } from './shared/tx-details-shared';
|
||||
import { TableCell, TableRow, TableWithTbody } from '../../table';
|
||||
import { MarketLink } from '../../links';
|
||||
|
||||
import type { components } from '../../../../types/explorer';
|
||||
import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
|
||||
import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
|
||||
import { StateVariableProposalWrapper } from './state-variable/data-wrapper';
|
||||
|
||||
interface TxDetailsStateVariableProps {
|
||||
txData: BlockExplorerTransactionResult | undefined;
|
||||
pubKey: string | undefined;
|
||||
blockData: TendermintBlocksResponse | undefined;
|
||||
}
|
||||
|
||||
/**
|
||||
* There is no market ID in the event, but it appears to be encoded in to the variable
|
||||
* ID so let's pull it out. MarketLink component will handle if it isn't a real market.
|
||||
*
|
||||
* Given how liable to break this is, it's wrapped in a try catch
|
||||
*
|
||||
* @param stateVarId The full state variable proposal variable name
|
||||
* @returns null or a string market id
|
||||
*/
|
||||
export function hackyGetMarketFromStateVariable(
|
||||
stateVarId?: string
|
||||
): string | null {
|
||||
try {
|
||||
const res = stateVarId ? stateVarId.split('_')[1] : null;
|
||||
return res && res.length === 64 ? res : null;
|
||||
} catch (e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* There is no event name in the event, but it appears to be encoded in to the variable
|
||||
* ID so let's pull it out. Will display nothing if it doesn't parse as expected
|
||||
*
|
||||
* Given how liable to break this is, it's wrapped in a try catch
|
||||
*
|
||||
* @param stateVarId The full state variable proposal variable name
|
||||
* @returns null or a string variable name
|
||||
*/
|
||||
export function hackyGetVariableFromStateVariable(
|
||||
stateVarId?: string
|
||||
): string | null {
|
||||
try {
|
||||
if (!stateVarId) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return stateVarId.split('_').slice(2).join(' ').replace('-', ' ');
|
||||
} catch (e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* State Variable proposals
|
||||
*/
|
||||
export const TxDetailsStateVariable = ({
|
||||
txData,
|
||||
pubKey,
|
||||
blockData,
|
||||
}: TxDetailsStateVariableProps) => {
|
||||
if (!txData) {
|
||||
return <>{t('Awaiting Block Explorer transaction details')}</>;
|
||||
}
|
||||
|
||||
const command: components['schemas']['v1StateVariableProposal'] =
|
||||
txData.command.stateVariableProposal;
|
||||
|
||||
const variable = hackyGetVariableFromStateVariable(
|
||||
command.proposal?.stateVarId
|
||||
);
|
||||
const marketId = hackyGetMarketFromStateVariable(
|
||||
command.proposal?.stateVarId
|
||||
);
|
||||
|
||||
return (
|
||||
<>
|
||||
<TableWithTbody className="mb-8" allowWrap={true}>
|
||||
<TxDetailsShared
|
||||
txData={txData}
|
||||
pubKey={pubKey}
|
||||
blockData={blockData}
|
||||
/>
|
||||
{marketId ? (
|
||||
<TableRow modifier="bordered">
|
||||
<TableCell>{t('Market')}</TableCell>
|
||||
<TableCell>
|
||||
<MarketLink id={marketId} />
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
) : null}
|
||||
<TableRow modifier="bordered">
|
||||
<TableCell>{t('Variable')}</TableCell>
|
||||
<TableCell className="capitalize">
|
||||
<span>{variable}</span>
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
</TableWithTbody>
|
||||
<section>
|
||||
<StateVariableProposalWrapper
|
||||
stateVariable={command.proposal?.stateVarId}
|
||||
kvb={command.proposal?.kvb}
|
||||
/>
|
||||
</section>
|
||||
</>
|
||||
);
|
||||
};
|
||||
@@ -46,7 +46,7 @@ export const TxDetailsUndelegate = ({
|
||||
txData.command.undelegateSubmission;
|
||||
|
||||
return (
|
||||
<TableWithTbody className="mb-8" allowWrap={true}>
|
||||
<TableWithTbody className="mb-8">
|
||||
<TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
|
||||
{u.nodeId ? (
|
||||
<TableRow modifier="bordered">
|
||||
|
||||
@@ -41,7 +41,7 @@ export const TxDetailsWithdrawSubmission = ({
|
||||
|
||||
return (
|
||||
<>
|
||||
<TableWithTbody className="mb-8" allowWrap={true}>
|
||||
<TableWithTbody className="mb-8">
|
||||
<TxDetailsShared
|
||||
txData={txData}
|
||||
pubKey={pubKey}
|
||||
|
||||
@@ -98,13 +98,24 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"tranche_id": 53,
|
||||
"tranche_start": "2023-03-06T00:00:00.000Z",
|
||||
"tranche_end": "2023-04-06T00:00:00.000Z",
|
||||
"total_added": "0",
|
||||
"total_removed": "0",
|
||||
"locked_amount": "0",
|
||||
"deposits": [],
|
||||
"withdrawals": [],
|
||||
"users": []
|
||||
},
|
||||
{
|
||||
"tranche_id": 49,
|
||||
"tranche_start": "2022-12-05T00:00:00.000Z",
|
||||
"tranche_end": "2023-12-05T00:00:00.000Z",
|
||||
"total_added": "86666.297",
|
||||
"total_removed": "0",
|
||||
"locked_amount": "71172.1900799821150969076",
|
||||
"locked_amount": "71112.3321837696257405828",
|
||||
"deposits": [
|
||||
{
|
||||
"amount": "86666.297",
|
||||
@@ -170,7 +181,7 @@
|
||||
"tranche_end": "2023-06-01T00:00:00.000Z",
|
||||
"total_added": "2500",
|
||||
"total_removed": "0",
|
||||
"locked_amount": "1548.704594017094",
|
||||
"locked_amount": "1545.241751882377",
|
||||
"deposits": [
|
||||
{
|
||||
"amount": "2500",
|
||||
@@ -558,7 +569,7 @@
|
||||
"tranche_end": "2023-08-01T00:00:00.000Z",
|
||||
"total_added": "37500",
|
||||
"total_removed": "183.137181525",
|
||||
"locked_amount": "35997.0361418047875",
|
||||
"locked_amount": "35944.80653391651375",
|
||||
"deposits": [
|
||||
{
|
||||
"amount": "7500",
|
||||
@@ -624,7 +635,7 @@
|
||||
"tranche_end": "2023-12-05T00:00:00.000Z",
|
||||
"total_added": "129999.45",
|
||||
"total_removed": "0",
|
||||
"locked_amount": "71107.254411762464072205",
|
||||
"locked_amount": "71047.451128348659886215",
|
||||
"deposits": [
|
||||
{
|
||||
"amount": "129999.45",
|
||||
@@ -690,7 +701,7 @@
|
||||
"tranche_end": "2023-09-03T00:00:00.000Z",
|
||||
"total_added": "62600",
|
||||
"total_removed": "0",
|
||||
"locked_amount": "35458.30266362252656",
|
||||
"locked_amount": "35415.06666032470672",
|
||||
"deposits": [
|
||||
{
|
||||
"amount": "10000",
|
||||
@@ -883,7 +894,7 @@
|
||||
"tranche_end": "2023-09-17T00:00:00.000Z",
|
||||
"total_added": "5000",
|
||||
"total_removed": "0",
|
||||
"locked_amount": "3023.913622526636",
|
||||
"locked_amount": "3020.4602676306445",
|
||||
"deposits": [
|
||||
{
|
||||
"amount": "5000",
|
||||
@@ -1094,7 +1105,7 @@
|
||||
"tranche_end": "2023-04-05T00:00:00.000Z",
|
||||
"total_added": "97499.58",
|
||||
"total_removed": "0",
|
||||
"locked_amount": "12971.7942604813033430448",
|
||||
"locked_amount": "12913.1328103802082906612",
|
||||
"deposits": [
|
||||
{
|
||||
"amount": "97499.58",
|
||||
@@ -1127,7 +1138,7 @@
|
||||
"tranche_end": "2023-04-05T00:00:00.000Z",
|
||||
"total_added": "135173.4239508",
|
||||
"total_removed": "98230.390980249184455396",
|
||||
"locked_amount": "17730.203267225049376980811848",
|
||||
"locked_amount": "17650.023192413700622871272848",
|
||||
"deposits": [
|
||||
{
|
||||
"amount": "135173.4239508",
|
||||
@@ -1173,7 +1184,7 @@
|
||||
"tranche_end": "2023-04-05T00:00:00.000Z",
|
||||
"total_added": "32499.86",
|
||||
"total_removed": "0",
|
||||
"locked_amount": "5457.0098344795841878884",
|
||||
"locked_amount": "5432.3319754511083747504",
|
||||
"deposits": [
|
||||
{
|
||||
"amount": "32499.86",
|
||||
@@ -1206,7 +1217,7 @@
|
||||
"tranche_end": "2023-04-05T00:00:00.000Z",
|
||||
"total_added": "10833.29",
|
||||
"total_removed": "0",
|
||||
"locked_amount": "1776.2037475531047139428",
|
||||
"locked_amount": "1768.171343907611431555",
|
||||
"deposits": [
|
||||
{
|
||||
"amount": "10833.29",
|
||||
@@ -1239,7 +1250,7 @@
|
||||
"tranche_end": "2023-04-05T00:00:00.000Z",
|
||||
"total_added": "22749.93",
|
||||
"total_removed": "0",
|
||||
"locked_amount": "6639.846316295812322976",
|
||||
"locked_amount": "6609.8193974640044998578",
|
||||
"deposits": [
|
||||
{
|
||||
"amount": "6500",
|
||||
@@ -1378,7 +1389,7 @@
|
||||
"tranche_end": "2023-05-01T00:00:00.000Z",
|
||||
"total_added": "22500",
|
||||
"total_removed": "3995.28612255",
|
||||
"locked_amount": "10161.75759668508375",
|
||||
"locked_amount": "10130.41983195211725",
|
||||
"deposits": [
|
||||
{
|
||||
"amount": "7500",
|
||||
@@ -1576,7 +1587,7 @@
|
||||
"tranche_end": "2023-06-02T00:00:00.000Z",
|
||||
"total_added": "1939928.38",
|
||||
"total_removed": "928642.9598472029154",
|
||||
"locked_amount": "604543.837686537201986533",
|
||||
"locked_amount": "603203.9854527480689673466",
|
||||
"deposits": [
|
||||
{
|
||||
"amount": "1852091.69",
|
||||
@@ -33558,8 +33569,8 @@
|
||||
"tranche_start": "2022-03-05T00:00:00.000Z",
|
||||
"tranche_end": "2023-06-05T00:00:00.000Z",
|
||||
"total_added": "3732368.4671",
|
||||
"total_removed": "589730.8667090699299",
|
||||
"locked_amount": "953474.62891778338628861474",
|
||||
"total_removed": "592998.0503546212334",
|
||||
"locked_amount": "951415.83704816660962319369",
|
||||
"deposits": [
|
||||
{
|
||||
"amount": "1998.95815",
|
||||
@@ -33738,6 +33749,11 @@
|
||||
"user": "0xE6CacAE56Cca8dFdB7910b5A13578719D4E57DA0",
|
||||
"tx": "0x8a19d30e4686bca650aa1c4e84a82d8a16d607e07828706cb758a6e17cab0190"
|
||||
},
|
||||
{
|
||||
"amount": "3267.1836455513035",
|
||||
"user": "0xE6CacAE56Cca8dFdB7910b5A13578719D4E57DA0",
|
||||
"tx": "0x96af4603ea4ac4ce4585d25325fd739e2380e315175e181c8ac5aec899e5861c"
|
||||
},
|
||||
{
|
||||
"amount": "2536.282963529438",
|
||||
"user": "0xE6CacAE56Cca8dFdB7910b5A13578719D4E57DA0",
|
||||
@@ -34093,6 +34109,12 @@
|
||||
"tranche_id": 1,
|
||||
"tx": "0x8a19d30e4686bca650aa1c4e84a82d8a16d607e07828706cb758a6e17cab0190"
|
||||
},
|
||||
{
|
||||
"amount": "3267.1836455513035",
|
||||
"user": "0xE6CacAE56Cca8dFdB7910b5A13578719D4E57DA0",
|
||||
"tranche_id": 1,
|
||||
"tx": "0x96af4603ea4ac4ce4585d25325fd739e2380e315175e181c8ac5aec899e5861c"
|
||||
},
|
||||
{
|
||||
"amount": "2536.282963529438",
|
||||
"user": "0xE6CacAE56Cca8dFdB7910b5A13578719D4E57DA0",
|
||||
@@ -34359,8 +34381,8 @@
|
||||
}
|
||||
],
|
||||
"total_tokens": "187637.95",
|
||||
"withdrawn_tokens": "136494.1152043067095",
|
||||
"remaining_tokens": "51143.8347956932905"
|
||||
"withdrawn_tokens": "139761.298849858013",
|
||||
"remaining_tokens": "47876.651150141987"
|
||||
},
|
||||
{
|
||||
"address": "0x1A71e3ED1996CAbB91bB043f880CE963D601707e",
|
||||
@@ -34873,8 +34895,8 @@
|
||||
"tranche_start": "2022-06-05T00:00:00.000Z",
|
||||
"tranche_end": "2023-12-05T00:00:00.000Z",
|
||||
"total_added": "15870102.715470999700000001",
|
||||
"total_removed": "560317.67585805941693952",
|
||||
"locked_amount": "8680647.4008609011096496602104470331211138",
|
||||
"total_removed": "560497.18500562348693952",
|
||||
"locked_amount": "8673347.0570783123228140520127045570383887",
|
||||
"deposits": [
|
||||
{
|
||||
"amount": "16249.93",
|
||||
@@ -35448,6 +35470,11 @@
|
||||
"user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
|
||||
"tx": "0xb6a33b8b8855789fbc2d0f9545ba5c2258e52f143d90bc75bbe2411bd2f9b4a5"
|
||||
},
|
||||
{
|
||||
"amount": "179.50914756407",
|
||||
"user": "0xE6CacAE56Cca8dFdB7910b5A13578719D4E57DA0",
|
||||
"tx": "0x86280b4d0cccc9e251d0f18fce5af974d0e1fb31a1aaf219725a27efb0d607f4"
|
||||
},
|
||||
{
|
||||
"amount": "858.360074993579125",
|
||||
"user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
|
||||
@@ -39471,6 +39498,12 @@
|
||||
"tranche_id": 2,
|
||||
"tx": "0xeb5f2401c9402d58fa4a7549ce2045a48a2c3b90ec6e812ca2f0059f1275e213"
|
||||
},
|
||||
{
|
||||
"amount": "179.50914756407",
|
||||
"user": "0xE6CacAE56Cca8dFdB7910b5A13578719D4E57DA0",
|
||||
"tranche_id": 2,
|
||||
"tx": "0x86280b4d0cccc9e251d0f18fce5af974d0e1fb31a1aaf219725a27efb0d607f4"
|
||||
},
|
||||
{
|
||||
"amount": "139.3487773806265",
|
||||
"user": "0xE6CacAE56Cca8dFdB7910b5A13578719D4E57DA0",
|
||||
@@ -39719,8 +39752,8 @@
|
||||
}
|
||||
],
|
||||
"total_tokens": "12362.05",
|
||||
"withdrawn_tokens": "5423.9024394185135",
|
||||
"remaining_tokens": "6938.1475605814865"
|
||||
"withdrawn_tokens": "5603.4115869825835",
|
||||
"remaining_tokens": "6758.6384130174165"
|
||||
},
|
||||
{
|
||||
"address": "0xb091D456d0dFCB94dcba6f355379056C5bb995fC",
|
||||
@@ -40352,7 +40385,7 @@
|
||||
"tranche_end": "2023-05-05T00:00:00.000Z",
|
||||
"total_added": "14597706.0446472999",
|
||||
"total_removed": "3921707.576409189114087282",
|
||||
"locked_amount": "2292473.027727501476908220604423147",
|
||||
"locked_amount": "2285733.39696055204772238928937325",
|
||||
"deposits": [
|
||||
{
|
||||
"amount": "129284.449",
|
||||
@@ -47188,7 +47221,7 @@
|
||||
"tranche_end": "2023-04-05T00:00:00.000Z",
|
||||
"total_added": "5778205.3912159303",
|
||||
"total_removed": "2730068.739915456784546642",
|
||||
"locked_amount": "588866.554476394378569370609352176",
|
||||
"locked_amount": "586203.563337309134341622543222115",
|
||||
"deposits": [
|
||||
{
|
||||
"amount": "552496.6455",
|
||||
@@ -49170,8 +49203,8 @@
|
||||
"tranche_start": "2022-06-05T00:00:00.000Z",
|
||||
"tranche_end": "2023-06-05T00:00:00.000Z",
|
||||
"total_added": "472355.6199999996",
|
||||
"total_removed": "32476.7515062512685",
|
||||
"locked_amount": "151083.50524536200128704962151192",
|
||||
"total_removed": "32520.5457984892685",
|
||||
"locked_amount": "150757.26292676673422831001319128",
|
||||
"deposits": [
|
||||
{
|
||||
"amount": "3000",
|
||||
@@ -55840,6 +55873,11 @@
|
||||
"user": "0x4eD2b3c68BB4fda084ce1591a210F4aC8b71234A",
|
||||
"tx": "0xc0f953d7ecc45bfc1d7b69ecd491a63e8b00b0d732ff006bee008e917a04179f"
|
||||
},
|
||||
{
|
||||
"amount": "43.794292238",
|
||||
"user": "0x916E6Ce65e828e725Affdeda2C0a083071188109",
|
||||
"tx": "0xdad3bca9bdda18abd6bbed7c1d618f60316bafc507591966b7a86bed3dc36b39"
|
||||
},
|
||||
{
|
||||
"amount": "78.261187214",
|
||||
"user": "0x479F059c46c6873C6B970A92911084b3eA036d56",
|
||||
@@ -75978,6 +76016,12 @@
|
||||
}
|
||||
],
|
||||
"withdrawals": [
|
||||
{
|
||||
"amount": "43.794292238",
|
||||
"user": "0x916E6Ce65e828e725Affdeda2C0a083071188109",
|
||||
"tranche_id": 5,
|
||||
"tx": "0xdad3bca9bdda18abd6bbed7c1d618f60316bafc507591966b7a86bed3dc36b39"
|
||||
},
|
||||
{
|
||||
"amount": "11.442313546",
|
||||
"user": "0x916E6Ce65e828e725Affdeda2C0a083071188109",
|
||||
@@ -75992,8 +76036,8 @@
|
||||
}
|
||||
],
|
||||
"total_tokens": "200",
|
||||
"withdrawn_tokens": "92.326249364",
|
||||
"remaining_tokens": "107.673750636"
|
||||
"withdrawn_tokens": "136.120541602",
|
||||
"remaining_tokens": "63.879458398"
|
||||
},
|
||||
{
|
||||
"address": "0x93D9D57409e0a1fD340b270Cd41368cc66392249",
|
||||
|
||||
@@ -32,11 +32,14 @@ const usdcSymbol = 'fUSDC';
|
||||
const toastContent = 'toast-content';
|
||||
const ordersTab = 'Orders';
|
||||
const depositsTab = 'Deposits';
|
||||
const collateralTab = 'Collateral';
|
||||
const toastCloseBtn = 'toast-close';
|
||||
const price = '390';
|
||||
const size = '0.0005';
|
||||
const newPrice = '200';
|
||||
const completeWithdrawalBtn = 'complete-withdrawal';
|
||||
const submitTransferBtn = '[type="submit"]';
|
||||
const transferForm = 'transfer-form';
|
||||
|
||||
// Because the tests are run on a live network to optimize time, the tests are interdependent and must be run in the given order.
|
||||
describe('capsule - without MultiSign', { tags: '@slow' }, () => {
|
||||
@@ -105,12 +108,39 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
|
||||
});
|
||||
});
|
||||
|
||||
it('can key to key transfers', function () {
|
||||
cy.visit('/#/portfolio');
|
||||
cy.get('main[data-testid="/portfolio"]').should('exist');
|
||||
|
||||
cy.getByTestId(collateralTab).click();
|
||||
cy.getByTestId('open-transfer-dialog').click();
|
||||
cy.getByTestId('transfer-form').should('be.visible');
|
||||
cy.getByTestId('transfer-form').find('[name="toAddress"]').select(1);
|
||||
cy.get('select option')
|
||||
.contains('BTC')
|
||||
.invoke('index')
|
||||
.then((index) => {
|
||||
cy.get(assetSelectField).select(index, { force: true });
|
||||
});
|
||||
cy.getByTestId(transferForm)
|
||||
.find(amountField)
|
||||
.focus()
|
||||
.type('1', { delay: 100 });
|
||||
cy.getByTestId(transferForm).find(submitTransferBtn).click();
|
||||
cy.getByTestId(toastContent).should(
|
||||
'contain.text',
|
||||
'Transfer completeYour transaction has been confirmed TransferTo 7f9cf0…c255351.00 tBTC'
|
||||
);
|
||||
cy.getByTestId(toastCloseBtn).click();
|
||||
});
|
||||
|
||||
it('can not withdrawal because of no MultiSign', function () {
|
||||
// 1002-WITH-022
|
||||
// 1002-WITH-023
|
||||
|
||||
cy.getByTestId('Withdrawals').click();
|
||||
cy.getByTestId('withdraw-dialog-button').click();
|
||||
connectEthereumWallet('Unknown');
|
||||
cy.get(assetSelectField, txTimeout).select(btcName, { force: true });
|
||||
cy.get(amountField).clear().type('1');
|
||||
cy.getByTestId('submit-withdrawal').click();
|
||||
@@ -118,7 +148,7 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
|
||||
'contain.text',
|
||||
'Funds unlocked'
|
||||
);
|
||||
|
||||
cy.getByTestId(toastCloseBtn).click();
|
||||
cy.getByTestId('tab-withdrawals').within(() => {
|
||||
cy.get('.ag-center-cols-container')
|
||||
.children()
|
||||
@@ -135,6 +165,7 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
|
||||
'contain.text',
|
||||
'Error occurredprocessing response error'
|
||||
);
|
||||
cy.getByTestId(toastCloseBtn).click({ multiple: true });
|
||||
cy.getByTestId(completeWithdrawalBtn).should(
|
||||
'contain.text',
|
||||
'Complete withdrawal'
|
||||
@@ -227,8 +258,8 @@ describe('capsule', { tags: '@slow' }, () => {
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
it('can edit order', function () {
|
||||
// comment because of bug #2695
|
||||
it.skip('can edit order', function () {
|
||||
cy.getByTestId(ordersTab).click();
|
||||
cy.getByTestId('edit').first().should('be.visible').click();
|
||||
cy.getByTestId('dialog-title').should('contain.text', 'Edit order');
|
||||
@@ -253,8 +284,8 @@ describe('capsule', { tags: '@slow' }, () => {
|
||||
checkIfDataAndTimeOfCreationAndUpdateIsEqual(orderUpdatedAt);
|
||||
});
|
||||
});
|
||||
|
||||
it('can cancel order', function () {
|
||||
// comment because of bug #2695
|
||||
it.skip('can cancel order', function () {
|
||||
cy.getByTestId(ordersTab).click();
|
||||
cy.getByTestId('cancel').first().click();
|
||||
cy.getByTestId(toastContent).should(
|
||||
@@ -301,7 +332,6 @@ describe('capsule', { tags: '@slow' }, () => {
|
||||
'contain.text',
|
||||
'Funds unlocked'
|
||||
);
|
||||
|
||||
cy.getByTestId('tab-withdrawals').within(() => {
|
||||
cy.get('.ag-center-cols-container')
|
||||
.children()
|
||||
@@ -318,8 +348,19 @@ describe('capsule', { tags: '@slow' }, () => {
|
||||
'contain.text',
|
||||
'Transaction confirmed'
|
||||
);
|
||||
cy.getByTestId(toastCloseBtn).click({ multiple: true });
|
||||
|
||||
cy.getByTestId(completeWithdrawalBtn).eq(0, txTimeout).should('not.exist');
|
||||
cy.wrap(null).then(() => {
|
||||
try {
|
||||
cy.getByTestId(completeWithdrawalBtn)
|
||||
.eq(0, txTimeout)
|
||||
.should('not.exist');
|
||||
} catch (error) {
|
||||
console.log(
|
||||
'Assertion failed, but we are continuing because this is our wait to complete transaction'
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
cy.get('[col-id="txHash"]', txTimeout)
|
||||
.should('have.length.above', 1)
|
||||
|
||||
@@ -0,0 +1,132 @@
|
||||
import { selectAsset } from '../support/helpers';
|
||||
|
||||
const formFieldError = 'input-error-text';
|
||||
const toAddressField = '[name="toAddress"]';
|
||||
const amountField = 'input[name="amount"]';
|
||||
const submitTransferBtn = '[type="submit"]';
|
||||
const transferForm = 'transfer-form';
|
||||
const errorText = 'input-error-text';
|
||||
const openTransferDialog = 'open-transfer-dialog';
|
||||
const closeDialog = 'dialog-close';
|
||||
const dialogTransferText = 'dialog-transfer-text';
|
||||
|
||||
const ASSET_SEPOLIA_TBTC = 2;
|
||||
const ASSET_EURO = 1;
|
||||
|
||||
const toastContent = 'toast-content';
|
||||
const collateralTab = 'Collateral';
|
||||
const toastCloseBtn = 'toast-close';
|
||||
|
||||
describe(
|
||||
'transfer form validation and transfer from options',
|
||||
{ tags: '@smoke' },
|
||||
() => {
|
||||
before(() => {
|
||||
cy.mockWeb3Provider();
|
||||
cy.mockTradingPage();
|
||||
cy.mockSubscription();
|
||||
cy.setVegaWallet();
|
||||
|
||||
cy.visit('/#/portfolio');
|
||||
cy.getByTestId(collateralTab).click();
|
||||
cy.getByTestId(openTransferDialog).click();
|
||||
|
||||
cy.wait('@Accounts');
|
||||
cy.wait('@Assets');
|
||||
});
|
||||
|
||||
it('empty fields', () => {
|
||||
cy.getByTestId(transferForm).find(submitTransferBtn).click();
|
||||
|
||||
cy.getByTestId(formFieldError).should('contain.text', 'Required');
|
||||
// only 2 despite 3 fields because the ethereum address will be auto populated
|
||||
cy.getByTestId(formFieldError).should('have.length', 3);
|
||||
});
|
||||
it('min amount', () => {
|
||||
// 1002-WITH-010
|
||||
selectAsset(ASSET_SEPOLIA_TBTC);
|
||||
cy.get(amountField).clear().type('0');
|
||||
cy.getByTestId(transferForm).find(submitTransferBtn).click();
|
||||
cy.getByTestId(errorText).should(
|
||||
'contain.text',
|
||||
'Value is below minimum'
|
||||
);
|
||||
});
|
||||
it('max amount', () => {
|
||||
selectAsset(ASSET_EURO); // Will be above maximum because the vega wallet doesn't have any collateral
|
||||
cy.get(amountField).clear().type('1001', { delay: 100 });
|
||||
cy.getByTestId(transferForm).find(submitTransferBtn).click();
|
||||
cy.getByTestId(errorText).should(
|
||||
'contain.text',
|
||||
'You cannot transfer more than your available collateral'
|
||||
);
|
||||
});
|
||||
|
||||
it('can start transfer from vega wallet', () => {
|
||||
cy.getByTestId(closeDialog).click();
|
||||
cy.getByTestId('manage-vega-wallet').click();
|
||||
cy.getByTestId('wallet-transfer').should('have.text', 'Transfer').click();
|
||||
cy.getByTestId(dialogTransferText).should(
|
||||
'contain.text',
|
||||
'Transfer funds to another Vega key from 02ecea…342f65 If you are at all unsure, stop and seek advice.'
|
||||
);
|
||||
});
|
||||
|
||||
it('can start transfer from trading collateral table', () => {
|
||||
cy.getByTestId(closeDialog).click();
|
||||
cy.getByTestId('Trading').first().click();
|
||||
cy.getByTestId(collateralTab).click();
|
||||
cy.getByTestId(openTransferDialog).click();
|
||||
cy.getByTestId(dialogTransferText).should(
|
||||
'contain.text',
|
||||
'Transfer funds to another Vega key from 02ecea…342f65 If you are at all unsure, stop and seek advice.'
|
||||
);
|
||||
});
|
||||
}
|
||||
);
|
||||
|
||||
describe('withdraw actions', { tags: '@regression' }, () => {
|
||||
beforeEach(() => {
|
||||
cy.mockWeb3Provider();
|
||||
cy.mockTradingPage();
|
||||
cy.mockSubscription();
|
||||
cy.setVegaWallet();
|
||||
|
||||
cy.visit('/#/portfolio');
|
||||
cy.getByTestId(collateralTab).click();
|
||||
cy.getByTestId(openTransferDialog).click();
|
||||
|
||||
cy.wait('@Accounts');
|
||||
cy.wait('@Assets');
|
||||
cy.mockVegaWalletTransaction();
|
||||
});
|
||||
|
||||
it('key to key transfers by select key', function () {
|
||||
cy.getByTestId(transferForm).should('be.visible');
|
||||
cy.getByTestId(transferForm).find(toAddressField).select(1);
|
||||
selectAsset(ASSET_SEPOLIA_TBTC);
|
||||
cy.getByTestId(transferForm).find(amountField).type('1', { delay: 100 });
|
||||
cy.getByTestId(transferForm).find(submitTransferBtn).click();
|
||||
cy.getByTestId(toastContent).should(
|
||||
'contain.text',
|
||||
'Awaiting confirmation'
|
||||
);
|
||||
cy.getByTestId(toastCloseBtn).click();
|
||||
});
|
||||
|
||||
it('key to key transfers by enter manual key', function () {
|
||||
cy.getByTestId(transferForm).should('be.visible');
|
||||
cy.contains('Enter manually').click();
|
||||
cy.getByTestId(transferForm)
|
||||
.find(toAddressField)
|
||||
.type('7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535');
|
||||
selectAsset(ASSET_SEPOLIA_TBTC);
|
||||
cy.getByTestId(transferForm).find(amountField).type('1', { delay: 100 });
|
||||
cy.getByTestId(transferForm).find(submitTransferBtn).click();
|
||||
cy.getByTestId(toastContent).should(
|
||||
'contain.text',
|
||||
'Awaiting confirmation'
|
||||
);
|
||||
cy.getByTestId(toastCloseBtn).click();
|
||||
});
|
||||
});
|
||||
@@ -43,7 +43,11 @@ export const AccountsContainer = () => {
|
||||
</div>
|
||||
{!isReadOnly && (
|
||||
<div className="flex gap-2 justify-end p-2 px-[11px]">
|
||||
<Button size="sm" onClick={() => openTransferDialog()}>
|
||||
<Button
|
||||
size="sm"
|
||||
data-testid="open-transfer-dialog"
|
||||
onClick={() => openTransferDialog()}
|
||||
>
|
||||
{t('Transfer')}
|
||||
</Button>
|
||||
<Button size="sm" onClick={() => openDepositDialog()}>
|
||||
|
||||
@@ -185,7 +185,10 @@ export const VegaWalletConnectButton = () => {
|
||||
))}
|
||||
</DropdownMenuRadioGroup>
|
||||
<DropdownMenuSeparator />
|
||||
<DropdownMenuItem onClick={() => openTransferDialog(true)}>
|
||||
<DropdownMenuItem
|
||||
data-testid="wallet-transfer"
|
||||
onClick={() => openTransferDialog(true)}
|
||||
>
|
||||
{t('Transfer')}
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuItem data-testid="disconnect" onClick={disconnect}>
|
||||
|
||||
@@ -51,7 +51,7 @@ export const TransferContainer = () => {
|
||||
|
||||
return (
|
||||
<>
|
||||
<p className="text-sm mb-4">
|
||||
<p className="text-sm mb-4" data-testid="dialog-transfer-text">
|
||||
{t('Transfer funds to another Vega key from')}{' '}
|
||||
<Lozenge className="font-mono">{truncateByChars(pubKey || '')}</Lozenge>{' '}
|
||||
{t('If you are at all unsure, stop and seek advice.')}
|
||||
|
||||
Reference in New Issue
Block a user