Daily update

This commit is contained in:
Mykola 2020-04-21 14:24:41 -07:00
parent fc91f1ccf8
commit 60eeffcf08
17 changed files with 76 additions and 41 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

View File

@ -2426,7 +2426,6 @@
"0x9C9892a3f6E45B32e82520E8374806aa603dFD8e",
"0x9Ca966d2Fd2dCa7FCB3C885C74588d0E5685667D",
"0x9cb151054ab13fa715F170c731A9705236e0a537",
"0x9cB1AEaFcc8A9406632C5B084246Ea72f62d37b6",
"0x9CCa9628FebCD0e076525602a3847D736F5B5953",
"0x9cD6e5795C792816AF761fE61cA03B0050511a04",
"0x9cE1cF95d95f555FC755660B493f0d3F3AA37b86",
@ -2626,7 +2625,6 @@
"0xa99CDAE5357E2CD1aDC864E74129859cD9faf5ca",
"0xa9B1B9F6fA0f8c6D7Ab15ccCfB83775E7B463511",
"0xA9B4A27360A649F1d4B67dA01f1696513DD49Ac6",
"0xa9fC65Da36064cE545e87690e06f5de10C52C690",
"0xa9FfdF75D7CC8FB6De9a774eAAB6A04B62E9278D",
"0xaA23E8ceBd3817eeEC735Cd9aaF557cCB8e8407C",
"0xaA2bF51C54bF11A9d0dDC7a6f91117065AE5A312",
@ -2792,7 +2790,6 @@
"0xb403B8390997D7058b9202f4446d6d206f77DF1e",
"0xb40539Cd3E7bF07eabEf8ba0DBA182b376FcE1b4",
"0xB4062b035b4A51336C39B2f83bB5C377c0602878",
"0xB422e605fBd765B80D2C4b5d8196C2f94144438B",
"0xB42e3daA35548130A6Ae2FEa855b31D3bDc91132",
"0xb44297e8D51Ee41e0a4C818155d556CB8E66a50f",
"0xB447030C916bA07a5a4AA50a379259E387c48182",
@ -2931,7 +2928,6 @@
"0xbC0a833E4e24e96bF35D1D0e6b07d779FDC4c482",
"0xbc0E164eE423B7800e355b012c06446e28b1a29d",
"0xBc1C8008aFE498116429fe601E970C2E650D6c76",
"0xbc41d05287498DEc58129560De6bd1b8d4E3aC1d",
"0xbc5370374FE08d699cf7fcd2e625A93BF393cCC4",
"0xbC5563De646CA6C6d7e2f7cc44FFADf1B5b614EF",
"0xbC56929699445f826ec61AAD4f37270912788B13",
@ -3233,7 +3229,6 @@
"0xcDf836192B5d00Fb4FB8c2bc4fBE1967cFF8CD99",
"0xce1280c69C0EeEacdfC0997DA1CF52214E02c2e8",
"0xCE322A6795e1685f8381e3a3f7b299507647bc84",
"0xCe49c3c92b33a1653F34811a9d7e34502bF12B89",
"0xcE53B468d40A5208e7Fcc8A4B589eBE0309BA030",
"0xcE5b23F11c486Be7f8BE4fAc3b4ee6372d7Ee91e",
"0xce69EAc10d152166c3f496AEb3F9e47a82e17C20",
@ -3436,7 +3431,6 @@
"0xdb47aBD512Ee7a3681E186CE037D274a3033941F",
"0xDb52DE58841caBf0D06adE89B6da4761E70A293f",
"0xdB56448fE2635f7912287cd619E7eD3d93180f25",
"0xDB61354E9cf2217a29770E9811832B360a8DAad3",
"0xDb7E971d39367b20BCf4df5aE2da0fa4261BF0E8",
"0xdB920ff339D433d4ED307153A39E8654B12AB101",
"0xDb993c4Fa267f4ae79FCe2d611c1d0A27F595BBd",
@ -3961,7 +3955,6 @@
"0xFcdAca099fBCF589fACe99F81916c4141CDD92C5",
"0xfcE1868d47fF7259411A9f0b64fF1041F4a0c938",
"0xfD13CB7D8287Eb7c09b04759231f8454B3FD81D6",
"0xFD25676Fc2c4421778B18Ec7Ab86E7C5701DF187",
"0xFD33cbC371512A95b8ed44C20d889ed73d031CC2",
"0xfD361c0d3383C1Df2ee9E6d5AE763BD5De7f82dC",
"0xfd385556EbF6B183380AFcd61efD8194D0D46520",

