Merge pull request #1632 from ethereumsocial/mercury

Add ethereum social network
MyEtherWallet · Mar 21, 2018 · adcce6a · adcce6a
2 parents f46991c + f6e6669
commit adcce6a
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 2 deletions.
diff --git a/app/scripts/abiDefinitions/etscAbi.json b/app/scripts/abiDefinitions/etscAbi.json
@@ -0,0 +1 @@
+[]
diff --git a/app/scripts/nodes.js b/app/scripts/nodes.js
@@ -16,6 +16,7 @@ nodes.nodeTypes = {
     POA: "POA",
     TOMO: "TOMO",
     ELLA: "ELLA",
+    ETSC: "ETSC",
     Custom: "CUSTOM ETH"
 };
 nodes.ensNodeTypes = [nodes.nodeTypes.ETH, nodes.nodeTypes.Ropsten];
@@ -242,6 +243,19 @@ nodes.nodeList = {
         'estimateGas': true,
         'service': 'ellaism.org',
         'lib': new nodes.customNode('https://jsonrpc.ellaism.org', '')
+    },
+    'etsc': {
+        'name': 'ETSC',
+        'blockExplorerTX': 'https://explorer.ethereumsocial.kr/#/tx/[[txHash]]',
+        'blockExplorerAddr': 'https://explorer.ethereumsocial.kr/#/address/[[address]]',
+        'type': nodes.nodeTypes.ETSC,
+        'eip155': true,
+        'chainId': 214,
+        'tokenList': require('./tokens/etscTokens.json'),
+        'abiList': require('./abiDefinitions/etscAbi.json'),
+        'estimateGas': true,
+        'service': 'gazua.tv',
+        'lib': new nodes.customNode('https://node.ethereumsocial.kr', '')
     }
 };
 

diff --git a/app/scripts/tokens/etscTokens.json b/app/scripts/tokens/etscTokens.json
@@ -0,0 +1 @@
+[]
diff --git a/app/styles/etherwallet-custom.less b/app/styles/etherwallet-custom.less
@@ -590,6 +590,7 @@ label small {
 @brand-poa: #4568bb;
 @brand-tomo: #6a488d;
 @brand-ella: #046111;
+@brand-etsc: #673ab7;
 @brand-cust: #b50085;
 
 .dropdown-node .dropdown-menu {
@@ -633,6 +634,9 @@ label small {
   li:nth-child(16) {
     border-left: 2px solid @brand-ella;
   }
+  li:nth-child(17) {
+    border-left: 2px solid @brand-etsc;
+  }
   li:last-child {
     border-left: 2px solid @gray-light;
   }
@@ -642,7 +646,8 @@ label small {
   li:nth-child(12),
   li:nth-child(13),
   li:nth-child(14),
-  li:nth-child(15) {
+  li:nth-child(15),
+  li:nth-child(16) {
     border-bottom: 1px solid @gray-lighter;
   }
 }
@@ -734,4 +739,9 @@ header.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;           }
+}