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

devop/sync-repo
MyEtherWallet · Jun 27, 2018 · 3a92bb8 · 3a92bb8
2 parents 03dc0b5 + 7acf70b
commit 3a92bb8
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ### Release v3.21.14
 ### New
+- Add DCC and QNT tokens []()
+- Add DCC abi [#1932](https://github.com/kvhnuke/etherwallet/pull/1932)
+- Add DCC custom gas limit [#1931](https://github.com/kvhnuke/etherwallet/pull/1931)
 - Add DIP token [#1928](https://github.com/kvhnuke/etherwallet/pull/1928)
 - List up-to-date supported token from KyberNetwork [#1923](https://github.com/kvhnuke/etherwallet/pull/1923)
 - upgrade Cardstack CARD token to new address [#1927](https://github.com/kvhnuke/etherwallet/pull/1927)

diff --git a/app/scripts/tokens/ethTokens.json b/app/scripts/tokens/ethTokens.json
@@ -401,6 +401,12 @@
 		"decimal": 18,
 		"type": "default"
 	},
+	{
+		"address": "0x14C926F2290044B647e1Bf2072e67B495eff1905",
+		"symbol": "BETHER",
+		"decimal": 18,
+		"type": "default"
+	},
 	{
 		"address": "0x763186eb8d4856d536ed4478302971214febc6a9",
 		"symbol": "BETR",
@@ -581,12 +587,6 @@
 		"decimal": 18,
 		"type": "default"
 	},
-	{
-		"address": "0x14C926F2290044B647e1Bf2072e67B495eff1905",
-		"symbol": "BETHER",
-		"decimal": 18,
-		"type": "default"
-	},
 	{
 		"address": "0xdb8646f5b487b5dd979fac618350e85018f557d4",
 		"symbol": "BTK",
@@ -1074,14 +1074,14 @@
 		"type": "default"
 	},
 	{
-		"address": "0x61725f3db4004afe014745b21dab1e1677cc328b",
-		"symbol": "DAXT",
+		"address": "0xd82Df0ABD3f51425Eb15ef7580fDA55727875f14",
+		"symbol": "DAV",
 		"decimal": 18,
 		"type": "default"
 	},
 	{
-		"address": "0xd82Df0ABD3f51425Eb15ef7580fDA55727875f14",
-		"symbol": "DAV",
+		"address": "0x61725f3db4004afe014745b21dab1e1677cc328b",
+		"symbol": "DAXT",
 		"decimal": 18,
 		"type": "default"
 	},
@@ -1091,6 +1091,12 @@
 		"decimal": 18,
 		"type": "default"
 	},
+	{
+		"address": "0xffa93aacf49297d51e211817452839052fdfb961",
+		"symbol": "DCC",
+		"decimal": 18,
+		"type": "default"
+	},
 	{
 		"address": "0x399A0e6FbEb3d74c85357439f4c8AeD9678a5cbF",
 		"symbol": "DCL",
@@ -1266,14 +1272,14 @@
 		"type": "default"
 	},
 	{
-		"address": "0x82fdedfB7635441aA5A92791D001fA7388da8025",
-		"symbol": "DTx",
+		"address": "0x765f0c16d1ddc279295c1a7c24b0883f62d33f75",
+		"symbol": "DTX",
 		"decimal": 18,
 		"type": "default"
 	},
 	{
-		"address": "0x765f0c16d1ddc279295c1a7c24b0883f62d33f75",
-		"symbol": "DTX",
+		"address": "0x82fdedfB7635441aA5A92791D001fA7388da8025",
+		"symbol": "DTx",
 		"decimal": 18,
 		"type": "default"
 	},
@@ -2729,12 +2735,6 @@
 		"decimal": 18,
 		"type": "default"
 	},
-	{
-		"address": "0xBB1fA4FdEB3459733bF67EbC6f893003fA976a82",
-		"symbol": "XPAT",
-		"decimal": 18,
-		"type": "default"
-	},
 	{
 		"address": "0x694404595e3075a942397f466aacd462ff1a7bd0",
 		"symbol": "PATENTS",
@@ -2993,6 +2993,12 @@
 		"decimal": 18,
 		"type": "default"
 	},
+	{
+		"address": "0x4a220E6096B25EADb88358cb44068A3248254675",
+		"symbol": "QNT",
+		"decimal": 18,
+		"type": "default"
+	},
 	{
 		"address": "0xFFAA5ffc455d9131f8A2713A741fD1960330508B",
 		"symbol": "QRG",
@@ -4007,6 +4013,12 @@
 		"decimal": 0,
 		"type": "default"
 	},
+	{
+		"address": "0xBB1fA4FdEB3459733bF67EbC6f893003fA976a82",
+		"symbol": "XPAT",
+		"decimal": 18,
+		"type": "default"
+	},
 	{
 		"address": "0xB24754bE79281553dc1adC160ddF5Cd9b74361a4",
 		"symbol": "XRL",