From 0f7bffd38bd508db4bd12162a463820bdc960909 Mon Sep 17 00:00:00 2001 From: Joe Tsang <30622993+jtsang586@users.noreply.github.com> Date: Thu, 27 Apr 2023 14:37:55 +0100 Subject: [PATCH] test(ci): capsule update v0.71.1 (#3559) --- apps/explorer-e2e/.env | 4 +- apps/explorer-e2e/cypress.config.js | 2 +- .../src/integration/node-switcher.cy.js | 2 +- .../src/integration/parties.cy.js | 2 +- apps/governance-e2e/.env | 5 +-- .../src/integration/flow/proposal-forms.cy.ts | 6 ++- .../src/integration/flow/staking-flow.cy.ts | 2 +- .../src/integration/view/home.cy.ts | 2 +- .../src/integration/view/pubkey-view.cy.ts | 7 +++- .../src/integration/view/rewards.cy.ts | 1 + .../src/integration/view/wallet-vega.cy.ts | 24 +++++++----- .../src/support/staking.functions.ts | 10 ++--- .../src/support/wallet-teardown.functions.ts | 37 +++++++++---------- apps/governance/.env.capsule | 2 +- .../.env.capsule | 2 +- apps/trading-e2e/.env | 4 +- apps/trading-e2e/.env.capsule | 4 +- .../src/integration/settings.cy.ts | 6 +-- .../src/integration/trading-accounts.cy.ts | 7 +--- apps/trading-e2e/src/support/helpers.ts | 5 +++ apps/trading/.env.capsule | 2 +- libs/cypress/src/lib/capsule/contants.ts | 5 ++- .../cypress/src/lib/capsule/propose-market.ts | 4 +- libs/cypress/src/lib/commands/get-assets.ts | 2 +- .../lib/commands/get-network-parameters.ts | 2 +- libs/cypress/src/lib/commands/get-nodes.ts | 2 +- vegacapsule/genesis.tmpl | 18 ++++----- 27 files changed, 91 insertions(+), 78 deletions(-) diff --git a/apps/explorer-e2e/.env b/apps/explorer-e2e/.env index ec072e6c6..594c765fb 100644 --- a/apps/explorer-e2e/.env +++ b/apps/explorer-e2e/.env @@ -1,7 +1,7 @@ NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api NX_TENDERMINT_URL=http://localhost:26617 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket -NX_VEGA_URL=http://localhost:3028/query +NX_VEGA_URL=http://localhost:3008/graphql NX_VEGA_ENV=CUSTOM NX_VEGA_CONFIG_URL= @@ -18,4 +18,4 @@ NX_EXPLORER_PARTIES=1 NX_EXPLORER_VALIDATORS=1 CYPRESS_VEGA_WALLET_API_TOKEN= -CYPRESS_VEGA_URL=http://localhost:3028/query +CYPRESS_VEGA_URL=http://localhost:3008/graphql diff --git a/apps/explorer-e2e/cypress.config.js b/apps/explorer-e2e/cypress.config.js index 9b91a7946..1d936740e 100644 --- a/apps/explorer-e2e/cypress.config.js +++ b/apps/explorer-e2e/cypress.config.js @@ -25,7 +25,7 @@ module.exports = defineConfig({ }, env: { environment: 'CUSTOM', - networkQueryUrl: 'http://localhost:3028/query', + networkQueryUrl: 'http://localhost:3008/graphql', ethUrl: 'https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8', commitHash: 'dev', tsConfig: 'tsconfig.json', diff --git a/apps/explorer-e2e/src/integration/node-switcher.cy.js b/apps/explorer-e2e/src/integration/node-switcher.cy.js index 965d5fce5..c61601ddf 100644 --- a/apps/explorer-e2e/src/integration/node-switcher.cy.js +++ b/apps/explorer-e2e/src/integration/node-switcher.cy.js @@ -6,7 +6,7 @@ const customNodeBtn = 'custom-node'; context.skip('Node switcher', { tags: '@regression' }, function () { beforeEach('visit home page', function () { cy.intercept('GET', 'https://static.vega.xyz/assets/capsule-network.json', { - hosts: ['http://localhost:3028/query'], + hosts: ['http://localhost:3008/graphql'], }).as('nodeData'); cy.visit('/'); cy.wait('@nodeData'); diff --git a/apps/explorer-e2e/src/integration/parties.cy.js b/apps/explorer-e2e/src/integration/parties.cy.js index db63026cd..7ff8b5a57 100644 --- a/apps/explorer-e2e/src/integration/parties.cy.js +++ b/apps/explorer-e2e/src/integration/parties.cy.js @@ -219,7 +219,7 @@ context.skip('Parties page', { tags: '@regression' }, function () { balance type asset {id symbol decimals}}}}}}}}'; cy.request({ method: 'POST', - url: `http://localhost:3028/query`, + url: `http://localhost:3008/graphql`, body: { query: mutation, }, diff --git a/apps/governance-e2e/.env b/apps/governance-e2e/.env index 847bb5bb4..4187dafaa 100644 --- a/apps/governance-e2e/.env +++ b/apps/governance-e2e/.env @@ -5,7 +5,7 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io NX_FAIRGROUND=false NX_VEGA_NETWORKS={} -NX_VEGA_URL=http://localhost:3028/query +NX_VEGA_URL=http://localhost:3008/graphql NX_ETHEREUM_CHAIN_ID=1440 NX_ETH_URL_CONNECT=1 NX_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session @@ -20,7 +20,7 @@ NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72 #Test configuration variables CYPRESS_FAIRGROUND=false -CYPRESS_VEGA_URL=http://localhost:3028/query +CYPRESS_VEGA_URL=http://localhost:3008/graphql CYPRESS_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session CYPRESS_ETHEREUM_PROVIDER_URL=http://localhost:8545 CYPRESS_EXPLORER_URL=https://explorer.fairground.wtf @@ -31,6 +31,5 @@ CYPRESS_VEGA_ENV=CUSTOM CYPRESS_VEGA_PUBLIC_KEY=02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65 CYPRESS_VEGA_PUBLIC_KEY2=7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535 CYPRESS_VEGA_TOKEN_URL=https://token.fairground.wtf -CYPRESS_VEGA_URL=http://localhost:3028/query CYPRESS_VEGA_WALLET_URL=http://localhost:1789 CYPRESS_VEGA_WALLET_API_TOKEN= diff --git a/apps/governance-e2e/src/integration/flow/proposal-forms.cy.ts b/apps/governance-e2e/src/integration/flow/proposal-forms.cy.ts index 8edb77c66..557f6c31e 100644 --- a/apps/governance-e2e/src/integration/flow/proposal-forms.cy.ts +++ b/apps/governance-e2e/src/integration/flow/proposal-forms.cy.ts @@ -50,6 +50,8 @@ const liquidityVoteStatus = 'liquidity-votes-status'; const tokenVoteStatus = 'token-votes-status'; const proposalTermsSection = 'proposal'; const vegaWalletPublicKey = Cypress.env('vegaWalletPublicKey'); +const fUSDCId = + '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc'; const epochTimeout = Cypress.env('epochTimeout'); const proposalTimeout = { timeout: 14000 }; @@ -264,7 +266,7 @@ context( it('Unable to submit update market proposal without minimum amount of tokens', function () { vegaWalletTeardown(); vegaWalletFaucetAssetsWithoutCheck( - 'fUSDC', + fUSDCId, '1000000', vegaWalletPublicKey ); @@ -290,7 +292,7 @@ context( // 3001-VOTE-092 3004-PMAC-001 it('Able to submit update market proposal and vote for proposal', function () { vegaWalletFaucetAssetsWithoutCheck( - 'fUSDC', + fUSDCId, '1000000', vegaWalletPublicKey ); diff --git a/apps/governance-e2e/src/integration/flow/staking-flow.cy.ts b/apps/governance-e2e/src/integration/flow/staking-flow.cy.ts index f811276fc..7722c6c8d 100644 --- a/apps/governance-e2e/src/integration/flow/staking-flow.cy.ts +++ b/apps/governance-e2e/src/integration/flow/staking-flow.cy.ts @@ -55,7 +55,6 @@ context( function () { // 2001-STKE-002, 2001-STKE-032 before('visit staking tab and connect vega wallet', function () { - cy.clearAllLocalStorage(); cy.visit('/'); ethereumWalletConnect(); // this is a workaround for #2422 which can be removed once issue is resolved @@ -67,6 +66,7 @@ context( beforeEach( 'teardown wallet & drill into a specific validator', function () { + cy.clearAllLocalStorage(); cy.reload(); waitForSpinner(); cy.connectVegaWallet(); diff --git a/apps/governance-e2e/src/integration/view/home.cy.ts b/apps/governance-e2e/src/integration/view/home.cy.ts index 2890c7f23..8c99a9313 100644 --- a/apps/governance-e2e/src/integration/view/home.cy.ts +++ b/apps/governance-e2e/src/integration/view/home.cy.ts @@ -131,7 +131,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () { .within(() => { cy.get('span') .first() - .should('have.text', 'http://localhost:3028/query'); + .should('have.text', 'http://localhost:3008/graphql'); cy.getByTestId('link').should('exist'); }); }); diff --git a/apps/governance-e2e/src/integration/view/pubkey-view.cy.ts b/apps/governance-e2e/src/integration/view/pubkey-view.cy.ts index 8727ab164..b4cf0056d 100644 --- a/apps/governance-e2e/src/integration/view/pubkey-view.cy.ts +++ b/apps/governance-e2e/src/integration/view/pubkey-view.cy.ts @@ -17,10 +17,15 @@ const banner = 'view-banner'; context('View functionality with public key', { tags: '@smoke' }, function () { before('send asset to wallet', function () { - vegaWalletFaucetAssetsWithoutCheck('fUSDC', '1000000', vegaWalletPubKey); + vegaWalletFaucetAssetsWithoutCheck( + '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc', + '1000000', + vegaWalletPubKey + ); }); beforeEach('visit home page', function () { + cy.clearLocalStorage(); cy.visit('/'); waitForSpinner(); cy.connectPublicKey(vegaWalletPubKey); diff --git a/apps/governance-e2e/src/integration/view/rewards.cy.ts b/apps/governance-e2e/src/integration/view/rewards.cy.ts index 856caeae3..f5e4fb194 100644 --- a/apps/governance-e2e/src/integration/view/rewards.cy.ts +++ b/apps/governance-e2e/src/integration/view/rewards.cy.ts @@ -13,6 +13,7 @@ context( { tags: '@regression' }, function () { before('navigate to rewards page', function () { + cy.clearLocalStorage(); cy.visit('/'); navigateTo(navigation.rewards); }); diff --git a/apps/governance-e2e/src/integration/view/wallet-vega.cy.ts b/apps/governance-e2e/src/integration/view/wallet-vega.cy.ts index 782a194a2..f43b77d33 100644 --- a/apps/governance-e2e/src/integration/view/wallet-vega.cy.ts +++ b/apps/governance-e2e/src/integration/view/wallet-vega.cy.ts @@ -282,26 +282,30 @@ context( describe('Vega wallet with assets', function () { const assets = [ { - id: 'fUSDC', + id: '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc', name: 'USDC (fake)', + symbol: 'fUSDC', amount: '1000000', expectedAmount: '10.00', }, { - id: 'fDAI', + id: '8566db7257222b5b7ef2886394ad28b938b28680a54a169bbc795027b89d6665', name: 'DAI (fake)', + symbol: 'fDAI', amount: '200000', expectedAmount: '2.00', }, { - id: 'fBTC', + id: '73174a6fb1d5802ba0ac7bd7ab79e0a3a4837b262de0a4e80815a55442692bd0', name: 'BTC (fake)', + symbol: 'fBTC', amount: '600000', expectedAmount: '6.00', }, { - id: 'fEURO', + id: 'e02d4c15d790d1d2dffaf2dcd1cf06a1fe656656cf4ed18c8ce99f9e83643567', name: 'EURO (fake)', + symbol: 'fEURO', amount: '800000', expectedAmount: '8.00', }, @@ -322,15 +326,15 @@ context( }); }); - for (const { id, name, expectedAmount } of assets) { - it(`should see ${id} within vega wallet`, () => { + for (const { name, symbol, expectedAmount } of assets) { + it(`should see ${name} within vega wallet`, () => { cy.get(walletContainer).within(() => { cy.get(vegaWalletCurrencyTitle) - .contains(id, txTimeout) + .contains(name, txTimeout) .should('be.visible'); cy.get(vegaWalletCurrencyTitle) - .contains(id) + .contains(name) .parent() .siblings() .invoke('text') @@ -338,9 +342,9 @@ context( .should('be.gte', parseFloat(expectedAmount)); cy.get(vegaWalletCurrencyTitle) - .contains(id) + .contains(name) .parent() - .contains(name); + .contains(symbol); }); }); } diff --git a/apps/governance-e2e/src/support/staking.functions.ts b/apps/governance-e2e/src/support/staking.functions.ts index bb85b57b4..15a427126 100644 --- a/apps/governance-e2e/src/support/staking.functions.ts +++ b/apps/governance-e2e/src/support/staking.functions.ts @@ -54,7 +54,7 @@ export function stakingValidatorPageRemoveStake(stake: string) { .and('contain', `Remove ${stake} $VEGA tokens at the end of epoch`) .and('be.visible') .click(); - cy.contains('been removed from validator').should('be.visible'); + cy.contains('been removed from validator', txTimeout).should('be.visible'); closeDialog(); } @@ -185,7 +185,7 @@ export function validateValidatorListTotalStakeAndShare( ) { cy.contains('Loading...', epochTimeout).should('not.exist'); waitForBeginningOfEpoch(); - cy.get(`[row-id="${positionOnList}"]:visible`) + cy.get(`[row-id="${positionOnList}"]`) .eq(1) .within(() => { cy.getByTestId(stakeValidatorListTotalStake, epochTimeout).should( @@ -221,12 +221,12 @@ export function ensureSpecifiedUnstakedTokensAreAssociated( } export function closeStakingDialog() { - cy.get('[data-testid="dialog-title"]:visible').should( + cy.getByTestId('dialog-title').should( 'contain.text', 'At the beginning of the next epoch' ); - cy.get('[data-testid="dialog-content"]:visible') - .first() + cy.getByTestId('dialog-content') + .last() .within(() => { cy.get('a').should('have.text', 'Back to Staking').click(); }); diff --git a/apps/governance-e2e/src/support/wallet-teardown.functions.ts b/apps/governance-e2e/src/support/wallet-teardown.functions.ts index 7d1366e83..1560c2233 100644 --- a/apps/governance-e2e/src/support/wallet-teardown.functions.ts +++ b/apps/governance-e2e/src/support/wallet-teardown.functions.ts @@ -9,7 +9,7 @@ import { import { ethers, Wallet } from 'ethers'; const associatedAmountInWallet = '[data-testid="associated-amount"]:visible'; -const vegaWalletContainer = 'aside [data-testid="vega-wallet"]:visible'; +const vegaWalletContainer = 'aside [data-testid="vega-wallet"]'; const vegaWalletMnemonic = Cypress.env('vegaWalletMnemonic'); const vegaWalletPubKey = Cypress.env('vegaWalletPublicKey'); const vegaTokenContractAddress = Cypress.env('vegaTokenContractAddress'); @@ -105,25 +105,24 @@ async function vegaWalletTeardownStaking(stakingBridgeContract: StakingBridge) { { timeout: transactionTimeout, log: false } ).then((stakeBalance) => { if (Number(stakeBalance) != 0) { - cy.get(vegaWalletContainer).within(() => { - cy.getByTestId('currency-value') - .invoke('text') - .then(($associatedAmount) => { - cy.wrap( - stakingBridgeContract.remove_stake( - String(stakeBalance), - vegaWalletPubKey - ), - { timeout: transactionTimeout, log: false } - ); - cy.get("[data-testid='currency-value']") - .first() - .invoke('text', { + cy.get('[data-testid="vega-wallet-balance-unstaked"]:visible').within( + () => { + cy.get(associatedAmountInWallet) + .invoke('text') + .then(($walletAmount) => { + cy.wrap( + stakingBridgeContract.remove_stake( + String(stakeBalance), + vegaWalletPubKey + ), + { timeout: transactionTimeout, log: false } + ); + cy.get(associatedAmountInWallet, { timeout: transactionTimeout, - }) - .should('not.eq', $associatedAmount); - }); - }); + }).should('not.have.text', $walletAmount); + }); + } + ); } }); } diff --git a/apps/governance/.env.capsule b/apps/governance/.env.capsule index d5c67898a..446dabc96 100644 --- a/apps/governance/.env.capsule +++ b/apps/governance/.env.capsule @@ -8,7 +8,7 @@ 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='' -NX_VEGA_URL=http://localhost:3028/query +NX_VEGA_URL=http://localhost:3008/graphql NX_ETHEREUM_CHAIN_ID=1440 NX_ETH_URL_CONNECT=1 NX_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session diff --git a/apps/liquidity-provision-dashboard/.env.capsule b/apps/liquidity-provision-dashboard/.env.capsule index 03bcc702c..6bc5b34a1 100644 --- a/apps/liquidity-provision-dashboard/.env.capsule +++ b/apps/liquidity-provision-dashboard/.env.capsule @@ -1,3 +1,3 @@ # App configuration variables -NX_VEGA_URL=http://localhost:3028/query +NX_VEGA_URL=http://localhost:3008/graphql NX_VEGA_ENV=LOCAL diff --git a/apps/trading-e2e/.env b/apps/trading-e2e/.env index d71f10490..d9fd22b0b 100644 --- a/apps/trading-e2e/.env +++ b/apps/trading-e2e/.env @@ -8,7 +8,7 @@ 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_TOKEN_URL=https://token.fairground.wtf -NX_VEGA_URL=http://localhost:3028/query +NX_VEGA_URL=http://localhost:3008/graphql NX_VEGA_WALLET_URL=http://localhost:1789 NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/ NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supply green clown session" @@ -27,6 +27,6 @@ CYPRESS_VEGA_ENV=CUSTOM CYPRESS_VEGA_PUBLIC_KEY=02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65 CYPRESS_VEGA_PUBLIC_KEY2=7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535 CYPRESS_VEGA_TOKEN_URL=https://token.fairground.wtf -CYPRESS_VEGA_URL=http://localhost:3028/query +CYPRESS_VEGA_URL=http://localhost:3008/graphql CYPRESS_VEGA_WALLET_URL=http://localhost:1789 CYPRESS_VEGA_WALLET_API_TOKEN= diff --git a/apps/trading-e2e/.env.capsule b/apps/trading-e2e/.env.capsule index 67273ea3f..5e9bf73bf 100644 --- a/apps/trading-e2e/.env.capsule +++ b/apps/trading-e2e/.env.capsule @@ -7,7 +7,7 @@ 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_TOKEN_URL=https://token.fairground.wtf -NX_VEGA_URL=http://localhost:3028/query +NX_VEGA_URL=http://localhost:3008/graphql NX_VEGA_WALLET_URL=http://localhost:1789 NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/ NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supply green clown session" @@ -24,6 +24,6 @@ CYPRESS_VEGA_ENV=CUSTOM CYPRESS_VEGA_PUBLIC_KEY=02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65 CYPRESS_VEGA_PUBLIC_KEY2=7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535 CYPRESS_VEGA_TOKEN_URL=https://token.fairground.wtf -CYPRESS_VEGA_URL=http://localhost:3028/query +CYPRESS_VEGA_URL=http://localhost:3008/graphql CYPRESS_VEGA_WALLET_URL=http://localhost:1789 CYPRESS_VEGA_WALLET_API_TOKEN= diff --git a/apps/trading-e2e/src/integration/settings.cy.ts b/apps/trading-e2e/src/integration/settings.cy.ts index 8074fee0c..c4ed19e46 100644 --- a/apps/trading-e2e/src/integration/settings.cy.ts +++ b/apps/trading-e2e/src/integration/settings.cy.ts @@ -1,12 +1,12 @@ +import { closeWelcomeDialog } from '../support/helpers'; + describe('Settings page', { tags: '@smoke' }, () => { beforeEach(() => { cy.clearLocalStorage().then(() => { cy.mockTradingPage(); cy.mockSubscription(); cy.visit('/'); - cy.get('[role=dialog]').within(() => { - cy.getByTestId('dialog-close').click(); - }); + closeWelcomeDialog(); cy.get('[aria-label="cog icon"]').click(); }); }); diff --git a/apps/trading-e2e/src/integration/trading-accounts.cy.ts b/apps/trading-e2e/src/integration/trading-accounts.cy.ts index 16823221f..fd0234641 100644 --- a/apps/trading-e2e/src/integration/trading-accounts.cy.ts +++ b/apps/trading-e2e/src/integration/trading-accounts.cy.ts @@ -25,12 +25,7 @@ describe('accounts', { tags: '@smoke' }, () => { cy.getByTestId('tab-accounts') .get(tradingAccountRowId) .find('[col-id="accounts-actions"]') - .should('have.text', ''); - - cy.getByTestId('tab-accounts') - .get(tradingAccountRowId) - .find('[col-id="accounts-actions"]') - .should('have.text', ''); + .should('have.text', ' '); cy.getByTestId('tab-accounts') .get(tradingAccountRowId) diff --git a/apps/trading-e2e/src/support/helpers.ts b/apps/trading-e2e/src/support/helpers.ts index 85fa22a68..19af30e7e 100644 --- a/apps/trading-e2e/src/support/helpers.ts +++ b/apps/trading-e2e/src/support/helpers.ts @@ -9,3 +9,8 @@ export const selectAsset = (assetIndex: number) => { // eslint-disable-next-line cy.wait(100); }; + +export const closeWelcomeDialog = () => { + cy.getByTestId('select-market-list').should('exist'); + cy.getByTestId('dialog-close').click(); +}; diff --git a/apps/trading/.env.capsule b/apps/trading/.env.capsule index f02546319..0a657ab2a 100644 --- a/apps/trading/.env.capsule +++ b/apps/trading/.env.capsule @@ -7,7 +7,7 @@ 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_TOKEN_URL=https://token.fairground.wtf -NX_VEGA_URL=http://localhost:3028/query +NX_VEGA_URL=http://localhost:3008/graphql 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/releases diff --git a/libs/cypress/src/lib/capsule/contants.ts b/libs/cypress/src/lib/capsule/contants.ts index 224bcadf4..449e18253 100644 --- a/libs/cypress/src/lib/capsule/contants.ts +++ b/libs/cypress/src/lib/capsule/contants.ts @@ -1 +1,4 @@ -export const ASSET_ID_FOR_MARKET = 'fUSDC'; +export const ASSET_ID_FOR_MARKET = + '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc'; + +export const ASSET_SYMBOL = 'fUSDC'; diff --git a/libs/cypress/src/lib/capsule/propose-market.ts b/libs/cypress/src/lib/capsule/propose-market.ts index 095379bcf..1ad7c0c9f 100644 --- a/libs/cypress/src/lib/capsule/propose-market.ts +++ b/libs/cypress/src/lib/capsule/propose-market.ts @@ -4,7 +4,7 @@ import { createLog } from './logging'; import type { ProposalSubmissionBody } from '@vegaprotocol/wallet'; import { getProposal } from './get-proposal'; import { sendVegaTx } from './wallet-client'; -import { ASSET_ID_FOR_MARKET } from './contants'; +import { ASSET_ID_FOR_MARKET, ASSET_SYMBOL } from './contants'; const log = createLog('propose-market'); @@ -43,7 +43,7 @@ function createNewMarketProposal(): ProposalSubmissionBody { code: 'TEST.24h', future: { settlementAsset: ASSET_ID_FOR_MARKET, - quoteName: ASSET_ID_FOR_MARKET, + quoteName: ASSET_SYMBOL, dataSourceSpecForSettlementData: { external: { oracle: { diff --git a/libs/cypress/src/lib/commands/get-assets.ts b/libs/cypress/src/lib/commands/get-assets.ts index 6d4f9d152..c2ea51845 100644 --- a/libs/cypress/src/lib/commands/get-assets.ts +++ b/libs/cypress/src/lib/commands/get-assets.ts @@ -66,7 +66,7 @@ export function addGetAssets() { cy.request({ method: 'POST', - url: 'http://localhost:3028/query', + url: 'http://localhost:3008/graphql', body: { query: print(query), }, diff --git a/libs/cypress/src/lib/commands/get-network-parameters.ts b/libs/cypress/src/lib/commands/get-network-parameters.ts index 9fa5e8871..1f12d67d6 100644 --- a/libs/cypress/src/lib/commands/get-network-parameters.ts +++ b/libs/cypress/src/lib/commands/get-network-parameters.ts @@ -24,7 +24,7 @@ export function addGetNetworkParameters() { }`; cy.request({ method: 'POST', - url: `http://localhost:3028/query`, + url: `http://localhost:3008/graphql`, body: { query: mutation, }, diff --git a/libs/cypress/src/lib/commands/get-nodes.ts b/libs/cypress/src/lib/commands/get-nodes.ts index d7206df7b..454ad1aba 100644 --- a/libs/cypress/src/lib/commands/get-nodes.ts +++ b/libs/cypress/src/lib/commands/get-nodes.ts @@ -43,7 +43,7 @@ export function addGetNodes() { cy.request({ method: 'POST', - url: `http://localhost:3028/query`, + url: `http://localhost:3008/graphql`, body: { query: print(query), }, diff --git a/vegacapsule/genesis.tmpl b/vegacapsule/genesis.tmpl index 061ec2c0e..692bd7efc 100644 --- a/vegacapsule/genesis.tmpl +++ b/vegacapsule/genesis.tmpl @@ -1,7 +1,7 @@ { "app_state": { "assets": { - "fBTC": { + "73174a6fb1d5802ba0ac7bd7ab79e0a3a4837b262de0a4e80815a55442692bd0": { "min_lp_stake": "1", "decimals": 5, "name": "BTC (fake)", @@ -13,7 +13,7 @@ } } }, - "fDAI": { + "8566db7257222b5b7ef2886394ad28b938b28680a54a169bbc795027b89d6665": { "min_lp_stake": "1", "decimals": 5, "name": "DAI (fake)", @@ -25,7 +25,7 @@ } } }, - "fEURO": { + "e02d4c15d790d1d2dffaf2dcd1cf06a1fe656656cf4ed18c8ce99f9e83643567": { "min_lp_stake": "1", "decimals": 5, "name": "EURO (fake)", @@ -37,7 +37,7 @@ } } }, - "fUSDC": { + "816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc": { "min_lp_stake": "1", "decimals": 5, "name": "USDC (fake)", @@ -49,7 +49,7 @@ } } }, - "XYZalpha": { + "62dfb1ab1cd488862b416cf163c75bc9a279226c65ac287c0dd67650daa444ee": { "min_lp_stake": "1", "decimals": 5, "name": "XYZ (α alpha)", @@ -61,7 +61,7 @@ } } }, - "XYZbeta": { + "dedb3c42e7bc88d98a7fe0d73c7b9870b34c62c79a713071bd4d645ef7c216ee": { "min_lp_stake": "1", "decimals": 5, "name": "XYZ (β beta)", @@ -73,7 +73,7 @@ } } }, - "XYZgamma": { + "a0ea8a48eb5cb024e66be5777bea75165ffcaf0be82d9047e376ce352e202f76": { "min_lp_stake": "1", "decimals": 5, "name": "XYZ (γ gamma)", @@ -85,7 +85,7 @@ } } }, - "XYZdelta": { + "9ed5dd08c88e38f1c92cb8f056bd9d0507512c9ea4e6f308936f73646187b8e9": { "min_lp_stake": "1", "decimals": 5, "name": "XYZ (δ delta)", @@ -97,7 +97,7 @@ } } }, - "XYZepsilon": { + "bdcde894dcc4ffa11d6192065d84f9dcc75814cf24760ff4f3e50d64eaddbc02": { "min_lp_stake": "1", "decimals": 5, "name": "XYZ (ε epsilon)",