chore(deps): upgrade detox to ^20.28.0

.env.test

@@ -1,4 +1,4 @@
-DEFAULT_TESTNET=alfajores
+DEFAULT_TESTNET=mainnet
 SMS_RETRIEVER_APP_SIGNATURE=TODO
 DEV_SETTINGS_ACTIVE_INITIALLY=true
 # Disable firebase b.c. google-services.json files are missing in CI

.github/workflows/e2e-android.yml

@@ -8,6 +8,11 @@ on:
 
 jobs:
   android:
+    env:
+      # `if` conditions can't directly access secrets, so we use a workaround
+      # See https://docs.github.com/en/actions/security-guides/encrypted-secrets#using-encrypted-secrets-in-a-workflow
+      SECRETS_AVAILABLE: ${{ secrets.SECRETS_AVAILABLE }}
+      BASH_ENV: ~/.profile
     name: Android (SDK ${{ inputs.android-api-level }})
     runs-on:
       - nscloud-ubuntu-22.04-amd64-16x64-with-cache
@@ -17,6 +22,25 @@ jobs:
     # If it takes longer it usually fails, so no need to pay for more
     timeout-minutes: 25
     steps:
+      - uses: google-github-actions/auth@v2
+        if: ${{ env.SECRETS_AVAILABLE }}
+        with:
+          project_id: celo-mobile-mainnet
+          credentials_json: ${{ secrets.MAINNET_SERVICE_ACCOUNT_KEY }}
+      - name: Google Secrets
+        if: ${{ env.SECRETS_AVAILABLE }}
+        id: google-secrets
+        uses: google-github-actions/[email protected]
+        with:
+          secrets: |-
+            E2E_WALLET_CONNECT_PROJECT_ID:projects/1027349420744/secrets/E2E_WALLET_CONNECT_PROJECT_ID
+            E2E_DEFAULT_RECIPIENT_MNEMONIC:projects/1027349420744/secrets/E2E_DEFAULT_RECIPIENT_MNEMONIC
+            E2E_DEFAULT_RECIPIENT_PRIVATE_KEY:projects/1027349420744/secrets/E2E_DEFAULT_RECIPIENT_PRIVATE_KEY
+            E2E_WALLET_MNEMONIC:projects/1027349420744/secrets/E2E_WALLET_MNEMONIC
+            E2E_WALLET_PRIVATE_KEY:projects/1027349420744/secrets/E2E_WALLET_PRIVATE_KEY
+            E2E_WALLET_SINGLE_VERIFIED_MNEMONIC:projects/1027349420744/secrets/E2E_WALLET_SINGLE_VERIFIED_MNEMONIC
+            E2E_WALLET_MULTIPLE_VERIFIED_MNEMONIC:projects/1027349420744/secrets/E2E_WALLET_MULTIPLE_VERIFIED_MNEMONIC
+            E2E_WALLET_12_WORDS_MNEMONIC:projects/1027349420744/secrets/E2E_WALLET_12_WORDS_MNEMONIC
       - uses: actions/checkout@v4
       - name: Set env
         run: |
@@ -74,9 +98,6 @@ jobs:
         run: yarn build:ts
       - name: Check E2E wallet balance
         run: NODE_OPTIONS='--unhandled-rejections=strict' yarn ts-node ./e2e/scripts/check-e2e-wallet-balance.ts
-      - name: Create Android E2E .env File
-        working-directory: e2e
-        run: echo WALLET_CONNECT_PROJECT_ID_E2E=${{ secrets.WALLET_CONNECT_PROJECT_ID_E2E }} >> .env
       - name: Create Detox Build
         run: CELO_TEST_CONFIG=e2e yarn detox build -c android.release
       - name: Run Detox
@@ -94,6 +115,15 @@ jobs:
           --headless
           --retries 3
           --device-boot-args="-snapshot ci_boot"
