Merge pull request #1889 from kvhnuke/devop/sync-repo

Update darklist and token list
MyEtherWallet · Jun 5, 2018 · f661432 · f661432
2 parents 794e2d6 + 98d80bf
commit f661432
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@
 - Fix network tab css [#1870](https://github.com/kvhnuke/etherwallet/pull/1870)
 
 ### New
+- Update darklist, Update JBX token, and add MKT token. [#1889](https://github.com/kvhnuke/etherwallet/pull/1889)
+- Add ATMI token [#1888](https://github.com/kvhnuke/etherwallet/pull/1888)
 - Add CARD token [#1884](https://github.com/kvhnuke/etherwallet/pull/1884)
 - Add ORBS token [#1883](https://github.com/kvhnuke/etherwallet/pull/1883)
 - Add C8 token [#1881](https://github.com/kvhnuke/etherwallet/pull/1881)

diff --git a/app/scripts/constants/darkListConst.js b/app/scripts/constants/darkListConst.js
@@ -1,5 +1,75 @@
 const darklist = function() {
 	return [
+		{
+			address: "0x181c71726f12ce2514e8b93019eb22645a79f966",
+			comment: "Fake Whalesburg ICO support",
+			date: "2018-05-14"
+		},
+		{
+			address: "0x2056d2e97cc9ad78cf527b382495a8b9704ce011",
+			comment: "Fake Whalesburg ICO support",
+			date: "2018-06-02"
+		},
+		{
+			address: "0x259EFb559a5D9ed64ccF44Bd5188b325DC4738c8",
+			comment: "Fake Whalesburg ICO support",
+			date: "2018-05-28"
+		},
+		{
+			address: "0x42A777E0F24390E7ed461a7AF325526e53ac57d9",
+			comment: "Fake Whalesburg ICO support",
+			date: "2018-05-29"
+		},
+		{
+			address: "0x4e790c545478029d20816a7212c46adde058d63e",
+			comment: "Fake Whalesburg ICO support",
+			date: "2018-05-31"
+		},
+		{
+			address: "0x5D840DB230c397AcC22ab28053d1a1fF7f14583E",
+			comment: "Fake Whalesburg ICO support",
+			date: "2018-06-01"
+		},
+		{
+			address: "0x6cF481C7090D88CA6F1Fa3C9FFD0911Ef5359808",
+			comment: "Fake Whalesburg ICO support",
+			date: "2018-05-29"
+		},
+		{
+			address: "0x73bb594368ddB778972C6f30b41437C897419C37",
+			comment: "Fake Whalesburg ICO support",
+			date: "2018-05-29"
+		},
+		{
+			address: "0x7613a475b7fE61775f579Bc148300C8171EcCaE9",
+			comment: "Fake Whalesburg ICO support",
+			date: "2018-05-31"
+		},
+		{
+			address: "0xBC83D48Dd0cd9c3F47Bab6436DeFeB334B563f4C",
+			comment: "Fake Whalesburg ICO support",
+			date: "2018-05-26"
+		},
+		{
+			address: "0xbca6294a6c80ee0f20173547b8d85d4948a0cb39",
+			comment: "Fake Whalesburg ICO support",
+			date: "2018-06-02"
+		},
+		{
+			address: "0xbeEbe66b6A511dD2acCBfF7F258554dbe97f1294",
+			comment: "Fake Whalesburg ICO support",
+			date: "2018-06-01"
+		},
+		{
+			address: "0xea7380369af53598a55b4622909cd9633e0ae7fa",
+			comment: "Fake Whalesburg ICO support",
+			date: "2018-05-30"
+		},
+		{
+			address: "0xfE9B7DB8d9D57E9ad9341bCf51B110Ba5d27b48B",
+			comment: "Fake Whalesburg ICO support",
+			date: "2018-06-02"
+		},
 		{
 			address: "0x08389B19ad52f0d983609ab785b3a43A0E90355F",
 			comment:

diff --git a/app/scripts/tokens/ethTokens.json b/app/scripts/tokens/ethTokens.json
@@ -1962,7 +1962,7 @@
 		"type": "default"
 	},
 	{
-		"address": "0x0Aaf561eFF5BD9c8F911616933F84166A17cfE0C",
+		"address": "0x884e3902C4d5cFA86de4aCE7A96AA91EbC25C0Ff",
 		"symbol": "JBX",
 		"decimal": 0,
 		"type": "default"
@@ -2315,6 +2315,12 @@
 		"decimal": 18,
 		"type": "default"
 	},
+	{
+		"address": "0x7939882b54fcf0bcae6b53dec39ad6e806176442",
+		"symbol": "MKT",
+		"decimal": 8,
+		"type": "default"
+	},
 	{
 		"address": "0xBEB9eF514a379B997e0798FDcC901Ee474B6D9A1",
 		"symbol": "MLN",