View File

@ -280,6 +280,7 @@
"0x0dF721639CA2F7fF0E1F618b918A65FFB199AC4E",
"0x0e0989b1f9B8A38983c2BA8053269Ca62Ec9B195",
"0x0e14FF106b70B807d74190Ce2c2D0Bb8c865082d",
"0x0E22734e078d6e399BCeE40a549DB591C4EA46cB",
"0x0E5d22C0CAbcB15BC75C3F5050ba56dFF2B3Cd6F",
"0x0E6BB94B7f25B96f13E0baf5bC04b8Ba39b897A8",
"0x0E7C28fb8ed4F5F63Aabd022DEaeEBA40Ecc335c",
@ -817,8 +818,8 @@
"0x28FB6531723EE54B1073F7f2beB7f2E3C74503Bc",
"0x28fB9FCf7cF7a67d05bD19fFBEc17578c0dE63d3",
"0x2910Ad99C6376492c9b1b7A5399516Ff59Bb9d63",
"0x2915ACAa744e36BEfB3c539c3d99A7f82AD8E6c9",
"0x2915acaa744E36bEFb3C539c3d99d7F82ad8e6c9",
"0x2915ACAa744e36BEfB3c539c3d99A7f82AD8E6c9",
"0x293265AB375f52e0D059d3438a76f49f59E234b8",
"0x2932746414a6766a2b4A472CB3a2624f5667Fd83",
"0x293B0Cd0991DB07c8529fEBb01bc7D052315C5Ab",
@ -2968,6 +2969,7 @@
"0x9c6Fa42209169bCeA032e401188a6fc3e9C9f59c",
"0x9c794f933b4DD8B49031A79b0f924D68BEF43992",
"0x9cAAA528c4F8adcFfFc8063c736C05f211908e0D",
"0x9cB1AEaFcc8A9406632C5B084246Ea72f62d37b6",
"0x9Cb2f26A23b8d89973F08c957C4d7cdf75CD341c",
"0x9cc9658382483ECd0f2117DE6B7656AA4013fa07",
"0x9CCbd05d4d25c745d49F5e6BF17e09113Eb4c769",
@ -3206,6 +3208,7 @@
"0xa9D24eC1D08856632Ed1847f43760e66Bcb91ca7",
"0xA9d2927d3a04309E008B6af6E2e282AE2952e7fD",
"0xA9f80A3C8258c42964Fac6263B8BAA648156b85D",
"0xa9fC65Da36064cE545e87690e06f5de10C52C690",
"0xAa0bb10CEc1fa372eb3Abc17C933FC6ba863DD9E",
"0xaA0CA4C5447101BfaE2c79f4cc4d91CD360f33a4",
"0xAA19961b6B858D9F18a115f25aa1D98ABc1fdBA8",
@ -3232,7 +3235,6 @@
"0xAAf37055188Feee4869dE63464937e683d61b2a1",
"0xAafd35ddb9189995937A2862E8Ff17519F5AAE78",
"0xab09D6D45350BeC652e817859e180F59DDa77603",
"0xAb16E0d25c06CB376259cc18C1de4ACA57605589",
"0xAb1A348BB48fEF25179cdeaBfA2a41c394f122BB",
"0xaB2282E27533749d7883E24F82dc8DFa2B3e3C85",
"0xAb418c5A8a85f9cC0fbA1802a57a30Bf7dB34d7C",
@ -3411,6 +3413,7 @@
"0xb41654a43Aae0D7d17701C612567b4243aa9cD6C",
"0xB417fA71A03A9bADBf962589F2478353fd5693e2",
"0xb41f09a973a85c7F497c10B00a939dE667B55a78",
"0xB422e605fBd765B80D2C4b5d8196C2f94144438B",
"0xB4272071eCAdd69d933AdcD19cA99fe80664fc08",
"0xb444208cB0516C150178fCf9a52604BC04A1aCEa",
"0xB45a50545bEEAB73F38F31E5973768C421805E5E",
@ -3551,6 +3554,7 @@
"0xBbe761EA1447A20b75aA485b7BCad4837415d7D7",
"0xbbFF862d906E348E9946Bfb2132ecB157Da3D4b4",
"0xbC32bE9115c3D2309ccF643f64C119bBc97a5280",
"0xbc41d05287498DEc58129560De6bd1b8d4E3aC1d",
"0xBC46D9961A3932f7D6b64abfdeC80C1816C4B835",
"0xBC4a124fAb7d1F7f3F02BA7167df9186A71F3b26",
"0xbC647aAd10114B89564c0a7aabE542bd0cf2C5aF",
@ -3863,6 +3867,7 @@
"0xcE1d3dA32e3a45d27dC841781f09E40C41CAC677",
"0xcE27A2388D2ba7a9995fa0960FB168568e2a7923",
"0xcE2834171F0FC397b46963E10331B38Ff635003d",
"0xCe49c3c92b33a1653F34811a9d7e34502bF12B89",
"0xce5114d7fa8361F0c088EE26FA3A5446C4a1f50b",
"0xCe53a179047ebed80261689367c093C90A94cC08",
"0xCE958ECf2C752c74973e89674Faa30404b15A498",
@ -4096,6 +4101,7 @@
"0xdb4837C9d84315ABCDE80A865f15178F86DB3966",
"0xdB52a87cda28EdA00f8aDd1C79c9DB4a50a70457",
"0xdb5af0e326B5f6417bc9Db89d76fB2390393287F",
"0xDB61354E9cf2217a29770E9811832B360a8DAad3",
"0xDB6e0077C6c1BCBe557a6fC4fB912685519E597C",
"0xDB7Eab9bA6be88B869F738f6DEeBa96d49Fe13fd",
"0xDB7eB3edE973665b1BB9F3016861E3255062E4ED",
@ -4515,7 +4521,9 @@
"0xf230b790E05390FC8295F4d3F60332c93BEd42e2",
"0xF244176246168F24e3187f7288EdbCA29267739b",
"0xF25AD7AfAC29e7CF7B82530c900196cbD5d09943",
"0xF25c91C87e0B1fd9B4064Af0F427157AaB0193A7",
"0xf263292e14d9D8ECd55B58dAD1F1dF825a874b7c",
"0xF26893f89B23084C4C6216038D6eBDBE9e96C5cb",
"0xf278c1CA969095ffddDED020290cf8B5C424AcE2",
"0xF29226914595052a04F5AFbe6410D0C3eD707548",
"0xf2a7C7f3932EfCc2ECB6b2C372B84030dE191dB0",
@ -4714,6 +4722,7 @@
"0xfD107B473AB90e8Fbd89872144a3DC92C40Fa8C9",
"0xFD1ccd0f8FABAB9B5b81173De82DE4A1566aC53f",
"0xfd1e80508F243E64CE234eA88A5Fd2827c71D4b7",
"0xFD25676Fc2c4421778B18Ec7Ab86E7C5701DF187",
"0xfD30E1e687965f2b7AFf7129156a5f50996F8F6B",
"0xFd3305E1c7cB5D269fb6CeD8eB8240255a50E7a4",
"0xFd66c6771D00b5646949086152B7CCDCa25E5686",