+        env:
+          E2E_WALLET_CONNECT_PROJECT_ID: ${{ steps.google-secrets.outputs.E2E_WALLET_CONNECT_PROJECT_ID }}
+          E2E_DEFAULT_RECIPIENT_MNEMONIC: ${{ steps.google-secrets.outputs.E2E_DEFAULT_RECIPIENT_MNEMONIC }}
+          E2E_DEFAULT_RECIPIENT_PRIVATE_KEY: ${{ steps.google-secrets.outputs.E2E_DEFAULT_RECIPIENT_PRIVATE_KEY }}
+          E2E_WALLET_MNEMONIC: ${{ steps.google-secrets.outputs.E2E_WALLET_MNEMONIC }}
+          E2E_WALLET_PRIVATE_KEY: ${{ steps.google-secrets.outputs.E2E_WALLET_PRIVATE_KEY }}
+          E2E_WALLET_SINGLE_VERIFIED_MNEMONIC: ${{ steps.google-secrets.outputs.E2E_WALLET_SINGLE_VERIFIED_MNEMONIC }}
+          E2E_WALLET_MULTIPLE_VERIFIED_MNEMONIC: ${{ steps.google-secrets.outputs.E2E_WALLET_MULTIPLE_VERIFIED_MNEMONIC }}
+          E2E_WALLET_12_WORDS_MNEMONIC: ${{ steps.google-secrets.outputs.E2E_WALLET_12_WORDS_MNEMONIC }}
       - name: Publish Android JUnit Report
         if: always()
         uses: mikepenz/action-junit-report@v4

.github/workflows/e2e-faucet-balance.yml

@@ -17,12 +17,21 @@ jobs:
     name: balance-and-fund
     runs-on: ubuntu-latest
     steps:
+      - uses: google-github-actions/auth@v2
+        if: ${{ env.SECRETS_AVAILABLE }}
+        with:
+          project_id: celo-mobile-mainnet
+          credentials_json: ${{ secrets.MAINNET_SERVICE_ACCOUNT_KEY }}
+      - name: Google Secrets
+        if: ${{ env.SECRETS_AVAILABLE }}
+        id: google-secrets
+        uses: google-github-actions/[email protected]
+        with:
+          secrets: |-
+            TEST_FAUCET_SECRET:projects/1027349420744/secrets/TEST_FAUCET_SECRET
       - uses: actions/checkout@v4
       - uses: ./.github/actions/yarn-install
-      - name: Create E2E Fund .env File
-        env:
-          TEST_FAUCET_SECRET: ${{ secrets.TEST_FAUCET_SECRET }}
-        working-directory: e2e
-        run: echo TEST_FAUCET_SECRET=$TEST_FAUCET_SECRET >> .env
       - name: Run Balance and Fund
         run: NODE_OPTIONS='--unhandled-rejections=strict' yarn ts-node ./e2e/scripts/fund-e2e-accounts.ts
+        env:
+          TEST_FAUCET_SECRET: ${{ steps.google-secrets.outputs.TEST_FAUCET_SECRET }}

.github/workflows/e2e-ios.yml

@@ -28,6 +28,14 @@ jobs:
         with:
           secrets: |-
             EMERGE_API_TOKEN:projects/1027349420744/secrets/EMERGE_API_TOKEN
+            E2E_WALLET_CONNECT_PROJECT_ID:projects/1027349420744/secrets/E2E_WALLET_CONNECT_PROJECT_ID
+            E2E_DEFAULT_RECIPIENT_MNEMONIC:projects/1027349420744/secrets/E2E_DEFAULT_RECIPIENT_MNEMONIC
+            E2E_DEFAULT_RECIPIENT_PRIVATE_KEY:projects/1027349420744/secrets/E2E_DEFAULT_RECIPIENT_PRIVATE_KEY
+            E2E_WALLET_MNEMONIC:projects/1027349420744/secrets/E2E_WALLET_MNEMONIC
+            E2E_WALLET_PRIVATE_KEY:projects/1027349420744/secrets/E2E_WALLET_PRIVATE_KEY
+            E2E_WALLET_SINGLE_VERIFIED_MNEMONIC:projects/1027349420744/secrets/E2E_WALLET_SINGLE_VERIFIED_MNEMONIC
+            E2E_WALLET_MULTIPLE_VERIFIED_MNEMONIC:projects/1027349420744/secrets/E2E_WALLET_MULTIPLE_VERIFIED_MNEMONIC
+            E2E_WALLET_12_WORDS_MNEMONIC:projects/1027349420744/secrets/E2E_WALLET_12_WORDS_MNEMONIC
       - uses: actions/checkout@v4
       - uses: ./.github/actions/yarn-install
       # Since the e2e runners have access to the Valora branding,
