Compare commits

...
Author SHA1 Message Date
Matthew Russell 4381463c6b fix: connect wallet before mobile view test for console-lite 2022-12-30 09:15:31 -08:00
Matthew Russell b468172522 chore: fix typescript error 2022-12-30 08:33:44 -08:00
Matthew Russell 9f5255f54a fix: amend and cancel order tests, global connect tests 2022-12-30 00:12:59 -08:00
Matthew Russell 16cb8bc4ee fix: trading-deal-ticket tests after wallet client added 2022-12-29 23:56:47 -08:00
Botond f1880772a6 fix: reset client on url change 2022-12-29 21:07:29 -08:00
Botond d6e27ee1f4 fix: format 2022-12-29 21:07:29 -08:00
Botond cc58c036ce fix: bump wallet client 2022-12-29 21:07:29 -08:00
Botond e2182e72ec fix: bump wallet client to 0.1.2 and remove empty params from method calls 2022-12-29 21:07:29 -08:00
Botond 2a2b719f72 fix: add new no client error 2022-12-29 21:07:29 -08:00
Botond 5c8ca4311a fix: bump client with new esm release version 2022-12-29 21:07:29 -08:00
Botond ae76e45ce8 chore: migrate to wallet client 2022-12-29 21:07:28 -08:00
Matthew Russell 955e233c46 fix: dark class being removed on token due to theme switcher changes (#2484)
* fix: dark class being removed on token due to theme switcher changes

* chore: check for window before reading from document classlist
2022-12-29 21:01:37 -08:00
Matthew RussellandEdd 0bafa4c7d5 chore: add readmes for token and explorer e2e (#2485)
* chore: add readmes for token and explorer e2e

* fix: typo fix in explorer readme

* fix: typo fix in token readme

Co-authored-by: Edd <edd@vega.xyz>
2022-12-29 20:48:04 -08:00
mattrussell36 045529dc38 chore: update tranches
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-12-30 00:11:08 +00:00
mattrussell36 5ca3e4d90f chore: update tranches
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-12-29 18:08:27 +00:00
mattrussell36 9048d41f72 chore: update tranches
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-12-29 12:08:48 +00:00
mattrussell36 d731c4797c chore: update tranches
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-12-29 06:08:36 +00:00
mattrussell36 4a931ca134 chore: update tranches
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-12-29 00:11:03 +00:00
mattrussell36 3398b15d8a chore: update tranches
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-12-28 18:08:02 +00:00
m.rayandMatthew Russell 1e98ecbd21 feat(#2367): liquidity supplied info in market header (#2481)
* feat(#2367): market liquidity supplied in trade market header

* feat(#2467): calculate LP status

* fix: add LP view link

* fix: add LP view link

* feat(#2367): show liquidity supplied percentage

* feat(#2367): show liquidity supplied percentage

* fix: liquidity-utils test needs big number

* feat(#2456): liquidity status marker

* feat(#2456): liquidity indicator

* feat(#2367): update props lp

* fix: use market data directly

* feat(#2367): move data grid in react-helpers

* feat(#2367): move data grid in react-helpers

* fix: indicator commented

* chore: remove unnecessary styles

* test: update test name

Co-authored-by: Matthew Russell <mattrussell36@gmail.com>
2022-12-28 09:37:19 -08:00
daro-maj a9c7c2bb46 chore: cover7003 mord e2e tests (#2487)
* chore:  tests will be added after the proper implementation is prepared

* chore: formatting fix
2022-12-28 15:18:06 +01:00
mattrussell36 ba2c71de67 chore: update tranches
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-12-28 12:06:41 +00:00
mattrussell36 15d2aed343 chore: update tranches
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-12-28 06:08:30 +00:00
mattrussell36 0284eaf9a2 chore: update tranches
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-12-28 00:12:18 +00:00
32 changed files with 723 additions and 316 deletions
@@ -67,6 +67,7 @@ describe('market selector', { tags: '@smoke' }, () => {
it('mobile view', () => {
cy.viewport('iphone-xr');
cy.visit(`/trading/${marketId}`);
cy.connectVegaWallet();
cy.get('[role="dialog"]').should('not.exist');
cy.getByTestId('arrow-button').click();
cy.get('[role="dialog"]').should('be.visible');
@@ -1,13 +1,12 @@
import type { ReactNode } from 'react';
import type { FieldErrors } from 'react-hook-form';
import { useMemo } from 'react';
import { t, toDecimal } from '@vegaprotocol/react-helpers';
import { DataGrid, t, toDecimal } from '@vegaprotocol/react-helpers';
import { useVegaWallet } from '@vegaprotocol/wallet';
import * as Schema from '@vegaprotocol/types';
import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
import { Tooltip } from '@vegaprotocol/ui-toolkit';
import {
MarketDataGrid,
compileGridData,
MarginWarning,
isMarketInAuction,
@@ -216,9 +215,7 @@ export const useOrderValidation = ({
<span>
{t('This market is in auction until it reaches')}{' '}
<Tooltip
description={
<MarketDataGrid grid={compileGridData(market)} />
}
description={<DataGrid grid={compileGridData(market)} />}
>
<span>{t('sufficient liquidity')}</span>
</Tooltip>
@@ -240,9 +237,7 @@ export const useOrderValidation = ({
<span>
{t('This market is in auction due to')}{' '}
<Tooltip
description={
<MarketDataGrid grid={compileGridData(market)} />
}
description={<DataGrid grid={compileGridData(market)} />}
>
<span>{t('high price volatility')}</span>
</Tooltip>
@@ -281,9 +276,7 @@ export const useOrderValidation = ({
<span>
{t('This market is in auction until it reaches')}{' '}
<Tooltip
description={
<MarketDataGrid grid={compileGridData(market)} />
}
description={<DataGrid grid={compileGridData(market)} />}
>
<span>{t('sufficient liquidity')}</span>
</Tooltip>
@@ -307,9 +300,7 @@ export const useOrderValidation = ({
<span>
{t('This market is in auction due to')}{' '}
<Tooltip
description={
<MarketDataGrid grid={compileGridData(market)} />
}
description={<DataGrid grid={compileGridData(market)} />}
>
<span>{t('high price volatility')}</span>
</Tooltip>
+34
View File
@@ -0,0 +1,34 @@
# Vega Explorer E2E tests
To run the UI automation tests with Vega Capsule, run:
```bash
yarn nx run explorer-e2e:e2e
```
To open Cypress and run in interactive mode, run:
```bash
yarn nx run explorer-e2e:e2e --watch
```
## Vega Capsule Setup
The e2e tests run against a locally running instance of the Vega network, managed and controlled by [Vega Capsule](https://github.com/vegaprotocol/vegacapsule). Vega Capsule will:
- Bootstrap and start up a Vega network
- Start up [Ganache](https://trufflesuite.com/ganache/) for a local Ethereum network
- Install the required Vega smart contracts
- Set up DataNodes with a running GraphQL and REST APIs.
Refer to the [Vega Capsule readme](https://github.com/vegaprotocol/vegacapsule#readme) for setting up and running Capsule. You will need [Go 1.19 or later](https://go.dev/doc/install) and [Docker](https://docs.docker.com/get-docker/) installed.
### Troubleshooting
- You may need to run `vegacapsule nodes unsafe-reset-all` to get a clean network state
## Vega Wallet Setup
Start by [downloading the Vega wallet software here](https://github.com/vegaprotocol/vega/releases).
You can then refer to (or run) `vegacapsule/setup-vegawallet.sh`. This will initialise and configure your wallet to have the correct public keys and network config to run against capsule.
+235 -46
View File
@@ -1,4 +1,70 @@
[
{
"tranche_id": 47,
"tranche_start": "2023-12-01T00:00:00.000Z",
"tranche_end": "2023-12-01T00:00:00.000Z",
"total_added": "3000",
"total_removed": "0",
"locked_amount": "3000",
"deposits": [
{
"amount": "3000",
"user": "0xD18ffAa4a1d16f9eD9d3BE4078738Eeda3f160FD",
"tx": "0xd4db7b194e49ecf5c65e6a64f34d43b8caf51a49be0a6c2744fa4b45667969bb"
}
],
"withdrawals": [],
"users": [
{
"address": "0xD18ffAa4a1d16f9eD9d3BE4078738Eeda3f160FD",
"deposits": [
{
"amount": "3000",
"user": "0xD18ffAa4a1d16f9eD9d3BE4078738Eeda3f160FD",
"tranche_id": 47,
"tx": "0xd4db7b194e49ecf5c65e6a64f34d43b8caf51a49be0a6c2744fa4b45667969bb"
}
],
"withdrawals": [],
"total_tokens": "3000",
"withdrawn_tokens": "0",
"remaining_tokens": "3000"
}
]
},
{
"tranche_id": 48,
"tranche_start": "2022-12-01T00:00:00.000Z",
"tranche_end": "2023-06-01T00:00:00.000Z",
"total_added": "2500",
"total_removed": "0",
"locked_amount": "2101.542467948718",
"deposits": [
{
"amount": "2500",
"user": "0xc704dA0E96a6b910fFA8d3F9f667d3D35Db8e5a1",
"tx": "0xd4db7b194e49ecf5c65e6a64f34d43b8caf51a49be0a6c2744fa4b45667969bb"
}
],
"withdrawals": [],
"users": [
{
"address": "0xc704dA0E96a6b910fFA8d3F9f667d3D35Db8e5a1",
"deposits": [
{
"amount": "2500",
"user": "0xc704dA0E96a6b910fFA8d3F9f667d3D35Db8e5a1",
"tranche_id": 48,
"tx": "0xd4db7b194e49ecf5c65e6a64f34d43b8caf51a49be0a6c2744fa4b45667969bb"
}
],
"withdrawals": [],
"total_tokens": "2500",
"withdrawn_tokens": "0",
"remaining_tokens": "2500"
}
]
},
{
"tranche_id": 45,
"tranche_start": "2023-05-01T00:00:00.000Z",
@@ -351,7 +417,7 @@
"tranche_end": "2023-12-05T00:00:00.000Z",
"total_added": "129999.45",
"total_removed": "0",
"locked_amount": "81189.00181109020553229",
"locked_amount": "80654.76445420848552798",
"deposits": [
{
"amount": "129999.45",
@@ -417,7 +483,7 @@
"tranche_end": "2023-09-03T00:00:00.000Z",
"total_added": "52600",
"total_removed": "0",
"locked_amount": "35918.4961123794978",
"locked_amount": "35593.95764840182646",
"deposits": [
{
"amount": "2600",
@@ -590,7 +656,7 @@
"tranche_end": "2023-09-17T00:00:00.000Z",
"total_added": "5000",
"total_removed": "0",
"locked_amount": "3606.086536022324",
"locked_amount": "3575.2368721461185",
"deposits": [
{
"amount": "5000",
@@ -801,7 +867,7 @@
"tranche_end": "2023-04-05T00:00:00.000Z",
"total_added": "97499.58",
"total_removed": "0",
"locked_amount": "22861.0493019706346484468",
"locked_amount": "22337.0122213305487778646",
"deposits": [
{
"amount": "97499.58",
@@ -834,7 +900,7 @@
"tranche_end": "2023-04-05T00:00:00.000Z",
"total_added": "135173.4239508",
"total_removed": "98230.390980249184455396",
"locked_amount": "31247.107600282979940660298716",
"locked_amount": "30530.839382275709150186336568",
"deposits": [
{
"amount": "135173.4239508",
@@ -880,7 +946,7 @@
"tranche_end": "2023-04-05T00:00:00.000Z",
"total_added": "32499.86",
"total_removed": "0",
"locked_amount": "9617.248652134231053772",
"locked_amount": "9396.795301945282664652",
"deposits": [
{
"amount": "32499.86",
@@ -913,7 +979,7 @@
"tranche_end": "2023-04-05T00:00:00.000Z",
"total_added": "10833.29",
"total_removed": "0",
"locked_amount": "3130.321112697780704066",
"locked_amount": "3058.5656864399509017977",
"deposits": [
{
"amount": "10833.29",
@@ -946,7 +1012,7 @@
"tranche_end": "2023-04-05T00:00:00.000Z",
"total_added": "22749.93",
"total_removed": "0",
"locked_amount": "11701.839463857984444507",
"locked_amount": "11433.601654221203906589",
"deposits": [
{
"amount": "6500",
@@ -1085,7 +1151,7 @@
"tranche_end": "2023-05-01T00:00:00.000Z",
"total_added": "22500",
"total_removed": "2310.007577475",
"locked_amount": "15444.7355547882135",
"locked_amount": "15164.7876381215475",
"deposits": [
{
"amount": "7500",
@@ -1195,7 +1261,7 @@
"tranche_end": "2023-06-02T00:00:00.000Z",
"total_added": "1939928.38",
"total_removed": "928642.9598472029154",
"locked_amount": "830418.589078051136755202",
"locked_amount": "818449.3613846688819184868",
"deposits": [
{
"amount": "1852091.69",
@@ -1546,8 +1612,8 @@
"tranche_start": "2022-08-01T00:00:00.000Z",
"tranche_end": "2023-02-01T00:00:00.000Z",
"total_added": "42500",
"total_removed": "22452.0135114",
"locked_amount": "8140.6710761372795",
"total_removed": "24434.0787288",
"locked_amount": "7620.50215126811625",
"deposits": [
{
"amount": "12500",
@@ -1561,6 +1627,11 @@
}
],
"withdrawals": [
{
"amount": "1982.0652174",
"user": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
"tx": "0x46af57ef687e51b40874f6bbe7c462d756e58ec8194c7b2959b64c270242c0c2"
},
{
"amount": "3425.611413",
"user": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
@@ -1604,6 +1675,12 @@
}
],
"withdrawals": [
{
"amount": "1982.0652174",
"user": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
"tranche_id": 17,
"tx": "0x46af57ef687e51b40874f6bbe7c462d756e58ec8194c7b2959b64c270242c0c2"
},
{
"amount": "3425.611413",
"user": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
@@ -1624,8 +1701,8 @@
}
],
"total_tokens": "30000",
"withdrawn_tokens": "22452.0135114",
"remaining_tokens": "7547.9864886"
"withdrawn_tokens": "24434.0787288",
"remaining_tokens": "5565.9212712"
}
]
},
@@ -31989,8 +32066,8 @@
"tranche_start": "2022-03-05T00:00:00.000Z",
"tranche_end": "2023-06-05T00:00:00.000Z",
"total_added": "3732368.4671",
"total_removed": "428705.3729302523069",
"locked_amount": "1300565.575097378439837757406",
"total_removed": "431193.2979482613764",
"locked_amount": "1282173.03937512653353077042",
"deposits": [
{
"amount": "1998.95815",
@@ -32169,6 +32246,11 @@
"user": "0xE6CacAE56Cca8dFdB7910b5A13578719D4E57DA0",
"tx": "0x96a49630063ce14e1e24e9878715d3c31d189d6dd107e01ebfceba8aa62971ba"
},
{
"amount": "2487.9250180090695",
"user": "0xE6CacAE56Cca8dFdB7910b5A13578719D4E57DA0",
"tx": "0x0c3a288c3e20316720b836d75c64f406519618b51e36592eee09ef9bb2cd6033"
},
{
"amount": "835.5431693861975",
"user": "0xE6CacAE56Cca8dFdB7910b5A13578719D4E57DA0",
@@ -32490,6 +32572,12 @@
"tranche_id": 1,
"tx": "0x96a49630063ce14e1e24e9878715d3c31d189d6dd107e01ebfceba8aa62971ba"
},
{
"amount": "2487.9250180090695",
"user": "0xE6CacAE56Cca8dFdB7910b5A13578719D4E57DA0",
"tranche_id": 1,
"tx": "0x0c3a288c3e20316720b836d75c64f406519618b51e36592eee09ef9bb2cd6033"
},
{
"amount": "835.5431693861975",
"user": "0xE6CacAE56Cca8dFdB7910b5A13578719D4E57DA0",
@@ -32708,8 +32796,8 @@
}
],
"total_tokens": "187637.95",
"withdrawn_tokens": "120247.6705774890865",
"remaining_tokens": "67390.2794225109135"
"withdrawn_tokens": "122735.595595498156",
"remaining_tokens": "64902.354404501844"
},
{
"address": "0x1A71e3ED1996CAbB91bB043f880CE963D601707e",
@@ -33215,8 +33303,8 @@
"tranche_start": "2022-06-05T00:00:00.000Z",
"tranche_end": "2023-12-05T00:00:00.000Z",
"total_added": "15870102.715470999700000001",
"total_removed": "511218.93522350218767952",
"locked_amount": "9911409.6106449879859047601650237654190322",
"total_removed": "513994.56123091191542452",
"locked_amount": "9846190.8598875452874234202340209699026764",
"deposits": [
{
"amount": "16249.93",
@@ -33790,6 +33878,26 @@
"user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
"tx": "0x1e3efba0c9a6b7f9653f0fb5f9b24ae9c13ec801d00cf7f9333689f7432914c0"
},
{
"amount": "488.552248551145625",
"user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
"tx": "0x2e647a56ae1d573955783dfae447261e5dbabf2f61557f2cf9a4f19cdfa9e0ed"
},
{
"amount": "1052.55764205514812",
"user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
"tx": "0xc48a7a49f743af0eb01f86880d6588e6feaca2f4799b8152785beda0cc344ce3"
},
{
"amount": "1097.830494",
"user": "0xF4c75FdbAe821C6B5DBB9f001bB23cBA58D1bA37",
"tx": "0x5d349afe6cec5ee1fb67bac724a75edf970d1004a8bd2ea8a6972a5a01319d09"
},
{
"amount": "136.685622803434",
"user": "0xE6CacAE56Cca8dFdB7910b5A13578719D4E57DA0",
"tx": "0xdbd515fed722081d9e1b03b6930f017f1df6de1cdc738a89a45716448dd708ad"
},
{
"amount": "930.302108",
"user": "0xF4c75FdbAe821C6B5DBB9f001bB23cBA58D1bA37",
@@ -35090,6 +35198,12 @@
"tranche_id": 2,
"tx": "0x1e3efba0c9a6b7f9653f0fb5f9b24ae9c13ec801d00cf7f9333689f7432914c0"
},
{
"amount": "488.552248551145625",
"user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
"tranche_id": 2,
"tx": "0x2e647a56ae1d573955783dfae447261e5dbabf2f61557f2cf9a4f19cdfa9e0ed"
},
{
"amount": "2074.139541638025125",
"user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -35980,8 +36094,8 @@
}
],
"total_tokens": "259998.8875",
"withdrawn_tokens": "97142.685093016968625",
"remaining_tokens": "162856.202406983031375"
"withdrawn_tokens": "97631.23734156811425",
"remaining_tokens": "162367.65015843188575"
},
{
"address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c",
@@ -36214,6 +36328,12 @@
"tranche_id": 2,
"tx": "0x06a5b5862308d83bda5de42c3ce7f692d528d61da7d77e7698488ece926e8e53"
},
{
"amount": "1052.55764205514812",
"user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
"tranche_id": 2,
"tx": "0xc48a7a49f743af0eb01f86880d6588e6feaca2f4799b8152785beda0cc344ce3"
},
{
"amount": "1055.19046635722995",
"user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
@@ -36354,8 +36474,8 @@
}
],
"total_tokens": "150551.801",
"withdrawn_tokens": "55659.48147836883658",
"remaining_tokens": "94892.31952163116342"
"withdrawn_tokens": "56712.0391204239847",
"remaining_tokens": "93839.7618795760153"
},
{
"address": "0x4d982Ab0823fD2f48e934a7be2bb0a5374a26148",
@@ -36575,6 +36695,12 @@
"tranche_id": 2,
"tx": "0xaa6324943437bf4c7cfd5e768371d0f23b2e9e4a93e3f0be5a790607524b3a77"
},
{
"amount": "1097.830494",
"user": "0xF4c75FdbAe821C6B5DBB9f001bB23cBA58D1bA37",
"tranche_id": 2,
"tx": "0x5d349afe6cec5ee1fb67bac724a75edf970d1004a8bd2ea8a6972a5a01319d09"
},
{
"amount": "930.302108",
"user": "0xF4c75FdbAe821C6B5DBB9f001bB23cBA58D1bA37",
@@ -36679,8 +36805,8 @@
}
],
"total_tokens": "200000",
"withdrawn_tokens": "74243.91305",
"remaining_tokens": "125756.08695"
"withdrawn_tokens": "75341.743544",
"remaining_tokens": "124658.256456"
},
{
"address": "0x1b956E6c00E238194B331eddEFF72Cb5f28A8d01",
@@ -37152,6 +37278,12 @@
"tranche_id": 2,
"tx": "0xd71183e476407ae537b585fa4e77b683a565390d7e4625025ff03314b417553a"
},
{
"amount": "136.685622803434",
"user": "0xE6CacAE56Cca8dFdB7910b5A13578719D4E57DA0",
"tranche_id": 2,
"tx": "0xdbd515fed722081d9e1b03b6930f017f1df6de1cdc738a89a45716448dd708ad"
},
{
"amount": "45.922183357104",
"user": "0xE6CacAE56Cca8dFdB7910b5A13578719D4E57DA0",
@@ -37352,8 +37484,8 @@
}
],
"total_tokens": "12362.05",
"withdrawn_tokens": "4531.2976364530895",
"remaining_tokens": "7830.7523635469105"
"withdrawn_tokens": "4667.9832592565235",
"remaining_tokens": "7694.0667407434765"
},
{
"address": "0xb091D456d0dFCB94dcba6f355379056C5bb995fC",
@@ -37984,8 +38116,8 @@
"tranche_start": "2021-11-05T00:00:00.000Z",
"tranche_end": "2023-05-05T00:00:00.000Z",
"total_added": "14597706.0446472999",
"total_removed": "3489401.90950082536320653",
"locked_amount": "3428704.84130926731572974432005816",
"total_removed": "3490080.38172369381877728",
"locked_amount": "3368495.307035651738854032761219703",
"deposits": [
{
"amount": "129284.449",
@@ -38239,6 +38371,11 @@
"user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
"tx": "0x617ff95943d9685aaf9763e3fb4ca1f81e8dd04fd013d1a64b59e52b78b25b81"
},
{
"amount": "678.47222286845557075",
"user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
"tx": "0x40dc4dbfbf26c199c7cf1be4b281d553d470a830423ff678795585588d1c5cd0"
},
{
"amount": "9158.56255453299474378",
"user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
@@ -40853,6 +40990,12 @@
"tranche_id": 3,
"tx": "0x617ff95943d9685aaf9763e3fb4ca1f81e8dd04fd013d1a64b59e52b78b25b81"
},
{
"amount": "678.47222286845557075",
"user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
"tranche_id": 3,
"tx": "0x40dc4dbfbf26c199c7cf1be4b281d553d470a830423ff678795585588d1c5cd0"
},
{
"amount": "2874.6686339993457875",
"user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -43033,8 +43176,8 @@
}
],
"total_tokens": "359123.469575",
"withdrawn_tokens": "274108.98298493707152025",
"remaining_tokens": "85014.48659006292847975"
"withdrawn_tokens": "274787.455207805527091",
"remaining_tokens": "84336.014367194472909"
},
{
"address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB",
@@ -44278,7 +44421,7 @@
"tranche_end": "2023-04-05T00:00:00.000Z",
"total_added": "5778205.3912159303",
"total_removed": "2479228.813551817124120168",
"locked_amount": "1037798.493633229255945123020263576",
"locked_amount": "1014009.464759607923552643856300592",
"deposits": [
{
"amount": "552496.6455",
@@ -46073,8 +46216,8 @@
"tranche_start": "2022-06-05T00:00:00.000Z",
"tranche_end": "2023-06-05T00:00:00.000Z",
"total_added": "472355.6199999996",
"total_removed": "27238.3679206278963",
"locked_amount": "206082.034745654336161635141856908",
"total_removed": "27394.9180255399005",
"locked_amount": "203167.64730254550148554696803652",
"deposits": [
{
"amount": "3000",
@@ -52748,6 +52891,16 @@
"user": "0xeE2C02Cd75dcEacD16614feB126a1cD2637646d0",
"tx": "0x81181699f4cae02ba8761ccf126f88141644a318f8f5bfd67f3d4a4f870b59e9"
},
{
"amount": "97.792503807",
"user": "0xdc040917f80aC350460e55467e4B6c52Fc5e220E",
"tx": "0x1f8e5bff5b6390c9de0c33a77494fda9ce1876e11e39400d9fe1d7ef4da9e679"
},
{
"amount": "58.7576011050042",
"user": "0x91Ff7FADb80385D2E25E12F92d211688a550A06C",
"tx": "0x87ae337c9809d80018c3f2c3b90df597bea0b3ac865fb58f8471ff92ebcbadd8"
},
{
"amount": "199.140778792",
"user": "0x2827B97046558f044ab07c3De0159632f8956472",
@@ -71574,10 +71727,17 @@
"tx": "0xc8541da6a57f410b6faba47a5e5184bae700193b7bd042914fffc562114d92f5"
}
],
"withdrawals": [],
"withdrawals": [
{
"amount": "58.7576011050042",
"user": "0x91Ff7FADb80385D2E25E12F92d211688a550A06C",
"tranche_id": 5,
"tx": "0x87ae337c9809d80018c3f2c3b90df597bea0b3ac865fb58f8471ff92ebcbadd8"
}
],
"total_tokens": "103.38",
"withdrawn_tokens": "0",
"remaining_tokens": "103.38"
"withdrawn_tokens": "58.7576011050042",
"remaining_tokens": "44.6223988949958"
},
{
"address": "0x942e32E60f465f5DCDc071840E9D9D6a3D619dE7",
@@ -72665,6 +72825,12 @@
}
],
"withdrawals": [
{
"amount": "97.792503807",
"user": "0xdc040917f80aC350460e55467e4B6c52Fc5e220E",
"tranche_id": 5,
"tx": "0x1f8e5bff5b6390c9de0c33a77494fda9ce1876e11e39400d9fe1d7ef4da9e679"
},
{
"amount": "29.694815448",
"user": "0xdc040917f80aC350460e55467e4B6c52Fc5e220E",
@@ -72679,8 +72845,8 @@
}
],
"total_tokens": "300",
"withdrawn_tokens": "72.631687593",
"remaining_tokens": "227.368312407"
"withdrawn_tokens": "170.4241914",
"remaining_tokens": "129.5758086"
},
{
"address": "0x8D01053B4f4857Ff453CAeDBf8387Cd57a5a2A2b",
@@ -74117,7 +74283,7 @@
"tranche_start": "2021-12-05T00:00:00.000Z",
"tranche_end": "2022-06-05T00:00:00.000Z",
"total_added": "171288.42",
"total_removed": "60641.2093106172989",
"total_removed": "60849.0699829322989",
"locked_amount": "0",
"deposits": [
{
@@ -78372,6 +78538,16 @@
"user": "0x667B436A05523B8D80483b030f559f034753DD74",
"tx": "0x48d6761a237f75fa95ff67082e4f0b5538586a58a7a677943f1c4260f3abb860"
},
{
"amount": "150",
"user": "0x300E9b1628eE5949365B7f6c08690C2B9ae2043A",
"tx": "0x3873e5c2e039043676e6e705feedd49a367c85d9e69aef64d695472bce689908"
},
{
"amount": "57.860672315",
"user": "0x0Fa5387417ce5030a259b48f1bde2001a100D27B",
"tx": "0x41b8c1181cf49b5d873bf94d03d3932b38705d6cbb5bc147026910ffcc480c0b"
},
{
"amount": "250",
"user": "0x3E1CECDc3d15Cb03e91a60470C4453f4fBFc75F9",
@@ -81085,6 +81261,12 @@
}
],
"withdrawals": [
{
"amount": "57.860672315",
"user": "0x0Fa5387417ce5030a259b48f1bde2001a100D27B",
"tranche_id": 6,
"tx": "0x41b8c1181cf49b5d873bf94d03d3932b38705d6cbb5bc147026910ffcc480c0b"
},
{
"amount": "192.139327685",
"user": "0x0Fa5387417ce5030a259b48f1bde2001a100D27B",
@@ -81093,8 +81275,8 @@
}
],
"total_tokens": "250",
"withdrawn_tokens": "192.139327685",
"remaining_tokens": "57.860672315"
"withdrawn_tokens": "250",
"remaining_tokens": "0"
},
{
"address": "0x643E4ea2718eFA5897F5eB655D767E4193695987",
@@ -89926,10 +90108,17 @@
"tx": "0x716a7be06da5a7a3d8038907974887a31805ea8eeab5d130cba528e4d2094d9f"
}
],
"withdrawals": [],
"withdrawals": [
{
"amount": "150",
"user": "0x300E9b1628eE5949365B7f6c08690C2B9ae2043A",
"tranche_id": 6,
"tx": "0x3873e5c2e039043676e6e705feedd49a367c85d9e69aef64d695472bce689908"
}
],
"total_tokens": "150",
"withdrawn_tokens": "0",
"remaining_tokens": "150"
"withdrawn_tokens": "150",
"remaining_tokens": "0"
},
{
"address": "0x2074924ebfD97Ff2351659CB00e259eBd6451aA5",
+34
View File
@@ -0,0 +1,34 @@
# Vega token website E2E tests
To run the UI automation tests with Vega Capsule, run:
```bash
yarn nx run token-e2e:e2e
```
To open Cypress and run in interactive mode, run:
```bash
yarn nx run token-e2e:e2e --watch
```
## Vega Capsule Setup
The e2e tests run against a locally running instance of the Vega network, managed and controlled by [Vega Capsule](https://github.com/vegaprotocol/vegacapsule). Vega Capsule will:
- Bootstrap and start up a Vega network
- Start up [Ganache](https://trufflesuite.com/ganache/) for a local Ethereum network
- Install the required Vega smart contracts
- Set up DataNodes with a running GraphQL and REST APIs.
Refer to the [Vega Capsule readme](https://github.com/vegaprotocol/vegacapsule#readme) for setting up and running Capsule. You will need [Go 1.19 or later](https://go.dev/doc/install) and [Docker](https://docs.docker.com/get-docker/) installed.
### Troubleshooting
- You may need to run `vegacapsule nodes unsafe-reset-all` to get a clean network state
## Vega Wallet Setup
Start by [downloading the Vega wallet software here](https://github.com/vegaprotocol/vega/releases).
You can then refer to (or run) `vegacapsule/setup-vegawallet.sh`. This will initialise and configure your wallet to have the correct public keys and network config to run against capsule.
@@ -30,11 +30,20 @@ const displayTomorrow = () => {
describe('time in force default values', () => {
before(() => {
cy.window().then((win) => {
win.localStorage.setItem(
'vega_wallet_config',
JSON.stringify({
token: Cypress.env('VEGA_WALLET_API_TOKEN'),
connector: 'jsonRpc',
url: 'http://localhost:1789',
})
);
});
cy.mockTradingPage();
cy.mockSubscription();
cy.visit('/#/markets/market-0');
cy.wait('@Market');
cy.connectVegaWallet();
});
it('must have market order set up to IOC by default', function () {
@@ -59,20 +68,15 @@ describe('time in force default values', () => {
describe('must submit order', { tags: '@smoke' }, () => {
// 7002-SORD-039
before(() => {
setVegaConfig();
cy.mockTradingPage();
cy.mockSubscription();
cy.visit('/#/markets/market-0');
cy.wait('@Market');
cy.connectVegaWallet();
cy.window().then(function (window) {
cy.wrap(window.localStorage.getItem('vega_wallet_config')).as('cfg');
});
});
beforeEach(() => {
cy.window().then(function (window) {
window.localStorage.setItem('vega_wallet_config', this.cfg);
});
setVegaConfig();
});
it('successfully places market buy order', () => {
@@ -158,6 +162,7 @@ describe(
{ tags: '@regression' },
() => {
before(() => {
setVegaConfig();
cy.mockTradingPage(
Schema.MarketState.STATE_SUSPENDED,
Schema.MarketTradingMode.TRADING_MODE_BATCH_AUCTION,
@@ -166,16 +171,10 @@ describe(
cy.mockSubscription();
cy.visit('/#/markets/market-0');
cy.wait('@Market');
cy.connectVegaWallet();
cy.window().then(function (window) {
cy.wrap(window.localStorage.getItem('vega_wallet_config')).as('cfg');
});
});
beforeEach(() => {
cy.window().then(function (window) {
window.localStorage.setItem('vega_wallet_config', this.cfg);
});
setVegaConfig();
});
it('successfully places limit buy order', () => {
@@ -232,6 +231,7 @@ describe(
{ tags: '@regression' },
() => {
before(() => {
setVegaConfig();
cy.mockTradingPage(
Schema.MarketState.STATE_SUSPENDED,
Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION,
@@ -240,16 +240,10 @@ describe(
cy.mockSubscription();
cy.visit('/#/markets/market-0');
cy.wait('@Market');
cy.connectVegaWallet();
cy.window().then(function (window) {
cy.wrap(window.localStorage.getItem('vega_wallet_config')).as('cfg');
});
});
beforeEach(() => {
cy.window().then(function (window) {
window.localStorage.setItem('vega_wallet_config', this.cfg);
});
setVegaConfig();
});
it('successfully places limit buy order', () => {
@@ -306,6 +300,7 @@ describe(
{ tags: '@regression' },
() => {
before(() => {
setVegaConfig();
cy.mockTradingPage(
Schema.MarketState.STATE_SUSPENDED,
Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
@@ -314,16 +309,10 @@ describe(
cy.mockSubscription();
cy.visit('/#/markets/market-0');
cy.wait('@Market');
cy.connectVegaWallet();
cy.window().then(function (window) {
cy.wrap(window.localStorage.getItem('vega_wallet_config')).as('cfg');
});
});
beforeEach(() => {
cy.window().then(function (window) {
window.localStorage.setItem('vega_wallet_config', this.cfg);
});
setVegaConfig();
});
it('successfully places limit buy order', () => {
@@ -421,10 +410,10 @@ describe('deal ticket validation', { tags: '@smoke' }, () => {
describe('deal ticket size validation', { tags: '@smoke' }, function () {
beforeEach(() => {
setVegaConfig();
cy.mockTradingPage();
cy.visit('/#/markets/market-0');
cy.wait('@Market');
cy.connectVegaWallet();
});
it('must warn if order size input has too many digits after the decimal place', function () {
@@ -455,14 +444,18 @@ describe('deal ticket size validation', { tags: '@smoke' }, function () {
describe('limit order validations', { tags: '@smoke' }, () => {
before(() => {
setVegaConfig();
cy.mockTradingPage();
cy.mockSubscription();
cy.visit('/#/markets/market-0');
cy.connectVegaWallet();
cy.wait('@Market');
cy.getByTestId(toggleLimit).click();
});
beforeEach(() => {
setVegaConfig();
});
it('must see the price unit', function () {
//7002-SORD-018
cy.getByTestId(orderPriceField)
@@ -544,11 +537,17 @@ describe('limit order validations', { tags: '@smoke' }, () => {
describe('market order validations', { tags: '@smoke' }, () => {
before(() => {
setVegaConfig();
cy.mockTradingPage();
cy.visit('/#/markets/market-0');
cy.wait('@Market');
cy.getByTestId(toggleMarket).click();
});
beforeEach(() => {
setVegaConfig();
});
it('must not see the price unit', function () {
//7002-SORD-019
cy.getByTestId(orderPriceField).should('not.exist');
@@ -587,6 +586,7 @@ describe('market order validations', { tags: '@smoke' }, () => {
describe('suspended market validation', { tags: '@regression' }, () => {
before(() => {
setVegaConfig();
cy.mockTradingPage(
Schema.MarketState.STATE_SUSPENDED,
Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
@@ -595,7 +595,10 @@ describe('suspended market validation', { tags: '@regression' }, () => {
cy.mockSubscription();
cy.visit('/#/markets/market-0');
cy.wait('@Market');
cy.connectVegaWallet();
});
beforeEach(() => {
setVegaConfig();
});
it('should show warning for market order', function () {
@@ -608,6 +611,7 @@ describe('suspended market validation', { tags: '@regression' }, () => {
'This market is in auction until it reaches sufficient liquidity. Only limit orders are permitted when market is in auction'
);
});
it('should show info for allowed TIF', function () {
cy.getByTestId(toggleLimit).click();
cy.getByTestId(orderPriceField).clear().type('0.1');
@@ -635,6 +639,7 @@ describe('suspended market validation', { tags: '@regression' }, () => {
describe('account validation', { tags: '@regression' }, () => {
describe('zero balance error', () => {
beforeEach(() => {
setVegaConfig();
cy.mockTradingPage();
cy.mockGQL((req) => {
aliasGQLQuery(
@@ -663,7 +668,6 @@ describe('account validation', { tags: '@regression' }, () => {
});
cy.mockSubscription();
cy.visit('/#/markets/market-0');
cy.connectVegaWallet();
cy.wait('@Market');
});
@@ -682,6 +686,7 @@ describe('account validation', { tags: '@regression' }, () => {
describe('not enough balance warning', () => {
beforeEach(() => {
setVegaConfig();
cy.mockTradingPage();
cy.mockGQL((req) => {
aliasGQLQuery(
@@ -699,9 +704,9 @@ describe('account validation', { tags: '@regression' }, () => {
});
cy.mockSubscription();
cy.visit('/#/markets/market-0');
cy.connectVegaWallet();
cy.wait('@Market');
});
it('should display info and button for deposit', () => {
//7002-SORD-003
// warning should show immediately
@@ -740,3 +745,16 @@ const createOrder = (order: OrderSubmission): void => {
}
cy.getByTestId(placeOrderBtn).click();
};
const setVegaConfig = () => {
cy.window().then((win) => {
win.localStorage.setItem(
'vega_wallet_config',
JSON.stringify({
token: Cypress.env('VEGA_WALLET_API_TOKEN'),
connector: 'jsonRpc',
url: 'http://localhost:1789',
})
);
});
};
@@ -423,4 +423,9 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
testOrderCancellation(order);
});
});
it.skip('tbd for 7003-MORD', () => {
// NOT COVERED: must see the reference, offset and direction for each part pegged order - waiting for clarification
// NOT COVERED: must see the reference, offset and direction for each part liquidity order order - waiting for clarification
// NOT COVERED: must be warned (pre-submit) if the input price has too many digits after the decimal place for the market - issues/2486
});
});
@@ -1,11 +0,0 @@
import { ethers } from 'ethers';
import type { Transaction } from '@vegaprotocol/wallet';
/**
* Base64 encode a transaction object
*/
export const encodeTransaction = (tx: Transaction): string => {
return ethers.utils.base64.encode(
ethers.utils.toUtf8Bytes(JSON.stringify(tx))
);
};
@@ -7,7 +7,6 @@ import type {
OrderSubmissionBody,
Transaction,
} from '@vegaprotocol/wallet';
import { encodeTransaction } from './encode-transaction';
export const testOrderSubmission = (
order: OrderSubmission,
@@ -18,9 +17,6 @@ export const testOrderSubmission = (
...expected,
};
expectedOrder.expiresAt = expectedOrder.expiresAt || undefined;
expectedOrder.price = expectedOrder.price || undefined;
const transaction: OrderSubmissionBody = {
orderSubmission: expectedOrder,
};
@@ -36,9 +32,6 @@ export const testOrderAmendment = (
...expected,
};
expectedOrder.expiresAt = expectedOrder.expiresAt || undefined;
expectedOrder.price = expectedOrder.price || undefined;
const transaction: OrderAmendmentBody = {
orderAmendment: expectedOrder,
};
@@ -70,7 +63,7 @@ const vegaWalletTransaction = (transaction: Transaction) => {
?.token,
publicKey: Cypress.env('VEGA_PUBLIC_KEY2'),
sendingMode: 'TYPE_SYNC',
encodedTransaction: encodeTransaction(transaction),
transaction,
});
cy.getByTestId(dialogTitle).should(
'have.text',
@@ -17,6 +17,7 @@ import { Last24hPriceChange } from '../../components/last-24h-price-change';
import { Last24hVolume } from '../../components/last-24h-volume';
import { MarketState } from '../../components/market-state';
import { MarketTradingMode } from '../../components/market-trading-mode';
import { MarketLiquiditySupplied } from '../../components/liquidity-supplied';
interface TradeMarketHeaderProps {
market: SingleMarketFieldsFragment | null;
@@ -96,6 +97,10 @@ export const TradeMarketHeader = ({
</HeaderStat>
) : null}
<MarketProposalNotification marketId={market?.id} />
<MarketLiquiditySupplied
marketId={market?.id}
assetDecimals={asset?.decimals || 0}
/>
</Header>
);
};
@@ -0,0 +1 @@
export * from './liquidity-supplied';
@@ -0,0 +1,130 @@
import { useCallback, useMemo, useState } from 'react';
import {
addDecimalsFormatNumber,
formatNumberPercentage,
NetworkParams,
t,
useDataProvider,
useNetworkParams,
} from '@vegaprotocol/react-helpers';
import type {
MarketData,
MarketDataUpdateFieldsFragment,
SingleMarketFieldsFragment,
} from '@vegaprotocol/market-list';
import { marketDataProvider, marketProvider } from '@vegaprotocol/market-list';
import { HeaderStat } from '../header';
import { Link } from '@vegaprotocol/ui-toolkit';
import BigNumber from 'bignumber.js';
import { useCheckLiquidityStatus } from '@vegaprotocol/liquidity';
import { DataGrid } from '@vegaprotocol/react-helpers';
interface Props {
marketId?: string;
noUpdate?: boolean;
assetDecimals: number;
}
export const MarketLiquiditySupplied = ({
marketId,
assetDecimals,
noUpdate = false,
}: Props) => {
const [market, setMarket] = useState<MarketData>();
const { params } = useNetworkParams([
NetworkParams.market_liquidity_stakeToCcySiskas,
NetworkParams.market_liquidity_targetstake_triggering_ratio,
]);
const stakeToCcyVolume = Number(params.market_liquidity_stakeToCcySiskas);
const triggeringRatio = Number(
params.market_liquidity_targetstake_triggering_ratio
);
const variables = useMemo(
() => ({
marketId: marketId,
}),
[marketId]
);
const { data } = useDataProvider<SingleMarketFieldsFragment, never>({
dataProvider: marketProvider,
variables,
skip: !marketId,
});
const update = useCallback(
({ data: marketData }: { data: MarketData | null }) => {
if (!noUpdate && marketData) {
setMarket(marketData);
}
return true;
},
[noUpdate]
);
useDataProvider<MarketData, MarketDataUpdateFieldsFragment>({
dataProvider: marketDataProvider,
update,
variables,
skip: noUpdate || !marketId || !data,
});
const supplied = market?.suppliedStake
? addDecimalsFormatNumber(
new BigNumber(market?.suppliedStake)
.multipliedBy(stakeToCcyVolume || 1)
.toString(),
assetDecimals
)
: '-';
const { percentage } = useCheckLiquidityStatus({
suppliedStake: market?.suppliedStake || 0,
targetStake: market?.targetStake || 0,
triggeringRatio,
});
const compiledGrid = [
{
label: t('Supplied stake'),
value: market?.suppliedStake
? addDecimalsFormatNumber(
new BigNumber(market?.suppliedStake).toString(),
assetDecimals
)
: '-',
},
{
label: t('Target stake'),
value: market?.targetStake
? addDecimalsFormatNumber(
new BigNumber(market?.targetStake).toString(),
assetDecimals
)
: '-',
},
];
const description = (
<section>
{compiledGrid && <DataGrid grid={compiledGrid} />}
<br />
<Link href={`/#/liquidity/${marketId}`} data-testid="view-liquidity-link">
{t('View liquidity provision table')}
</Link>
</section>
);
return (
<HeaderStat
heading={t('Liquidity supplied')}
description={description}
testId="liquidity-supplied"
>
{/* <Indicator variant={status} /> */}
{supplied} ({formatNumberPercentage(percentage, 2)})
</HeaderStat>
);
};
@@ -6,10 +6,10 @@ import {
Tooltip,
} from '@vegaprotocol/ui-toolkit';
import * as Schema from '@vegaprotocol/types';
import { t } from '@vegaprotocol/react-helpers';
import { DataGrid, t } from '@vegaprotocol/react-helpers';
import { timeInForceLabel } from '@vegaprotocol/orders';
import type { MarketDealTicket } from '@vegaprotocol/market-list';
import { compileGridData, MarketDataGrid } from '../trading-mode-tooltip';
import { compileGridData } from '../trading-mode-tooltip';
import { MarketModeValidationType } from '../../constants';
interface TimeInForceSelectorProps {
@@ -78,9 +78,7 @@ export const TimeInForceSelector = ({
return (
<span>
{t('This market is in auction until it reaches')}{' '}
<Tooltip
description={<MarketDataGrid grid={compileGridData(market)} />}
>
<Tooltip description={<DataGrid grid={compileGridData(market)} />}>
<span>{t('sufficient liquidity')}</span>
</Tooltip>
{'. '}
@@ -95,9 +93,7 @@ export const TimeInForceSelector = ({
return (
<span>
{t('This market is in auction due to')}{' '}
<Tooltip
description={<MarketDataGrid grid={compileGridData(market)} />}
>
<Tooltip description={<DataGrid grid={compileGridData(market)} />}>
<span>{t('high price volatility')}</span>
</Tooltip>
{'. '}
@@ -1,9 +1,9 @@
import { FormGroup, InputError, Tooltip } from '@vegaprotocol/ui-toolkit';
import { t } from '@vegaprotocol/react-helpers';
import { DataGrid, t } from '@vegaprotocol/react-helpers';
import * as Schema from '@vegaprotocol/types';
import { Toggle } from '@vegaprotocol/ui-toolkit';
import type { MarketDealTicket } from '@vegaprotocol/market-list';
import { compileGridData, MarketDataGrid } from '../trading-mode-tooltip';
import { compileGridData } from '../trading-mode-tooltip';
import { MarketModeValidationType } from '../../constants';
interface TypeSelectorProps {
@@ -33,9 +33,7 @@ export const TypeSelector = ({
return (
<span>
{t('This market is in auction until it reaches')}{' '}
<Tooltip
description={<MarketDataGrid grid={compileGridData(market)} />}
>
<Tooltip description={<DataGrid grid={compileGridData(market)} />}>
<span>{t('sufficient liquidity')}</span>
</Tooltip>
{'. '}
@@ -48,9 +46,7 @@ export const TypeSelector = ({
return (
<span>
{t('This market is in auction due to')}{' '}
<Tooltip
description={<MarketDataGrid grid={compileGridData(market)} />}
>
<Tooltip description={<DataGrid grid={compileGridData(market)} />}>
<span>{t('high price volatility')}</span>
</Tooltip>
{'. '}
@@ -1,3 +1,4 @@
import type { DataGridProps } from '@vegaprotocol/react-helpers';
import {
t,
getDateTimeFormat,
@@ -6,7 +7,6 @@ import {
import * as Schema from '@vegaprotocol/types';
import { Link as UILink } from '@vegaprotocol/ui-toolkit';
import type { ReactNode } from 'react';
import type { MarketDataGridProps } from './market-data-grid';
import { Link } from 'react-router-dom';
import type { MarketDealTicket } from '@vegaprotocol/market-list';
@@ -14,7 +14,7 @@ export const compileGridData = (
market: MarketDealTicket,
onSelect?: (id: string) => void
): { label: ReactNode; value?: ReactNode }[] => {
const grid: MarketDataGridProps['grid'] = [];
const grid: DataGridProps['grid'] = [];
const isLiquidityMonitoringAuction =
market.data.marketTradingMode ===
Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION &&
@@ -1,3 +1,2 @@
export * from './market-data-grid';
export * from './trading-mode-tooltip';
export * from './compile-grid-data';
@@ -1,11 +1,10 @@
import type { ReactNode } from 'react';
import classNames from 'classnames';
import { useEnvironment } from '@vegaprotocol/environment';
import { t } from '@vegaprotocol/react-helpers';
import { DataGrid, t } from '@vegaprotocol/react-helpers';
import * as Schema from '@vegaprotocol/types';
import { ExternalLink } from '@vegaprotocol/ui-toolkit';
import { createDocsLinks } from '@vegaprotocol/react-helpers';
import { MarketDataGrid } from './market-data-grid';
type TradingModeTooltipProps = {
tradingMode: Schema.MarketTradingMode | null;
@@ -46,7 +45,7 @@ export const TradingModeTooltip = ({
</ExternalLink>
)}
</p>
{compiledGrid && <MarketDataGrid grid={compiledGrid} />}
{compiledGrid && <DataGrid grid={compiledGrid} />}
</section>
);
}
@@ -72,7 +71,7 @@ export const TradingModeTooltip = ({
</ExternalLink>
)}
</p>
{compiledGrid && <MarketDataGrid grid={compiledGrid} />}
{compiledGrid && <DataGrid grid={compiledGrid} />}
</section>
);
}
@@ -94,7 +93,7 @@ export const TradingModeTooltip = ({
</ExternalLink>
)}
</p>
{compiledGrid && <MarketDataGrid grid={compiledGrid} />}
{compiledGrid && <DataGrid grid={compiledGrid} />}
</section>
);
}
@@ -1,3 +1,6 @@
import { renderHook } from '@testing-library/react';
import { Intent } from '@vegaprotocol/ui-toolkit';
import BigNumber from 'bignumber.js';
import {
formatWithAsset,
sumLiquidityCommitted,
@@ -6,6 +9,7 @@ import {
getCandle24hAgo,
getChange,
EMPTY_VALUE,
useCheckLiquidityStatus,
} from './liquidity-utils';
const CANDLES_1 = [
@@ -118,3 +122,50 @@ describe('getChange', () => {
expect(result).toEqual(EMPTY_VALUE);
});
});
describe('useCheckLiquidityStatus', () => {
it('should return amber if liquidity is enough', () => {
const { result } = renderHook(() =>
useCheckLiquidityStatus({
suppliedStake: '60',
targetStake: '100',
triggeringRatio: '0.5',
})
);
expect(result.current).toEqual({
status: Intent.Warning,
percentage: new BigNumber('60'),
});
});
it('should return red if liquidity is not enough', () => {
const { result } = renderHook(() =>
useCheckLiquidityStatus({
suppliedStake: '60',
targetStake: '100',
triggeringRatio: '1',
})
);
expect(result.current).toEqual({
status: Intent.Danger,
percentage: new BigNumber('60'),
});
});
it('should return green if liquidity is enough', () => {
const { result } = renderHook(() =>
useCheckLiquidityStatus({
suppliedStake: '101',
targetStake: '100',
triggeringRatio: '1',
})
);
expect(result.current).toEqual({
status: Intent.Success,
percentage: new BigNumber('101'),
});
});
});
@@ -2,6 +2,7 @@ import BigNumber from 'bignumber.js';
import { addDecimalsFormatNumber } from '@vegaprotocol/react-helpers';
import type { MarketNodeFragment } from './../__generated__/MarketsLiquidity';
import { Intent } from '@vegaprotocol/ui-toolkit';
export type LiquidityProvisionMarket = MarketNodeFragment;
@@ -117,3 +118,46 @@ export const getTargetStake = (
) => {
return markets.find((m) => m.id === marketId)?.data?.targetStake || '0';
};
export const useCheckLiquidityStatus = ({
suppliedStake,
targetStake,
triggeringRatio,
}: {
suppliedStake: string | number;
targetStake: string | number;
triggeringRatio: string | number;
}): {
status: Intent;
percentage: BigNumber;
} => {
// percentage supplied
const percentage = new BigNumber(suppliedStake)
.dividedBy(targetStake)
.multipliedBy(100);
// IF supplied_stake >= target_stake THEN
if (new BigNumber(suppliedStake).gte(new BigNumber(targetStake))) {
// show a green status, e.g. "🟢 $13,666,999 liquidity supplied"
return {
status: Intent.Success,
percentage,
};
// ELSE IF supplied_stake > NETPARAM[market.liquidity.targetstake.triggering.ratio] * target_stake THEN
} else if (
new BigNumber(suppliedStake).gte(
new BigNumber(targetStake).multipliedBy(triggeringRatio)
)
) {
// show an amber status, e.g. "🟠 $3,456,123 liquidity supplied"
return {
status: Intent.Warning,
percentage,
};
// ELSE show a red status, e.g. "🔴 $600,002 liquidity supplied"
} else {
return {
status: Intent.Danger,
percentage,
};
}
};
+4 -2
View File
@@ -3,14 +3,14 @@ import * as Types from '@vegaprotocol/types';
import { gql } from '@apollo/client';
import * as Apollo from '@apollo/client';
const defaultOptions = {} as const;
export type MarketDataUpdateFieldsFragment = { __typename?: 'ObservableMarketData', marketId: string, bestBidPrice: string, bestOfferPrice: string, markPrice: string, trigger: Types.AuctionTrigger, staticMidPrice: string, marketTradingMode: Types.MarketTradingMode, marketState: Types.MarketState, indicativeVolume: string, indicativePrice: string, bestStaticBidPrice: string, bestStaticOfferPrice: string };
export type MarketDataUpdateFieldsFragment = { __typename?: 'ObservableMarketData', marketId: string, bestBidPrice: string, bestOfferPrice: string, markPrice: string, trigger: Types.AuctionTrigger, staticMidPrice: string, marketTradingMode: Types.MarketTradingMode, marketState: Types.MarketState, indicativeVolume: string, indicativePrice: string, bestStaticBidPrice: string, bestStaticOfferPrice: string, targetStake?: string | null, suppliedStake?: string | null };
export type MarketDataUpdateSubscriptionVariables = Types.Exact<{
marketId: Types.Scalars['ID'];
}>;
export type MarketDataUpdateSubscription = { __typename?: 'Subscription', marketsData: Array<{ __typename?: 'ObservableMarketData', marketId: string, bestBidPrice: string, bestOfferPrice: string, markPrice: string, trigger: Types.AuctionTrigger, staticMidPrice: string, marketTradingMode: Types.MarketTradingMode, marketState: Types.MarketState, indicativeVolume: string, indicativePrice: string, bestStaticBidPrice: string, bestStaticOfferPrice: string }> };
export type MarketDataUpdateSubscription = { __typename?: 'Subscription', marketsData: Array<{ __typename?: 'ObservableMarketData', marketId: string, bestBidPrice: string, bestOfferPrice: string, markPrice: string, trigger: Types.AuctionTrigger, staticMidPrice: string, marketTradingMode: Types.MarketTradingMode, marketState: Types.MarketState, indicativeVolume: string, indicativePrice: string, bestStaticBidPrice: string, bestStaticOfferPrice: string, targetStake?: string | null, suppliedStake?: string | null }> };
export type MarketDataFieldsFragment = { __typename?: 'MarketData', bestBidPrice: string, bestOfferPrice: string, markPrice: string, trigger: Types.AuctionTrigger, staticMidPrice: string, marketTradingMode: Types.MarketTradingMode, marketState: Types.MarketState, indicativeVolume: string, indicativePrice: string, bestStaticBidPrice: string, bestStaticOfferPrice: string, targetStake?: string | null, suppliedStake?: string | null, auctionStart?: string | null, auctionEnd?: string | null, market: { __typename?: 'Market', id: string } };
@@ -35,6 +35,8 @@ export const MarketDataUpdateFieldsFragmentDoc = gql`
indicativePrice
bestStaticBidPrice
bestStaticOfferPrice
targetStake
suppliedStake
}
`;
export const MarketDataFieldsFragmentDoc = gql`
@@ -11,6 +11,8 @@ fragment MarketDataUpdateFields on ObservableMarketData {
indicativePrice
bestStaticBidPrice
bestStaticOfferPrice
targetStake
suppliedStake
}
subscription MarketDataUpdate($marketId: ID!) {
@@ -102,6 +102,9 @@ export const NetworkParams = {
spam_protection_voting_min_tokens: 'spam_protection_voting_min_tokens',
spam_protection_proposal_min_tokens: 'spam_protection_proposal_min_tokens',
market_liquidity_stakeToCcySiskas: 'market_liquidity_stakeToCcySiskas',
market_liquidity_stakeToCcyVolume: 'market_liquidity_stakeToCcyVolume',
market_liquidity_targetstake_triggering_ratio:
'market_liquidity_targetstake_triggering_ratio',
} as const;
type Params = typeof NetworkParams;
@@ -9,6 +9,8 @@ const Themes = {
type Theme = typeof Themes[keyof typeof Themes];
const isBrowser = typeof window !== 'undefined';
const validateTheme = (theme: string): theme is Theme => {
if (Object.values(Themes).includes(theme as Theme)) return true;
LocalStorage.removeItem(THEME_STORAGE_KEY);
@@ -16,7 +18,7 @@ const validateTheme = (theme: string): theme is Theme => {
};
const setThemeClassName = (theme: Theme) => {
if (typeof window !== 'undefined') {
if (isBrowser) {
if (theme === Themes.DARK) {
document.documentElement.classList.add(Themes.DARK);
} else {
@@ -26,6 +28,13 @@ const setThemeClassName = (theme: Theme) => {
};
const getCurrentTheme = () => {
// If an app is only dark theme then the page will be rendered with
// the dark class already applied. In this case return early with state
// set to dark
if (isBrowser && document.documentElement.classList.contains(Themes.DARK)) {
return Themes.DARK;
}
const storedTheme = LocalStorage.getItem(THEME_STORAGE_KEY);
if (storedTheme && validateTheme(storedTheme)) {
@@ -34,7 +43,7 @@ const getCurrentTheme = () => {
}
const theme =
typeof window !== 'undefined' &&
isBrowser &&
typeof window.matchMedia === 'function' && // jest test environment matchMedia is undefined
window.matchMedia('(prefers-color-scheme: dark)').matches
? Themes.DARK
+1
View File
@@ -14,3 +14,4 @@ export * from './lib/links';
export * from './lib/is-asset-erc20';
export * from './lib/remove-pagination-wrapper';
export * from './lib/__generated__/ChainId';
export * from './lib/data-grid';
@@ -1,13 +1,13 @@
import type { ReactNode } from 'react';
export type MarketDataGridProps = {
export type DataGridProps = {
grid: {
label: string | ReactNode;
value?: ReactNode;
}[];
};
export const MarketDataGrid = ({ grid }: MarketDataGridProps) => {
export const DataGrid = ({ grid }: DataGridProps) => {
return (
<>
{grid.map(
@@ -0,0 +1 @@
export * from './data-grid';
+1
View File
@@ -11,3 +11,4 @@ export * from './remove-0x';
export * from './time';
export * from './links';
export * from './remove-pagination-wrapper';
export * from './data-grid';
+65 -158
View File
@@ -1,74 +1,11 @@
import { t } from '@vegaprotocol/react-helpers';
import { z } from 'zod';
import { WalletClient } from '@vegaprotocol/wallet-client';
import { clearConfig, getConfig, setConfig } from '../storage';
import { encodeTransaction } from '../utils';
import type { Transaction, VegaConnector } from './vega-connector';
import { WalletError } from './vega-connector';
const VERSION = 'v2';
enum Methods {
ConnectWallet = 'client.connect_wallet',
DisconnectWallet = 'client.disconnect_wallet',
ListKeys = 'client.list_keys',
SendTransaction = 'client.send_transaction',
GetChainId = 'client.get_chain_id',
}
const BaseSchema = z.object({
id: z.string(),
jsonrpc: z.literal('2.0'),
});
const ConnectWalletSchema = BaseSchema.extend({
result: z.object({
token: z.string(),
}),
});
const ListKeysSchema = BaseSchema.extend({
result: z.object({
keys: z.array(
z.object({
publicKey: z.string(),
name: z.string(),
})
),
}),
});
const GetChainIdSchema = BaseSchema.extend({
result: z.object({
chainID: z.string(),
}),
});
const SendTransactionSchema = BaseSchema.extend({
result: z.object({
receivedAt: z.string(),
sentAt: z.string(),
transactionHash: z.string(),
transaction: z.object({
signature: z.object({
value: z.string(),
}),
}),
}),
});
type JsonRpcError = {
message: string;
code: number;
data?: string;
};
type Response =
| z.infer<typeof ConnectWalletSchema>
| z.infer<typeof ListKeysSchema>
| z.infer<typeof GetChainIdSchema>
| z.infer<typeof SendTransactionSchema>
| { error: JsonRpcError };
export const ClientErrors = {
NO_SERVICE: new WalletError(t('No service'), 100),
NO_TOKEN: new WalletError(t('No token'), 101),
@@ -86,51 +23,69 @@ export const ClientErrors = {
),
} as const;
class NoClientError extends Error {
constructor() {
super(
t('No client found. The connector needs to be initialized with a url.')
);
}
}
export class JsonRpcConnector implements VegaConnector {
version = VERSION;
url: string | null = null;
private _url: string | null = null;
token: string | null = null;
reqId = 0;
client?: WalletClient;
constructor() {
const cfg = getConfig();
if (cfg) {
this.token = cfg.token;
this.token = cfg?.token ?? null;
if (cfg && cfg.url) {
this.url = cfg.url;
this.client = new WalletClient({
address: cfg.url,
token: cfg.token ?? undefined,
});
}
}
set url(url: string) {
this._url = url;
this.client = new WalletClient({
address: url,
token: this.token ?? undefined,
});
}
async getChainId() {
const result = await this.request(Methods.GetChainId);
if ('error' in result) {
throw this.wrapError(result.error);
if (!this.client) {
throw new NoClientError();
}
const parseResult = GetChainIdSchema.safeParse(result);
if (parseResult.success) {
return parseResult.data.result;
} else {
try {
const { result } = await this.client.GetChainId();
return result;
} catch (err) {
throw ClientErrors.INVALID_RESPONSE;
}
}
async connectWallet() {
const result = await this.request(Methods.ConnectWallet, {
hostname: window.location.host,
});
if ('error' in result) {
throw this.wrapError(result.error);
if (!this.client) {
throw new NoClientError();
}
const parseResult = ConnectWalletSchema.safeParse(result);
if (parseResult.success) {
// store token and other config for eager connect and subsequent requests
try {
const { result } = await this.client.ConnectWallet();
setConfig({
token: parseResult.data.result.token,
token: result.token,
connector: 'jsonRpc',
url: this.url,
});
return parseResult.data.result;
} else {
return result;
} catch (err) {
throw ClientErrors.INVALID_RESPONSE;
}
}
@@ -138,80 +93,57 @@ export class JsonRpcConnector implements VegaConnector {
// connect actually calling list_keys here, not to be confused with connect_wallet
// which retrieves the session token
async connect() {
const cfg = getConfig();
if (!cfg?.token) {
throw ClientErrors.NO_TOKEN;
if (!this.client) {
throw new NoClientError();
}
const result = await this.request(Methods.ListKeys, {
token: cfg.token,
});
if ('error' in result) {
throw this.wrapError(result.error);
}
const parseResult = ListKeysSchema.safeParse(result);
if (parseResult.success) {
return parseResult.data.result.keys;
} else {
try {
const { result } = await this.client.ListKeys();
return result.keys;
} catch (err) {
throw ClientErrors.INVALID_RESPONSE;
}
}
async disconnect() {
const cfg = getConfig();
if (cfg?.token) {
await this.request(Methods.DisconnectWallet, {
token: cfg.token,
});
if (!this.client) {
throw new NoClientError();
}
await this.client.DisconnectWallet();
clearConfig();
}
async sendTx(pubKey: string, transaction: Transaction) {
const cfg = getConfig();
if (!cfg?.token) {
throw ClientErrors.NO_TOKEN;
if (!this.client) {
throw new NoClientError();
}
const result = await this.request(Methods.SendTransaction, {
token: cfg.token,
publicKey: pubKey,
sendingMode: 'TYPE_SYNC',
encodedTransaction: encodeTransaction(transaction),
});
try {
const { result } = await this.client.SendTransaction({
publicKey: pubKey,
sendingMode: 'TYPE_SYNC',
transaction,
});
if ('error' in result) {
// In the case of sending a tx, error code 3001 indicates that the
// user rejected the tx. Returning null will allow the dialog to close immediately
if (result.error.code === 3001) {
return null;
} else {
throw this.wrapError(result.error);
}
}
const parsedResult = SendTransactionSchema.safeParse(result);
if (parsedResult.success) {
return {
transactionHash: parsedResult.data.result.transactionHash,
sentAt: parsedResult.data.result.sentAt,
receivedAt: parsedResult.data.result.receivedAt,
signature: parsedResult.data.result.transaction.signature.value,
transactionHash: result.transactionHash,
sentAt: result.sentAt,
receivedAt: result.receivedAt,
signature: result.transaction.signature.value,
};
} else {
} catch (err) {
throw ClientErrors.INVALID_RESPONSE;
}
}
async checkCompat() {
try {
const result = await fetch(`${this.url}/api/${this.version}/methods`);
const result = await fetch(`${this._url}/api/${this.version}/methods`);
if (!result.ok) {
const err = ClientErrors.INVALID_WALLET;
err.data = t(
`The wallet running at ${this.url} is not supported. Required version is ${this.version}`
`The wallet running at ${this._url} is not supported. Required version is ${this.version}`
);
throw err;
}
@@ -224,29 +156,4 @@ export class JsonRpcConnector implements VegaConnector {
throw ClientErrors.NO_SERVICE;
}
}
private async request(method: Methods, params?: object): Promise<Response> {
try {
const result = await fetch(`${this.url}/api/${this.version}/requests`, {
method: 'post',
body: JSON.stringify({
jsonrpc: '2.0',
method,
params,
id: `${this.reqId++}`,
}),
headers: {
'Content-Type': 'application/json',
},
});
const json = await result.json();
return json;
} catch (err) {
throw ClientErrors.NO_SERVICE;
}
}
private wrapError(error: JsonRpcError) {
return new WalletError(error.message, error.code, error.data);
}
}
+1 -1
View File
@@ -17,7 +17,7 @@ export interface VegaWalletContextShape {
connect: (connector: VegaConnector) => Promise<PubKey[] | null>;
/** Disconnects from the connector and clears public key state */
disconnect: () => Promise<boolean>;
disconnect: () => Promise<void>;
/** Sets the current selected public key */
selectPubKey: (pubKey: string) => void;
+8 -12
View File
@@ -59,23 +59,19 @@ export const VegaWalletProvider = ({ children }: VegaWalletProviderProps) => {
}, []);
const disconnect = useCallback(async () => {
// always clear state after attempted disconnection.. this
// is because long lived token sessions (used in tests)
// cannot be cleared. Clearing state will force user to reconnect
// again as expected
setPubKeys(null);
setPubKey(null);
LocalStorage.removeItem(WALLET_KEY);
try {
await connector.current?.disconnect();
setPubKeys(null);
setPubKey(null);
connector.current = null;
LocalStorage.removeItem(WALLET_KEY);
return true;
} catch (err) {
console.error(err);
if (err instanceof WalletError && err.code === 100) {
setPubKeys(null);
setPubKey(null);
connector.current = null;
LocalStorage.removeItem(WALLET_KEY);
return true;
}
return false;
connector.current = null;
}
}, []);
+1
View File
@@ -36,6 +36,7 @@
"@sentry/nextjs": "^6.19.3",
"@sentry/react": "^6.19.2",
"@sentry/tracing": "^6.19.2",
"@vegaprotocol/wallet-client": "0.1.4",
"@walletconnect/ethereum-provider": "^1.7.5",
"@web3-react/core": "8.0.20-beta.0",
"@web3-react/metamask": "8.0.16-beta.0",
+11 -2
View File
@@ -7559,6 +7559,15 @@
"@typescript-eslint/types" "5.40.0"
eslint-visitor-keys "^3.3.0"
"@vegaprotocol/wallet-client@0.1.4":
version "0.1.4"
resolved "https://registry.yarnpkg.com/@vegaprotocol/wallet-client/-/wallet-client-0.1.4.tgz#202fa1a84dbef57199810383f2887a7ee0afd64c"
integrity sha512-uGEbusoi3lwyl7Nn9ovBg9YHrfcH/Rl33KUcLfdMeTX8FZO+n7BVm3ejd00e5RsM/PJlqJ1oW4qkiq7kervxng==
dependencies:
express "4.18.2"
nanoid "3.3.4"
node-fetch "2.6.7"
"@walletconnect/browser-utils@^1.8.0":
version "1.8.0"
resolved "https://registry.yarnpkg.com/@walletconnect/browser-utils/-/browser-utils-1.8.0.tgz#33c10e777aa6be86c713095b5206d63d32df0951"
@@ -12798,7 +12807,7 @@ expect@^29.0.0:
jest-message-util "^29.1.2"
jest-util "^29.1.2"
express@^4.17.1, express@^4.17.3:
express@4.18.2, express@^4.17.1, express@^4.17.3:
version "4.18.2"
resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
@@ -17333,7 +17342,7 @@ nan@^2.12.1:
resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb"
integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==
nanoid@^3.3.1, nanoid@^3.3.4:
nanoid@3.3.4, nanoid@^3.3.1, nanoid@^3.3.4:
version "3.3.4"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==