Skip to content
This repository has been archived by the owner on Nov 21, 2019. It is now read-only.

Update Custom Networks #1850

Merged
merged 6 commits into from May 19, 2018
Merged

Update Custom Networks #1850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
350ef63
Remove Callisto Testnet
May 14, 2018
bc6130a
Add Chainkorea ETC node
May 14, 2018
a0f6fad
Update network selection tab css
May 14, 2018
f1eda56
[ETSC] Rename gazua.tv to ethereumsocial.kr
May 14, 2018
a67d38d
[CLO] TREZOR support for Callisto Network
jhoenicke May 8, 2018
9e69efe
[ETSC] TREZOR support for Ethereum Social
May 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions app/scripts/controllers/decryptWalletCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ var decryptWalletCtrl = function($scope, $sce, walletService) {
hwEllaismPath: "m/44'/163'/0'/0", // first address: m/44'/163'/0'/0/0
hwEtherGemPath: "m/44'/1987'/0'/0", // first address: m/44'/1987'/0'/0/0
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
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
};
Expand Down Expand Up @@ -93,8 +94,8 @@ var decryptWalletCtrl = function($scope, $sce, walletService) {
case nodes.nodeTypes.CLO:
$scope.HDWallet.dPath = $scope.HDWallet.hwCallistoPath;
break;
case nodes.nodeTypes.CLOT:
$scope.HDWallet.dPath = $scope.HDWallet.trezorTestnetPath;
case nodes.nodeTypes.ETSC:
$scope.HDWallet.dPath = $scope.HDWallet.hwSocialPath;
break;
default:
$scope.HDWallet.dPath = $scope.HDWallet.trezorPath;
Expand Down Expand Up @@ -125,8 +126,8 @@ var decryptWalletCtrl = function($scope, $sce, walletService) {
case nodes.nodeTypes.CLO:
$scope.HDWallet.dPath = $scope.HDWallet.hwCallistoPath;
break;
case nodes.nodeTypes.CLOT:
$scope.HDWallet.dPath = $scope.HDWallet.trezorTestnetPath;
case nodes.nodeTypes.ETSC:
$scope.HDWallet.dPath = $scope.HDWallet.hwSocialPath;
break;
default:
$scope.HDWallet.dPath = $scope.HDWallet.defaultDPath;
Expand Down
18 changes: 16 additions & 2 deletions app/scripts/directives/walletDecryptDrtv.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=='Testnet CLO'">
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'">
<input aria-flowto="aria4"
type="radio"
aria-label="Trezor Hardware Wallet"
Expand Down Expand Up @@ -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=='Testnet CLO'">
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'">
We do not know the correct path for this network.
<a href="https://github.com/kvhnuke/etherwallet/issues"
target="_blank"
Expand Down Expand Up @@ -937,6 +937,20 @@ <h4 id="modalTitle" class="modal-title" translate="ADD_Radio_5_Path" style="marg
</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>

<section class="row">
<div class="col-sm-4">
<label class="radio small">
Expand Down
29 changes: 14 additions & 15 deletions app/scripts/nodes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ nodes.nodeTypes = {
ETSC: "ETSC",
EGEM: "EGEM",
CLO: "CLO",
CLOT: "Testnet CLO",
EAST: "EAST",
X888: "X88",
Custom: "CUSTOM ETH"
Expand Down Expand Up @@ -100,6 +99,18 @@ nodes.nodeList = {
'service': 'Ethereum Commonwealth',
'lib': new nodes.customNode('https://etc-geth.0xinfra.com', '')
},
'etc_chainkorea': {
'name': 'ETC',
'blockExplorerTX': 'https://classicexplorer.org/tx/[[txHash]]',
'blockExplorerAddr': 'https://classicexplorer.org/addr/[[address]]',
'type': nodes.nodeTypes.ETC,
'eip155': true,
'chainId': 61,
'tokenList': require('./tokens/etcTokens.json'),
'abiList': require('./abiDefinitions/etcAbi.json'),
'service': 'Chainkorea',
'lib': new nodes.customNode('https://node.classicexplorer.org', '')
},
'etc_epool': {
'name': 'ETC',
'blockExplorerTX': 'https://gastracker.io/tx/[[txHash]]',
Expand Down Expand Up @@ -259,7 +270,7 @@ nodes.nodeList = {
'tokenList': require('./tokens/etscTokens.json'),
'abiList': require('./abiDefinitions/etscAbi.json'),
'estimateGas': true,
'service': 'gazua.tv',
'service': 'ethereumsocial.kr',
'lib': new nodes.customNode('https://node.ethereumsocial.kr', '')
},
'egem': {
Expand All @@ -275,7 +286,7 @@ nodes.nodeList = {
'service': 'egem.io',
'lib': new nodes.customNode('https://jsonrpc.egem.io/custom', '')
},
'clo_mainnet': {
'clo': {
'name': 'CLO',
'blockExplorerTX': 'https://explorer.callisto.network/tx/[[txHash]]',
'blockExplorerAddr': 'https://explorer.callisto.network/addr/[[address]]',
Expand All @@ -287,18 +298,6 @@ nodes.nodeList = {
'service': 'Callisto.network',
'lib': new nodes.customNode('https://clo-geth.0xinfra.com/', '')
},
'clo_testnet3': {
'name': 'CLO Testnet 3.0',
'blockExplorerTX': 'https://explorer-testnet.callisto.network/tx/[[txHash]]',
'blockExplorerAddr': 'https://explorer-testnet.callisto.network/addr/[[address]]',
'type': nodes.nodeTypes.CLOT,
'eip155': true,
'chainId': 7919,
'tokenList': require('./tokens/cloTokens.json'),
'abiList': require('./abiDefinitions/cloAbi.json'),
'service': 'Callisto.network',
'lib': new nodes.customNode('https://clo-testnet3.0xinfra.com/', '')
},
'east': {
'name': 'EAST',
'blockExplorerTX': 'https://explorer.easthub.io/tx/[[txHash]]',
Expand Down
61 changes: 49 additions & 12 deletions app/styles/etherwallet-custom.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,9 @@ label small {
@brand-tomo: #6a488d;
@brand-ella: #046111;
@brand-etsc: #4295d1;
@brand-egem: #0e97c0;
@brand-clo: #009241;
@brand-east: #0e97c0;
@brand-cust: #b50085;

.dropdown-node .dropdown-menu {
Expand All @@ -609,46 +612,59 @@ label small {
border-left: 2px solid @brand-eth;
}
li:nth-child(5),
li:nth-child(6) {
li:nth-child(6),
li:nth-child(7) {
border-left: 2px solid @brand-etc;
}
li:nth-child(7),
li:nth-child(8),
li:nth-child(9),
li:nth-child(10),
li:nth-child(11),
li:nth-child(12) {
li:nth-child(12),
li:nth-child(13) {
border-left: 2px solid @brand-test;
}
li:nth-child(13) {
li:nth-child(14) {
border-left: 2px solid @brand-exp;
}
li:nth-child(14) {
li:nth-child(15) {
border-left: 2px solid @brand-ubq;
}
li:nth-child(15) {
li:nth-child(16) {
border-left: 2px solid @brand-poa;
}
li:nth-child(16) {
li:nth-child(17) {
border-left: 2px solid @brand-tomo;
}
li:nth-child(17) {
li:nth-child(18) {
border-left: 2px solid @brand-ella;
}
li:nth-child(18) {
li:nth-child(19) {
border-left: 2px solid @brand-etsc;
}
li:nth-child(20) {
border-left: 2px solid @brand-egem;
}
li:nth-child(21) {
border-left: 2px solid @brand-clo;
}
li:nth-child(21) {
border-left: 2px solid @brand-east;
}
li:last-child {
border-left: 2px solid @gray-light;
}
li:nth-child(4),
li:nth-child(6),
li:nth-child(12),
li:nth-child(7),
li:nth-child(13),
li:nth-child(14),
li:nth-child(15),
li:nth-child(16),
li:nth-child(17) {
li:nth-child(17),
li:nth-child(18),
li:nth-child(19),
li:nth-child(20),
li:nth-child(21) {
border-bottom: 1px solid @gray-lighter;
}
}
Expand Down Expand Up @@ -747,6 +763,27 @@ header.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; }
}

header.CLO {
.nav-container { border-top: 0.25rem solid @brand-clo; }
& + .container + .pre-footer + .footer { border-top: 0.25rem solid @brand-clo; }
& + .container .modal-content { border: 0.25rem solid @brand-clo; }
& + .container .alert-info { background-color:@brand-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; }
}

.contest-container {
align-content: center;
display: flex;
Expand Down