diff --git a/blockchains/ethereum/blacklist.json b/blockchains/ethereum/blacklist.json
index 804575ce5..2364c774e 100644
--- a/blockchains/ethereum/blacklist.json
+++ b/blockchains/ethereum/blacklist.json
@@ -330,6 +330,7 @@
     "0x24ADBFF8Ce845b8B46E690a6B0559970bCA33828",
     "0x24Dd3Ad953811dea67AcA5A6345fa6CF079593f7",
     "0x24e4b9bFf04F311E4029FDb8928c58F60d5e3BFB",
+    "0x24ef6E747cd17F94915c73f50470fDd5eD9F6d21",
     "0x2501FFF7031448ce3238f1B61EE7591350aFa8E4",
     "0x251C111464ddB5BCCfc28d3Ff12408D9DbA61c8A",
     "0x252E26F83C7399bff2C6fb721a481f9Fa5b3595e",
@@ -2332,6 +2333,7 @@
     "0xfE1d6c88e18bD94E56325bbA80f2546dBf583fa6",
     "0xFeBD6c53a9FFA3aE607e8e11a6DA63FF179D3CFf",
     "0xFf0ABe21693dde0fe0D61B50248e96C02c13Adf1",
+    "0xff362Fca7D583004cEA21E539f64C15bBa9eCe44",
     "0xFf488FD296c38a24CCcC60B43DD7254810dAb64e",
     "0xFF5425f2b1f789972fd050DF47dccfC2e33fB207",
     "0xFF725a253E47060E4B1aEC4142D2B3976e43d096",
diff --git a/blockchains/ethereum/whitelist.json b/blockchains/ethereum/whitelist.json
index 20ac64968..44a893be0 100644
--- a/blockchains/ethereum/whitelist.json
+++ b/blockchains/ethereum/whitelist.json
@@ -114,7 +114,6 @@
     "0x062f78C886547F5f6FE337F37232573eC01D5363",
     "0x064fA27612E080d3460dd1c62cFF88687D56942E",
     "0x068578338B146D64727428954cc348Cf92d9Ba88",
-    "0x06a6a7aF298129E3a2AB396c9C06F91D3C54aBA8",
     "0x06A8F2BCc622ac55d596ea02CE5bb5f318F485e9",
     "0x06AF07097C9Eeb7fD685c692751D5C66dB49c215",
     "0x06B4d381FFA099E47aFE7dda0a310d582023d063",
@@ -382,7 +381,6 @@
     "0x170b275CEd089FffAEBFe927F445a350ED9160DC",
     "0x171D750d42d661B62C277a6B486ADb82348c3Eca",
     "0x17280DA053596E097604839C61A2eF5efb7d493f",
-    "0x174BfA6600Bf90C885c7c01C7031389ed1461Ab9",
     "0x1776e1F26f98b1A5dF9cD347953a26dd3Cb46671",
     "0x1778fFfBD431be2AC3D69e64d1d819C786B2BEe0",
     "0x177d39AC676ED1C67A2b268AD7F1E58826E5B0af",
@@ -664,7 +662,6 @@
     "0x27403b58ac43Be5a9F422962B4CDD5ffbDb60639",
     "0x274c5236276422330060aA95cADEd86dA0a297c2",
     "0x275b69AA7c8C1d648A0557656bCe1C286e69a29d",
-    "0x27695E09149AdC738A978e9A678F99E4c39e9eb9",
     "0x2774B5771F607938D4e9197B3A5CA9f21110CF11",
     "0x2775F2A3C83bee1541D1d1BC308b3BB432B45151",
     "0x27894f59CbFeEdcCCb9644d91121e4070ffbc9Eb",
@@ -689,7 +686,6 @@
     "0x2859021eE7F2Cb10162E67F33Af2D22764B31aFf",
     "0x286708f069225905194673755F12359e6afF6FE1",
     "0x28673D7A6DF30c99B705EDcA0046DE738431edE1",
-    "0x286a4b47169b27ebCab6cd94d4A4F58A7BBB4474",
     "0x286BDA1413a2Df81731D4930ce2F862a35A609fE",
     "0x288c8ff967859B119B14768c9da5B5656504E4F3",
     "0x28a8aE348bbdc392497F9745832B5E0f0bd664F4",
@@ -782,7 +778,6 @@
     "0x2D033D4CDaFA1b452362a2514Cb619E2F7B3A869",
     "0x2d03a587fd6d3726ecD36E2f5286B7fC4297b3A0",
     "0x2d0E95bd4795D7aCe0da3C0Ff7b706a5970eb9D3",
-    "0x2d184014b5658C453443AA87c8e9C4D57285620b",
     "0x2d3B86234A16a1D558945c6f9C5eb2443275A4f2",
     "0x2D3E7D4870a51b918919E7B851FE19983E4c38d5",
     "0x2d9765a94FF22e0CA3AfC3E3F4B116dE2b67582a",