@@ -46,9 +54,6 @@ jobs:
         run: yarn ts-node ./.github/scripts/checkPodfileAndUpdateRenovatePr.ts
       - name: Check E2E wallet balance
         run: NODE_OPTIONS='--unhandled-rejections=strict' yarn ts-node ./e2e/scripts/check-e2e-wallet-balance.ts
-      - name: Create iOS E2E .env File
-        working-directory: e2e
-        run: echo MOCK_PROVIDER_BASE_URL=${{ secrets.MOCK_PROVIDER_BASE_URL }} >> .env && echo MOCK_PROVIDER_API_KEY=${{ secrets.MOCK_PROVIDER_API_KEY }} >> .env && echo WALLET_CONNECT_PROJECT_ID_E2E=${{ secrets.WALLET_CONNECT_PROJECT_ID_E2E }} >> .env
       - name: Create Detox Build
         run: |
           export CELO_TEST_CONFIG=e2e
@@ -76,6 +81,15 @@ jobs:
           --maxWorkers 6
           --retries 3
         timeout-minutes: 45
+        env:
+          E2E_WALLET_CONNECT_PROJECT_ID: ${{ steps.google-secrets.outputs.E2E_WALLET_CONNECT_PROJECT_ID }}
+          E2E_DEFAULT_RECIPIENT_MNEMONIC: ${{ steps.google-secrets.outputs.E2E_DEFAULT_RECIPIENT_MNEMONIC }}
+          E2E_DEFAULT_RECIPIENT_PRIVATE_KEY: ${{ steps.google-secrets.outputs.E2E_DEFAULT_RECIPIENT_PRIVATE_KEY }}
+          E2E_WALLET_MNEMONIC: ${{ steps.google-secrets.outputs.E2E_WALLET_MNEMONIC }}
+          E2E_WALLET_PRIVATE_KEY: ${{ steps.google-secrets.outputs.E2E_WALLET_PRIVATE_KEY }}
+          E2E_WALLET_SINGLE_VERIFIED_MNEMONIC: ${{ steps.google-secrets.outputs.E2E_WALLET_SINGLE_VERIFIED_MNEMONIC }}
+          E2E_WALLET_MULTIPLE_VERIFIED_MNEMONIC: ${{ steps.google-secrets.outputs.E2E_WALLET_MULTIPLE_VERIFIED_MNEMONIC }}
+          E2E_WALLET_12_WORDS_MNEMONIC: ${{ steps.google-secrets.outputs.E2E_WALLET_12_WORDS_MNEMONIC }}
       - name: Publish iOS JUnit Report
         if: always()
         uses: mikepenz/action-junit-report@v4

e2e/README.md

