Commit 89ee64e2 authored by Gamaliel 'Yel' Padillo's avatar Gamaliel 'Yel' Padillo Committed by GitHub

Merge pull request #2030 from mkrufky/atheios

Enable Ledger Hardware Wallet support for Atheios (ATH)
parents cf7ff632 481f9473
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24.706 23.493">
<defs>
<linearGradient id="a">
<stop offset="0" stop-color="#f1f1f1"/>
<stop offset="1" stop-color="#fbfbfb" stop-opacity=".886"/>
</linearGradient>
<clipPath id="b">
<path d="M0 327.655h339.279V0H0z"/>
</clipPath>
<linearGradient id="c" x1="32.219" x2="31.858" y1="-.695" y2="48.55" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
</defs>
<g clip-path="url(#b)" transform="matrix(.35278 0 0 -.35278 -19.497 39.732)">
<path fill="url(#c)" d="M0 0a.62.62 0 0 0-.28.264c-.193.423-.059.829.757 2.289l13.817 25.174 11.492-.021L12.254 2.499C11.502 1.085 11.151.454 11.062.354c-.057-.062-.252-.188-.436-.28-.334-.166-.334-.166-5.38-.164C1.22-.087.159-.069 0 0zm54.37.077c-.248.123-.402.263-.574.522a3.589 3.589 0 0 0-.234.38c0 .016-.301.574-.669 1.242l-4.122 7.413-16.436.096v7.976h11.998s-11.026 20.4-11.12 20.526c-.147.196-.366.271-.875.271-.824 0-.863-.276-1.243-.894-.613-1.17-2.003-3.672-2.003-3.672l-11.505-.015 6.512 11.504c1.112 1.477 2.363 2.354 3.919 2.749.581.148.666.151 4.021.151 3.306 0 3.451-.005 4.087-.147 1.479-.33 2.451-.851 3.467-1.862a10.732 10.732 0 0 0 1.791-2.275l22.4-40.607C64.844 1.523 65.098.987 65.098.66c0-.368-.078-.523-.328-.653-.167-.086-.855-.099-5.127-.099-4.935 0-4.935 0-5.273.169z" transform="translate(57.618 54.236)"/>
</g>
</svg>
......@@ -37,6 +37,7 @@ var decryptWalletCtrl = function($scope, $sce, walletService) {
hwAkromaPath: "m/44'/200625'/0'/0", // first address: m/44'/200625'/0'/0/0
hwESNetworkPath: "m/44'/31102'/0'/0", // first address: m/44'/31102'/0'/0/0
hwEther1Path: "m/44'/1313114'/0'/0", // first address: m/44'/1313114'/0'/0/0
hwAtheiosPath: "m/44'/1620'/0'/0", // first address: m/44'/1620'/0'/0/0
};
$scope.HDWallet.dPath = $scope.HDWallet.defaultDPath;
$scope.mnemonicModel = new Modal(document.getElementById('mnemonicModel'));
......@@ -77,6 +78,8 @@ var decryptWalletCtrl = function($scope, $sce, walletService) {
case nodes.nodeTypes.ETHO:
$scope.HDWallet.dPath = $scope.HDWallet.hwEther1Path;
break;
case nodes.nodeTypes.ATH:
$scope.HDWallet.dPath = $scope.HDWallet.hwAtheiosPath;
case nodes.nodeTypes.EGEM:
$scope.HDWallet.dPath = $scope.HDWallet.hwEtherGemPath;
break;
......@@ -133,6 +136,9 @@ var decryptWalletCtrl = function($scope, $sce, walletService) {
case nodes.nodeTypes.ESN:
$scope.HDWallet.dPath = $scope.HDWallet.hwESNetworkPath;
break;
case nodes.nodeTypes.ATH:
$scope.HDWallet.dPath = $scope.HDWallet.hwAtheiosPath;
break;
default:
$scope.HDWallet.dPath = $scope.HDWallet.trezorPath;
}
......@@ -186,6 +192,9 @@ var decryptWalletCtrl = function($scope, $sce, walletService) {
case nodes.nodeTypes.ETHO:
$scope.HDWallet.dPath = $scope.HDWallet.hwEther1Path;
break;
case nodes.nodeTypes.ATH:
$scope.HDWallet.dPath = $scope.HDWallet.hwAtheiosPath;
break;
default:
$scope.HDWallet.dPath = $scope.HDWallet.defaultDPath;
}
......
......@@ -35,7 +35,7 @@
<!-- Ledger -->
<label aria-flowto="aria3"
class="radio"
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=='POA'||ajaxReq.type=='TOMO'||ajaxReq.type=='ESN'||ajaxReq.type=='AKROMA'||ajaxReq.type=='PIRL'||ajaxReq.type=='ETHO'||ajaxReq.type=='EGEM'||ajaxReq.type=='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=='POA'||ajaxReq.type=='TOMO'||ajaxReq.type=='ESN'||ajaxReq.type=='AKROMA'||ajaxReq.type=='PIRL'||ajaxReq.type=='ETHO'||ajaxReq.type=='EGEM'||ajaxReq.type=='CLO'||ajaxReq.type=='ATH'">
<input aria-flowto="aria3"
type="radio"
aria-label="Ledger Hardware Wallet"
......@@ -769,7 +769,7 @@
</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=='GO'||ajaxReq.type=='EOSC'||ajaxReq.type=='POA'||ajaxReq.type=='AKROMA'||ajaxReq.type=='ESN'||ajaxReq.type=='PIRL'||ajaxReq.type=='ETHO'">
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=='GO'||ajaxReq.type=='EOSC'||ajaxReq.type=='POA'||ajaxReq.type=='AKROMA'||ajaxReq.type=='ESN'||ajaxReq.type=='PIRL'||ajaxReq.type=='ETHO'||ajaxReq.type=='ATH'">
We do not know the correct path for this network.
<a href="https://github.com/kvhnuke/etherwallet/issues"
target="_blank"
......@@ -1044,6 +1044,20 @@
</p>
</label>
</div>
<div class="col-sm-4">
<label class="radio small">
<input aria-describedby="Path: TREZOR (ATH) {{HDWallet.hwAtheiosPath}}"
ng-change="onHDDPathChange()"
ng-model="HDWallet.dPath"
type="radio"
value="{{HDWallet.hwAtheiosPath}}"/>
<span ng-bind="HDWallet.hwAtheiosPath"></span>
<p class="small">
Network: Atheios (ATH)
</p>
</label>
</div>
<div class="col-sm-4">
......
......@@ -24,6 +24,7 @@ nodes.nodeTypes = {
ESN: "ESN",
PIRL: "PIRL",
ETHO: "ETHO",
ATH: "ATH",
Custom: "CUSTOM ETH"
};
nodes.ensNodeTypes = [nodes.nodeTypes.ETH, nodes.nodeTypes.Ropsten];
......@@ -391,6 +392,19 @@ nodes.nodeList = {
estimateGas: true,
service: "ether1.org",
lib: new nodes.customNode("https://rpc.ether1.org", "")
},
ath: {
name: "ATH",
blockExplorerTX: "https://scan.atheios.com/tx/[[txHash]]",
blockExplorerAddr: "https://scan.atheios.com/addr/[[address]]",
type: nodes.nodeTypes.ATH,
eip155: true,
chainId: 1620,
tokenList: require("./tokens/athTokens.json"),
abiList: require("./abiDefinitions/athAbi.json"),
estimateGas: true,
service: "wallet.atheios.com",
lib: new nodes.customNode("https://wallet.atheios.com", "8797")
}
};
......
......@@ -608,6 +608,7 @@ label small {
@brand-esn: #a16bff;
@brand-pirl: #a2d729;
@brand-etho: #d63068;
@brand-ath: #0099ff;
@brand-cust: #b50085;
.dropdown-node .dropdown-menu {
......@@ -683,6 +684,9 @@ label small {
li:nth-child(28) {
border-left: 2px solid @brand-etho;
}
li:nth-child(29) {
border-left: 2px solid @brand-ath;
}
li:last-child {
border-left: 2px solid @gray-light;
......@@ -703,7 +707,8 @@ label small {
li:nth-child(24),
li:nth-child(25),
li:nth-child(26),
li:nth-child(27) {
li:nth-child(27),
li:nth-child(28) {
border-bottom: 1px solid @gray-lighter;
}
}
......@@ -927,6 +932,17 @@ header.ETHO {
}
}
header.ATH {
.header-branding { border-bottom: 0.25rem solid @brand-ath; }
& + .container + .pre-footer + .footer { border-top: 0.25rem solid @brand-ath; }
& + .container .modal-content { border: 0.25rem solid @brand-ath; }
& + .container .alert-info { background-color:@brand-ath; }
.dropdown-gas:before {
width: 36px;
background-image: url("../images/coins/atheios.svg");
}
}
.contest-container {
align-content: center;
display: flex;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment