Merge branch 'main' into ytm-in-asset-detail

centrifuge · May 13, 2024 · 1c67236 · 1c67236
2 parents 1710f7c + fd321f5
commit 1c67236
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 18 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -1,9 +1,10 @@
 name: Synpress tests
 
 on:
-  pull_request:
-    types: [closed]
-    branches: [main]
+  workflow_run:
+    workflows: ['Demo deployments (manual)']
+    types:
+      - completed
 
 jobs:
   cypress-run:
@@ -35,8 +36,8 @@ jobs:
           CYPRESS_PRIVATE_KEY: ${{secrets.CYPRESS_PRIVATE_KEY}}
           PRIVATE_KEY: ${{secrets.CYPRESS_PRIVATE_KEY}}
           NETWORK_NAME: centrifuge
-          RPC_URL: https://fullnode.development.cntrfg.com
-          CHAIN_ID: 2000
+          RPC_URL: https://fullnode-apps.demo.k-f.dev
+          CHAIN_ID: 2090
           SYMBOL: DEVEL
           IS_TESTNET: true
           DEBUG: true
@@ -54,5 +55,5 @@ jobs:
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           CYPRESS_PRIVATE_KEY: ${{ secrets.CYPRESS_PRIVATE_KEY }}
           PRIVATE_KEY: ${{ secrets.CYPRESS_PRIVATE_KEY }}
-          CYPRESS_BASE_URL: https://app-dev.k-f.dev
+          CYPRESS_BASE_URL: https://app-demo.k-f.dev
           DISPLAY: :0.0
diff --git a/centrifuge-app/env.sample b/centrifuge-app/env.sample
@@ -1,7 +1,8 @@
 # Copy to .env (for synpress/e2e testing config ONLY)
-PRIVATE_KEY=
-NETWORK_NAME=centrifuge 
-RPC_URL=https://fullnode.development.cntrfg.com 
-CHAIN_ID=2000 
-SYMBOL=DEVEL 
-IS_TESTNET=true
+NETWORK_NAME=centrifuge
+RPC_URL=https://fullnode-apps.demo.k-f.dev
+CHAIN_ID=2090
+SYMBOL=DEVEL
+IS_TESTNET=true
+DEBUG=true
+PRIVATE_KEY= 
diff --git a/centrifuge-app/tests/e2e/data/pool.json b/centrifuge-app/tests/e2e/data/pool.json
@@ -1,19 +1,19 @@
 {
   "name": "E2E Pool",
-  "poolId": "3515519799",
-  "poolCurrency": "USDT",
+  "poolId": "1101557597",
+  "poolCurrency": "USDC",
   "investAmount": "2",
   "poolAdmin": "0x70fC4d9C87E9e9B0751A5680b1Dd654517f02309",
   "tranches": [
     {
       "name": "Junior",
       "symbol": "E2EJUN",
-      "id": "0xec6528e5b1a899fed47777b19963b1a6"
+      "id": "0xbf444862859556b448b9242c9cfee126"
     },
     {
       "name": "Senior",
       "symbol": "E2ESEN",
-      "id": "0xc18e73516eda0e038c50f6ab075b74ec"
+      "id": "0x7ccd846d1116ce4a751edf9d01e484b7"
     }
   ]
 }
diff --git a/centrifuge-app/tests/e2e/specs/invest.cy.ts b/centrifuge-app/tests/e2e/specs/invest.cy.ts
@@ -20,7 +20,7 @@ describe('Invest flows', () => {
     cy.get('button[type="submit"]').click()
     cy.confirmTransaction()
   })
-  it('Pool Admin: Transfer USDT (fund investor)', () => {
+  it(`Pool Admin: Transfer ${pool.poolCurrency} (fund investor)`, () => {
     cy.visit('/portfolio', { failOnStatusCode: false })
     cy.connectWallet()
     cy.switchMetamaskAccount('Investor') // switch to investor account to grab address

diff --git a/centrifuge-app/tests/e2e/support/e2e.ts b/centrifuge-app/tests/e2e/support/e2e.ts
@@ -38,7 +38,7 @@ Cypress.Commands.add('connectWallet', (config) => {
 })
 
 Cypress.Commands.add('confirmTransaction', () => {
-  cy.confirmMetamaskTransaction()
+  cy.confirmMetamaskTransaction({ gasConfig: 'market' })
   cy.contains('Transaction pending').should('exist')
   cy.contains('Transaction pending', { timeout: 100000 }).should('not.exist')
   cy.contains('Transaction failed').should('not.exist')