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

devop/sync-repo
MyEtherWallet · Sep 4, 2018 · e8d98eb · e8d98eb
2 parents 7e0bd75 + cdb44b5
commit e8d98eb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,8 @@
 ### New
+- Add 0xinfra nodes [#2045](https://github.com/kvhnuke/etherwallet/pull/2045)
+- nodes: add remote.akroma.io [#2046](https://github.com/kvhnuke/etherwallet/pull/2046)
+- Add STB token and Add electrominer scammer address [#2047](https://github.com/kvhnuke/etherwallet/pull/2047)
+- Add Ledger support for Musicoin, Add Trezor support for Pirl, Ether-1 and Atheios [#2040](https://github.com/kvhnuke/etherwallet/pull/2040)
 - Add IMT token [#2043](https://github.com/kvhnuke/etherwallet/pull/2043)
 - Update darklist from eth-list, update ledger affiliate links [#2042](https://github.com/kvhnuke/etherwallet/pull/2042)
 - Add USD//Coin (USDC) token [#2036](https://github.com/kvhnuke/etherwallet/pull/2036)

diff --git a/app/scripts/constants/darkListConst.js b/app/scripts/constants/darkListConst.js
@@ -6,6 +6,11 @@ const darklist = function() {
         "Scam lottery contract that takes advantage of odd struct memory management",
       date: "2018-06-19"
     },
+    {
+      address: "0xB4c9d8A5812a024BDb177991af256dA144776033",
+      comment: "Electrominer ICO fake admin",
+      date: "2018-08-30"
+    },
     {
       address: "0x5ddD20aC4bACFf3f148aF4C8C24194a1C102CfE5",
       comment: "Electrominer ICO fake admin",

diff --git a/app/scripts/tokens/ethTokens.json b/app/scripts/tokens/ethTokens.json
@@ -3683,6 +3683,12 @@
     "decimal": 18,
     "type": "default"
   },
+  {
+    "address": "0x09bca6ebab05ee2ae945be4eda51393d94bf7b99",
+    "symbol": "STB",
+    "decimal": 4,
+    "type": "default"
+  },
   {
     "address": "0x629aEe55ed49581C33ab27f9403F7992A289ffd5",
     "symbol": "STC",