@@ -20,6 +20,10 @@ Ensure you have Xcode installed.
 
 Install [AppleSimulatorUtils](https://github.com/wix/AppleSimulatorUtils#installing) which is used in e2e scripts to launch the iOS simulator.
 
+### Setting up secrets for local runs
+
+An `.env` example is present at `e2e/example.env` rename this file to `.env` and populate the secrets from Google Cloud Platform. Do not commit the newly created `e2e/.env` file.
+
 ## Running the tests
 
 ```sh

e2e/example.env

@@ -0,0 +1,9 @@
+E2E_TEST_FAUCET_SECRET=""
+E2E_WALLET_CONNECT_PROJECT_ID=""
+E2E_DEFAULT_RECIPIENT_MNEMONIC=""
+E2E_DEFAULT_RECIPIENT_PRIVATE_KEY=""
+E2E_WALLET_MNEMONIC=""
+E2E_WALLET_PRIVATE_KEY=""
+E2E_WALLET_SINGLE_VERIFIED_MNEMONIC=""
+E2E_WALLET_MULTIPLE_VERIFIED_MNEMONIC=""
+E2E_WALLET_12_WORDS_MNEMONIC=""

e2e/scripts/check-e2e-wallet-balance.ts

@@ -1,4 +1,4 @@
-import { E2E_TEST_WALLET, E2E_TEST_WALLET_SECURE_SEND } from './consts'
+import { E2E_TEST_FAUCET, E2E_TEST_WALLET, E2E_TEST_WALLET_SECURE_SEND } from './consts'
 import { checkBalance, getCeloTokensBalance } from './utils'
 ;(async () => {
   console.log(`E2E_TEST_WALLET: ${E2E_TEST_WALLET}`)
@@ -8,4 +8,7 @@ import { checkBalance, getCeloTokensBalance } from './utils'
   console.log(`E2E_TEST_WALLET_SECURE_SEND: ${E2E_TEST_WALLET_SECURE_SEND}`)
   console.table(await getCeloTokensBalance(E2E_TEST_WALLET_SECURE_SEND))
   await checkBalance(E2E_TEST_WALLET_SECURE_SEND)
+
+  console.log(`E2E_TEST_FACUET: ${E2E_TEST_FAUCET}`)
+  console.table(await getCeloTokensBalance(E2E_TEST_FAUCET))
 })()

e2e/scripts/consts.ts

@@ -1,4 +1,4 @@
-export const E2E_TEST_WALLET = '0x6131a6d616a4be3737b38988847270a64bc10caa'
-export const E2E_TEST_WALLET_SECURE_SEND = '0x86b8f44386cb2d457db79c3dab8cf42f9d8a3fc0'
-export const E2E_TEST_FAUCET = '0xe5F5363e31351C38ac82DBAdeaD91Fd5a7B08846'
+export const E2E_TEST_WALLET = '0xebf95355cc5ea643179a02337f3f943fd8dd2bcb'
+export const E2E_TEST_WALLET_SECURE_SEND = '0x06f4b680c6cb1aeec4a3ce12c63ea18acb136aa3'
+export const E2E_TEST_FAUCET = '0xa694b396cd6f73e4003da8f97f4b12e498b3f2ec'
 export const REFILL_TOKENS = ['CELO', 'cUSD', 'cEUR']

e2e/scripts/fund-e2e-accounts.ts

@@ -11,7 +11,7 @@ import {
 } from './consts'
 import { checkBalance, getCeloTokensBalance } from './utils'
 
-const provider = new providers.JsonRpcProvider('https://alfajores-forno.celo-testnet.org')
+const provider = new providers.JsonRpcProvider('https://forno.celo.org/')
 
 dotenv.config({ path: `${__dirname}/../.env` })
 
@@ -25,17 +25,17 @@ interface Token {
 
 const CELO: Token = {
   symbol: 'CELO',
-  address: utils.getAddress('0xf194afdf50b03e69bd7d057c1aa9e10c9954e4c9'),
+  address: utils.getAddress('0x471ece3750da237f93b8e339c536989b8978a438'),
   decimals: 18,
 }
 const CUSD: Token = {
   symbol: 'cUSD',
-  address: utils.getAddress('0x874069fa1eb16d44d622f2e0ca25eea172369bc1'),
+  address: utils.getAddress('0x765de816845861e75a25fca122bb6898b8b1282a'),
   decimals: 18,
 }
 const CEUR: Token = {
   symbol: 'cEUR',
-  address: utils.getAddress('0x10c892a6ec43a53e45d0b916b4b7d383b1b78c0f'),
+  address: utils.getAddress('0xd8763cba276a3738e6de85b4b3bf5fded6d6ca73'),
   decimals: 18,
 }
 const TOKENS_BY_SYMBOL: Record<string, Token> = {
@@ -53,7 +53,7 @@ const TOKENS_BY_SYMBOL: Record<string, Token> = {
   }
 
   const faucetTokenBalances = (await getCeloTokensBalance(E2E_TEST_FAUCET)) ?? {}
-  console.log('Initial faucet balance:')
+  console.log(`Initial balance for faucet at: ${E2E_TEST_FAUCET}:`)
   console.table(faucetTokenBalances)
 
   // Connect Valora E2E Test Faucet - Private Key Stored in GitHub Secrets
@@ -216,14 +216,14 @@ const TOKENS_BY_SYMBOL: Record<string, Token> = {
   }
 
   // Set Amount To Send
-  const amountToSend = '100'
+  const amountToSend = '10'
 
   for (let i = 0; i < walletsToBeFunded.length; i++) {
     const walletAddress = walletsToBeFunded[i]
     const walletBalance = walletBalances[i]
     for (const tokenSymbol of REFILL_TOKENS) {
       // @ts-ignore
-      if (walletBalance && walletBalance[tokenSymbol] < 200) {
+      if (walletBalance && walletBalance[tokenSymbol] < 20) {
         console.log(`Sending ${amountToSend} ${tokenSymbol} to ${walletAddress}`)
         await transferToken(TOKENS_BY_SYMBOL[tokenSymbol], amountToSend, walletAddress)
       }

e2e/scripts/utils.ts

@@ -1,5 +1,5 @@
 import { Address, createPublicClient, erc20Abi, http } from 'viem'
-import { celoAlfajores } from 'viem/chains'
+import { celo } from 'viem/chains'
 import { REFILL_TOKENS } from './consts'
 
 export async function checkBalance(
@@ -11,7 +11,7 @@ export async function checkBalance(
   for (const [tokenSymbol, tokenBalance] of Object.entries(balance)) {
     if (tokenSymbols.includes(tokenSymbol) && tokenBalance < minBalance) {
       throw new Error(
-        `${balance} balance of ${address} is below ${minBalance}. Please refill from the faucet https://celo.org/developers/faucet or run ./fund-e2e-accounts.ts if a Valora Dev.`
+        `${balance} balance of ${address} is below ${minBalance}. Please refill from the faucet or run ./fund-e2e-accounts.ts if a Valora Dev.`
       )
     }
   }