View File

@ -1,6 +1,6 @@
[
"1000001",
"1000010",
"TZHTVehxLeoVQ5uuQLy3TDx4Uuw6EmHVNF",
"1000017",
"1000018",
"1000131",
@ -81,7 +81,7 @@
"1001546",
"1001559",
"1001581",
"1001584",
"1000010",
"1001596",
"1001617",
"1001645",
@ -162,5 +162,5 @@
"TYqgBctn2NjCQZLBbh1SMEAsH36mopnNqo",
"TYxoK7DAvfze7ByWA7LYnzcoLxdKQpjrD1",
"TZGQJY1QbZuXJmMgDgoZVeG4mD1Ef6SdWU",
"TZHTVehxLeoVQ5uuQLy3TDx4Uuw6EmHVNF"
"1001584"
]

View File

@ -654,6 +654,12 @@
"type": "coin",
"id": 1464
},
{
"coin": 60,
"type": "token",
"token_id": "0xAbC430136A4dE71c9998242de8c1b4B97D2b9045",
"id": 1465
},
{
"coin": 197,
"type": "coin",
@ -3454,6 +3460,12 @@
"token_id": "0x6Ba460AB75Cd2c56343b3517ffeBA60748654D26",
"id": 2597
},
{
"coin": 60,
"type": "token",
"token_id": "0xfDBc1aDc26F0F8f8606a5d63b7D3a3CD21c22B23",
"id": 2601
},
{
"coin": 60,
"type": "token",
@ -4215,12 +4227,6 @@
"token_id": "0xB6eD7644C69416d67B522e20bC294A9a9B405B31",
"id": 2837
},
{
"coin": 60,
"type": "token",
"token_id": "0xB9bb08AB7E9Fa0A1356bd4A39eC0ca267E03b0b3",
"id": 2838
},
{
"coin": 60,
"type": "token",
@ -8322,6 +8328,12 @@
"token_id": "0xA7fC5D2453E3F68aF0cc1B78bcFEe94A1B293650",
"id": 4094
},
{
"coin": 60,
"type": "token",
"token_id": "0xD6a55C63865AffD67E2FB9f284F87b7a9E5FF3bD",
"id": 4096
},
{
"coin": 424242,
"type": "coin",
@ -9526,12 +9538,6 @@
"token_id": "0x193408cA0576B73156Ed42A2EA7D6fD3f6507162",
"id": 4903
},
{
"coin": 60,
"type": "token",
"token_id": "0x6710CeE627Fa3A988200ffD5687cc1C814cEf0F6",
"id": 4907
},
{
"coin": 60,
"type": "token",
@ -10394,6 +10400,12 @@
"token_id": "0x19B58d95929586Ad750893CAad43E77aa6e8Ce9E",
"id": 5388
},
{
"coin": 60,
"type": "token",
"token_id": "0x7A5E6ca9d335e343D1Ed12239F67248E056AFE2f",
"id": 5391
},
{
"coin": 60,
"type": "token",
@ -10512,6 +10524,12 @@
"token_id": "0xcFD6Ae8BF13f42DE14867351eAff7A8A3b9FbBe7",
"id": 5431
},
{
"coin": 60,
"type": "token",
"token_id": "0xF26893f89B23084C4C6216038D6eBDBE9e96C5cb",
"id": 5433
},
{
"coin": 60,
"type": "token",
@ -10631,5 +10649,23 @@
"type": "token",
"token_id": "0xd7E1e4530D95717506633E58437f056A49c1FABB",
"id": 5469
},
{
"coin": 60,
"type": "token",
"token_id": "0x8fc9b6354E839AB1c8B31F4afa53607092B8C2e5",
"id": 5478
},
{
"coin": 60,
"type": "token",
"token_id": "0x013A06558f07d9E6F9A00c95a33f3a0E0255176b",
"id": 5480
},
{
"coin": 60,
"type": "token",
"token_id": "0xF25c91C87e0B1fd9B4064Af0F427157AaB0193A7",
"id": 5481
}
]

