From 4fd0f6819a1851d4b6962d2f8717bd4f91454ee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20M=C5=82odzikowski?= Date: Thu, 4 May 2023 16:29:31 +0200 Subject: [PATCH 1/7] feat(ci): deploy develop to stagnet1 (#3609) --- .github/workflows/publish-dist.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-dist.yml b/.github/workflows/publish-dist.yml index a81b29fe7..1e3a17f6d 100644 --- a/.github/workflows/publish-dist.yml +++ b/.github/workflows/publish-dist.yml @@ -66,7 +66,7 @@ jobs: fi fi elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then - envName="stagnet3" + envName="stagnet1" fi bucketName="${{ matrix.app }}.${envName}.${domain}" echo BUCKET_NAME=${bucketName} >> $GITHUB_ENV From 6b8b33a78b3aad3ee4c069efe8017c74dc5f4064 Mon Sep 17 00:00:00 2001 From: Edd Date: Thu, 4 May 2023 17:50:39 +0100 Subject: [PATCH 2/7] chore(explorer,trading,governance): remove stagnet3 (#3608) --- .prettierignore | 1 - apps/explorer-e2e/.env.stagnet3 | 18 -------------- apps/explorer/.env | 20 +++++++++------- apps/explorer/.env.capsule | 8 ------- apps/explorer/.env.stagnet1 | 15 +----------- apps/explorer/.env.stagnet3 | 8 ------- apps/explorer/README.md | 3 +-- apps/governance-e2e/.env | 2 +- apps/governance-e2e/.env.stagnet3 | 5 ---- apps/governance/.env | 12 +++++----- apps/governance/.env.capsule | 4 ++-- apps/governance/.env.devnet | 2 +- apps/governance/.env.mainnet | 2 +- apps/governance/.env.stagnet1 | 2 +- apps/governance/.env.stagnet3 | 11 --------- apps/governance/.env.testnet | 2 +- apps/governance/.env.validator-testnet | 2 +- apps/governance/README.md | 3 +-- apps/governance/src/config/env.ts | 4 ---- apps/liquidity-provision-dashboard/.env | 2 +- .../liquidity-provision-dashboard/.env.devnet | 2 +- .../.env.stagnet1 | 2 +- .../.env.stagnet3 | 8 ------- apps/multisig-signer/.env | 6 ++--- apps/multisig-signer/.env.stagnet3 | 5 ---- apps/multisig-signer/README.md | 3 +-- apps/static/src/assets/stagnet3-network.json | 3 --- apps/trading-e2e/.env | 2 +- apps/trading-e2e/.env.capsule | 2 +- apps/trading-e2e/.env.stagnet3 | 24 ------------------- apps/trading/.env | 8 +++---- apps/trading/.env.capsule | 4 ++-- apps/trading/.env.devnet | 2 +- apps/trading/.env.mainnet | 2 +- apps/trading/.env.stagnet1 | 2 +- apps/trading/.env.stagnet3 | 14 ----------- apps/trading/.env.testnet | 2 +- apps/trading/.env.validator-testnet | 2 +- apps/trading/README.md | 3 +-- .../risk-notice-dialog.spec.tsx | 1 - .../network-switcher.spec.tsx | 21 +++++----------- .../network-switcher/network-switcher.tsx | 3 --- .../src/hooks/use-environment.spec.ts | 1 - libs/environment/src/hooks/use-links.ts | 3 --- libs/environment/src/types.ts | 1 - .../src/utils/validate-environment.ts | 1 - 46 files changed, 56 insertions(+), 197 deletions(-) delete mode 100644 apps/explorer-e2e/.env.stagnet3 delete mode 100644 apps/explorer/.env.stagnet3 delete mode 100644 apps/governance-e2e/.env.stagnet3 delete mode 100644 apps/governance/.env.stagnet3 delete mode 100644 apps/liquidity-provision-dashboard/.env.stagnet3 delete mode 100644 apps/multisig-signer/.env.stagnet3 delete mode 100644 apps/static/src/assets/stagnet3-network.json delete mode 100644 apps/trading-e2e/.env.stagnet3 delete mode 100644 apps/trading/.env.stagnet3 diff --git a/.prettierignore b/.prettierignore index 344ebc105..365c3d4f7 100644 --- a/.prettierignore +++ b/.prettierignore @@ -7,5 +7,4 @@ __generated___ apps/static/src/assets/devnet-tranches.json apps/static/src/assets/mainnet-tranches.json -apps/static/src/assets/stagnet3-tranches.json apps/static/src/assets/testnet-tranches.json diff --git a/apps/explorer-e2e/.env.stagnet3 b/apps/explorer-e2e/.env.stagnet3 deleted file mode 100644 index 3e33e1bc1..000000000 --- a/apps/explorer-e2e/.env.stagnet3 +++ /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://tm.n00.stagnet3.vega.xyz -NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n00.stagnet3.vega.xyz/websocket -NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql -NX_VEGA_ENV=STAGNET3 -NX_BLOCK_EXPLORER=https://be.stagnet3.vega.xyz/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=0 -NX_EXPLORER_NETWORK_PARAMETERS=1 -NX_EXPLORER_PARTIES=1 -NX_EXPLORER_VALIDATORS=1 diff --git a/apps/explorer/.env b/apps/explorer/.env index 00d6f58d1..6e2be9609 100644 --- a/apps/explorer/.env +++ b/apps/explorer/.env @@ -1,13 +1,17 @@ -NX_TENDERMINT_URL=https://tm.n00.stagnet3.vega.xyz -NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n00.stagnet3.vega.xyz/websocket -NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml -NX_VEGA_NETWORKS='{"STAGNET1":"https://stagnet1.token.vega.xyz", "STAGNET3":"https://stagnet3.explorer.vega.xyz","VALIDATOR_TESTNET":"https://validator-testnet.fairground.wtf","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}' -NX_VEGA_ENV=STAGNET3 -NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions +NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 +NX_ETHERSCAN_URL=https://sepolia.etherscan.io NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz +NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml +NX_VEGA_ENV=STAGNET1 +NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz +NX_VEGA_TOKEN_URL=https://stagnet1.token.vega.xyz +NX_VEGA_WALLET_URL=http://localhost:1789 +NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.xyz +NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket +NX_BLOCK_EXPLORER=https://be.stagnet1.vega.xyz/rest NX_ETHERSCAN_URL=https://sepolia.etherscan.io -NX_BLOCK_EXPLORER=https://be.stagnet3.vega.xyz/rest -NX_ETHERSCAN_URL=https://sepolia.etherscan.io +NX_VEGA_GOVERNANCE_URL=https://stagnet1.token.vega.xyz +NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.jsoo # App flags NX_EXPLORER_ASSETS=1 diff --git a/apps/explorer/.env.capsule b/apps/explorer/.env.capsule index a190b40a4..dc6f83bab 100644 --- a/apps/explorer/.env.capsule +++ b/apps/explorer/.env.capsule @@ -6,12 +6,4 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json # 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=0 -NX_EXPLORER_NETWORK_PARAMETERS=1 -NX_EXPLORER_PARTIES=1 -NX_EXPLORER_VALIDATORS=1 diff --git a/apps/explorer/.env.stagnet1 b/apps/explorer/.env.stagnet1 index 2bf424130..37d1e4bf7 100644 --- a/apps/explorer/.env.stagnet1 +++ b/apps/explorer/.env.stagnet1 @@ -1,14 +1 @@ -NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 -NX_ETHERSCAN_URL=https://sepolia.etherscan.io -NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz -NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml -NX_VEGA_ENV=STAGNET1 -NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz -NX_VEGA_TOKEN_URL=https://stagnet1.token.vega.xyz -NX_VEGA_WALLET_URL=http://localhost:1789 -NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.xyz -NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket -NX_BLOCK_EXPLORER=https://be.stagnet1.vega.xyz/rest -NX_ETHERSCAN_URL=https://sepolia.etherscan.io -NX_VEGA_GOVERNANCE_URL=https://stagnet1.token.vega.xyz -NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json \ No newline at end of file +# .env is stagnet1, so there are no overrides required \ No newline at end of file diff --git a/apps/explorer/.env.stagnet3 b/apps/explorer/.env.stagnet3 deleted file mode 100644 index d9d30a30c..000000000 --- a/apps/explorer/.env.stagnet3 +++ /dev/null @@ -1,8 +0,0 @@ -NX_TENDERMINT_URL=https://tm.n00.stagnet3.vega.xyz -NX_TENDERMINT_WEBSOCKET_URL=wss://be.stagnet3.vega.xyz/websocket -NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml -NX_VEGA_ENV=STAGNET3 -NX_BLOCK_EXPLORER=https://be.stagnet3.vega.xyz/rest -NX_VEGA_GOVERNANCE_URL=https://stagnet3.token.vega.xyz -NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega-dev-releases/releases/ -NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json \ No newline at end of file diff --git a/apps/explorer/README.md b/apps/explorer/README.md index a7ea117b6..f75a41965 100644 --- a/apps/explorer/README.md +++ b/apps/explorer/README.md @@ -35,12 +35,11 @@ Example configurations are provided here: - [Devnet](./.env.devnet) - [Capsule](./.env.capsule) - [Testnet](./.env.testnet) -- [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. stagnet3 +yarn nx run explorer:serve --env={env} # e.g. stagnet1 ``` There are a few different configuration options offered for this app: diff --git a/apps/governance-e2e/.env b/apps/governance-e2e/.env index 4187dafaa..1f48d6450 100644 --- a/apps/governance-e2e/.env +++ b/apps/governance-e2e/.env @@ -13,7 +13,7 @@ NX_LOCAL_PROVIDER_URL=http://localhost:8545/ NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/ NX_VEGA_WALLET_URL=http://localhost:1789 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet -NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz +NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72 diff --git a/apps/governance-e2e/.env.stagnet3 b/apps/governance-e2e/.env.stagnet3 deleted file mode 100644 index 1e8fab0f4..000000000 --- a/apps/governance-e2e/.env.stagnet3 +++ /dev/null @@ -1,5 +0,0 @@ -# App configuration variables -NX_VEGA_ENV=STAGNET3 -NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql -NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 -NX_ETHERSCAN_URL=https://sepolia.etherscan.io diff --git a/apps/governance/.env b/apps/governance/.env index 6ced39e1c..67d327f93 100644 --- a/apps/governance/.env +++ b/apps/governance/.env @@ -1,18 +1,18 @@ # App configuration variables -NX_VEGA_ENV=STAGNET3 -NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml -NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql +NX_VEGA_ENV=STAGNET1 +NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml +NX_VEGA_URL=https://api.n00.stagnet1.vega.xyz/graphql NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 NX_ETHERSCAN_URL=https://sepolia.etherscan.io NX_FAIRGROUND=false -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_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET1":"https://stagnet1.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 -NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf +NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet NX_DELEGATIONS_PAGINATION=50 -NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz +NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72 diff --git a/apps/governance/.env.capsule b/apps/governance/.env.capsule index 446dabc96..38195652b 100644 --- a/apps/governance/.env.capsule +++ b/apps/governance/.env.capsule @@ -3,7 +3,7 @@ NX_VEGA_ENV=CUSTOM NX_ETHEREUM_PROVIDER_URL=http://localhost:8545 NX_ETHERSCAN_URL=https://sepolia.etherscan.io NX_FAIRGROUND=false -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_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}' NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json NX_VEGA_CONFIG_URL='' @@ -16,7 +16,7 @@ NX_LOCAL_PROVIDER_URL=http://localhost:8545/ NX_VEGA_WALLET_URL=http://localhost:1789 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet NX_DELEGATIONS_PAGINATION=50 -NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz +NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz #Test configuration variables CYPRESS_FAIRGROUND=false diff --git a/apps/governance/.env.devnet b/apps/governance/.env.devnet index 8f5e70d72..60ef29604 100644 --- a/apps/governance/.env.devnet +++ b/apps/governance/.env.devnet @@ -2,7 +2,7 @@ NX_VEGA_ENV=DEVNET NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml NX_VEGA_URL=https://api.n00.devnet1.vega.xyz/graphql -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_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}' NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 NX_ETHERSCAN_URL=https://sepolia.etherscan.io NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions diff --git a/apps/governance/.env.mainnet b/apps/governance/.env.mainnet index f947895f8..693dcf46b 100644 --- a/apps/governance/.env.mainnet +++ b/apps/governance/.env.mainnet @@ -2,7 +2,7 @@ NX_VEGA_ENV=MAINNET NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml NX_VEGA_URL=https://api.vega.xyz/query -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_NETWORKS='{"DEVNET":"https://dev.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/governance/.env.stagnet1 b/apps/governance/.env.stagnet1 index 09564786c..3ffa1c917 100644 --- a/apps/governance/.env.stagnet1 +++ b/apps/governance/.env.stagnet1 @@ -1,7 +1,7 @@ # App configuration variables NX_VEGA_URL=https://api.n00.stagnet1.vega.xyz/graphql NX_VEGA_ENV=STAGNET1 -NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","STAGNET1":"https://stagnet1.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}' +NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET1":"https://stagnet1.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}' NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet diff --git a/apps/governance/.env.stagnet3 b/apps/governance/.env.stagnet3 deleted file mode 100644 index f90baae40..000000000 --- a/apps/governance/.env.stagnet3 +++ /dev/null @@ -1,11 +0,0 @@ -# App configuration variables -NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql -NX_VEGA_ENV=STAGNET3 -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://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml -NX_VEGA_EXPLORER_URL=https://stagnet3.explorer.vega.xyz -NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet -NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz -NX_DELEGATIONS_PAGINATION=50 -NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz -NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json \ No newline at end of file diff --git a/apps/governance/.env.testnet b/apps/governance/.env.testnet index 4e7d865c5..d9507da64 100644 --- a/apps/governance/.env.testnet +++ b/apps/governance/.env.testnet @@ -2,7 +2,7 @@ NX_VEGA_ENV=TESTNET NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql -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_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}' NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 NX_ETHERSCAN_URL=https://sepolia.etherscan.io NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions diff --git a/apps/governance/.env.validator-testnet b/apps/governance/.env.validator-testnet index 29407c73c..2befa2780 100644 --- a/apps/governance/.env.validator-testnet +++ b/apps/governance/.env.validator-testnet @@ -3,7 +3,7 @@ NX_VEGA_ENV=VALIDATOR_TESTNET NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/testnet2/testnet2.toml NX_VEGA_URL=https://api-validators-testnet.vega.rocks/graphql NX_VEGA_REST=https://api-validators-testnet.vega.rocks/ -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_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}' NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 NX_ETHERSCAN_URL=https://sepolia.etherscan.io NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions diff --git a/apps/governance/README.md b/apps/governance/README.md index a6caec825..cb72f785b 100644 --- a/apps/governance/README.md +++ b/apps/governance/README.md @@ -27,12 +27,11 @@ Example configurations are provided here: - [Mainnet](./.env.mainnet) - [Devnet](./.env.devnet) - [Testnet](./.env.testnet) -- [Stagnet3](./.env.stagnet3) For convenience, you can boot the app injecting one of the configurations above by running: ```bash -yarn nx run governance:serve --env={env} # e.g. stagnet3 +yarn nx run governance:serve --env={env} # e.g. stagnet1 ``` There are a few different configuration options offered for this app: diff --git a/apps/governance/src/config/env.ts b/apps/governance/src/config/env.ts index 5fdbeb9d6..991c3e1dc 100644 --- a/apps/governance/src/config/env.ts +++ b/apps/governance/src/config/env.ts @@ -33,10 +33,6 @@ export const ContractAddresses: { 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 - }, TESTNET: { 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/liquidity-provision-dashboard/.env b/apps/liquidity-provision-dashboard/.env index fa7e64896..49466181f 100644 --- a/apps/liquidity-provision-dashboard/.env +++ b/apps/liquidity-provision-dashboard/.env @@ -23,5 +23,5 @@ NX_VEGA_URL="https://api.n07.testnet.vega.xyz/graphql" NX_VEGA_WALLET_URL=http://localhost:1789 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 NX_ETHERSCAN_URL=https://sepolia.etherscan.io -NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"} +NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"} NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf diff --git a/apps/liquidity-provision-dashboard/.env.devnet b/apps/liquidity-provision-dashboard/.env.devnet index 5afd02920..f45c97b2c 100644 --- a/apps/liquidity-provision-dashboard/.env.devnet +++ b/apps/liquidity-provision-dashboard/.env.devnet @@ -2,7 +2,7 @@ NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql NX_VEGA_ENV=DEVNET -NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"} +NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"} NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 NX_ETHERSCAN_URL=https://sepolia.etherscan.io NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz diff --git a/apps/liquidity-provision-dashboard/.env.stagnet1 b/apps/liquidity-provision-dashboard/.env.stagnet1 index bb7a88eb9..2ee216fc2 100644 --- a/apps/liquidity-provision-dashboard/.env.stagnet1 +++ b/apps/liquidity-provision-dashboard/.env.stagnet1 @@ -5,4 +5,4 @@ NX_VEGA_ENV=STAGNET1 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 NX_ETHERSCAN_URL=https://sepolia.etherscan.io NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz -NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"} +NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"} diff --git a/apps/liquidity-provision-dashboard/.env.stagnet3 b/apps/liquidity-provision-dashboard/.env.stagnet3 deleted file mode 100644 index 27e58cd05..000000000 --- a/apps/liquidity-provision-dashboard/.env.stagnet3 +++ /dev/null @@ -1,8 +0,0 @@ -# App configuration variables -NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml -NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql -NX_VEGA_ENV=STAGNET3 -NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 -NX_ETHERSCAN_URL=https://sepolia.etherscan.io -NX_VEGA_EXPLORER_URL=https://staging2.explorer.vega.xyz -NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"} diff --git a/apps/multisig-signer/.env b/apps/multisig-signer/.env index d8cae4d67..285cab418 100644 --- a/apps/multisig-signer/.env +++ b/apps/multisig-signer/.env @@ -1,5 +1,5 @@ -NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql -NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml +NX_VEGA_URL=https://api.stagnet1.vega.xyz/graphql +NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml NX_VEGA_NETWORKS='{"TESTNET":"https://multisig-signer.fairground.wtf","MAINNET":"https://multisig-signer.vega.xyz"}' -NX_VEGA_ENV=STAGNET3 +NX_VEGA_ENV=STAGNET1 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72 diff --git a/apps/multisig-signer/.env.stagnet3 b/apps/multisig-signer/.env.stagnet3 deleted file mode 100644 index c044d7f1d..000000000 --- a/apps/multisig-signer/.env.stagnet3 +++ /dev/null @@ -1,5 +0,0 @@ -# App configuration variables -NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml -NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql -NX_VEGA_NETWORKS='{"TESTNET":"https://multisig-signer.fairground.wtf","MAINNET":"https://multisig-signer.vega.xyz"}' -NX_VEGA_ENV=STAGNET3 diff --git a/apps/multisig-signer/README.md b/apps/multisig-signer/README.md index 20ff1270a..184e25f66 100644 --- a/apps/multisig-signer/README.md +++ b/apps/multisig-signer/README.md @@ -22,12 +22,11 @@ Example configurations are provided here: - [Devnet](./.env.devnet) - [Capsule](./.env.capsule) - [Testnet](./.env.testnet) -- [Stagnet3](./.env.stagnet3) For convenience, you can boot the app injecting one of the configurations above by running: ```bash -yarn nx run multisig-signer:serve --env={env} # e.g. stagnet3 +yarn nx run multisig-signer:serve --env={env} # e.g. stagnet1 ``` There are a few different configuration options offered for this app: diff --git a/apps/static/src/assets/stagnet3-network.json b/apps/static/src/assets/stagnet3-network.json deleted file mode 100644 index 160149221..000000000 --- a/apps/static/src/assets/stagnet3-network.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "hosts": ["https://api-stagnet3.vega.rocks/graphql"] -} diff --git a/apps/trading-e2e/.env b/apps/trading-e2e/.env index d9fd22b0b..be10f6048 100644 --- a/apps/trading-e2e/.env +++ b/apps/trading-e2e/.env @@ -6,7 +6,7 @@ NX_VEGA_CONFIG_URL='' NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet NX_VEGA_ENV=CUSTOM NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf -NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"} +NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"} NX_VEGA_TOKEN_URL=https://token.fairground.wtf NX_VEGA_URL=http://localhost:3008/graphql NX_VEGA_WALLET_URL=http://localhost:1789 diff --git a/apps/trading-e2e/.env.capsule b/apps/trading-e2e/.env.capsule index 5e9bf73bf..727fd7aa1 100644 --- a/apps/trading-e2e/.env.capsule +++ b/apps/trading-e2e/.env.capsule @@ -5,7 +5,7 @@ NX_VEGA_CONFIG_URL='' NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet NX_VEGA_ENV=CUSTOM NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf -NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"} +NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"} NX_VEGA_TOKEN_URL=https://token.fairground.wtf NX_VEGA_URL=http://localhost:3008/graphql NX_VEGA_WALLET_URL=http://localhost:1789 diff --git a/apps/trading-e2e/.env.stagnet3 b/apps/trading-e2e/.env.stagnet3 deleted file mode 100644 index 886447ead..000000000 --- a/apps/trading-e2e/.env.stagnet3 +++ /dev/null @@ -1,24 +0,0 @@ -NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 -NX_ETHERSCAN_URL=https://sepolia.etherscan.io -NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz -NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml -NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet -NX_VEGA_ENV=STAGNET3 -NX_VEGA_EXPLORER_URL=https://stagnet3.explorer.vega.xyz -NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"} -NX_VEGA_TOKEN_URL=https://stagnet3.token.vega.xyz -NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql -NX_VEGA_WALLET_URL=http://localhost:1789 - -CYPRESS_ETH_WALLET_MNEMONIC= -CYPRESS_ETHEREUM_WALLET_ADDRESS=0xEe7D375bcB50C26d52E1A4a472D8822A2A22d94F -CYPRESS_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 -CYPRESS_EXPLORER_URL=https://stagnet3.explorer.vega.xyz -CYPRESS_TRUNCATED_VEGA_PUBLIC_KEY=1a18cd…0cf2e4 -CYPRESS_TRUNCATED_VEGA_PUBLIC_KEY2=47836c…c7d278 -CYPRESS_VEGA_ENV=STAGNET3 -CYPRESS_VEGA_PUBLIC_KEY=1a18cdcaaa4f44a57b35a4e9b77e0701c17a476f2b407620f8c17371740cf2e4 -CYPRESS_VEGA_PUBLIC_KEY2=47836c253520d2661bf5bed6339c0de08fd02cf5d4db0efee3b4373f20c7d278 -CYPRESS_VEGA_TOKEN_URL=https://stagnet3.token.vega.xyz -CYPRESS_VEGA_URL=https://api.stagnet3.vega.xyz/graphql -CYPRESS_VEGA_WALLET_API_TOKEN= diff --git a/apps/trading/.env b/apps/trading/.env index 38f8c53a9..39f65e8a4 100644 --- a/apps/trading/.env +++ b/apps/trading/.env @@ -3,10 +3,10 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json -NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml -NX_VEGA_ENV=STAGNET3 -NX_VEGA_EXPLORER_URL=https://stagnet3.explorer.vega.xyz -NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"} +NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml +NX_VEGA_ENV=STAGNET1 +NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz +NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"} NX_VEGA_TOKEN_URL=https://token.fairground.wtf NX_VEGA_WALLET_URL=http://localhost:1789 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet diff --git a/apps/trading/.env.capsule b/apps/trading/.env.capsule index 0a657ab2a..15d67e983 100644 --- a/apps/trading/.env.capsule +++ b/apps/trading/.env.capsule @@ -4,8 +4,8 @@ NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz NX_VEGA_CONFIG_URL='' NX_VEGA_ENV=CUSTOM -NX_VEGA_EXPLORER_URL=https://stagnet3.explorer.vega.xyz -NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"} +NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz +NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"} NX_VEGA_TOKEN_URL=https://token.fairground.wtf NX_VEGA_URL=http://localhost:3008/graphql NX_VEGA_WALLET_URL=http://localhost:1789 diff --git a/apps/trading/.env.devnet b/apps/trading/.env.devnet index 63d01564b..38fd26272 100644 --- a/apps/trading/.env.devnet +++ b/apps/trading/.env.devnet @@ -5,7 +5,7 @@ NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml NX_VEGA_ENV=DEVNET NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz -NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"} +NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"} NX_VEGA_TOKEN_URL=https://token.fairground.wtf NX_VEGA_WALLET_URL=http://localhost:1789 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet diff --git a/apps/trading/.env.mainnet b/apps/trading/.env.mainnet index 2d6d825d5..0f227d38f 100644 --- a/apps/trading/.env.mainnet +++ b/apps/trading/.env.mainnet @@ -4,7 +4,7 @@ NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml NX_VEGA_ENV=MAINNET NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz -NX_VEGA_NETWORKS={\"MAINNET\":\"https://alpha.console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"} +NX_VEGA_NETWORKS={\"MAINNET\":\"https://alpha.console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"} NX_VEGA_TOKEN_URL=https://token.vega.xyz NX_VEGA_WALLET_URL=http://localhost:1789 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet diff --git a/apps/trading/.env.stagnet1 b/apps/trading/.env.stagnet1 index 3140601c3..e0bb2fa5f 100644 --- a/apps/trading/.env.stagnet1 +++ b/apps/trading/.env.stagnet1 @@ -5,7 +5,7 @@ NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml NX_VEGA_ENV=STAGNET1 NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz -NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"} +NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"} NX_VEGA_TOKEN_URL=https://stagnet1.token.vega.xyz NX_VEGA_WALLET_URL=http://localhost:1789 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet diff --git a/apps/trading/.env.stagnet3 b/apps/trading/.env.stagnet3 deleted file mode 100644 index 3be750257..000000000 --- a/apps/trading/.env.stagnet3 +++ /dev/null @@ -1,14 +0,0 @@ -NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 -NX_ETHERSCAN_URL=https://sepolia.etherscan.io -NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions -NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz -NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml -NX_VEGA_ENV=STAGNET3 -NX_VEGA_EXPLORER_URL=https://stagnet3.explorer.vega.xyz -NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"} -NX_VEGA_TOKEN_URL=https://token.fairground.wtf -NX_VEGA_WALLET_URL=http://localhost:1789 -NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet -NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega-dev-releases/releases -NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json -NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports \ No newline at end of file diff --git a/apps/trading/.env.testnet b/apps/trading/.env.testnet index c4f8bc481..56563bb9b 100644 --- a/apps/trading/.env.testnet +++ b/apps/trading/.env.testnet @@ -5,7 +5,7 @@ NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml NX_VEGA_ENV=TESTNET NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf -NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"} +NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"} NX_VEGA_TOKEN_URL=https://token.fairground.wtf NX_VEGA_WALLET_URL=http://localhost:1789 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet diff --git a/apps/trading/.env.validator-testnet b/apps/trading/.env.validator-testnet index 682016788..da703e9c0 100644 --- a/apps/trading/.env.validator-testnet +++ b/apps/trading/.env.validator-testnet @@ -5,7 +5,7 @@ NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/testnet2/testnet2.toml NX_VEGA_ENV=VALIDATOR_TESTNET NX_VEGA_EXPLORER_URL=https://validator-testnet.explorer.vega.xyz -NX_VEGA_NETWORKS={\"STAGNET3\":\"https://stagnet3.console.vega.xyz\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\"} +NX_VEGA_NETWORKS={\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\"} NX_VEGA_TOKEN_URL=https://validator-testnet.governance.vega.xyz NX_VEGA_WALLET_URL=http://localhost:1789 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet diff --git a/apps/trading/README.md b/apps/trading/README.md index 1449e05ba..6bbb2ad69 100644 --- a/apps/trading/README.md +++ b/apps/trading/README.md @@ -21,12 +21,11 @@ Example configurations are provided here: - [Mainnet](./.env.mainnet) - [Devnet](./.env.devnet) - [Testnet](./.env.testnet) -- [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. stagnet3 +yarn nx run token:serve --env={env} # e.g. stagnet1 ``` There are a few different configuration options offered for this app: diff --git a/apps/trading/components/welcome-dialog/risk-notice-dialog.spec.tsx b/apps/trading/components/welcome-dialog/risk-notice-dialog.spec.tsx index c4a9af049..db35f80c9 100644 --- a/apps/trading/components/welcome-dialog/risk-notice-dialog.spec.tsx +++ b/apps/trading/components/welcome-dialog/risk-notice-dialog.spec.tsx @@ -20,7 +20,6 @@ describe('Risk notice dialog', () => { assertion | network ${'displays'} | ${Networks.CUSTOM} ${'displays'} | ${Networks.DEVNET} - ${'displays'} | ${Networks.STAGNET3} ${'displays'} | ${Networks.TESTNET} `( '$assertion a generic message on $network', 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 84293132b..a5b0470d7 100644 --- a/libs/environment/src/components/network-switcher/network-switcher.spec.tsx +++ b/libs/environment/src/components/network-switcher/network-switcher.spec.tsx @@ -14,12 +14,11 @@ jest.mock('../../hooks/use-environment'); describe('Network switcher', () => { it.each` - network | label - ${Networks.CUSTOM} | ${envTriggerMapping[Networks.CUSTOM]} - ${Networks.DEVNET} | ${envTriggerMapping[Networks.DEVNET]} - ${Networks.STAGNET3} | ${envTriggerMapping[Networks.STAGNET3]} - ${Networks.TESTNET} | ${envTriggerMapping[Networks.TESTNET]} - ${Networks.MAINNET} | ${envTriggerMapping[Networks.MAINNET]} + network | label + ${Networks.CUSTOM} | ${envTriggerMapping[Networks.CUSTOM]} + ${Networks.DEVNET} | ${envTriggerMapping[Networks.DEVNET]} + ${Networks.TESTNET} | ${envTriggerMapping[Networks.TESTNET]} + ${Networks.MAINNET} | ${envTriggerMapping[Networks.MAINNET]} `( 'displays the correct selection label for $network', ({ network, label }) => { @@ -137,7 +136,6 @@ describe('Network switcher', () => { [Networks.MAINNET]: 'https://main.net', [Networks.TESTNET]: 'https://test.net', [Networks.VALIDATOR_TESTNET]: 'https://validator-test.net', - [Networks.STAGNET3]: 'https://stag3.net', [Networks.DEVNET]: 'https://dev.net', [Networks.STAGNET1]: 'https://stag1.net', }; @@ -154,12 +152,7 @@ describe('Network switcher', () => { screen.getByRole('menuitem', { name: t('Advanced') }) ); - [ - Networks.MAINNET, - Networks.TESTNET, - Networks.STAGNET3, - Networks.DEVNET, - ].forEach((network) => { + [Networks.MAINNET, Networks.TESTNET, Networks.DEVNET].forEach((network) => { expect( screen.getByRole('link', { name: envNameMapping[network] }) ).toHaveAttribute('href', VEGA_NETWORKS[network]); @@ -176,7 +169,6 @@ describe('Network switcher', () => { [Networks.MAINNET]: 'https://main.net', [Networks.VALIDATOR_TESTNET]: 'https://validator-test.net', [Networks.TESTNET]: 'https://test.net', - [Networks.STAGNET3]: 'https://stag3.net', [Networks.DEVNET]: 'https://dev.net', [Networks.STAGNET1]: 'https://stag1.net', }; @@ -208,7 +200,6 @@ describe('Network switcher', () => { [Networks.MAINNET]: undefined, [Networks.VALIDATOR_TESTNET]: 'https://validator-test.net', [Networks.TESTNET]: 'https://test.net', - [Networks.STAGNET3]: 'https://stag3.net', [Networks.DEVNET]: 'https://dev.net', [Networks.STAGNET1]: 'https://stag1.net', }; diff --git a/libs/environment/src/components/network-switcher/network-switcher.tsx b/libs/environment/src/components/network-switcher/network-switcher.tsx index 4f7392342..b9a802aa0 100644 --- a/libs/environment/src/components/network-switcher/network-switcher.tsx +++ b/libs/environment/src/components/network-switcher/network-switcher.tsx @@ -18,7 +18,6 @@ export const envNameMapping: Record = { [Networks.CUSTOM]: t('Custom'), [Networks.DEVNET]: t('Devnet'), [Networks.STAGNET1]: t('Stagnet'), - [Networks.STAGNET3]: t('Stagnet3'), [Networks.TESTNET]: t('Fairground testnet'), [Networks.MAINNET]: t('Mainnet'), }; @@ -33,7 +32,6 @@ export const envDescriptionMapping: Record = { [Networks.VALIDATOR_TESTNET]: t('The validator deployed testnet'), [Networks.DEVNET]: t('The latest Vega code auto-deployed'), [Networks.STAGNET1]: t('A release candidate for the staging environment'), - [Networks.STAGNET3]: t('A staging environment with trading'), [Networks.TESTNET]: t( 'Public testnet run by the Vega team, often used for incentives' ), @@ -44,7 +42,6 @@ const standardNetworkKeys = [Networks.MAINNET, Networks.TESTNET]; const advancedNetworkKeys = [ Networks.MAINNET, Networks.TESTNET, - Networks.STAGNET3, Networks.DEVNET, ]; diff --git a/libs/environment/src/hooks/use-environment.spec.ts b/libs/environment/src/hooks/use-environment.spec.ts index d4b793e7c..38777de8f 100644 --- a/libs/environment/src/hooks/use-environment.spec.ts +++ b/libs/environment/src/hooks/use-environment.spec.ts @@ -55,7 +55,6 @@ const mockEnvVars = { VEGA_NETWORKS: { DEVNET: 'https://devnet.url', TESTNET: 'https://testnet.url', - STAGNET3: 'https://stagnet3.url', MAINNET: 'https://mainnet.url', }, VEGA_WALLET_URL: 'https://localhost:1234', diff --git a/libs/environment/src/hooks/use-links.ts b/libs/environment/src/hooks/use-links.ts index 69197976c..11b97318d 100644 --- a/libs/environment/src/hooks/use-links.ts +++ b/libs/environment/src/hooks/use-links.ts @@ -19,7 +19,6 @@ const EmptyLinks: DAppLinks = { [Networks.VALIDATOR_TESTNET]: '', [Networks.DEVNET]: '', [Networks.STAGNET1]: '', - [Networks.STAGNET3]: '', [Networks.TESTNET]: '', [Networks.MAINNET]: '', }; @@ -34,14 +33,12 @@ const ExplorerLinks = { const ConsoleLinks = { ...EmptyLinks, [Networks.STAGNET1]: 'https://stagnet1.console.vega.xyz', - [Networks.STAGNET3]: 'https://stagnet3.console.vega.xyz', [Networks.TESTNET]: 'https://console.fairground.wtf', }; const TokenLinks = { ...EmptyLinks, [Networks.DEVNET]: 'https://dev.token.vega.xyz', - [Networks.STAGNET3]: 'https://stagnet3.token.vega.xyz', [Networks.TESTNET]: 'https://token.fairground.wtf', [Networks.VALIDATOR_TESTNET]: 'https://validator-testnet.governance.vega.xyz', [Networks.MAINNET]: 'https://token.vega.xyz', diff --git a/libs/environment/src/types.ts b/libs/environment/src/types.ts index b87b686bd..ebc069c1b 100644 --- a/libs/environment/src/types.ts +++ b/libs/environment/src/types.ts @@ -7,7 +7,6 @@ export enum Networks { CUSTOM = 'CUSTOM', TESTNET = 'TESTNET', STAGNET1 = 'STAGNET1', - STAGNET3 = 'STAGNET3', DEVNET = 'DEVNET', MAINNET = 'MAINNET', } diff --git a/libs/environment/src/utils/validate-environment.ts b/libs/environment/src/utils/validate-environment.ts index af032d4bb..651a76206 100644 --- a/libs/environment/src/utils/validate-environment.ts +++ b/libs/environment/src/utils/validate-environment.ts @@ -5,7 +5,6 @@ export enum Networks { CUSTOM = 'CUSTOM', TESTNET = 'TESTNET', STAGNET1 = 'STAGNET1', - STAGNET3 = 'STAGNET3', DEVNET = 'DEVNET', MAINNET = 'MAINNET', } From b1b9695998efd524af44f59922deed116195c547 Mon Sep 17 00:00:00 2001 From: "m.ray" <16125548+MadalinaRaicu@users.noreply.github.com> Date: Thu, 4 May 2023 20:23:52 +0300 Subject: [PATCH 3/7] fix(liquidity): rows duplicated wrong ag-grid row ID (#3614) --- libs/liquidity/src/lib/liquidity-data-provider.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/liquidity/src/lib/liquidity-data-provider.ts b/libs/liquidity/src/lib/liquidity-data-provider.ts index 231822c8a..03fc94988 100644 --- a/libs/liquidity/src/lib/liquidity-data-provider.ts +++ b/libs/liquidity/src/lib/liquidity-data-provider.ts @@ -94,8 +94,8 @@ export const getId = ( > ) => isLpFragment(entry) - ? `${entry.party.id}${entry.status}${entry.createdAt}${entry.updatedAt}` - : `${entry.partyID}${entry.status}${entry.createdAt}${entry.updatedAt}`; + ? `${entry.party.id}${entry.status}${entry.createdAt}` + : `${entry.partyID}${entry.status}${entry.createdAt}`; export const marketLiquidityDataProvider = makeDataProvider< MarketLpQuery, From 7b15d2db1086f16d6d94b16a1806ba24650d27e3 Mon Sep 17 00:00:00 2001 From: dexturr Date: Thu, 4 May 2023 18:07:23 +0000 Subject: [PATCH 4/7] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 43 ++++++++++++-------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index b8b9d348d..b640add59 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -1,4 +1,15 @@ [ + { + "tranche_id": 58, + "tranche_start": "2023-05-11T00:00:00.000Z", + "tranche_end": "2023-06-11T00:00:00.000Z", + "total_added": "0", + "total_removed": "0", + "locked_amount": "0", + "deposits": [], + "withdrawals": [], + "users": [] + }, { "tranche_id": 57, "tranche_start": "2024-04-01T00:00:00.000Z", @@ -38,7 +49,7 @@ "tranche_end": "2023-05-20T00:00:00.000Z", "total_added": "19242.125", "total_removed": "959.3245960538025", - "locked_amount": "9937.5330975115729338", + "locked_amount": "9778.132284239970893725", "deposits": [ { "amount": "188", @@ -845,7 +856,7 @@ "tranche_end": "2023-05-06T00:00:00.000Z", "total_added": "14520", "total_removed": "5079.76864115505", - "locked_amount": "722.8069444444451328", + "locked_amount": "602.523981481480872", "deposits": [ { "amount": "111", @@ -4715,7 +4726,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "86666.297", "total_removed": "0", - "locked_amount": "50929.7231498068801776055", + "locked_amount": "50870.7144382016204122711", "deposits": [ { "amount": "86666.297", @@ -4781,7 +4792,7 @@ "tranche_end": "2023-06-01T00:00:00.000Z", "total_added": "2500", "total_removed": "0", - "locked_amount": "377.65663156288155", + "locked_amount": "374.242915649165575", "deposits": [ { "amount": "2500", @@ -4814,7 +4825,7 @@ "tranche_end": "2023-11-01T00:00:00.000Z", "total_added": "15000.000000000000015", "total_removed": "0", - "locked_amount": "14714.136096014493014714136096014493", + "locked_amount": "14693.8764341787435146938764341787435", "deposits": [ { "amount": "1.5e-14", @@ -4902,7 +4913,7 @@ "tranche_end": "2023-09-01T00:00:00.000Z", "total_added": "17500", "total_removed": "0", - "locked_amount": "11364.8616772342995", + "locked_amount": "11341.2254050925935", "deposits": [ { "amount": "12500", @@ -5169,7 +5180,7 @@ "tranche_end": "2023-08-01T00:00:00.000Z", "total_added": "37500", "total_removed": "17836.1796921", - "locked_amount": "18334.268531307550125", + "locked_amount": "18282.77988796807875", "deposits": [ { "amount": "7500", @@ -5577,7 +5588,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "50883.256185656170147137", + "locked_amount": "50824.30131207547475805", "deposits": [ { "amount": "129999.45", @@ -5610,7 +5621,7 @@ "tranche_end": "2024-04-01T00:00:00.000Z", "total_added": "54144.7663", "total_removed": "0", - "locked_amount": "49187.91691173374041346364", + "locked_amount": "49151.15194696213614364594", "deposits": [ { "amount": "54144.7663", @@ -5643,7 +5654,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "62600", "total_removed": "0", - "locked_amount": "20836.950722983256762", + "locked_amount": "20794.3280948756986", "deposits": [ { "amount": "10000", @@ -5836,7 +5847,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "1856.07401065448985", + "locked_amount": "1852.669647387113", "deposits": [ { "amount": "5000", @@ -6894,7 +6905,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "1709370.7872515768348", - "locked_amount": "151438.7964147451270015398", + "locked_amount": "150117.9522311023317082554", "deposits": [ { "amount": "1852091.69", @@ -40766,7 +40777,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "715655.108029600523393", - "locked_amount": "257209.934903168881888467304", + "locked_amount": "255180.351788727463654323131", "deposits": [ { "amount": "1998.95815", @@ -42159,7 +42170,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", "total_removed": "869802.17678213314859352", - "locked_amount": "6211737.5003512443867025914959180178169776", + "locked_amount": "6204540.728939124626399115372553117991349", "deposits": [ { "amount": "16249.93", @@ -48759,7 +48770,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "6169862.126766503085603932", - "locked_amount": "13191.17171553312990484487088804078", + "locked_amount": "6547.158299684973084315598915349103", "deposits": [ { "amount": "129284.449", @@ -58869,7 +58880,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "44078.8527972103416", - "locked_amount": "40756.38446007669418433357128362", + "locked_amount": "40434.785414001751136630548756968", "deposits": [ { "amount": "3000", From 85e293f3ec785a6aad7b9222aa2543814e81b6bf Mon Sep 17 00:00:00 2001 From: "m.ray" <16125548+MadalinaRaicu@users.noreply.github.com> Date: Fri, 5 May 2023 02:23:33 +0300 Subject: [PATCH 5/7] fix(liquidity): use LP order ID as ag-grid row ID (#3615) --- .../src/lib/liquidity-data-provider.ts | 26 ++----------------- libs/liquidity/src/lib/liquidity-table.tsx | 3 +-- 2 files changed, 3 insertions(+), 26 deletions(-) diff --git a/libs/liquidity/src/lib/liquidity-data-provider.ts b/libs/liquidity/src/lib/liquidity-data-provider.ts index 03fc94988..821567c42 100644 --- a/libs/liquidity/src/lib/liquidity-data-provider.ts +++ b/libs/liquidity/src/lib/liquidity-data-provider.ts @@ -22,7 +22,6 @@ import type { LiquidityProvisionsQueryVariables, LiquidityProvisionsUpdateSubscription, } from './__generated__/MarketLiquidity'; -import type { IterableElement } from 'type-fest'; export const liquidityProvisionsDataProvider = makeDataProvider< LiquidityProvisionsQuery, @@ -39,8 +38,8 @@ export const liquidityProvisionsDataProvider = makeDataProvider< ) => { return produce(data || [], (draft) => { deltas?.forEach((delta) => { - const id = getId(delta); - const index = draft.findIndex((a) => getId(a) === id); + const id = delta.id; + const index = draft.findIndex((a) => delta.id === id); if (index !== -1) { draft[index].commitmentAmount = delta.commitmentAmount; draft[index].fee = delta.fee; @@ -76,27 +75,6 @@ export const liquidityProvisionsDataProvider = makeDataProvider< }, }); -function isLpFragment( - entry: - | LiquidityProvisionFieldsFragment - | IterableElement< - LiquidityProvisionsUpdateSubscription['liquidityProvisions'] - > -): entry is LiquidityProvisionFieldsFragment { - return entry.__typename === 'LiquidityProvision'; -} - -export const getId = ( - entry: - | LiquidityProvisionFieldsFragment - | IterableElement< - LiquidityProvisionsUpdateSubscription['liquidityProvisions'] - > -) => - isLpFragment(entry) - ? `${entry.party.id}${entry.status}${entry.createdAt}` - : `${entry.partyID}${entry.status}${entry.createdAt}`; - export const marketLiquidityDataProvider = makeDataProvider< MarketLpQuery, MarketLpQuery, diff --git a/libs/liquidity/src/lib/liquidity-table.tsx b/libs/liquidity/src/lib/liquidity-table.tsx index e9b408681..47865558c 100644 --- a/libs/liquidity/src/lib/liquidity-table.tsx +++ b/libs/liquidity/src/lib/liquidity-table.tsx @@ -17,7 +17,6 @@ import type { ValueFormatterParams } from 'ag-grid-community'; import BigNumber from 'bignumber.js'; import { LiquidityProvisionStatusMapping } from '@vegaprotocol/types'; import type { LiquidityProvisionData } from './liquidity-data-provider'; -import { getId } from './liquidity-data-provider'; const percentageFormatter = ({ value }: ValueFormatterParams) => { if (!value) return '-'; @@ -56,7 +55,7 @@ export const LiquidityTable = forwardRef( getId(data)} + getRowId={({ data }) => data.id} ref={ref} tooltipShowDelay={500} defaultColDef={{ From 4f6ed1eadf37b837874f637c2dc01558b5a20a53 Mon Sep 17 00:00:00 2001 From: dexturr Date: Fri, 5 May 2023 00:14:53 +0000 Subject: [PATCH 6/7] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 66 +++++++++++++------- 1 file changed, 44 insertions(+), 22 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index b640add59..e3c0a83e5 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -48,8 +48,8 @@ "tranche_start": "2023-04-20T00:00:00.000Z", "tranche_end": "2023-05-20T00:00:00.000Z", "total_added": "19242.125", - "total_removed": "959.3245960538025", - "locked_amount": "9778.132284239970893725", + "total_removed": "1214.9959502191275", + "locked_amount": "9614.44059587191292221375", "deposits": [ { "amount": "188", @@ -247,6 +247,11 @@ "amount": "422.1034736680125", "user": "0xf915Da10e5136352Ba049acB0545Deb119054256", "tx": "0x5932f574afe019060f5812fc89c7298ab9f768cddebe0a803c27e9914b45dc3d" + }, + { + "amount": "255.671354165325", + "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756", + "tx": "0x92cd553dcee22eb58abadc7aab2dc8d4d9b2285943b41aacea8ed09eff5a0914" } ], "users": [ @@ -308,11 +313,17 @@ "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756", "tranche_id": 56, "tx": "0x5f544a659ae728cc7b1a29dcda14740425cadf1f47aa74bae92bf2ade3c8093d" + }, + { + "amount": "255.671354165325", + "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756", + "tranche_id": 56, + "tx": "0x92cd553dcee22eb58abadc7aab2dc8d4d9b2285943b41aacea8ed09eff5a0914" } ], "total_tokens": "1207.5", - "withdrawn_tokens": "341.3307146949", - "remaining_tokens": "866.1692853051" + "withdrawn_tokens": "597.002068860225", + "remaining_tokens": "610.497931139775" }, { "address": "0x33Ce1D9E53AFb7367E34749517C086405a651a95", @@ -856,7 +867,7 @@ "tranche_end": "2023-05-06T00:00:00.000Z", "total_added": "14520", "total_removed": "5079.76864115505", - "locked_amount": "602.523981481480872", + "locked_amount": "479.00314814814754512", "deposits": [ { "amount": "111", @@ -4726,7 +4737,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "86666.297", "total_removed": "0", - "locked_amount": "50870.7144382016204122711", + "locked_amount": "50810.1172841919093407674", "deposits": [ { "amount": "86666.297", @@ -4792,7 +4803,7 @@ "tranche_end": "2023-06-01T00:00:00.000Z", "total_added": "2500", "total_removed": "0", - "locked_amount": "374.242915649165575", + "locked_amount": "370.7373066748068", "deposits": [ { "amount": "2500", @@ -4825,7 +4836,7 @@ "tranche_end": "2023-11-01T00:00:00.000Z", "total_added": "15000.000000000000015", "total_removed": "0", - "locked_amount": "14693.8764341787435146938764341787435", + "locked_amount": "14673.0714070048305146730714070048305", "deposits": [ { "amount": "1.5e-14", @@ -4913,7 +4924,7 @@ "tranche_end": "2023-09-01T00:00:00.000Z", "total_added": "17500", "total_removed": "0", - "locked_amount": "11341.2254050925935", + "locked_amount": "11316.952873389695", "deposits": [ { "amount": "12500", @@ -5180,7 +5191,7 @@ "tranche_end": "2023-08-01T00:00:00.000Z", "total_added": "37500", "total_removed": "17836.1796921", - "locked_amount": "18282.77988796807875", + "locked_amount": "18229.9052332719465", "deposits": [ { "amount": "7500", @@ -5588,7 +5599,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "50824.30131207547475805", + "locked_amount": "50763.759445344185166297", "deposits": [ { "amount": "129999.45", @@ -5621,7 +5632,7 @@ "tranche_end": "2024-04-01T00:00:00.000Z", "total_added": "54144.7663", "total_removed": "0", - "locked_amount": "49151.15194696213614364594", + "locked_amount": "49113.39731426774597774478", "deposits": [ { "amount": "54144.7663", @@ -5654,7 +5665,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "62600", "total_removed": "0", - "locked_amount": "20794.3280948756986", + "locked_amount": "20750.558117706745644", "deposits": [ { "amount": "10000", @@ -5847,7 +5858,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "1852.669647387113", + "locked_amount": "1849.17364282090325", "deposits": [ { "amount": "5000", @@ -6905,7 +6916,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "1709370.7872515768348", - "locked_amount": "150117.9522311023317082554", + "locked_amount": "148761.5525361821611038764", "deposits": [ { "amount": "1852091.69", @@ -40777,7 +40788,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "715655.108029600523393", - "locked_amount": "255180.351788727463654323131", + "locked_amount": "253095.943179135403450236224", "deposits": [ { "amount": "1998.95815", @@ -42170,7 +42181,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", "total_removed": "869802.17678213314859352", - "locked_amount": "6204540.728939124626399115372553117991349", + "locked_amount": "6197149.5498413355214668656878001982333063", "deposits": [ { "amount": "16249.93", @@ -48770,7 +48781,7 @@ "tranche_end": "2023-05-05T00:00:00.000Z", "total_added": "14597706.0446472999", "total_removed": "6169862.126766503085603932", - "locked_amount": "6547.158299684973084315598915349103", + "locked_amount": "0", "deposits": [ { "amount": "129284.449", @@ -58879,8 +58890,8 @@ "tranche_start": "2022-06-05T00:00:00.000Z", "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", - "total_removed": "44078.8527972103416", - "locked_amount": "40434.785414001751136630548756968", + "total_removed": "44110.3307271943416", + "locked_amount": "40104.498954824267000350197970596", "deposits": [ { "amount": "3000", @@ -65534,6 +65545,11 @@ "user": "0x4d4AA3f302cbA998AAFC03F9d73484434ed9Fd53", "tx": "0x1e4902d0a3cb7b4f2ba7119dfcaa681a784e1d724c984961767e9feaa078fe54" }, + { + "amount": "31.477929984", + "user": "0xcB555C5602cC0b2434A27d277e14Cb5C7bF4Ead1", + "tx": "0x1b9ddd24634b4c6eab202f0a65dc0d3119fbc5502cbac5086352eab14ebd7b02" + }, { "amount": "168.502276762", "user": "0x38A292CB98Dc602ECAFF94E8E5fADD9800e4bA13", @@ -84359,6 +84375,12 @@ } ], "withdrawals": [ + { + "amount": "31.477929984", + "user": "0xcB555C5602cC0b2434A27d277e14Cb5C7bF4Ead1", + "tranche_id": 5, + "tx": "0x1b9ddd24634b4c6eab202f0a65dc0d3119fbc5502cbac5086352eab14ebd7b02" + }, { "amount": "19.918569252", "user": "0xcB555C5602cC0b2434A27d277e14Cb5C7bF4Ead1", @@ -84403,8 +84425,8 @@ } ], "total_tokens": "400", - "withdrawn_tokens": "334.458891424", - "remaining_tokens": "65.541108576" + "withdrawn_tokens": "365.936821408", + "remaining_tokens": "34.063178592" }, { "address": "0x3738bec36216eA2F11B954891C65AAd1Bc852156", From 023a83e0f7c2dc192f1b9e43aa60c8a47f52e1ac Mon Sep 17 00:00:00 2001 From: dexturr Date: Fri, 5 May 2023 06:08:12 +0000 Subject: [PATCH 7/7] chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- apps/static/src/assets/mainnet-tranches.json | 30 ++++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json index e3c0a83e5..b76a81c6b 100644 --- a/apps/static/src/assets/mainnet-tranches.json +++ b/apps/static/src/assets/mainnet-tranches.json @@ -49,7 +49,7 @@ "tranche_end": "2023-05-20T00:00:00.000Z", "total_added": "19242.125", "total_removed": "1214.9959502191275", - "locked_amount": "9614.44059587191292221375", + "locked_amount": "9457.0664415991503175975", "deposits": [ { "amount": "188", @@ -867,7 +867,7 @@ "tranche_end": "2023-05-06T00:00:00.000Z", "total_added": "14520", "total_removed": "5079.76864115505", - "locked_amount": "479.00314814814754512", + "locked_amount": "360.24949074073997136", "deposits": [ { "amount": "111", @@ -4737,7 +4737,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "86666.297", "total_removed": "0", - "locked_amount": "50810.1172841919093407674", + "locked_amount": "50751.8588230648417449891", "deposits": [ { "amount": "86666.297", @@ -4803,7 +4803,7 @@ "tranche_end": "2023-06-01T00:00:00.000Z", "total_added": "2500", "total_removed": "0", - "locked_amount": "370.7373066748068", + "locked_amount": "367.3669935388685", "deposits": [ { "amount": "2500", @@ -4836,7 +4836,7 @@ "tranche_end": "2023-11-01T00:00:00.000Z", "total_added": "15000.000000000000015", "total_removed": "0", - "locked_amount": "14673.0714070048305146730714070048305", + "locked_amount": "14653.0693312198065146530693312198065", "deposits": [ { "amount": "1.5e-14", @@ -4924,7 +4924,7 @@ "tranche_end": "2023-09-01T00:00:00.000Z", "total_added": "17500", "total_removed": "0", - "locked_amount": "11316.952873389695", + "locked_amount": "11293.61711830716525", "deposits": [ { "amount": "12500", @@ -5191,7 +5191,7 @@ "tranche_end": "2023-08-01T00:00:00.000Z", "total_added": "37500", "total_removed": "17836.1796921", - "locked_amount": "18229.9052332719465", + "locked_amount": "18179.07122851442625", "deposits": [ { "amount": "7500", @@ -5599,7 +5599,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "129999.45", "total_removed": "0", - "locked_amount": "50763.759445344185166297", + "locked_amount": "50705.5541377325336221035", "deposits": [ { "amount": "129999.45", @@ -5632,7 +5632,7 @@ "tranche_end": "2024-04-01T00:00:00.000Z", "total_added": "54144.7663", "total_removed": "0", - "locked_amount": "49113.39731426774597774478", + "locked_amount": "49077.09978780568889746099", "deposits": [ { "amount": "54144.7663", @@ -5665,7 +5665,7 @@ "tranche_end": "2023-09-03T00:00:00.000Z", "total_added": "62600", "total_removed": "0", - "locked_amount": "20750.558117706745644", + "locked_amount": "20708.477403602233016", "deposits": [ { "amount": "10000", @@ -5858,7 +5858,7 @@ "tranche_end": "2023-09-17T00:00:00.000Z", "total_added": "5000", "total_removed": "0", - "locked_amount": "1849.17364282090325", + "locked_amount": "1845.81256341958375", "deposits": [ { "amount": "5000", @@ -6916,7 +6916,7 @@ "tranche_end": "2023-06-02T00:00:00.000Z", "total_added": "1939928.38", "total_removed": "1709370.7872515768348", - "locked_amount": "148761.5525361821611038764", + "locked_amount": "147457.5018725717723958", "deposits": [ { "amount": "1852091.69", @@ -40788,7 +40788,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "3732368.4671", "total_removed": "715655.108029600523393", - "locked_amount": "253095.943179135403450236224", + "locked_amount": "251092.165858100635559352498", "deposits": [ { "amount": "1998.95815", @@ -42181,7 +42181,7 @@ "tranche_end": "2023-12-05T00:00:00.000Z", "total_added": "15870102.715470999700000001", "total_removed": "869802.17678213314859352", - "locked_amount": "6197149.5498413355214668656878001982333063", + "locked_amount": "6190044.28411574715560088425053188532414163", "deposits": [ { "amount": "16249.93", @@ -58891,7 +58891,7 @@ "tranche_end": "2023-06-05T00:00:00.000Z", "total_added": "472355.6199999996", "total_removed": "44110.3307271943416", - "locked_amount": "40104.498954824267000350197970596", + "locked_amount": "39786.9889842268933819326661593", "deposits": [ { "amount": "3000",