@@ -20,15 +20,15 @@ export async function checkBalance(
 export async function getCeloTokensBalance(walletAddress: Address) {
   try {
     const supportedTokenAddresses: Address[] = [
-      '0x874069fa1eb16d44d622f2e0ca25eea172369bc1',
-      '0x10c892a6ec43a53e45d0b916b4b7d383b1b78c0f',
-      '0xf194afdf50b03e69bd7d057c1aa9e10c9954e4c9',
-      '0xe4d517785d091d3c54818832db6094bcc2744545',
+      '0x765de816845861e75a25fca122bb6898b8b1282a',
+      '0xd8763cba276a3738e6de85b4b3bf5fded6d6ca73',
+      '0x471ece3750da237f93b8e339c536989b8978a438',
+      '0xe8537a3d056da446677b9e9d6c5db704eaab4787',
     ] // cUSD, cEUR, CELO, cREAL
     const supportedTokenSymbols: string[] = ['cUSD', 'cEUR', 'CELO', 'cREAL']
 
     const celoClient = createPublicClient({
-      chain: celoAlfajores,
+      chain: celo,
       transport: http(),
     })
 

e2e/src/CeloPage.spec.js

@@ -1,8 +1,7 @@
 import CeloEducation from './usecases/CeloEducation'
-import PriceChart from './usecases/PriceChart'
 import CeloNews from './usecases/CeloNews'
+import PriceChart from './usecases/PriceChart'
 import { quickOnboarding } from './utils/utils'
-import { launchApp } from './utils/retries'
 
 describe('Celo page', () => {
   beforeAll(async () => {

e2e/src/Discover.spec.js

@@ -1,6 +1,6 @@
-import { quickOnboarding, waitForElementByIdAndTap, scrollIntoView } from './utils/utils'
-import { launchApp } from './utils/retries'
 import DappListDisplay from './usecases/DappListDisplay'
+import { launchApp } from './utils/retries'
+import { quickOnboarding, scrollIntoView, waitForElementByIdAndTap } from './utils/utils'
 
 describe('Discover tab', () => {
   beforeAll(async () => {

e2e/src/HomeFeed.spec.js

@@ -1,6 +1,6 @@
-import { quickOnboarding, waitForElementId } from './utils/utils'
-import { sleep } from '../../src/utils/sleep'
 import jestExpect from 'expect'
+import { sleep } from '../../src/utils/sleep'
+import { quickOnboarding, waitForElementId } from './utils/utils'
 
 beforeAll(async () => {
   await quickOnboarding()

e2e/src/QRScanner.spec.js

@@ -1,4 +1,4 @@
-import { reloadReactNative, launchApp } from './utils/retries'
+import { reloadReactNative } from './utils/retries'
 import { quickOnboarding, waitForElementId } from './utils/utils'
 
 describe('Given QR Scanner', () => {