From afaa52e5e73558d6a936cd175d46a4aabcfc8a01 Mon Sep 17 00:00:00 2001
From: Connor McEwen <connor.mcewen@gmail.com>
Date: Wed, 19 Oct 2022 13:30:42 -0400
Subject: [PATCH] feat: use widget validate function (#4909)

* feat: use widget validate function

* load GA scripts
---
 package.json                                  |  1 -
 public/index.html                             |  1 +
 src/lib/hooks/useTokenList/fetchTokenList.ts  |  3 +-
 .../useTokenList/validateTokenList.test.ts    | 42 ---------------
 .../hooks/useTokenList/validateTokenList.ts   | 54 -------------------
 yarn.lock                                     |  2 +-
 6 files changed, 3 insertions(+), 100 deletions(-)
 delete mode 100644 src/lib/hooks/useTokenList/validateTokenList.test.ts
 delete mode 100644 src/lib/hooks/useTokenList/validateTokenList.ts

diff --git a/package.json b/package.json
index 17fc4f086b..6edb9c4bf9 100644
--- a/package.json
+++ b/package.json
@@ -169,7 +169,6 @@
     "@web3-react/types": "^8.0.20-beta.0",
     "@web3-react/url": "^8.0.25-beta.0",
     "@web3-react/walletconnect": "^8.0.35-beta.0",
-    "ajv": "^6.12.3",
     "array.prototype.flat": "^1.2.4",
     "array.prototype.flatmap": "^1.2.4",
     "cids": "^1.0.0",
diff --git a/public/index.html b/public/index.html
index 634c7adf1f..d43f7ff7d0 100644
--- a/public/index.html
+++ b/public/index.html
@@ -17,6 +17,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
   <meta name="theme-color" content="#FC72FF" />
+  <meta http-equiv="Content-Security-Policy" content="script-src 'self' https://www.google-analytics.com https://www.googletagmanager.com 'unsafe-inline'" />
 
   <!--
       manifest.json provides metadata used when the app is installed as a PWA.
diff --git a/src/lib/hooks/useTokenList/fetchTokenList.ts b/src/lib/hooks/useTokenList/fetchTokenList.ts
index 4b489daca4..55b422da42 100644
--- a/src/lib/hooks/useTokenList/fetchTokenList.ts
+++ b/src/lib/hooks/useTokenList/fetchTokenList.ts
@@ -1,10 +1,9 @@
 import type { TokenList } from '@uniswap/token-lists'
+import { validateTokenList } from '@uniswap/widgets'
 import contenthashToUri from 'lib/utils/contenthashToUri'
 import parseENSAddress from 'lib/utils/parseENSAddress'
 import uriToHttp from 'lib/utils/uriToHttp'
 
-import validateTokenList from './validateTokenList'
-
 export const DEFAULT_TOKEN_LIST = 'https://gateway.ipfs.io/ipns/tokens.uniswap.org'
 
 const listCache = new Map<string, TokenList>()
diff --git a/src/lib/hooks/useTokenList/validateTokenList.test.ts b/src/lib/hooks/useTokenList/validateTokenList.test.ts
deleted file mode 100644
index 92735cbe46..0000000000
--- a/src/lib/hooks/useTokenList/validateTokenList.test.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { TokenInfo } from '@uniswap/token-lists'
-
-import { validateTokens } from './validateTokenList'
-
-const INVALID_TOKEN: TokenInfo = {
-  name: 'Dai Stablecoin',
-  address: '0xD3ADB33F',
-  symbol: 'DAI',
-  decimals: 18,
-  chainId: 1,
-}
-
-const INLINE_TOKEN_LIST = [
-  {
-    name: 'Dai Stablecoin',
-    address: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
-    symbol: 'DAI',
-    decimals: 18,
-    chainId: 1,
-    logoURI:
-      'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0x6B175474E89094C44Da98b954EedeAC495271d0F/logo.png',
-  },
-  {
-    name: 'USDCoin',
-    address: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
-    symbol: 'USDC',
-    decimals: 6,
-    chainId: 1,
-    logoURI:
-      'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png',
-  },
-]
-
-describe('validateTokens', () => {
-  it('throws on invalid tokens', async () => {
-    await expect(validateTokens([INVALID_TOKEN])).rejects.toThrowError(/^Token list failed validation:.*address/)
-  })
-
-  it('validates the passed token info', async () => {
-    await expect(validateTokens(INLINE_TOKEN_LIST)).resolves.toBe(INLINE_TOKEN_LIST)
-  })
-})
diff --git a/src/lib/hooks/useTokenList/validateTokenList.ts b/src/lib/hooks/useTokenList/validateTokenList.ts
deleted file mode 100644
index 9ba86e8e30..0000000000
--- a/src/lib/hooks/useTokenList/validateTokenList.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import type { TokenInfo, TokenList } from '@uniswap/token-lists'
-import type { Ajv, ValidateFunction } from 'ajv'
-
-enum ValidationSchema {
-  LIST = 'list',
-  TOKENS = 'tokens',
-}
-
-const validator = new Promise<Ajv>(async (resolve) => {
-  const [ajv, schema] = await Promise.all([import('ajv'), import('@uniswap/token-lists/src/tokenlist.schema.json')])
-  const validator = new ajv.default({ allErrors: true })
-    .addSchema(schema, ValidationSchema.LIST)
-    // Adds a meta scheme of Pick<TokenList, 'tokens'>
-    .addSchema(
-      {
-        ...schema,
-        $id: schema.$id + '#tokens',
-        required: ['tokens'],
-      },
-      ValidationSchema.TOKENS
-    )
-  resolve(validator)
-})
-
-function getValidationErrors(validate: ValidateFunction | undefined): string {
-  return (
-    validate?.errors?.map((error) => [error.dataPath, error.message].filter(Boolean).join(' ')).join('; ') ??
-    'unknown error'
-  )
-}
-
-/**
- * Validates an array of tokens.
- * @param json the TokenInfo[] to validate
- */
-export async function validateTokens(json: TokenInfo[]): Promise<TokenInfo[]> {
-  const validate = (await validator).getSchema(ValidationSchema.TOKENS)
-  if (validate?.({ tokens: json })) {
-    return json
-  }
-  throw new Error(`Token list failed validation: ${getValidationErrors(validate)}`)
-}
-
-/**
- * Validates a token list.
- * @param json the TokenList to validate
- */
-export default async function validateTokenList(json: TokenList): Promise<TokenList> {
-  const validate = (await validator).getSchema(ValidationSchema.LIST)
-  if (validate?.(json)) {
-    return json
-  }
-  throw new Error(`Token list failed validation: ${getValidationErrors(validate)}`)
-}
diff --git a/yarn.lock b/yarn.lock
index 10d3bee043..a6c536ace4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5220,7 +5220,7 @@ ajv@6.5.3:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==