diff --git a/.prettierignore b/.prettierignore index 16b8bff30..6b83ad2e8 100644 --- a/.prettierignore +++ b/.prettierignore @@ -6,6 +6,5 @@ __generated__ apps/static/src/assets/devnet-tranches.json apps/static/src/assets/mainnet-tranches.json -apps/static/src/assets/stagnet1-tranches.json apps/static/src/assets/stagnet3-tranches.json apps/static/src/assets/testnet-tranches.json diff --git a/README.md b/README.md index d245dd5eb..723d3fe2a 100644 --- a/README.md +++ b/README.md @@ -127,7 +127,7 @@ As environment variables are build time and not run time in frontend application In order to override specific environment variables you can pass these to the container like this: ```bash -docker run -e NX_VEGA_URL=https://n04.d.vega.xyz/query -p 3000:80 [TAG] +docker run -e NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql -p 3000:80 [TAG] ``` Which will now point the app to use a devnet data node. To see a list of all possible config properties see the readme.md for each app in the app directory. diff --git a/apps/console-lite/.env.devnet b/apps/console-lite/.env.devnet index 7ba4cdd07..71f82946b 100644 --- a/apps/console-lite/.env.devnet +++ b/apps/console-lite/.env.devnet @@ -1,8 +1,8 @@ # App configuration variables NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/devnet-network.json -NX_VEGA_URL=https://n04.d.vega.xyz/query +NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql NX_VEGA_ENV=DEVNET -NX_VEGA_REST=https://n04.d.vega.xyz/datanode/rest +NX_VEGA_REST=https://api.n04.d.vega.xyz NX_VEGA_NETWORKS={\"MAINNET\":\"https://alpha.console.vega.xyz\"} NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 NX_ETHERSCAN_URL=https://ropsten.etherscan.io diff --git a/apps/console-lite/.env.mainnet b/apps/console-lite/.env.mainnet index d4d89f07e..63ce90cf6 100644 --- a/apps/console-lite/.env.mainnet +++ b/apps/console-lite/.env.mainnet @@ -2,7 +2,7 @@ NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/mainnet-network.json NX_VEGA_URL=https://api.token.vega.xyz/query NX_VEGA_ENV=MAINNET -NX_VEGA_REST=https://api.token.vega.xyz/ +NX_VEGA_REST=https://api.token.vega.xyz NX_VEGA_NETWORKS='{\"MAINNET\":\"https://alpha.console.vega.xyz\"}' NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 NX_ETHERSCAN_URL=https://etherscan.io diff --git a/apps/console-lite/.env.stagnet1 b/apps/console-lite/.env.stagnet1 deleted file mode 100644 index 0ec54a3c7..000000000 --- a/apps/console-lite/.env.stagnet1 +++ /dev/null @@ -1,9 +0,0 @@ -# App configuration variables -NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet1-network.json -NX_VEGA_URL=https://n03.s.vega.xyz/query -NX_VEGA_ENV=STAGNET -NX_VEGA_REST=https://n03.s.vega.xyz/datanode/rest -NX_VEGA_NETWORKS='{\"MAINNET\":\"https://alpha.console.vega.xyz\"}' -NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 -NX_ETHERSCAN_URL=https://ropsten.etherscan.io -NX_VEGA_EXPLORER_URL=https://staging.explorer.vega.xyz diff --git a/apps/console-lite/.env.stagnet3 b/apps/console-lite/.env.stagnet3 index 0f7d3aeaa..66bd82fdd 100644 --- a/apps/console-lite/.env.stagnet3 +++ b/apps/console-lite/.env.stagnet3 @@ -1,8 +1,8 @@ # App configuration variables NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json -NX_VEGA_URL=https://n01.stagnet3.vega.xyz/query +NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/graphql NX_VEGA_ENV=STAGNET3 -NX_VEGA_REST=https://n01.stagnet3.vega.xyz/datanode/rest +NX_VEGA_REST=https://api.n01.stagnet3.vega.xyz NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 NX_ETHERSCAN_URL=https://ropsten.etherscan.io NX_VEGA_EXPLORER_URL=https://staging2.explorer.vega.xyz diff --git a/apps/explorer-e2e/.env.devnet b/apps/explorer-e2e/.env.devnet index 0956ee9f3..836acdd28 100644 --- a/apps/explorer-e2e/.env.devnet +++ b/apps/explorer-e2e/.env.devnet @@ -2,9 +2,9 @@ NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api NX_TENDERMINT_URL=https://n04.d.vega.xyz/tm NX_TENDERMINT_WEBSOCKET_URL=wss://n04.d.vega.xyz/tm/websocket -NX_VEGA_URL=https://n04.d.vega.xyz/query +NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql NX_VEGA_ENV=DEVNET -NX_VEGA_REST=https://n04.d.vega.xyz/datanode/rest +NX_VEGA_REST=https://api.n04.d.vega.xyz # App flags NX_EXPLORER_ASSETS=1 diff --git a/apps/explorer-e2e/.env.stagnet1 b/apps/explorer-e2e/.env.stagnet1 deleted file mode 100644 index 19d6fd050..000000000 --- a/apps/explorer-e2e/.env.stagnet1 +++ /dev/null @@ -1,18 +0,0 @@ -# App configuration variables -NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api -NX_TENDERMINT_URL=https://n03.s.vega.xyz/tm -NX_TENDERMINT_WEBSOCKET_URL=wss://n03.s.vega.xyz/tm/websocket -NX_VEGA_URL=https://n03.s.vega.xyz/query -NX_VEGA_ENV=STAGNET -NX_VEGA_REST=https://n03.s.vega.xyz/datanode/rest - -# App flags -NX_EXPLORER_ASSETS=1 -NX_EXPLORER_GENESIS=1 -NX_EXPLORER_GOVERNANCE=1 -NX_EXPLORER_MARKETS=1 -NX_EXPLORER_ORACLES=1 -NX_EXPLORER_TXS_LIST=1 -NX_EXPLORER_NETWORK_PARAMETERS=1 -NX_EXPLORER_PARTIES=1 -NX_EXPLORER_VALIDATORS=1 diff --git a/apps/explorer-e2e/.env.stagnet3 b/apps/explorer-e2e/.env.stagnet3 index d48301ed4..0906be0b4 100644 --- a/apps/explorer-e2e/.env.stagnet3 +++ b/apps/explorer-e2e/.env.stagnet3 @@ -2,9 +2,9 @@ NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api NX_TENDERMINT_URL=https://n01.stagnet3.vega.xyz/tm NX_TENDERMINT_WEBSOCKET_URL=wss://n01.stagnet3.vega.xyz/tm/websocket -NX_VEGA_URL=https://n01.stagnet3.vega.xyz/query +NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/graphql NX_VEGA_ENV=STAGNET3 -NX_VEGA_REST=https://n01.stagnet3.vega.xyz/datanode/rest +NX_VEGA_REST=https://api.n01.stagnet3.vega.xyz # App flags NX_EXPLORER_ASSETS=1 diff --git a/apps/explorer/.env b/apps/explorer/.env index 9fdd36c08..0671f6c90 100644 --- a/apps/explorer/.env +++ b/apps/explorer/.env @@ -8,7 +8,7 @@ NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-exp NX_TENDERMINT_URL=https://n01.stagnet3.vega.xyz/tm NX_TENDERMINT_WEBSOCKET_URL=wss://n01.stagnet3.vega.xyz/tm/websocket NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json -NX_VEGA_URL=https://n01.stagnet3.vega.xyz/query +NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/graphql NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz"}' NX_VEGA_ENV=STAGNET3 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions diff --git a/apps/explorer/.env.devnet b/apps/explorer/.env.devnet index e8a1dc521..0953fb115 100644 --- a/apps/explorer/.env.devnet +++ b/apps/explorer/.env.devnet @@ -3,7 +3,7 @@ NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-exp NX_TENDERMINT_URL=https://n04.d.vega.xyz/tm NX_TENDERMINT_WEBSOCKET_URL=wss://n04.d.vega.xyz/tm/websocket NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/devnet-network.json -NX_VEGA_URL=https://n04.d.vega.xyz/query +NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz"}' NX_VEGA_ENV=DEVNET NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions diff --git a/apps/explorer/.env.stagnet1 b/apps/explorer/.env.stagnet1 deleted file mode 100644 index 723adaf10..000000000 --- a/apps/explorer/.env.stagnet1 +++ /dev/null @@ -1,9 +0,0 @@ -# App configuration variables -NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api -NX_TENDERMINT_URL=https://n03.s.vega.xyz/tm -NX_TENDERMINT_WEBSOCKET_URL=wss://n03.s.vega.xyz/tm/websocket -NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet1-network.json -NX_VEGA_URL=https://n03.s.vega.xyz/query -NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz"}' -NX_VEGA_ENV=STAGNET -NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions diff --git a/apps/explorer/.env.stagnet3 b/apps/explorer/.env.stagnet3 index 12dec4d38..3cb62f060 100644 --- a/apps/explorer/.env.stagnet3 +++ b/apps/explorer/.env.stagnet3 @@ -3,7 +3,7 @@ NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-exp NX_TENDERMINT_URL=https://n01.stagnet3.vega.xyz/tm NX_TENDERMINT_WEBSOCKET_URL=wss://n01.stagnet3.vega.xyz/tm/websocket NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json -NX_VEGA_URL=https://n01.stagnet3.vega.xyz/query +NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/graphql NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz"}' NX_VEGA_ENV=STAGNET3 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions diff --git a/apps/explorer/README.md b/apps/explorer/README.md index 792c49464..d4d053613 100644 --- a/apps/explorer/README.md +++ b/apps/explorer/README.md @@ -35,13 +35,12 @@ Example configurations are provided here: - [Devnet](./.env.devnet) - [Capsule](./.env.capsule) - [Testnet](./.env.testnet) -- [Stagnet1](./.env.stagnet1) - [Stagnet3](./.env.stagnet3) For convenience, you can boot the app injecting one of the configurations above by running: ```bash -yarn nx run explorer:serve --env={env} # e.g. stagnet1 +yarn nx run explorer:serve --env={env} # e.g. stagnet3 ``` There are a few different configuration options offered for this app: diff --git a/apps/static/src/assets/devnet-network.json b/apps/static/src/assets/devnet-network.json index 0ae00e51b..f73463246 100644 --- a/apps/static/src/assets/devnet-network.json +++ b/apps/static/src/assets/devnet-network.json @@ -1,3 +1,3 @@ { - "hosts": ["https://n04.d.vega.xyz/query"] + "hosts": ["https://api.n04.d.vega.xyz/graphql"] } diff --git a/apps/static/src/assets/stagnet1-network.json b/apps/static/src/assets/stagnet1-network.json deleted file mode 100644 index c912e6233..000000000 --- a/apps/static/src/assets/stagnet1-network.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "hosts": ["https://n03.s.vega.xyz/query"] -} diff --git a/apps/static/src/assets/stagnet1-tranches.json b/apps/static/src/assets/stagnet1-tranches.json deleted file mode 100644 index bc8337831..000000000 --- a/apps/static/src/assets/stagnet1-tranches.json +++ /dev/null @@ -1,316 +0,0 @@ -[ - { - "tranche_id": 4, - "tranche_start": "2021-05-15T09:09:30.000Z", - "tranche_end": "2022-05-15T09:09:30.000Z", - "total_added": "100", - "total_removed": "0", - "locked_amount": "0", - "deposits": [ - { - "amount": "100", - "user": "0xFc00fa2A8B7f0D85a39e101B985a74e83f5c8980", - "tx": "0xaf36ffbe4a40813ef0f778054f78aa0a506211a56e976193fb046571995cc76a" - } - ], - "withdrawals": [], - "users": [ - { - "address": "0xFc00fa2A8B7f0D85a39e101B985a74e83f5c8980", - "deposits": [ - { - "amount": "100", - "user": "0xFc00fa2A8B7f0D85a39e101B985a74e83f5c8980", - "tranche_id": 4, - "tx": "0xaf36ffbe4a40813ef0f778054f78aa0a506211a56e976193fb046571995cc76a" - } - ], - "withdrawals": [], - "total_tokens": "100", - "withdrawn_tokens": "0", - "remaining_tokens": "100" - } - ] - }, - { - "tranche_id": 5, - "tranche_start": "2021-11-26T13:48:10.000Z", - "tranche_end": "2022-11-26T13:48:10.000Z", - "total_added": "100", - "total_removed": "0", - "locked_amount": "25.43070776255708", - "deposits": [ - { - "amount": "100", - "user": "0xaA383f95fa88e979e7de91B37433a38B293b7432", - "tx": "0x8f97b9e33af057e155f3d745cefe43ee2408f0ae8df89ecbc2d4dedbd1389114" - } - ], - "withdrawals": [], - "users": [ - { - "address": "0xaA383f95fa88e979e7de91B37433a38B293b7432", - "deposits": [ - { - "amount": "100", - "user": "0xaA383f95fa88e979e7de91B37433a38B293b7432", - "tranche_id": 5, - "tx": "0x8f97b9e33af057e155f3d745cefe43ee2408f0ae8df89ecbc2d4dedbd1389114" - } - ], - "withdrawals": [], - "total_tokens": "100", - "withdrawn_tokens": "0", - "remaining_tokens": "100" - } - ] - }, - { - "tranche_id": 1, - "tranche_start": "1970-01-01T00:00:00.000Z", - "tranche_end": "1970-01-01T00:00:00.000Z", - "total_added": "11200", - "total_removed": "10100", - "locked_amount": "0", - "deposits": [ - { - "amount": "600", - "user": "0x9804C6E98dA75e3271ccE3aA56728FD8e9376155", - "tx": "0xbcccc6382d70694e48c342c00b52422a1594be74cedf18dcf0f76d1049484868" - }, - { - "amount": "100", - "user": "0xAbEbf1f93aA8C80fB38C896c9a76e266A8EB1d99", - "tx": "0xf1902e5ef53e51dfd8b8c95babd22118c3c3818d6ca775530885808ab2125eb9" - }, - { - "amount": "500", - "user": "0x58F0F575eFA3De140aaEDcbffe31B724994e2ec6", - "tx": "0xde7f73f9c46a83796467a12987a2946dea081124483bc3477ca8e0596c03421e" - }, - { - "amount": "10000", - "user": "0x7382EF0cDb0168D9c1106Efbc43e8a12fB6106cB", - "tx": "0xfaf9be231e81948888804534a2f1869e270086583570f3c802507f9e9388d238" - } - ], - "withdrawals": [ - { - "amount": "100", - "user": "0xAbEbf1f93aA8C80fB38C896c9a76e266A8EB1d99", - "tx": "0x3ca0e398ef7d33731d65f4de0c73c24a5dd3604a959d58553bebcae166dc24cc" - }, - { - "amount": "10000", - "user": "0x7382EF0cDb0168D9c1106Efbc43e8a12fB6106cB", - "tx": "0x00ca6784af8d8674d4cc418abb3aab601efa0e2968720610b0094c84366bf5a7" - } - ], - "users": [ - { - "address": "0x9804C6E98dA75e3271ccE3aA56728FD8e9376155", - "deposits": [ - { - "amount": "600", - "user": "0x9804C6E98dA75e3271ccE3aA56728FD8e9376155", - "tranche_id": 1, - "tx": "0xbcccc6382d70694e48c342c00b52422a1594be74cedf18dcf0f76d1049484868" - } - ], - "withdrawals": [], - "total_tokens": "600", - "withdrawn_tokens": "0", - "remaining_tokens": "600" - }, - { - "address": "0xAbEbf1f93aA8C80fB38C896c9a76e266A8EB1d99", - "deposits": [ - { - "amount": "100", - "user": "0xAbEbf1f93aA8C80fB38C896c9a76e266A8EB1d99", - "tranche_id": 1, - "tx": "0xf1902e5ef53e51dfd8b8c95babd22118c3c3818d6ca775530885808ab2125eb9" - } - ], - "withdrawals": [ - { - "amount": "100", - "user": "0xAbEbf1f93aA8C80fB38C896c9a76e266A8EB1d99", - "tranche_id": 1, - "tx": "0x3ca0e398ef7d33731d65f4de0c73c24a5dd3604a959d58553bebcae166dc24cc" - } - ], - "total_tokens": "100", - "withdrawn_tokens": "100", - "remaining_tokens": "0" - }, - { - "address": "0x58F0F575eFA3De140aaEDcbffe31B724994e2ec6", - "deposits": [ - { - "amount": "500", - "user": "0x58F0F575eFA3De140aaEDcbffe31B724994e2ec6", - "tranche_id": 1, - "tx": "0xde7f73f9c46a83796467a12987a2946dea081124483bc3477ca8e0596c03421e" - } - ], - "withdrawals": [], - "total_tokens": "500", - "withdrawn_tokens": "0", - "remaining_tokens": "500" - }, - { - "address": "0x7382EF0cDb0168D9c1106Efbc43e8a12fB6106cB", - "deposits": [ - { - "amount": "10000", - "user": "0x7382EF0cDb0168D9c1106Efbc43e8a12fB6106cB", - "tranche_id": 1, - "tx": "0xfaf9be231e81948888804534a2f1869e270086583570f3c802507f9e9388d238" - } - ], - "withdrawals": [ - { - "amount": "10000", - "user": "0x7382EF0cDb0168D9c1106Efbc43e8a12fB6106cB", - "tranche_id": 1, - "tx": "0x00ca6784af8d8674d4cc418abb3aab601efa0e2968720610b0094c84366bf5a7" - } - ], - "total_tokens": "10000", - "withdrawn_tokens": "10000", - "remaining_tokens": "0" - } - ] - }, - { - "tranche_id": 2, - "tranche_start": "2033-05-18T03:33:20.000Z", - "tranche_end": "2033-05-18T03:33:20.000Z", - "total_added": "600", - "total_removed": "0", - "locked_amount": "600", - "deposits": [ - { - "amount": "100", - "user": "0xAbEbf1f93aA8C80fB38C896c9a76e266A8EB1d99", - "tx": "0x1de2c1884b96c2f58930cc08e0eb2739abedeea4527943cd4989310415e142ed" - }, - { - "amount": "500", - "user": "0x58F0F575eFA3De140aaEDcbffe31B724994e2ec6", - "tx": "0x54b0c591f9582767aaa3ea9661ed65bbe4ba5cacc66f292b4978fd3b93dec8e6" - } - ], - "withdrawals": [], - "users": [ - { - "address": "0xAbEbf1f93aA8C80fB38C896c9a76e266A8EB1d99", - "deposits": [ - { - "amount": "100", - "user": "0xAbEbf1f93aA8C80fB38C896c9a76e266A8EB1d99", - "tranche_id": 2, - "tx": "0x1de2c1884b96c2f58930cc08e0eb2739abedeea4527943cd4989310415e142ed" - } - ], - "withdrawals": [], - "total_tokens": "100", - "withdrawn_tokens": "0", - "remaining_tokens": "100" - }, - { - "address": "0x58F0F575eFA3De140aaEDcbffe31B724994e2ec6", - "deposits": [ - { - "amount": "500", - "user": "0x58F0F575eFA3De140aaEDcbffe31B724994e2ec6", - "tranche_id": 2, - "tx": "0x54b0c591f9582767aaa3ea9661ed65bbe4ba5cacc66f292b4978fd3b93dec8e6" - } - ], - "withdrawals": [], - "total_tokens": "500", - "withdrawn_tokens": "0", - "remaining_tokens": "500" - } - ] - }, - { - "tranche_id": 3, - "tranche_start": "2021-10-12T00:53:20.000Z", - "tranche_end": "2022-10-12T00:53:20.000Z", - "total_added": "1100", - "total_removed": "673.04388635", - "locked_amount": "142.499739979705724", - "deposits": [ - { - "amount": "1000", - "user": "0x970Bf6C66E55f90a7D455354954Af5CaBA11318C", - "tx": "0xfee1971d3403ecfbee9b88a14aee2654a5a397d9fb5e4a1787b0a8d4a60dd42c" - }, - { - "amount": "100", - "user": "0xFc00fa2A8B7f0D85a39e101B985a74e83f5c8980", - "tx": "0xf3a97d073a229b78b0dfacb6b24d6eb2fc89d79dc003bff114c1d205705f880b" - } - ], - "withdrawals": [ - { - "amount": "673.00240994", - "user": "0x970Bf6C66E55f90a7D455354954Af5CaBA11318C", - "tx": "0xdaf6124a50ae4cfed3e72d42e5bb43dcc707538d3db1355f215aac162c3f35a4" - }, - { - "amount": "0.04147641", - "user": "0x970Bf6C66E55f90a7D455354954Af5CaBA11318C", - "tx": "0x8c9b4e7bb2ef3f06f47c614ac42f466de3b6994c36a5061e7d384607bdbdfb01" - } - ], - "users": [ - { - "address": "0x970Bf6C66E55f90a7D455354954Af5CaBA11318C", - "deposits": [ - { - "amount": "1000", - "user": "0x970Bf6C66E55f90a7D455354954Af5CaBA11318C", - "tranche_id": 3, - "tx": "0xfee1971d3403ecfbee9b88a14aee2654a5a397d9fb5e4a1787b0a8d4a60dd42c" - } - ], - "withdrawals": [ - { - "amount": "673.00240994", - "user": "0x970Bf6C66E55f90a7D455354954Af5CaBA11318C", - "tranche_id": 3, - "tx": "0xdaf6124a50ae4cfed3e72d42e5bb43dcc707538d3db1355f215aac162c3f35a4" - }, - { - "amount": "0.04147641", - "user": "0x970Bf6C66E55f90a7D455354954Af5CaBA11318C", - "tranche_id": 3, - "tx": "0x8c9b4e7bb2ef3f06f47c614ac42f466de3b6994c36a5061e7d384607bdbdfb01" - } - ], - "total_tokens": "1000", - "withdrawn_tokens": "673.04388635", - "remaining_tokens": "326.95611365" - }, - { - "address": "0xFc00fa2A8B7f0D85a39e101B985a74e83f5c8980", - "deposits": [ - { - "amount": "100", - "user": "0xFc00fa2A8B7f0D85a39e101B985a74e83f5c8980", - "tranche_id": 3, - "tx": "0xf3a97d073a229b78b0dfacb6b24d6eb2fc89d79dc003bff114c1d205705f880b" - } - ], - "withdrawals": [], - "total_tokens": "100", - "withdrawn_tokens": "0", - "remaining_tokens": "100" - } - ] - } -] \ No newline at end of file diff --git a/apps/static/src/assets/stagnet3-network.json b/apps/static/src/assets/stagnet3-network.json index 10150bfef..70919e034 100644 --- a/apps/static/src/assets/stagnet3-network.json +++ b/apps/static/src/assets/stagnet3-network.json @@ -1,3 +1,3 @@ { - "hosts": ["https://n01.stagnet3.vega.xyz/query"] + "hosts": ["https://api.n01.stagnet3.vega.xyz/graphql"] } diff --git a/apps/static/src/assets/testnet-network.json b/apps/static/src/assets/testnet-network.json index 8e6e13295..4e8c841da 100644 --- a/apps/static/src/assets/testnet-network.json +++ b/apps/static/src/assets/testnet-network.json @@ -1,3 +1,3 @@ { - "hosts": ["https://lb.testnet.vega.xyz/query"] + "hosts": ["https://api.n09.testnet.vega.xyz/graphql"] } diff --git a/apps/stats-e2e/.env.devnet b/apps/stats-e2e/.env.devnet index 451ec50d2..c061c2c24 100644 --- a/apps/stats-e2e/.env.devnet +++ b/apps/stats-e2e/.env.devnet @@ -1,4 +1,4 @@ # App configuration variables NX_VEGA_ENV=DEVNET CYPRESS_VEGA_ENV=DEVNET -NX_VEGA_REST=https://n04.d.vega.xyz/datanode/rest +NX_VEGA_REST=https://api.n04.d.vega.xyz diff --git a/apps/stats-e2e/.env.stagnet1 b/apps/stats-e2e/.env.stagnet1 deleted file mode 100644 index c7799e52c..000000000 --- a/apps/stats-e2e/.env.stagnet1 +++ /dev/null @@ -1,4 +0,0 @@ -# App configuration variables -NX_VEGA_ENV=STAGNET 1 -CYPRESS_VEGA_ENV=STAGNET 1 -NX_VEGA_REST=https://n03.s.vega.xyz/datanode/rest diff --git a/apps/stats-e2e/.env.stagnet3 b/apps/stats-e2e/.env.stagnet3 index c3b8d2454..04dba78fc 100644 --- a/apps/stats-e2e/.env.stagnet3 +++ b/apps/stats-e2e/.env.stagnet3 @@ -1,4 +1,4 @@ # App configuration variables -NX_VEGA_ENV=STAGNET 3 -CYPRESS_VEGA_ENV=STAGNET 3 -NX_VEGA_REST=https://n01.stagnet3.vega.xyz/datanode/rest +NX_VEGA_ENV=STAGNET3 +CYPRESS_VEGA_ENV=STAGNET3 +NX_VEGA_REST=https://api.n01.stagnet3.vega.xyz diff --git a/apps/stats/.env.devnet b/apps/stats/.env.devnet index 6a83c6fb7..4a7d135c8 100644 --- a/apps/stats/.env.devnet +++ b/apps/stats/.env.devnet @@ -1,3 +1,3 @@ # App configuration variables NX_VEGA_ENV=DEVNET -NX_VEGA_URL=https://n04.d.vega.xyz/query +NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql diff --git a/apps/stats/.env.stagnet1 b/apps/stats/.env.stagnet1 deleted file mode 100644 index 677035096..000000000 --- a/apps/stats/.env.stagnet1 +++ /dev/null @@ -1,3 +0,0 @@ -# App configuration variables -NX_VEGA_ENV=STAGNET1; -NX_VEGA_URL=https://n03.s.vega.xyz/query; diff --git a/apps/stats/.env.stagnet3 b/apps/stats/.env.stagnet3 index 94a4feb03..8a99fa630 100644 --- a/apps/stats/.env.stagnet3 +++ b/apps/stats/.env.stagnet3 @@ -1,3 +1,3 @@ # App configuration variables -NX_VEGA_URL=https://n01.stagnet3.vega.xyz/query; +NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/graphql NX_VEGA_ENV=STAGNET3; diff --git a/apps/token-e2e/.env.devnet b/apps/token-e2e/.env.devnet index 1b684b256..cc1179783 100644 --- a/apps/token-e2e/.env.devnet +++ b/apps/token-e2e/.env.devnet @@ -1,5 +1,5 @@ # App configuration variables NX_VEGA_ENV=DEVNET -NX_VEGA_URL=https://n04.d.vega.xyz/query +NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 NX_ETHERSCAN_URL=https://ropsten.etherscan.io diff --git a/apps/token-e2e/.env.stagnet1 b/apps/token-e2e/.env.stagnet1 deleted file mode 100644 index bc321d731..000000000 --- a/apps/token-e2e/.env.stagnet1 +++ /dev/null @@ -1,5 +0,0 @@ -# App configuration variables -NX_VEGA_ENV=STAGNET -NX_VEGA_URL=https://n03.s.vega.xyz/query -NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 -NX_ETHERSCAN_URL=https://ropsten.etherscan.io diff --git a/apps/token-e2e/.env.stagnet3 b/apps/token-e2e/.env.stagnet3 index df702a149..7dd92489a 100644 --- a/apps/token-e2e/.env.stagnet3 +++ b/apps/token-e2e/.env.stagnet3 @@ -1,5 +1,5 @@ # App configuration variables NX_VEGA_ENV=STAGNET3 -NX_VEGA_URL=https://n01.stagnet3.vega.xyz/query +NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/graphql NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 NX_ETHERSCAN_URL=https://ropsten.etherscan.io diff --git a/apps/token/.env b/apps/token/.env index 710b85e2c..1bf2a0d1f 100644 --- a/apps/token/.env +++ b/apps/token/.env @@ -6,7 +6,7 @@ NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9 NX_ETHERSCAN_URL=https://ropsten.etherscan.io NX_VEGA_REST=https://api.n11.testnet.vega.xyz NX_FAIRGROUND=false -NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET":"https://staging.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}' +NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}' NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions NX_VEGA_WALLET_URL=http://localhost:1789/api/v1 diff --git a/apps/token/.env.capsule b/apps/token/.env.capsule index 0a09dc14d..3a96cbc27 100644 --- a/apps/token/.env.capsule +++ b/apps/token/.env.capsule @@ -3,7 +3,7 @@ NX_VEGA_ENV=TESTNET NX_ETHEREUM_PROVIDER_URL=http://localhost:8545 NX_ETHERSCAN_URL=https://ropsten.etherscan.io NX_FAIRGROUND=false -NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET":"https://staging.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}' +NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}' NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions NX_VEGA_CONFIG_URL='' diff --git a/apps/token/.env.devnet b/apps/token/.env.devnet index c4b6c5d5f..23139db8f 100644 --- a/apps/token/.env.devnet +++ b/apps/token/.env.devnet @@ -1,9 +1,9 @@ # App configuration variables NX_VEGA_ENV=DEVNET NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/devnet-network.json -NX_VEGA_URL=https://n04.d.vega.xyz/query -NX_VEGA_REST=https://n04.d.vega.xyz/datanode/rest -NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET":"https://staging.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}' +NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql +NX_VEGA_REST=https://api.n04.d.vega.xyz +NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}' NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 NX_ETHERSCAN_URL=https://ropsten.etherscan.io NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions diff --git a/apps/token/.env.mainnet b/apps/token/.env.mainnet index edcd92e82..bf94be649 100644 --- a/apps/token/.env.mainnet +++ b/apps/token/.env.mainnet @@ -2,7 +2,7 @@ NX_VEGA_ENV=MAINNET NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/mainnet-network.json NX_VEGA_URL=https://api.token.vega.xyz/query -NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET":"https://staging.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}' +NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}' NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 NX_ETHERSCAN_URL=https://etherscan.io NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions diff --git a/apps/token/.env.stagnet1 b/apps/token/.env.stagnet1 deleted file mode 100644 index ac76067eb..000000000 --- a/apps/token/.env.stagnet1 +++ /dev/null @@ -1,9 +0,0 @@ -# App configuration variables -NX_VEGA_ENV=STAGNET -NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet1-network.json -NX_VEGA_URL=https://n03.s.vega.xyz/query -NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET":"https://staging.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}' -NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 -NX_ETHERSCAN_URL=https://ropsten.etherscan.io -NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions -NX_VEGA_REST=https://n03.s.vega.xyz/datanode/rest diff --git a/apps/token/.env.stagnet3 b/apps/token/.env.stagnet3 index dc3ce0902..6a0d5308e 100644 --- a/apps/token/.env.stagnet3 +++ b/apps/token/.env.stagnet3 @@ -2,10 +2,10 @@ NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api NX_TENDERMINT_URL=https://tm.n01.stagnet3.vega.xyz/ NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet3.vega.xyz/websocket -NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/query +NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/graphql NX_VEGA_ENV=STAGNET3 NX_VEGA_REST=https://api.n01.stagnet3.vega.xyz -NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET":"https://staging.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}' +NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}' NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json # App flags diff --git a/apps/token/.env.testnet b/apps/token/.env.testnet index 4ea7113d6..0c51e50fd 100644 --- a/apps/token/.env.testnet +++ b/apps/token/.env.testnet @@ -2,7 +2,7 @@ NX_VEGA_ENV=TESTNET NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/testnet-network.json NX_VEGA_URL=https://api.n11.testnet.vega.xyz/graphql -NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET":"https://staging.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}' +NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}' NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 NX_ETHERSCAN_URL=https://ropsten.etherscan.io NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions diff --git a/apps/token/README.md b/apps/token/README.md index a9079fdec..31e6ef3a2 100644 --- a/apps/token/README.md +++ b/apps/token/README.md @@ -27,13 +27,12 @@ Example configurations are provided here: - [Mainnet](./.env.mainnet) - [Devnet](./.env.devnet) - [Testnet](./.env.testnet) -- [Stagnet1](./.env.stagnet1) - [Stagnet3](./.env.stagnet3) For convenience, you can boot the app injecting one of the configurations above by running: ```bash -yarn nx run token:serve --env={env} # e.g. stagnet1 +yarn nx run token:serve --env={env} # e.g. stagnet3 ``` There are a few different configuration options offered for this app: diff --git a/apps/token/src/config/env.ts b/apps/token/src/config/env.ts index ae96a7b1a..b66081b81 100644 --- a/apps/token/src/config/env.ts +++ b/apps/token/src/config/env.ts @@ -28,10 +28,6 @@ export const ContractAddresses: { claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', lockedAddress: '0x0', }, - STAGNET: { - claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error - lockedAddress: '0x0', // TODO not deployed to this env - }, STAGNET3: { claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error lockedAddress: '0x0', // TODO not deployed to this env diff --git a/apps/token/src/hooks/use-tranches.ts b/apps/token/src/hooks/use-tranches.ts index cb4ab7f07..88a911484 100644 --- a/apps/token/src/hooks/use-tranches.ts +++ b/apps/token/src/hooks/use-tranches.ts @@ -9,7 +9,6 @@ import { BigNumber } from '../lib/bignumber'; const TRANCHES_URLS: { [N in Networks]: string } = { MAINNET: 'https://static.vega.xyz/assets/mainnet-tranches.json', TESTNET: 'https://static.vega.xyz/assets/testnet-tranches.json', - STAGNET: 'https://static.vega.xyz/assets/stagnet1-tranches.json', STAGNET3: 'https://static.vega.xyz/assets/stagnet3-tranches.json', DEVNET: 'https://static.vega.xyz/assets/devnet-tranches.json', CUSTOM: 'https://static.vega.xyz/assets/testnet-tranches.json', diff --git a/apps/trading/.env.devnet b/apps/trading/.env.devnet index a9a913252..de04803c7 100644 --- a/apps/trading/.env.devnet +++ b/apps/trading/.env.devnet @@ -1,7 +1,7 @@ # App configuration variables NX_VEGA_ENV=DEVNET NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/devnet-network.json -NX_VEGA_URL=https://n04.d.vega.xyz/query +NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql NX_VEGA_NETWORKS={\"MAINNET\":\"https://alpha.console.vega.xyz\"} NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 NX_ETHERSCAN_URL=https://ropsten.etherscan.io diff --git a/apps/trading/.env.stagnet1 b/apps/trading/.env.stagnet1 deleted file mode 100644 index 7a84c347f..000000000 --- a/apps/trading/.env.stagnet1 +++ /dev/null @@ -1,8 +0,0 @@ -# App configuration variables -NX_VEGA_ENV=STAGNET -NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet1-network.json -NX_VEGA_URL=https://n03.s.vega.xyz/query -NX_VEGA_NETWORKS='{\"MAINNET\":\"https://alpha.console.vega.xyz\"}' -NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 -NX_ETHERSCAN_URL=https://ropsten.etherscan.io -NX_VEGA_EXPLORER_URL=https://staging.explorer.vega.xyz diff --git a/apps/trading/.env.stagnet3 b/apps/trading/.env.stagnet3 index c999e5de5..c2d7fe4de 100644 --- a/apps/trading/.env.stagnet3 +++ b/apps/trading/.env.stagnet3 @@ -1,7 +1,7 @@ # App configuration variables NX_VEGA_ENV=STAGNET3 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json -NX_VEGA_URL=https://n01.stagnet3.vega.xyz/query +NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/graphql NX_VEGA_NETWORKS='{\"MAINNET\":\"https://alpha.console.vega.xyz\"}' NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 NX_ETHERSCAN_URL=https://ropsten.etherscan.io diff --git a/apps/trading/README.md b/apps/trading/README.md index 6205c14e5..1449e05ba 100644 --- a/apps/trading/README.md +++ b/apps/trading/README.md @@ -21,13 +21,12 @@ Example configurations are provided here: - [Mainnet](./.env.mainnet) - [Devnet](./.env.devnet) - [Testnet](./.env.testnet) -- [Stagnet1](./.env.stagnet1) - [Stagnet3](./.env.stagnet3) For convenience, you can boot the app injecting one of the configurations above by running: ```bash -yarn nx run token:serve --env={env} # e.g. stagnet1 +yarn nx run token:serve --env={env} # e.g. stagnet3 ``` There are a few different configuration options offered for this app: diff --git a/libs/environment/src/components/network-switcher/network-switcher.spec.tsx b/libs/environment/src/components/network-switcher/network-switcher.spec.tsx index 28d08b134..bd58a79ee 100644 --- a/libs/environment/src/components/network-switcher/network-switcher.spec.tsx +++ b/libs/environment/src/components/network-switcher/network-switcher.spec.tsx @@ -16,7 +16,6 @@ describe('Network switcher', () => { network | label ${Networks.CUSTOM} | ${envTriggerMapping[Networks.CUSTOM]} ${Networks.DEVNET} | ${envTriggerMapping[Networks.DEVNET]} - ${Networks.STAGNET} | ${envTriggerMapping[Networks.STAGNET]} ${Networks.STAGNET3} | ${envTriggerMapping[Networks.STAGNET3]} ${Networks.TESTNET} | ${envTriggerMapping[Networks.TESTNET]} ${Networks.MAINNET} | ${envTriggerMapping[Networks.MAINNET]} @@ -137,7 +136,6 @@ describe('Network switcher', () => { [Networks.MAINNET]: 'https://main.net', [Networks.TESTNET]: 'https://test.net', [Networks.STAGNET3]: 'https://stag3.net', - [Networks.STAGNET]: 'https://stag.net', [Networks.DEVNET]: 'https://dev.net', }; // @ts-ignore Typescript doesn't know about this module being mocked @@ -155,7 +153,6 @@ describe('Network switcher', () => { Networks.MAINNET, Networks.TESTNET, Networks.STAGNET3, - Networks.STAGNET, Networks.DEVNET, ].forEach((network) => { expect( @@ -174,7 +171,6 @@ describe('Network switcher', () => { [Networks.MAINNET]: 'https://main.net', [Networks.TESTNET]: 'https://test.net', [Networks.STAGNET3]: 'https://stag3.net', - [Networks.STAGNET]: 'https://stag.net', [Networks.DEVNET]: 'https://dev.net', }; // @ts-ignore Typescript doesn't know about this module being mocked @@ -203,7 +199,6 @@ describe('Network switcher', () => { [Networks.MAINNET]: undefined, [Networks.TESTNET]: 'https://test.net', [Networks.STAGNET3]: 'https://stag3.net', - [Networks.STAGNET]: 'https://stag.net', [Networks.DEVNET]: 'https://dev.net', }; // @ts-ignore Typescript doesn't know about this module being mocked diff --git a/libs/environment/src/components/network-switcher/network-switcher.tsx b/libs/environment/src/components/network-switcher/network-switcher.tsx index d8e73cadd..a5a825262 100644 --- a/libs/environment/src/components/network-switcher/network-switcher.tsx +++ b/libs/environment/src/components/network-switcher/network-switcher.tsx @@ -15,7 +15,6 @@ import { Networks } from '../../types'; export const envNameMapping: Record = { [Networks.CUSTOM]: t('Custom'), [Networks.DEVNET]: t('Devnet'), - [Networks.STAGNET]: t('Stagnet'), [Networks.STAGNET3]: t('Stagnet3'), [Networks.TESTNET]: t('Fairground testnet'), [Networks.MAINNET]: t('Mainnet'), @@ -29,10 +28,7 @@ export const envTriggerMapping: Record = { export const envDescriptionMapping: Record = { [Networks.CUSTOM]: '', [Networks.DEVNET]: t('The latest Vega code auto-deployed'), - [Networks.STAGNET]: t('A staging environment with trading'), - [Networks.STAGNET3]: t( - 'A testnet that simulates validators coming and going' - ), + [Networks.STAGNET3]: t('A staging environment with trading'), [Networks.TESTNET]: t( 'Public testnet run by the Vega team, often used for incentives' ), @@ -44,7 +40,6 @@ const advancedNetworkKeys = [ Networks.MAINNET, Networks.TESTNET, Networks.STAGNET3, - Networks.STAGNET, Networks.DEVNET, ]; diff --git a/libs/environment/src/hooks/use-environment-errors.spec.tsx b/libs/environment/src/hooks/use-environment-errors.spec.tsx index bac54f752..4f6405807 100644 --- a/libs/environment/src/hooks/use-environment-errors.spec.tsx +++ b/libs/environment/src/hooks/use-environment-errors.spec.tsx @@ -149,7 +149,7 @@ describe('throws error', () => { ); }); - it('throws a validation error when VEGA_NETWORKS is has an invalid network as a key', () => { + it('throws a validation error when VEGA_NETWORKS has an invalid network as a key', () => { process.env['NX_VEGA_NETWORKS'] = JSON.stringify({ NOT_A_NETWORK: 'https://somewhere.url', }); @@ -159,7 +159,7 @@ describe('throws error', () => { }); expect(result).toThrow( `Error processing the vega app environment: - - All keys in NX_VEGA_NETWORKS must represent a valid environment: CUSTOM | TESTNET | STAGNET | STAGNET3 | DEVNET | MAINNET` + - All keys in NX_VEGA_NETWORKS must represent a valid environment: CUSTOM | TESTNET | STAGNET3 | DEVNET | MAINNET` ); }); @@ -183,7 +183,7 @@ describe('throws error', () => { }); expect(result).toThrow( `Error processing the vega app environment: - - NX_VEGA_ENV is invalid, received "undefined" instead of: 'CUSTOM' | 'TESTNET' | 'STAGNET' | 'STAGNET3' | 'DEVNET' | 'MAINNET'` + - NX_VEGA_ENV is invalid, received "undefined" instead of: 'CUSTOM' | 'TESTNET' | 'STAGNET3' | 'DEVNET' | 'MAINNET'` ); }); @@ -195,7 +195,7 @@ describe('throws error', () => { }); expect(result).not.toThrow( `Error processing the vega app environment: - - NX_VEGA_ENV is invalid, received "SOMETHING" instead of: CUSTOM | TESTNET | STAGNET | DEVNET | MAINNET` + - NX_VEGA_ENV is invalid, received "SOMETHING" instead of: CUSTOM | TESTNET | STAGNET3 | DEVNET | MAINNET` ); }); }); diff --git a/libs/environment/src/hooks/use-environment.spec.tsx b/libs/environment/src/hooks/use-environment.spec.tsx index a59e099ec..a3de88e8c 100644 --- a/libs/environment/src/hooks/use-environment.spec.tsx +++ b/libs/environment/src/hooks/use-environment.spec.tsx @@ -33,7 +33,7 @@ const mockEnvironmentState = { VEGA_CONFIG_URL: 'https://vega.xyz/testnet-config.json', VEGA_NETWORKS: { TESTNET: 'https://testnet.url', - STAGNET: 'https://stagnet.url', + STAGNET3: 'https://stagnet3.url', MAINNET: 'https://mainnet.url', }, ETHEREUM_PROVIDER_URL: 'https://ether.provider', @@ -191,7 +191,6 @@ it.each` env | etherscanUrl | providerUrl ${Networks.DEVNET} | ${'https://ropsten.etherscan.io'} | ${'https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8'} ${Networks.TESTNET} | ${'https://ropsten.etherscan.io'} | ${'https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8'} - ${Networks.STAGNET} | ${'https://ropsten.etherscan.io'} | ${'https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8'} ${Networks.STAGNET3} | ${'https://ropsten.etherscan.io'} | ${'https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8'} ${Networks.MAINNET} | ${'https://etherscan.io'} | ${'https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8'} `( diff --git a/libs/environment/src/utils/validate-environment.ts b/libs/environment/src/utils/validate-environment.ts index added30f5..1488da896 100644 --- a/libs/environment/src/utils/validate-environment.ts +++ b/libs/environment/src/utils/validate-environment.ts @@ -6,7 +6,6 @@ import { compileErrors } from './compile-errors'; export enum Networks { CUSTOM = 'CUSTOM', TESTNET = 'TESTNET', - STAGNET = 'STAGNET', STAGNET3 = 'STAGNET3', DEVNET = 'DEVNET', MAINNET = 'MAINNET', diff --git a/libs/types/.env b/libs/types/.env index 11bf90db0..72694fe98 100644 --- a/libs/types/.env +++ b/libs/types/.env @@ -1 +1 @@ -NX_VEGA_URL=https://n04.d.vega.xyz/query +NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql diff --git a/scripts/get-tranches.js b/scripts/get-tranches.js index d8f1ea3c0..138e3e224 100644 --- a/scripts/get-tranches.js +++ b/scripts/get-tranches.js @@ -18,12 +18,6 @@ const CONFIG = [ provider: 'https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8', startBlock: 11340808, }, - { - env: 'stagnet1', - contract: '0xfCe6eB272D3d4146A96bC28de71212b327F575fa', - provider: 'https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8', - startBlock: 11259488, - }, { env: 'stagnet3', contract: '0x9F10cBeEf03A564Fb914c2010c0Cd55E9BB11406',