Merge pull request #314 from ava-labs/dev

kanatliemre · web-flow · commit 9791193c771a · 2022-06-06T15:11:16.000-04:00
Master update
diff --git a/package.json b/package.json
@@ -73,7 +73,7 @@
         "lodash.differenceby": "4.8.0",
         "lodash.isequal": "4.5.0",
         "luxon": "1.25.0",
-        "moment": "2.27.0",
+        "moment": "2.29.2",
         "morgan": "1.9.1",
         "print-js": "1.0.63",
         "punycode": "2.1.1",
diff --git a/src/store/modules/assets/assets.ts b/src/store/modules/assets/assets.ts
@@ -36,7 +36,7 @@ import { web3 } from '@/evm'
 // import ERC721Token from '@/js/ERC721Token'
 
 const TOKEN_LISTS = [
-    'https://raw.githubusercontent.com/pangolindex/tokenlists/main/ab.tokenlist.json',
+    'https://raw.githubusercontent.com/pangolindex/tokenlists/main/43114.tokenlist.json',
 ]
 
 import ERC721Module from './modules/erc721'
@@ -186,7 +186,8 @@ const assets_module: Module<AssetsState, RootState> = {
             for (var i = 0; i < tokens.length; i++) {
                 let t = tokens[i]
                 if (token.address === t.data.address && token.chainId === t.data.chainId) {
-                    throw new Error('ERC20 Token already added.')
+                    console.log('ERC20 Token already added.')
+                    return
                 }
             }
 
@@ -201,7 +202,8 @@ const assets_module: Module<AssetsState, RootState> = {
             for (var i = 0; i < tokens.length; i++) {
                 let t = tokens[i]
                 if (token.address === t.data.address && token.chainId === t.data.chainId) {
-                    throw new Error('ERC20 Token already added.')
+                    console.log('ERC20 Token already added.')
+                    return
                 }
             }
 
diff --git a/src/store/modules/assets/modules/erc721.ts b/src/store/modules/assets/modules/erc721.ts
@@ -48,7 +48,8 @@ const erc721_module: Module<Erc721ModuleState, RootState> = {
             for (var i = 0; i < tokens.length; i++) {
                 let t = tokens[i]
                 if (data.address === t.data.address && data.chainId === t.data.chainId) {
-                    throw new Error('ERC20 Token already added.')
+                    console.log('ERC721 Token already added.')
+                    return
                 }
             }
 
diff --git a/yarn.lock b/yarn.lock
@@ -7683,9 +7683,9 @@ events@^3.2.0:
   integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==
 
 eventsource@^1.0.7:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.0.tgz#00e8ca7c92109e94b0ddf32dac677d841028cfaf"
-  integrity sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.1.tgz#4544a35a57d7120fba4fa4c86cb4023b2c09df2f"
+  integrity sha512-qV5ZC0h7jYIAOhArFJgSfdyz6rALJyb270714o7ZtNnw2WSJ+eexhKtE0O8LYPRsHZHf2osHKZBxGPvm3kPkCA==
   dependencies:
     original "^1.0.0"
 
@@ -11544,15 +11544,10 @@ mock-fs@^4.1.0:
   resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-4.13.0.tgz#31c02263673ec3789f90eb7b6963676aa407a598"
   integrity sha512-DD0vOdofJdoaRNtnWcrXe6RQbpHkPPmtqGq14uRX0F8ZKJ5nv89CVTYl/BZdppDxBDaV0hl75htg3abpEWlPZA==
 
-moment@2.27.0:
-  version "2.27.0"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.27.0.tgz#8bff4e3e26a236220dfe3e36de756b6ebaa0105d"
-  integrity sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==
-
-moment@^2.27.0:
-  version "2.29.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
-  integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
+moment@2.29.2, moment@^2.27.0:
+  version "2.29.2"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.2.tgz#00910c60b20843bcba52d37d58c628b47b1f20e4"
+  integrity sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg==
 
 morgan@1.9.1:
   version "1.9.1"

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ import { web3 } from '@/evm'`
`36`	`36`	`// import ERC721Token from '@/js/ERC721Token'`
`37`	`37`
`38`	`38`	`const TOKEN_LISTS = [`
`39`		`- 'https://raw.githubusercontent.com/pangolindex/tokenlists/main/ab.tokenlist.json',`
	`39`	`+ 'https://raw.githubusercontent.com/pangolindex/tokenlists/main/43114.tokenlist.json',`
`40`	`40`	`]`
`41`	`41`
`42`	`42`	`import ERC721Module from './modules/erc721'`
`@@ -186,7 +186,8 @@ const assets_module: Module<AssetsState, RootState> = {`
`186`	`186`	`for (var i = 0; i < tokens.length; i++) {`
`187`	`187`	`let t = tokens[i]`
`188`	`188`	`if (token.address === t.data.address && token.chainId === t.data.chainId) {`
`189`		`- throw new Error('ERC20 Token already added.')`
	`189`	`+ console.log('ERC20 Token already added.')`
	`190`	`+ return`
`190`	`191`	`}`
`191`	`192`	`}`
`192`	`193`
`@@ -201,7 +202,8 @@ const assets_module: Module<AssetsState, RootState> = {`
`201`	`202`	`for (var i = 0; i < tokens.length; i++) {`
`202`	`203`	`let t = tokens[i]`
`203`	`204`	`if (token.address === t.data.address && token.chainId === t.data.chainId) {`
`204`		`- throw new Error('ERC20 Token already added.')`
	`205`	`+ console.log('ERC20 Token already added.')`
	`206`	`+ return`
`205`	`207`	`}`
`206`	`208`	`}`
`207`	`209`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,8 @@ const erc721_module: Module<Erc721ModuleState, RootState> = {`
`48`	`48`	`for (var i = 0; i < tokens.length; i++) {`
`49`	`49`	`let t = tokens[i]`
`50`	`50`	`if (data.address === t.data.address && data.chainId === t.data.chainId) {`
`51`		`- throw new Error('ERC20 Token already added.')`
	`51`	`+ console.log('ERC721 Token already added.')`
	`52`	`+ return`
`52`	`53`	`}`
`53`	`54`	`}`
`54`	`55`