View File

@ -45,18 +45,18 @@ function formatWhiteBlackList() {
let newBlackList = []
// Some chains required pulling lists from other sources
switch (chain) {
case Ethereum:
const nftList = await getOpenseaCollectionAddresses()
newBlackList = currentBlacklist.concat(nftList)
break;
default:
newBlackList = newBlackList.concat(currentBlacklist)
break;
}
// switch (chain) {
// case Ethereum:
// const nftList = await getOpenseaCollectionAddresses()
// newBlackList = currentBlacklist.concat(nftList)
// break;
// default:
// newBlackList = newBlackList.concat(currentBlacklist)
// break;
// }
const removedAssets = getRemovedAddressesFromAssets(assets, currentWhitelist)
newBlackList = newBlackList.concat(removedAssets)
newBlackList = currentBlacklist.concat(removedAssets)
fs.writeFileSync(whitelistPath, JSON.stringify(sortDesc(assets), null, 4))
fs.writeFileSync(blacklistPath, JSON.stringify(getUnique(sortDesc(newBlackList)), null, 4))

View File

@ -373,20 +373,17 @@ describe("Test blacklist and whitelist", () => {
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`, () => {
const blacklistMap = mapList(blackList)
whiteList.forEach(a => {
const isWhitelistInBlacklist = blacklistMap.hasOwnProperty(a)
expect(isWhitelistInBlacklist, `Found whitelist asset ${a} in blacklist on chain ${chain}`).toBe(false)
expect(a in blacklistMap, `Found whitelist asset ${a} in blacklist on chain ${chain}`).toBe(false)
})
})
test(`Blacklist should not contain assets from whitelist on ${chain} chain`, () => {
const whitelistMap = mapList(whiteList)
blackList.forEach(a => {
const isBlacklistInWhitelist = whitelistMap.hasOwnProperty(a)
expect(isBlacklistInWhitelist, `Found blacklist asset ${a} in whitelist on chain ${chain}`).toBe(false)
expect(a in whitelistMap, `Found blacklist asset ${a} in whitelist on chain ${chain}`).toBe(false)
})
})
})