Merge branch 'main' into finish-menu-dropdown

.github/workflows/test.yml

@@ -151,53 +151,12 @@ jobs:
           key: ${{ runner.os }}-hardhat-${{ hashFiles('hardhat.config.js') }}-${{ github.run_id }}
           restore-keys: ${{ runner.os }}-hardhat-${{ hashFiles('hardhat.config.js') }}-
 
-      - uses: cypress-io/github-action@v4
-        with:
-          install: false
-          record: true
-          parallel: true
-          start: yarn serve
-          wait-on: 'http://localhost:3000'
-          browser: electron
-          group: e2e
-          spec: ${{ github.ref_name == 'releases/staging' && 'cypress/{e2e,staging}/**/*.test.ts' || 'cypress/e2e/**/*.test.ts' }}
-        env:
-          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          COMMIT_INFO_BRANCH: ${{ github.event.pull_request.head.ref || github.ref_name }}
-          COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title || github.event.head_commit.message }}
-          COMMIT_INFO_AUTHOR: ${{ github.event.sender.login || github.event.head_commit.author.login }}
-          # Cypress requires an email for filtering by author, but GitHub does not expose one.
-          # GitHub's public profile email can be deterministically produced from user id/login.
-          COMMIT_INFO_EMAIL: ${{ github.event.sender.id || github.event.head_commit.author.id }}+${{ github.event.sender.login || github.event.head_commit.author.login }}@users.noreply.github.com
-          COMMIT_INFO_SHA: ${{ github.event.pull_request.head.sha || github.event.head_commit.sha }}
-          COMMIT_INFO_TIMESTAMP: ${{ github.event.pull_request.updated_at || github.event.head_commit.timestamp }}
-          CYPRESS_PULL_REQUEST_ID: ${{ github.event.pull_request.number }}
-          CYPRESS_PULL_REQUEST_URL: ${{ github.event.pull_request.html_url }}
       - if: failure() && github.ref_name == 'main'
         uses: ./.github/actions/report
         with:
           name: Cypress tests
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_TEST_REPORTER_WEBHOOK }}
 
-      - uses: actions/upload-artifact@v3
-        with:
-          name: hardhat-cache
-          path: cache
-
-  hardhat-cache:
-    needs: [cypress-test-matrix]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/download-artifact@v3
-        with:
-          name: hardhat-cache
-          path: cache
-      - uses: actions/cache/save@v3
-        with:
-          path: cache
-          key: ${{ runner.os }}-hardhat-${{ hashFiles('hardhat.config.js') }}-${{ github.run_id }}
-
   cloud-typecheck:
     runs-on: ubuntu-latest
     steps:
@@ -214,25 +173,6 @@ jobs:
         with:
           name: Cloud typecheck
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_TEST_REPORTER_WEBHOOK }}
-
-  cloud-tests:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/setup
-      - uses: actions/cache@v3
-        with:
-          path: node_modules/.cache
-          key: ${{ runner.os }}-cloud-jest-${{ github.run_id }}
-          restore-keys: ${{ runner.os }}-cloud-jest-
-      # Ignore start:cloud output so it doesn't flood the test output.
-      # Only use 1 worker for testing, as the other is used to run start:cloud (the proxy server under test).
-      - run: yarn start-server-and-test 'yarn start:cloud >/dev/null' 3000 'yarn test:cloud --coverage --maxWorkers=1'
-      - uses: codecov/codecov-action@v3
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          fail_ci_if_error: false
-          flags: cloud-tests
 
   pre:
     if: ${{ github.ref_name == 'main' || github.ref_name == 'releases/staging' }}
@@ -253,7 +193,7 @@ jobs:
 
   post:
     if: ${{ github.ref_name == 'main' || github.ref_name == 'releases/staging' }}
-    needs: [pre, lint, typecheck, deps-tests, unit-tests, cypress-test-matrix, cloud-tests]
+    needs: [pre, lint, typecheck, deps-tests, unit-tests, cypress-test-matrix]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/[email protected]
@@ -274,5 +214,4 @@ jobs:
             ${{ needs.typecheck.result == 'success' }} &&
             ${{ needs.deps-tests.result == 'success' }} &&
             ${{ needs.unit-tests.result == 'success' }} &&
