From e6b71bb381152a31e2e8a5ac2443cdbc8fef4006 Mon Sep 17 00:00:00 2001 From: Mykola Date: Wed, 8 Apr 2020 13:12:50 -0700 Subject: [PATCH] Daily update --- blockchains/cosmos/validators/list.json | 2 +- blockchains/ethereum/blacklist.json | 10 ++++++++++ blockchains/ethereum/whitelist.json | 9 +++++++++ blockchains/kava/validators/list.json | 2 +- blockchains/tezos/validators/list.json | 2 +- blockchains/tron/whitelist.json | 6 +++--- src/test/helpers.ts | 6 ++++++ src/test/index.test.ts | 16 ++++++++++++++-- 8 files changed, 45 insertions(+), 8 deletions(-) diff --git a/blockchains/cosmos/validators/list.json b/blockchains/cosmos/validators/list.json index d1f20881d..88fc2a129 100644 --- a/blockchains/cosmos/validators/list.json +++ b/blockchains/cosmos/validators/list.json @@ -263,4 +263,4 @@ "description": "Secure and stable Cosmos validator service from China team", "website": "https://www.bitcat365.com" } -] +] \ No newline at end of file diff --git a/blockchains/ethereum/blacklist.json b/blockchains/ethereum/blacklist.json index f05364c99..0f6efb1a8 100644 --- a/blockchains/ethereum/blacklist.json +++ b/blockchains/ethereum/blacklist.json @@ -221,6 +221,7 @@ "0x0f1F99A29ed4d7732AC0817dA1BA30A208539277", "0x0f3b491841680eb40Bd2Be42Bce7104F2511dbD9", "0x0f4d4b7F3F3a6991415942D44b2dAE245c6a1F67", + "0x0f572FfFa1011EF0232D1B83C7acB17f649BEFc8", "0x0f71B8De197A1C84d31de0F1fA7926c365F052B3", "0x0F78bd01BB36585D1dd0393A67f26Fa3cD03bAe8", "0x0F7Fe053b9385a1AF178d7d4AcD89B9777917279", @@ -379,6 +380,7 @@ "0x1a7946F366f7C2ab8a7bA4fA673Fab46c2bCC488", "0x1A847C26D94dDEA7656ce5e629405b68518b855D", "0x1a94fce7ef36Bc90959E206bA569a12AFBC91ca1", + "0x1A9dFC9Dc7A81A9B7AED13d6427031E1d7e7dD8B", "0x1aa25c28B50186C02Ba6E9b02d2e055bc4D6D782", "0x1Acf94F13eEd40d4285Ad3f2C3A29C4F1705093a", "0x1AD366CF8DE878E730daEF21Fd44276d8166A91a", @@ -566,6 +568,7 @@ "0x27c48b2f1d99CaB6F6F6aE143204a0029666e29B", "0x27C8bba278aCa587772cfA91028363ae301b1A72", "0x27F889C3A7504B825e9FD6D8352540117643146c", + "0x28027a0fC6A3c6DD7037B7e279195831AD34f650", "0x281092947F058cDAe7F0546d940dAC549Cb93dBE", "0x2814d2De819d258aCD6d37687623F786d295018f", "0x2828380E639Ee92da9409226D448ffC4B6469a1E", @@ -1462,6 +1465,7 @@ "0x66e48832224FF412462aD6D84f716861e4908B07", "0x66eb65d7ab8e9567ba0fa6e37c305956c5341574", "0x66EfD47948fBBb19A9D2a6FD4124a35b26c19825", + "0x66f6F9Cb5c079D084993f4762Afc0eD6E1c3cB8c", "0x67162A5075C6E1E3ec24124fD9f4e8B8EdB87ec4", "0x67322076fa2f86d209ae53982Ac5BAAe546DbABA", "0x674fa2b17f319f6F2dbf29bDBFB81181F5F00CdB", @@ -1551,6 +1555,7 @@ "0x6d01d163185427b37Ea3270cc9bd5218B13b15f5", "0x6D0Fc4A1044fb9BA169F032ff3A7bC618cd1CE66", "0x6D18647bd1A283e8ae7F0318E48661432D943D5c", + "0x6D2208Aac56b97d222092dA900A42eD5f1e7e12e", "0x6D225D3b813fD7Ae8D4a2e8DAb01d50D500FCD6F", "0x6d389E3b8e4D2c6cc1daA4C1eC002779d85a6A5c", "0x6D526002c59119b89a81A5C876E7F87d2A7609c4", @@ -1593,6 +1598,7 @@ "0x701C55310674Af17Fb2956692914FF2e65357f03", "0x70282C6226Bf92a2B1212b5A346072ae7E46452A", "0x704F837D1ECde34c5fdCDaDd61A7b85Ecb243fB3", + "0x70556555324f9ABeD72E96e448520201AFBe5248", "0x706163a2ccFDF9b851830954A64a21a4987edd36", "0x707112Dc2220917d2Bf91D294931C6c267F28f82", "0x707124F19fCEE9bcd73Be055AA700dCb2dbaa9F2", @@ -2041,6 +2047,7 @@ "0x8E00439B5Ebb030d4300aC3E35b0846ACc9dF578", "0x8e08c7542E144e4082Ed2981B53Dd373539CE43F", "0x8E44eBb62Ef1d1191eDA8E5f1cB2FFC279182C5B", + "0x8E669CEeca2416193fE3dccc4438E91e45203ee1", "0x8E7c44195016ADC5746caB7ca10d954F7941a627", "0x8ED70b10E67a207f8caa4433b83B962550bA81ee", "0x8EeE2F59e98375Eda08a00148Ad4A852f26003d6", @@ -2446,6 +2453,7 @@ "0xaA23E8ceBd3817eeEC735Cd9aaF557cCB8e8407C", "0xaA2bF51C54bF11A9d0dDC7a6f91117065AE5A312", "0xaa471a6f1a463F880CA25eF0aa7D110F97482324", + "0xAA65E7c8BBf3F2C6d2d8634Fc830F050a55BBbF9", "0xAAC1940c779FA12eb22ae49DfE80F2e89C2ef25B", "0xAac97Fb5De128d0a78446f2B1E9BE05AB5113939", "0xaacCAAB0E85b1EfCEcdBA88F4399fa6CAb402349", @@ -3110,7 +3118,9 @@ "0xd632C4e51C065B93e20e21f68167e1218851D2A9", "0xD64705f59521D6774613D04cdB7Cc15A37C6AF19", "0xd649C62a740b9d606EC7E404Bb829d407033aB06", + "0xd650125a0c2D40BC4853C303241B9EfdB1887C18", "0xD6630E4500D2bA9e28D039eDb70a836bd12E731b", + "0xd67085675bfB5cF19dD2Ef55c77D81563470324C", "0xD68CaADcf9a52130E14e0cCE4EA929dAF7B3081b", "0xD691dfaBdCB14DDC1fAb610d41c1b85A7d87a27A", "0xD6dD2578D8a5e02e276A1100BE4CCF74979bD21a", diff --git a/blockchains/ethereum/whitelist.json b/blockchains/ethereum/whitelist.json index 62e523dd1..5da26bd72 100644 --- a/blockchains/ethereum/whitelist.json +++ b/blockchains/ethereum/whitelist.json @@ -60,6 +60,7 @@ "0x02639FC688DF086f18Ce5E7f0F014bc74DE0229b", "0x026B2693a7C724E8eD0122f39aB6fBC4d5a4Fb22", "0x026e62dDEd1a6aD07D93D39f96b9eabd59665e0d", + "0x026f8D523D49F36db657e012C96488465d8d88f9", "0x029606e5ec44caD1346d6a1273a53b971fa93AD6", "0x02b1669bC9EE893edAFf3cADfD326A294d643f99", "0x02C12964e74A0EbB4EcFA13C3717797DeDD9EF6F", @@ -74,6 +75,7 @@ "0x02F61Fd266DA6E8B102D4121f5CE7b992640CF98", "0x030c32c1190CBF077E5eE67ED19572c558e43AE4", "0x031228f403DbFdE1DD47310BDc49Bb788F53Ecd9", + "0x0327112423F3A68efdF1fcF402F6c5CB9f7C33fd", "0x033030FEeBd93E3178487c35A9c8cA80874353C9", "0x03410a55d072C79C586Ff7B079a4dE0359A45BD5", "0x034B0dd380b5f6f8123b8d0d0E42329b67772792", @@ -257,6 +259,7 @@ "0x0cF713b11C9b986EC40D65bD4F7fbd50F6ff2d64", "0x0cFD0Cc77f3b6Af24Dcf505CF02A6be219457e1c", "0x0d16450D347c12C086d6C94c76c5Aaac35eA07E0", + "0x0D24e4A32B174ff6777059D4fD6bF8CFE031014b", "0x0D262e5dC4A06a0F1c90cE79C7a60C09DfC884E4", "0x0d2BB9D68dD4451A09ec94C05E20Bd395022bd8e", "0x0D2f3987a76995be593D755A0d36d90Ec86a2AE1", @@ -1745,6 +1748,7 @@ "0x5B54240612a83d34E89C141fd2F8d399349A9490", "0x5B7093Fe2491DFB058c94BcD62A1CD4D822F884C", "0x5b71BEE9D961b1B848f8485EEC8d8787f80217F5", + "0x5b7EE4fc3DC39335AE2D6bFBa3033C3FE1ae5D0f", "0x5b978aA9227cDD45905a1fbaC52d6d6b497E88ce", "0x5Bc63f70030CC31531c9cD899BD1BA97b9411AbC", "0x5BC7e5f0Ab8b2E10D2D0a3F21739FCe62459aeF3", @@ -2187,6 +2191,7 @@ "0x72dD4b6bd852A3AA172Be4d6C5a6dbEc588cf131", "0x72e646b78a2b58CBD9B0282c2E9C812Bc8033293", "0x730749c9C73cB491f9E0D4fd6bdd5f3096373BC7", + "0x73145E8603c71FFfDC4E37E6957a6C55dB00ED23", "0x73187be2C94F645175da8B60B43813d7A25f353B", "0x7324e2Fc03dB82ed4f42ff04559a73E3D87226B4", "0x7357397c090F5ac0Ab4b1194020dB94F77c4D4da", @@ -2243,6 +2248,7 @@ "0x76a435B51bAeae457324406da02ee7E3473288B5", "0x76cb396Be0f76DbC58A8eB0569B7163Bf02d5555", "0x7703C35CfFdC5CDa8D27aa3df2F9ba6964544b6e", + "0x771b5D3c4B6FA706A006Da2463b41A528E98E41D", "0x7728dFEF5aBd468669EB7f9b48A7f70a501eD29D", "0x773dCEFa15b47E77c7955e5d0383BaFECd672734", "0x774be8Aa7482E2d4a4961ECa756C73D662689dF1", @@ -3392,6 +3398,7 @@ "0xb683D83a532e2Cb7DFa5275eED3698436371cc9f", "0xB6957bf56805FaeD7f1bAe30EAEbE918B8baFF71", "0xb6c4267C4877BB0D6b1685Cfd85b0FBe82F105ec", + "0xB6D14Df0f2Cf6c9bb33F0B61b4474b0364c7440e", "0xB6d945CAc888ffC1c76FDBE28e9F50E8B3b8252a", "0xB6eC8C3a347f66a3d7C4F39D6DD68A422E69E81d", "0xB6eD7644C69416d67B522e20bC294A9a9B405B31", @@ -3438,6 +3445,7 @@ "0xB97048628DB6B661D4C2aA833e95Dbe1A905B280", "0xB9843e5dE0f37d1e22C8075e5814e13565FE7C22", "0xB98d4C97425d9908E66E53A6fDf673ACcA0BE986", + "0xb9b5467B8F8ce1e4E48796E4c24758EfFf512352", "0xB9bb08AB7E9Fa0A1356bd4A39eC0ca267E03b0b3", "0xB9D90d2292eCAAEb616a7C709ec6D24F9FD5E286", "0xB9e7F8568e08d5659f5D29C4997173d84CdF2607", @@ -3909,6 +3917,7 @@ "0xd4c435F5B09F855C3317c8524Cb1F586E42795fa", "0xd4cA5c2AFf1eeFb0BeA9e9Eab16f88DB2990C183", "0xD4CffeeF10F60eCA581b5E1146B5Aca4194a4C3b", + "0xd4deD7a563B7032b46EF6A484663CA053ded7E20", "0xd4fa1460F537bb9085d22C7bcCB5DD450Ef28e3a", "0xD4fb1706Ae549FEBeC06bb7175b08010DD1B0C2e", "0xd50649AAb1D39d68BC965E0F6D1cfe0010e4908b", diff --git a/blockchains/kava/validators/list.json b/blockchains/kava/validators/list.json index 042eded6d..8a63d4678 100644 --- a/blockchains/kava/validators/list.json +++ b/blockchains/kava/validators/list.json @@ -35,4 +35,4 @@ "description": "Secure and stable KAVA validator service from China team", "website": "https://www.bitcat365.com" } -] +] \ No newline at end of file diff --git a/blockchains/tezos/validators/list.json b/blockchains/tezos/validators/list.json index 51c74068e..18baa5763 100644 --- a/blockchains/tezos/validators/list.json +++ b/blockchains/tezos/validators/list.json @@ -317,4 +317,4 @@ "commission": 8 } } -] +] \ No newline at end of file diff --git a/blockchains/tron/whitelist.json b/blockchains/tron/whitelist.json index b5f2c5515..5c0933ac3 100644 --- a/blockchains/tron/whitelist.json +++ b/blockchains/tron/whitelist.json @@ -1,6 +1,6 @@ [ "1000001", - "TZHTVehxLeoVQ5uuQLy3TDx4Uuw6EmHVNF", + "1000010", "1000017", "1000018", "1000131", @@ -81,7 +81,7 @@ "1001546", "1001559", "1001581", - "1000010", + "1001584", "1001596", "1001617", "1001645", @@ -162,5 +162,5 @@ "TYqgBctn2NjCQZLBbh1SMEAsH36mopnNqo", "TYxoK7DAvfze7ByWA7LYnzcoLxdKQpjrD1", "TZGQJY1QbZuXJmMgDgoZVeG4mD1Ef6SdWU", - "1001584" + "TZHTVehxLeoVQ5uuQLy3TDx4Uuw6EmHVNF" ] \ No newline at end of file diff --git a/src/test/helpers.ts b/src/test/helpers.ts index ee4239bdd..efa9e8eab 100644 --- a/src/test/helpers.ts +++ b/src/test/helpers.ts @@ -24,6 +24,7 @@ export const Tron = getChainName(CoinType.tron) export const Kava = "kava" // TODO add to kava to tw types export const Wanchain = getChainName(CoinType.wanchain) export const Waves = getChainName(CoinType.waves) +export const Solana = "solana" export const ethSidechains = [Ethereum, Classic, POA, TomoChain, GoChain, Wanchain, ThunderCore] export const stakingChains = [Tezos, Cosmos, IoTeX, Tron, Waves, Kava, Terra] @@ -109,6 +110,11 @@ export const isWavesAddress = (address: string) => { isUpperCase(address) == false } +export const isSolanaAddress = (address: string) => { + // return address.length == 44 + return true +} + export const isPathDir = (path: string): boolean => { try { return fs.lstatSync(path).isDirectory() diff --git a/src/test/index.test.ts b/src/test/index.test.ts index 364436edf..0078ad9ac 100644 --- a/src/test/index.test.ts +++ b/src/test/index.test.ts @@ -18,7 +18,7 @@ import { isChecksum, isPathDir, getBinanceBEP2Symbols, - isTRC10, isTRC20, isWavesAddress, + isTRC10, isTRC20, isWavesAddress, isSolanaAddress, isLogoOK, getChainWhitelistPath, getChainBlacklistPath, @@ -31,7 +31,8 @@ import { assetFolderAllowedFiles, stakingChains, Kava, - Terra + Terra, + Solana } from "./helpers" import { ValidatorModel } from "./models"; import { getHandle } from "../../script/gen_info"; @@ -183,6 +184,9 @@ describe(`Test "blockchains" folder`, () => { case Waves: testWavesValidatorsAssets(chainValidatorsAssetsList) break; + // case Solana: + // testSolanaValidatorsAssets(chainValidatorsAssetsList) + // break; // TODO Add IoTex when taking suported by Trust default: break; @@ -228,6 +232,14 @@ function testWavesValidatorsAssets(assets: string[]) { }) } +function testSolanaValidatorsAssets(assets: string[]) { + test("Solana assets must have correct format", () => { + assets.forEach(addr => { + expect(isSolanaAddress(addr), `Address ${addr} should be Solana formated`).toBe(true) + }) + }) +} + function testCosmosValidatorsAddress(assets: string[]) { test("Cosmos assets must have correct format", () => { assets.forEach(addr => {