@@ -807,7 +802,6 @@
     "0x2F78eb502DafaefBCc4bEaaC969ffF2aCf9b39A9",
     "0x2F83750F3F3a2295adE99E897a7FCbc099bd56c2",
     "0x2f8472dd7ecf7cA760c8f6b45dB20Ca7cf52F8d7",
-    "0x2f85E502a988AF76f7ee6D83b7db8d6c0A823bf9",
     "0x2F8EF85b43Df8Aa5B2096Ef090B00266CE714d72",
     "0x2F9b6779c37DF5707249eEb3734BbfC94763fBE2",
     "0x2FA32a39fc1c399E0Cc7B2935868f5165De7cE97",
@@ -1285,7 +1279,6 @@
     "0x4D09C5e758CA68bE27240f29fb681E5a5341Ca98",
     "0x4D13d624a87baa278733c068A174412AfA9ca6C8",
     "0x4d1f4B0eF6F65dE9A8f5c12C208C37E5c2458444",
-    "0x4D24d8D75a8ec4a2d4BF2b2aA7F9A3Cf27ef5Fcf",
     "0x4d45b5d37413803280E32a0efCedb4ABEa406D7B",
     "0x4d46335Fe05EBf9D220382AE014328C0f62EB12D",
     "0x4D807509aECe24C0fa5A102b6a3B059Ec6E14392",
diff --git a/blockchains/tron/assets/1000501/logo.png b/blockchains/tron/assets/1000501/logo.png
deleted file mode 100644
index b84250d2a..000000000
Binary files a/blockchains/tron/assets/1000501/logo.png and /dev/null differ
diff --git a/script/gen_list.ts b/script/gen_list.ts
index d254f1499..c00363b8e 100644
--- a/script/gen_list.ts
+++ b/script/gen_list.ts
@@ -44,6 +44,7 @@ assetsChains.forEach(async chain => {
             newBlackList = currentBlacklist.concat(nftList)
             break;
         default:
+            newBlackList = newBlackList.concat(currentBlacklist)
             break;
     }
  
diff --git a/script/opesea_contrats.ts b/script/opesea_contrats.ts
index 5892d5140..636fb470b 100644
--- a/script/opesea_contrats.ts
+++ b/script/opesea_contrats.ts
@@ -9,7 +9,8 @@ export const getOpenseaCollectionAddresses = async () => {
     const nftList = []
 
     while(true) {
-        const collections = await axios.get(`https://api.opensea.io/api/v1/collections?limit=${limit}&offset=${offset}`)
+        const url = `https://api.opensea.io/api/v1/collections?limit=${limit}&offset=${offset}`
+        const collections = await axios.get(url)
             .then(res => res.data.collections)
             .catch(e => console.log(e.message))
 
diff --git a/src/test/index.test.ts b/src/test/index.test.ts
index 005477ad7..a2d5333db 100644
--- a/src/test/index.test.ts
+++ b/src/test/index.test.ts
@@ -17,6 +17,9 @@ import {
     getBinanceBEP2Symbols,
     isTRC10, isTRC20,
     isLogoOK,
+    getChainWhitelistPath,
+    getChainBlacklistPath,
+    mapList
 } from "./helpers"
 
 enum TickerType {
@@ -295,4 +298,31 @@ describe("Test Coinmarketcap mapping", () => {
         })
     })
 })
-// TODO test whitelist
+
+// Enable when better solution handaling erc20 from opensea erc721 list
+describe.skip("Test blacklist and whitelist", () => {
+    const assetsChains = readDirSync(chainsFolderPath).filter(chain => isPathExistsSync(getChainAssetsPath(chain)))
+
+    assetsChains.forEach(chain => {
+        const whiteList = JSON.parse(readFileSync(getChainWhitelistPath(chain)))
+        const blackList = JSON.parse(readFileSync(getChainBlacklistPath(chain)))
+
+        const whitelistMap = mapList(whiteList)
+        const blacklistMap = mapList(blackList)
+
+        test(`Whitelist should not contain assets from blacklist on ${chain} chain`, () => {
+            whiteList.forEach(a => {
+                const isWhitelistInBlacklist = blacklistMap.hasOwnProperty(a)
+                expect(isWhitelistInBlacklist, `Found whitelist asset ${a} in blacklist on chain ${chain}`).toBe(false)
+            })
+        })
+
+        test(`Blacklist should not contain assets from whitelist on ${chain} chain`, () => {
+            blackList.forEach(a => {
+                const isBlacklistInWhitelist = whitelistMap.hasOwnProperty(a)
+                expect(isBlacklistInWhitelist, `Found blacklist asset ${a} in whitelist on chain ${chain}`).toBe(false)
+            })
+        })
+    })
+})
+