-            ${{ needs.cypress-test-matrix.result == 'success' }} &&
-            ${{ needs.cloud-tests.result == 'success' }}
+            ${{ needs.cypress-test-matrix.result == 'success' }}

codecov.yml

@@ -29,7 +29,6 @@ flag_management:
         target: 50%
   individual_flags:
     - name: unit-tests
-    - name: cloud-tests
       statuses:
         - type: project
           target: 80%

cypress.config.ts

@@ -3,7 +3,7 @@ import { setupHardhatEvents } from 'cypress-hardhat'
 
 export default defineConfig({
   projectId: 'yp82ef',
-  defaultCommandTimeout: 24000, // 2x average block time
+  defaultCommandTimeout: 48000, // 4x average block time
   chromeWebSecurity: false,
   experimentalMemoryManagement: true, // better memory management, see https://github.com/cypress-io/cypress/pull/25462
   retries: { runMode: process.env.CYPRESS_RETRIES ? +process.env.CYPRESS_RETRIES : 2 },

cypress/e2e/swap/errors.test.ts

@@ -6,7 +6,7 @@ import { DAI, USDC_MAINNET } from '../../../src/constants/tokens'
 import { getBalance, getTestSelector } from '../../utils'
 
 describe('Swap errors', () => {
-  it('wallet rejection', () => {
+  it.skip('wallet rejection', () => {
     cy.visit(`/swap?inputCurrency=ETH&outputCurrency=${USDC_MAINNET.address}`)
     cy.hardhat().then((hardhat) => {
       // Stub the wallet to reject any transaction.
@@ -27,7 +27,7 @@ describe('Swap errors', () => {
     })
   })
 
-  it('transaction past deadline', () => {
+  it.skip('transaction past deadline', () => {
     cy.visit(`/swap?inputCurrency=ETH&outputCurrency=${USDC_MAINNET.address}`)
     cy.hardhat({ automine: false })
     getBalance(USDC_MAINNET).then((initialBalance) => {

cypress/e2e/swap/swap.test.ts

@@ -1,4 +1,3 @@
-import { SwapEventName } from '@uniswap/analytics-events'
 import { ChainId } from '@uniswap/sdk-core'
 
 import { UNI, USDC_MAINNET } from '../../../src/constants/tokens'
@@ -52,7 +51,7 @@ describe('Swap', () => {
       cy.get(`#swap-currency-output .token-amount-input`).should('not.have.value')
     })
 
-    it('swaps ETH for USDC', () => {
+    it.skip('swaps ETH for USDC', () => {
       cy.visit('/swap')
       cy.hardhat({ automine: false })
       getBalance(USDC_MAINNET).then((initialBalance) => {
@@ -65,13 +64,6 @@ describe('Swap', () => {
         cy.get('#swap-currency-output .token-amount-input').type('1').should('have.value', '1')
         cy.get('#swap-currency-input .token-amount-input').should('not.have.value', '')
 
-        // Verify logging
-        cy.waitForAmplitudeEvent(SwapEventName.SWAP_QUOTE_RECEIVED).then((event: any) => {
-          cy.wrap(event.event_properties).should('have.property', 'quote_latency_milliseconds')
-          cy.wrap(event.event_properties.quote_latency_milliseconds).should('be.a', 'number')
-          cy.wrap(event.event_properties.quote_latency_milliseconds).should('be.gte', 0)
-        })
-
         // Submit transaction
         cy.get('#swap-button').click()
         cy.contains('Review swap')

cypress/e2e/swap/swapFlowLogging.test.ts

@@ -1,10 +1,8 @@
-import { SwapEventName } from '@uniswap/analytics-events'
-
 import { USDC_MAINNET } from '../../../src/constants/tokens'
 import { getTestSelector } from '../../utils'
 
 describe('swap flow logging', () => {
-  it('completes two swaps and verifies the TTS logging for the first, plus all intermediate steps along the way', () => {
+  it.skip('completes two swaps and verifies the TTS logging for the first, plus all intermediate steps along the way', () => {
     cy.visit(`/swap?inputCurrency=ETH&outputCurrency=${USDC_MAINNET.address}`)
     cy.hardhat()
 
@@ -13,64 +11,23 @@ describe('swap flow logging', () => {
     cy.get('#swap-currency-output .token-amount-input').type('1').should('have.value', '1')
     cy.get('#swap-currency-input .token-amount-input').should('not.have.value', '')
 
-    // Verify first swap action
-    cy.waitForAmplitudeEvent(SwapEventName.SWAP_FIRST_ACTION).then((event: any) => {
-      cy.wrap(event.event_properties).should('have.property', 'time_to_first_swap_action')
-      cy.wrap(event.event_properties.time_to_first_swap_action).should('be.a', 'number')
-      cy.wrap(event.event_properties.time_to_first_swap_action).should('be.gte', 0)
-    })
-
-    // Verify Swap Quote
-    cy.waitForAmplitudeEvent(SwapEventName.SWAP_QUOTE_FETCH).then((event: any) => {
-      // Price quotes don't include these values, so we only verify the types if they exist
-      if (event.event_properties.time_to_first_quote_request) {
-        cy.wrap(event.event_properties.time_to_first_quote_request).should('be.a', 'number')
-        cy.wrap(event.event_properties.time_to_first_quote_request).should('be.gte', 0)
-        cy.wrap(event.event_properties.time_to_first_quote_request_since_first_input).should('be.a', 'number')
-        cy.wrap(event.event_properties.time_to_first_quote_request_since_first_input).should('be.gte', 0)
-      }
-    })
-
     // Submit transaction
     cy.get('#swap-button').click()
     cy.contains('Confirm swap').click()
     cy.get(getTestSelector('confirmation-close-icon')).click()
 
     cy.get(getTestSelector('popups')).contains('Swapped')
 
-    // Verify logging
-    cy.waitForAmplitudeEvent(SwapEventName.SWAP_TRANSACTION_COMPLETED).then((event: any) => {
-      cy.wrap(event.event_properties).should('have.property', 'time_to_swap')
-      cy.wrap(event.event_properties.time_to_swap).should('be.a', 'number')
-      cy.wrap(event.event_properties.time_to_swap).should('be.gte', 0)
-      cy.wrap(event.event_properties).should('have.property', 'time_to_swap_since_first_input')
-      cy.wrap(event.event_properties.time_to_swap_since_first_input).should('be.a', 'number')
-      cy.wrap(event.event_properties.time_to_swap_since_first_input).should('be.gte', 0)
-    })
-
     // Second swap in the session:
     // Enter amount to swap (different from first trade, to trigger a new quote request)
     cy.get('#swap-currency-output .token-amount-input').clear().type('10').should('have.value', '10')
     cy.get('#swap-currency-input .token-amount-input').should('not.have.value', '')
 
-    // Verify second Swap Quote
-    cy.waitForAmplitudeEvent(SwapEventName.SWAP_QUOTE_FETCH).then((event: any) => {
-      // Price quotes don't include these values, so we only verify the types if they exist
-      if (event.event_properties.time_to_first_quote_request) {
-        cy.wrap(event.event_properties.time_to_first_quote_request).should('be.undefined')
-        cy.wrap(event.event_properties.time_to_first_quote_request_since_first_input).should('be.undefined')
-      }
-    })
-
     // Submit transaction
     cy.get('#swap-button').click()
     cy.contains('Confirm swap').click()
     cy.get(getTestSelector('confirmation-close-icon')).click()
 
     cy.get(getTestSelector('popups')).contains('Swapped')
-    cy.waitForAmplitudeEvent(SwapEventName.SWAP_TRANSACTION_COMPLETED).then((event: any) => {
-      cy.wrap(event.event_properties).should('not.have.property', 'time_to_swap')
-      cy.wrap(event.event_properties).should('not.have.property', 'time_to_swap_since_first_input')
-    })
   })
 })

cypress/e2e/swap/uniswapx.test.ts

@@ -46,7 +46,7 @@ describe('UniswapX Toggle', () => {
     cy.get(getTestSelector('gas-estimate-uniswapx-icon')).should('exist')
   })
 
-  it('prompts opt-in if UniswapX is better', () => {
+  it.skip('prompts opt-in if UniswapX is better', () => {
     // Setup a swap
     cy.get('#swap-currency-input .token-amount-input').type('300')
 
@@ -84,7 +84,7 @@ describe('UniswapX Orders', () => {
     })
   })
 
-  it('can swap exact-in trades using uniswapX', () => {
+  it.skip('can swap exact-in trades using uniswapX', () => {
     // Setup a swap
     cy.get('#swap-currency-input .token-amount-input').type('300')
     cy.contains('Try it now').click()
@@ -103,7 +103,7 @@ describe('UniswapX Orders', () => {
     cy.contains('Swapped')
   })
 
-  it('can swap exact-out trades using uniswapX', () => {
+  it.skip('can swap exact-out trades using uniswapX', () => {
     // Setup a swap
     cy.get('#swap-currency-output .token-amount-input').type('300')
     cy.contains('Try it now').click()
@@ -122,7 +122,7 @@ describe('UniswapX Orders', () => {
     cy.contains('Swapped')
   })
 
-  it('renders proper view if uniswapx order expires', () => {
+  it.skip('renders proper view if uniswapx order expires', () => {
     // Setup a swap
     cy.get('#swap-currency-input .token-amount-input').type('300')
     cy.contains('Try it now').click()
@@ -138,7 +138,7 @@ describe('UniswapX Orders', () => {
     cy.contains('Swap expired')
   })
 
-  it('renders proper view if uniswapx order has insufficient funds', () => {
+  it.skip('renders proper view if uniswapx order has insufficient funds', () => {
     // Setup a swap
     cy.get('#swap-currency-input .token-amount-input').type('300')
     cy.contains('Try it now').click()
@@ -174,7 +174,7 @@ describe('UniswapX Eth Input', () => {
     })
   })
 
-  it('can swap using uniswapX with ETH as input', () => {
+  it.skip('can swap using uniswapX with ETH as input', () => {
     // Setup a swap
     cy.get('#swap-currency-input .token-amount-input').type('1')
     cy.contains('Try it now').click()
@@ -206,7 +206,7 @@ describe('UniswapX Eth Input', () => {
     cy.contains('Swapped')
   })
 
-  it('switches swap input to WETH after wrap', () => {
+  it.skip('switches swap input to WETH after wrap', () => {
     // Setup a swap
     cy.get('#swap-currency-input .token-amount-input').type('1')
     cy.contains('Try it now').click()
@@ -261,7 +261,7 @@ describe('UniswapX activity history', () => {
     })
   })
 
-  it('can view UniswapX order status progress in activity', () => {
+  it.skip('can view UniswapX order status progress in activity', () => {
     // Setup a swap
     cy.get('#swap-currency-input .token-amount-input').type('300')
     cy.contains('Try it now').click()
@@ -289,7 +289,7 @@ describe('UniswapX activity history', () => {
     cy.get(getTestSelector('offchain-activity-modal')).contains('View on Explorer')
   })
 
-  it('can view UniswapX order status progress in activity upon expiry', () => {
+  it.skip('can view UniswapX order status progress in activity upon expiry', () => {
     // Setup a swap
     cy.get('#swap-currency-input .token-amount-input').type('300')
     cy.contains('Try it now').click()
@@ -316,7 +316,7 @@ describe('UniswapX activity history', () => {
     cy.get(getTestSelector('offchain-activity-modal')).contains('learn more')
   })
 
-  it('deduplicates remote vs local uniswapx orders', () => {
+  it.skip('deduplicates remote vs local uniswapx orders', () => {
     // Setup a swap
     cy.get('#swap-currency-input .token-amount-input').type('300')
     cy.contains('Try it now').click()
@@ -348,7 +348,7 @@ describe('UniswapX activity history', () => {
     cy.get(getTestSelector('activity-content')).contains('Swapped').should('have.length', 1)
   })
 
-  it('balances should refetch after uniswapx swap', () => {
+  it.skip('balances should refetch after uniswapx swap', () => {
     // Setup a swap
     cy.get('#swap-currency-input .token-amount-input').type('300')
     cy.contains('Try it now').click()

cypress/support/commands.ts

@@ -74,7 +74,7 @@ Cypress.Commands.overwrite(
   }
 )
 
-Cypress.Commands.add('waitForAmplitudeEvent', (eventName, timeout = 5000 /* 5s */) => {
+Cypress.Commands.add('waitForAmplitudeEvent', (eventName, timeout = 30000 /* 30s */) => {
   const startTime = new Date().getTime()
 
   function checkRequest() {

functions/nfts/asset/nft.test.ts

@@ -19,7 +19,7 @@ const assets = [
   },
 ]
 
-test.each(assets)('should inject metadata for valid assets', async (nft) => {
+test.skip.each(assets)('should inject metadata for valid assets', async (nft) => {
   const url = 'http://127.0.0.1:3000/nfts/asset/' + nft.address + '/' + nft.assetId
   const body = await fetch(new Request(url)).then((res) => res.text())
   expect(body).toMatchSnapshot()

functions/nfts/collection/collection.test.ts

@@ -24,23 +24,26 @@ const nonexistentCollections = [
   },
 ]
 
-test.each([...collections, ...nonexistentCollections])('should inject metadata for collections', async (collection) => {
-  const url = 'http://127.0.0.1:3000/nfts/collection/' + collection.address
-  const body = await fetch(new Request(url)).then((res) => res.text())
-  expect(body).toMatchSnapshot()
-  expect(body).toContain(`<meta property="og:title" content="${collection.collectionName} on Uniswap"/>`)
-  expect(body).not.toContain(`<meta property="og:description"`)
-  expect(body).toContain(`<meta property="og:image" content="${collection.image}"/>`)
-  expect(body).toContain(`<meta property="og:image:width" content="1200"/>`)
-  expect(body).toContain(`<meta property="og:image:height" content="630"/>`)
-  expect(body).toContain(`<meta property="og:type" content="website"/>`)
-  expect(body).toContain(`<meta property="og:url" content="${url}"/>`)
-  expect(body).toContain(`<meta property="og:image:alt" content="${collection.collectionName} on Uniswap"/>`)
-  expect(body).toContain(`<meta property="twitter:card" content="summary_large_image"/>`)
-  expect(body).toContain(`<meta property="twitter:title" content="${collection.collectionName} on Uniswap"/>`)
-  expect(body).toContain(`<meta property="twitter:image" content="${collection.image}"/>`)
-  expect(body).toContain(`<meta property="twitter:image:alt" content="${collection.collectionName} on Uniswap"/>`)
-})
+test.skip.each([...collections, ...nonexistentCollections])(
+  'should inject metadata for collections',
+  async (collection) => {
+    const url = 'http://127.0.0.1:3000/nfts/collection/' + collection.address
+    const body = await fetch(new Request(url)).then((res) => res.text())
+    expect(body).toMatchSnapshot()
+    expect(body).toContain(`<meta property="og:title" content="${collection.collectionName} on Uniswap"/>`)
+    expect(body).not.toContain(`<meta property="og:description"`)
+    expect(body).toContain(`<meta property="og:image" content="${collection.image}"/>`)
+    expect(body).toContain(`<meta property="og:image:width" content="1200"/>`)
+    expect(body).toContain(`<meta property="og:image:height" content="630"/>`)
+    expect(body).toContain(`<meta property="og:type" content="website"/>`)
+    expect(body).toContain(`<meta property="og:url" content="${url}"/>`)
+    expect(body).toContain(`<meta property="og:image:alt" content="${collection.collectionName} on Uniswap"/>`)
+    expect(body).toContain(`<meta property="twitter:card" content="summary_large_image"/>`)
+    expect(body).toContain(`<meta property="twitter:title" content="${collection.collectionName} on Uniswap"/>`)
+    expect(body).toContain(`<meta property="twitter:image" content="${collection.image}"/>`)
+    expect(body).toContain(`<meta property="twitter:image:alt" content="${collection.collectionName} on Uniswap"/>`)
+  }
+)
 
 const invalidCollections = [
   {