Merge branch 'mercury' into esn-support

MyEtherWallet · Jun 1, 2018 · 06af655 · 06af655
2 parents 512f5f1 + 5cfa0f8
commit 06af655
Show file tree

Hide file tree

Showing 8 changed files with 119 additions and 62 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,14 @@
 ### Release v3.21.13
 ### Update
+- Update UMKA token address [#1880](https://github.com/kvhnuke/etherwallet/pull/1880)
+- [Network] linting css & walletDecryptDrtv.html [#1878](https://github.com/kvhnuke/etherwallet/pull/1880)
 - Minor grammatical fixes [#1873](https://github.com/kvhnuke/etherwallet/pull/1873)
 - Update CLO explorer address [#1872](https://github.com/kvhnuke/etherwallet/pull/1872)
 - Fix network tab css [#1870](https://github.com/kvhnuke/etherwallet/pull/1870)
 
 ### New
+- Add COIN token [#1880](https://github.com/kvhnuke/etherwallet/pull/1880)
+- YAP Node [#1876](https://github.com/kvhnuke/etherwallet/pull/1876)
 - Add EGT, WYS, IOTX, BTCL, GZR and FYX tokens [#1874](https://github.com/kvhnuke/etherwallet/pull/1874)
 - Add OS.University EDU tokens to MEW [#1871](https://github.com/kvhnuke/etherwallet/pull/1871)
 

diff --git a/app/scripts/abiDefinitions/yapAbi.json b/app/scripts/abiDefinitions/yapAbi.json
@@ -0,0 +1 @@
+[]
diff --git a/app/scripts/controllers/decryptWalletCtrl.js b/app/scripts/controllers/decryptWalletCtrl.js
@@ -30,6 +30,7 @@ var decryptWalletCtrl = function($scope, $sce, walletService) {
         hwCallistoPath:    "m/44'/820'/0'/0",      // first address: m/44'/820'/0'/0/0
         hwSocialPath:      "m/44'/1128'/0'/0",     // first address: m/44'/1128'/0'/0/0
         hwMusicoinPath:    "m/44'/184'/0'/0",      // first address: m/44'/184'/0'/0/0
+        hwYapstonePath:    "m/44'/528'/0'/0",      // first address: m/44'/528'/0'/0/0
         hwESNetworkPath:   "m/44'/31102'/0'/0",    // first address: m/44'/31102'/0'/0/0
         singularDTVPath:   "m/0'/0'/0'",           // first address: m/0'/0'/0'/0
         hwRskPath:         "m/44'/137'/0'/0",      // first address : m/44'/137'/0'/0/0
@@ -102,6 +103,9 @@ var decryptWalletCtrl = function($scope, $sce, walletService) {
                 case nodes.nodeTypes.MUSIC:
                     $scope.HDWallet.dPath = $scope.HDWallet.hwMusicoinPath;
                     break;
+                case nodes.nodeTypes.YAP:
+                    $scope.HDWallet.dPath = $scope.HDWallet.hwYapstonePath;
+                    break;
                 case nodes.nodeTypes.ESN:
                     $scope.HDWallet.dPath = $scope.HDWallet.hwESNetworkPath;
                     break;
@@ -140,6 +144,9 @@ var decryptWalletCtrl = function($scope, $sce, walletService) {
                 case nodes.nodeTypes.MUSIC:
                     $scope.HDWallet.dPath = $scope.HDWallet.hwMusicoinPath;
                     break;
+                case nodes.nodeTypes.YAP:
+                    $scope.HDWallet.dPath = $scope.HDWallet.hwYapstonePath;
+                    break;
                 case nodes.nodeTypes.ESN:
                     $scope.HDWallet.dPath = $scope.HDWallet.hwESNetworkPath;
                     break;

diff --git a/app/scripts/directives/walletDecryptDrtv.html b/app/scripts/directives/walletDecryptDrtv.html
@@ -47,7 +47,7 @@ <h4 translate="decrypt_Access">
     <!-- TREZOR -->
     <label class="radio"
            aria-flowto="aria4"
-           ng-show="ajaxReq.type=='ETH'||ajaxReq.type=='ETC'||ajaxReq.type=='ROPSTEN ETH'||ajaxReq.type=='RINKEBY ETH'||ajaxReq.type=='KOVAN ETH'||ajaxReq.type=='EXP'||ajaxReq.type=='UBQ'||ajaxReq.type=='RSK'||ajaxReq.type=='POA'||ajaxReq.type=='TOMO'||ajaxReq.type=='ELLA'||ajaxReq.type=='EGEM'||ajaxReq.type=='CLO'||ajaxReq.type=='ETSC'||ajaxReq.type=='MUSIC'||ajaxReq.type=='ESN'">
+           ng-show="ajaxReq.type=='ETH'||ajaxReq.type=='ETC'||ajaxReq.type=='ROPSTEN ETH'||ajaxReq.type=='RINKEBY ETH'||ajaxReq.type=='KOVAN ETH'||ajaxReq.type=='EXP'||ajaxReq.type=='UBQ'||ajaxReq.type=='RSK'||ajaxReq.type=='POA'||ajaxReq.type=='TOMO'||ajaxReq.type=='ELLA'||ajaxReq.type=='EGEM'||ajaxReq.type=='CLO'||ajaxReq.type=='ETSC'||ajaxReq.type=='MUSIC'||ajaxReq.type=='YAP'||ajaxReq.type=='ESN'">
       <input aria-flowto="aria4"
              type="radio"
              aria-label="Trezor Hardware Wallet"
@@ -769,7 +769,7 @@ <h4 id="modalTitle" class="modal-title" translate="ADD_Radio_5_Path" style="marg
           </h4>
 
           <p class="alert alert-danger"
-             ng-hide="ajaxReq.type=='ETH'||ajaxReq.type=='ETC'||ajaxReq.type=='ROPSTEN ETH'||ajaxReq.type=='RINKEBY ETH'||ajaxReq.type=='KOVAN ETH'||ajaxReq.type=='EXP'||ajaxReq.type=='UBQ'||ajaxReq.type=='ELLA'||ajaxReq.type=='EGEM'||ajaxReq.type=='CLO'||ajaxReq.type=='ETSC'||ajaxReq.type=='MUSIC'||ajaxReq.type=='ESN'">
+             ng-hide="ajaxReq.type=='ETH'||ajaxReq.type=='ETC'||ajaxReq.type=='ROPSTEN ETH'||ajaxReq.type=='RINKEBY ETH'||ajaxReq.type=='KOVAN ETH'||ajaxReq.type=='EXP'||ajaxReq.type=='UBQ'||ajaxReq.type=='ELLA'||ajaxReq.type=='EGEM'||ajaxReq.type=='CLO'||ajaxReq.type=='ETSC'||ajaxReq.type=='MUSIC'||ajaxReq.type=='YAP'||ajaxReq.type=='ESN'">
                 We do not know the correct path for this network.
                 <a href="https://github.com/kvhnuke/etherwallet/issues"
                    target="_blank"
@@ -807,7 +807,9 @@ <h4 id="modalTitle" class="modal-title" translate="ADD_Radio_5_Path" style="marg
                   Ledger (ETH)
                 </p>
               </label>
+            </div>
 
+            <div class="col-sm-4">
               <label class="radio small">
                 <input aria-describedby="Path: Ledger (ETC) {{HDWallet.ledgerClassicPath}}"
                        ng-change="onHDDPathChange()"
@@ -849,9 +851,6 @@ <h4 id="modalTitle" class="modal-title" translate="ADD_Radio_5_Path" style="marg
               </label>
             </div>
 
-          </section>
-
-          <section class="row">
             <div class="col-sm-4">
               <label class="radio small">
                 <input aria-describedby="Path: TREZOR - TESTNET - {{HDWallet.trezorTestnetPath}}"
@@ -935,35 +934,48 @@ <h4 id="modalTitle" class="modal-title" translate="ADD_Radio_5_Path" style="marg
                 </p>
               </label>
             </div>
-          </section>
 
-          <div class="col-sm-4">
-            <label class="radio small">
-              <input aria-describedby="Path: TREZOR (ETSC) {{HDWallet.hwSocialPath}}"
-                     ng-change="onHDDPathChange()"
-                     ng-model="HDWallet.dPath"
-                     type="radio"
-                    value="{{HDWallet.hwSocialPath}}"/>
-              <span ng-bind="HDWallet.hwSocialPath"></span>
-              <p class="small">
-                Network: Ethereum Social
-              </p>
-            </label>
-          </div>
+            <div class="col-sm-4">
+              <label class="radio small">
+                <input aria-describedby="Path: TREZOR (ETSC) {{HDWallet.hwSocialPath}}"
+                       ng-change="onHDDPathChange()"
+                       ng-model="HDWallet.dPath"
+                       type="radio"
+                      value="{{HDWallet.hwSocialPath}}"/>
+                <span ng-bind="HDWallet.hwSocialPath"></span>
+                <p class="small">
+                  Network: Ethereum Social
+                </p>
+              </label>
+            </div>
 
-          <div class="col-sm-4">
-            <label class="radio small">
-              <input aria-describedby="Path: TREZOR (MUSIC) {{HDWallet.hwMusicoinPath}}"
-                     ng-change="onHDDPathChange()"
-                     ng-model="HDWallet.dPath"
-                     type="radio"
-                    value="{{HDWallet.hwMusicoinPath}}"/>
-              <span ng-bind="HDWallet.hwMusicoinPath"></span>
-              <p class="small">
-                Network: Musicoin
-              </p>
-            </label>
-          </div>
+            <div class="col-sm-4">
+              <label class="radio small">
+                <input aria-describedby="Path: TREZOR (MUSIC) {{HDWallet.hwMusicoinPath}}"
+                       ng-change="onHDDPathChange()"
+                       ng-model="HDWallet.dPath"
+                       type="radio"
+                      value="{{HDWallet.hwMusicoinPath}}"/>
+                <span ng-bind="HDWallet.hwMusicoinPath"></span>
+                <p class="small">
+                  Network: Musicoin
+                </p>
+              </label>
+            </div>
+
+            <div class="col-sm-4">
+              <label class="radio small">
+                <input aria-describedby="Path: TREZOR (YAP) {{HDWallet.hwYapstonePath}}"
+                       ng-change="onHDDPathChange()"
+                       ng-model="HDWallet.dPath"
+                       type="radio"
+                      value="{{HDWallet.hwYapstonePath}}"/>
+                <span ng-bind="HDWallet.hwYapstonePath"></span>
+                <p class="small">
+                  Network: Yapstone
+                </p>
+              </label>
+            </div>
 
           <div class="col-sm-4">
             <label class="radio small">

diff --git a/app/scripts/nodes.js b/app/scripts/nodes.js
@@ -23,6 +23,7 @@ nodes.nodeTypes = {
     ESN: "ESN",
     X888: "X88",
     MUSIC: "MUSIC",
+    YAP: "YAP",
     Custom: "CUSTOM ETH"
 };
 nodes.ensNodeTypes = [nodes.nodeTypes.ETH, nodes.nodeTypes.Ropsten];
@@ -351,6 +352,19 @@ nodes.nodeList = {
         'estimateGas': true,
         'service': 'musicoin.org',
         'lib': new nodes.customNode('https://mcdnode.trustfarm.io/api', '')
+    },
+    'yap': {
+        'name': 'YAP',
+        'blockExplorerTX': 'https://explorer.yapstone.pro/tx/[[txHash]]',
+        'blockExplorerAddr': 'https://explorer.yapstone.pro/addr/[[address]]',
+        'type': nodes.nodeTypes.YAP,
+        'eip155': true,
+        'chainId': 528,
+        'tokenList': require('./tokens/yapTokens.json'),
+        'abiList': require('./abiDefinitions/yapAbi.json'),
+        'estimateGas': true,
+        'service': 'yapstone.pro',
+        'lib': new nodes.customNode('https://node.yapstone.pro', '')
     }
 };
 

diff --git a/app/scripts/tokens/ethTokens.json b/app/scripts/tokens/ethTokens.json
@@ -821,6 +821,12 @@
 		"decimal": 8,
 		"type": "default"
 	},
+	{
+		"address": "0x5e8f855966d638135a968861e80dda722291b06d",
+		"symbol": "COIN",
+		"decimal": 18,
+		"type": "default"
+	},
 	{
 		"address": "0x65292eeadf1426cd2df1c4793a3d7519f253913b",
 		"symbol": "COSS",
@@ -3516,7 +3522,7 @@
 		"type": "default"
 	},
 	{
-		"address": "0x105d97ef2e723f1cfb24519bc6ff15a6d091a3f1",
+		"address": "0x8e5afc69f6227a3ad75ed346c8723bc62ce97123",
 		"symbol": "UMKA",
 		"decimal": 4,
 		"type": "default"

diff --git a/app/scripts/tokens/yapTokens.json b/app/scripts/tokens/yapTokens.json
@@ -0,0 +1 @@
+[]
diff --git a/app/styles/etherwallet-custom.less b/app/styles/etherwallet-custom.less
@@ -595,6 +595,7 @@ label small {
 @brand-east: #0e97c0;
 @brand-x888: #ff9;
 @brand-music: #fece00;
+@brand-yap: #0e97c0;
 @brand-cust: #b50085;
 
 .dropdown-node .dropdown-menu {
@@ -658,6 +659,9 @@ label small {
   li:nth-child(24) {
     border-left: 2px solid @brand-music;
   }
+  li:nth-child(25) {
+    border-left: 2px solid @brand-yap;
+  }
   li:last-child {
     border-left: 2px solid @gray-light;
   }
@@ -673,7 +677,8 @@ label small {
   li:nth-child(20),
   li:nth-child(21),
   li:nth-child(22),
-  li:nth-child(23) {
+  li:nth-child(23),
+  li:nth-child(24) {
     border-bottom: 1px solid @gray-lighter;
   }
 }
@@ -752,31 +757,31 @@ header.POA {
 }
 
 header.TOMO {
-  .nav-container                         { border-top: 0.25rem solid @brand-tomo;  }
-  & + .container + .pre-footer + .footer { border-top: 0.25rem solid @brand-tomo;  }
-  & + .container .modal-content          { border: 0.25rem solid @brand-tomo;      }
-  & + .container .alert-info             { background-color:@brand-tomo;           }
+  .nav-container                         { border-top: 0.25rem solid @brand-tomo; }
+  & + .container + .pre-footer + .footer { border-top: 0.25rem solid @brand-tomo; }
+  & + .container .modal-content          { border: 0.25rem solid @brand-tomo;     }
+  & + .container .alert-info             { background-color:@brand-tomo;          }
 }
 
 header.ELLA {
-  .nav-container                         { border-top: 0.25rem solid @brand-ella;  }
-  & + .container + .pre-footer + .footer { border-top: 0.25rem solid @brand-ella;  }
-  & + .container .modal-content          { border: 0.25rem solid @brand-ella;      }
-  & + .container .alert-info             { background-color:@brand-ella;           }
+  .nav-container                         { border-top: 0.25rem solid @brand-ella; }
+  & + .container + .pre-footer + .footer { border-top: 0.25rem solid @brand-ella; }
+  & + .container .modal-content          { border: 0.25rem solid @brand-ella;     }
+  & + .container .alert-info             { background-color:@brand-ella;          }
 }
 
 header.ETSC {
-  .nav-container                         { border-top: 0.25rem solid @brand-etsc;  }
-  & + .container + .pre-footer + .footer { border-top: 0.25rem solid @brand-etsc;  }
-  & + .container .modal-content          { border: 0.25rem solid @brand-etsc;      }
-  & + .container .alert-info             { background-color:@brand-etsc;           }
+  .nav-container                         { border-top: 0.25rem solid @brand-etsc; }
+  & + .container + .pre-footer + .footer { border-top: 0.25rem solid @brand-etsc; }
+  & + .container .modal-content          { border: 0.25rem solid @brand-etsc;     }
+  & + .container .alert-info             { background-color:@brand-etsc;          }
 }
 
 header.EGEM {
-  .nav-container                         { border-top: 0.25rem solid @brand-egem;  }
-  & + .container + .pre-footer + .footer { border-top: 0.25rem solid @brand-egem;  }
-  & + .container .modal-content          { border: 0.25rem solid @brand-egem;      }
-  & + .container .alert-info             { background-color:@brand-egem;           }
+  .nav-container                         { border-top: 0.25rem solid @brand-egem; }
+  & + .container + .pre-footer + .footer { border-top: 0.25rem solid @brand-egem; }
+  & + .container .modal-content          { border: 0.25rem solid @brand-egem;     }
+  & + .container .alert-info             { background-color:@brand-egem;          }
 }
 
 header.CLO {
@@ -787,24 +792,31 @@ header.CLO {
 }
 
 header.EAST {
-  .nav-container                         { border-top: 0.25rem solid @brand-east;  }
-  & + .container + .pre-footer + .footer { border-top: 0.25rem solid @brand-east;  }
-  & + .container .modal-content          { border: 0.25rem solid @brand-east;      }
-  & + .container .alert-info             { background-color:@brand-east;           }
+  .nav-container                         { border-top: 0.25rem solid @brand-east; }
+  & + .container + .pre-footer + .footer { border-top: 0.25rem solid @brand-east; }
+  & + .container .modal-content          { border: 0.25rem solid @brand-east;     }
+  & + .container .alert-info             { background-color:@brand-east;          }
 }
 
 header.X888 {
-  .nav-container                         { border-top: 0.25rem solid @brand-x888;  }
-  & + .container + .pre-footer + .footer { border-top: 0.25rem solid @brand-x888;  }
-  & + .container .modal-content          { border: 0.25rem solid @brand-x888;      }
-  & + .container .alert-info             { background-color:@brand-x888;           }
+  .nav-container                         { border-top: 0.25rem solid @brand-x888; }
+  & + .container + .pre-footer + .footer { border-top: 0.25rem solid @brand-x888; }
+  & + .container .modal-content          { border: 0.25rem solid @brand-x888;     }
+  & + .container .alert-info             { background-color:@brand-x888;          }
 }
 
 header.MUSIC {
-  .nav-container                         { border-top: 0.25rem solid @brand-music; }
-  & + .container + .pre-footer + .footer { border-top: 0.25rem solid @brand-music; }
-  & + .container .modal-content          { border: 0.25rem solid @brand-music;     }
-  & + .container .alert-info             { background-color:@brand-music;          }
+  .nav-container                         { border-top: 0.25rem solid @brand-music;}
+  & + .container + .pre-footer + .footer { border-top: 0.25rem solid @brand-music;}
+  & + .container .modal-content          { border: 0.25rem solid @brand-music;    }
+  & + .container .alert-info             { background-color:@brand-music;         }
+}
+
+header.YAP {
+  .nav-container                         { border-top: 0.25rem solid @brand-yap;  }
+  & + .container + .pre-footer + .footer { border-top: 0.25rem solid @brand-yap;  }
+  & + .container .modal-content          { border: 0.25rem solid @brand-yap;      }
+  & + .container .alert-info             { background-color:@brand-yap;           }
 }
 
 .contest-container {