From 350ef6359ee35fd1d53b1d63c73175084e632b66 Mon Sep 17 00:00:00 2001 From: Akira Takizawa Date: Tue, 15 May 2018 01:05:50 +0900 Subject: [PATCH 1/6] Remove Callisto Testnet --- app/scripts/nodes.js | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/app/scripts/nodes.js b/app/scripts/nodes.js index fda5c825f7..24dce643de 100644 --- a/app/scripts/nodes.js +++ b/app/scripts/nodes.js @@ -19,7 +19,6 @@ nodes.nodeTypes = { ETSC: "ETSC", EGEM: "EGEM", CLO: "CLO", - CLOT: "Testnet CLO", EAST: "EAST", X888: "X88", Custom: "CUSTOM ETH" @@ -275,7 +274,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]]', @@ -287,18 +286,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]]', From bc6130a7726903197bccce95cd2c00deaf3a7cc4 Mon Sep 17 00:00:00 2001 From: Akira Takizawa Date: Tue, 15 May 2018 01:06:11 +0900 Subject: [PATCH 2/6] Add Chainkorea ETC node --- app/scripts/nodes.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/scripts/nodes.js b/app/scripts/nodes.js index 24dce643de..670e51aa5b 100644 --- a/app/scripts/nodes.js +++ b/app/scripts/nodes.js @@ -99,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]]', From a0f6fadd003b2d800074340e80e323f5c22adeba Mon Sep 17 00:00:00 2001 From: Akira Takizawa Date: Tue, 15 May 2018 01:06:38 +0900 Subject: [PATCH 3/6] Update network selection tab css --- app/styles/etherwallet-custom.less | 61 ++++++++++++++++++++++++------ 1 file changed, 49 insertions(+), 12 deletions(-) diff --git a/app/styles/etherwallet-custom.less b/app/styles/etherwallet-custom.less index b200dd4007..4a3895424f 100644 --- a/app/styles/etherwallet-custom.less +++ b/app/styles/etherwallet-custom.less @@ -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 { @@ -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; } } @@ -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; From f1eda56360e9b128f61547e99f9f901ecab4cf44 Mon Sep 17 00:00:00 2001 From: Akira Takizawa Date: Tue, 15 May 2018 01:06:59 +0900 Subject: [PATCH 4/6] [ETSC] Rename gazua.tv to ethereumsocial.kr --- app/scripts/nodes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/nodes.js b/app/scripts/nodes.js index 670e51aa5b..dcbceac9eb 100644 --- a/app/scripts/nodes.js +++ b/app/scripts/nodes.js @@ -270,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': { From a67d38d5bb1d435a78aa923e12bb6c0a6b467d94 Mon Sep 17 00:00:00 2001 From: Jochen Hoenicke Date: Tue, 8 May 2018 23:51:31 +0200 Subject: [PATCH 5/6] [CLO] TREZOR support for Callisto Network --- app/scripts/controllers/decryptWalletCtrl.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/scripts/controllers/decryptWalletCtrl.js b/app/scripts/controllers/decryptWalletCtrl.js index 4eaf672bba..4d935a64f7 100644 --- a/app/scripts/controllers/decryptWalletCtrl.js +++ b/app/scripts/controllers/decryptWalletCtrl.js @@ -93,9 +93,6 @@ 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; - break; default: $scope.HDWallet.dPath = $scope.HDWallet.trezorPath; } @@ -125,9 +122,6 @@ 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; - break; default: $scope.HDWallet.dPath = $scope.HDWallet.defaultDPath; } From 9e69efe0f5f32b11d545f0ef1b5f50b384eecafd Mon Sep 17 00:00:00 2001 From: Akira Takizawa Date: Tue, 15 May 2018 01:15:17 +0900 Subject: [PATCH 6/6] [ETSC] TREZOR support for Ethereum Social --- app/scripts/controllers/decryptWalletCtrl.js | 7 +++++++ app/scripts/directives/walletDecryptDrtv.html | 18 ++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/app/scripts/controllers/decryptWalletCtrl.js b/app/scripts/controllers/decryptWalletCtrl.js index 4d935a64f7..2d059f2a6a 100644 --- a/app/scripts/controllers/decryptWalletCtrl.js +++ b/app/scripts/controllers/decryptWalletCtrl.js @@ -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 }; @@ -93,6 +94,9 @@ var decryptWalletCtrl = function($scope, $sce, walletService) { case nodes.nodeTypes.CLO: $scope.HDWallet.dPath = $scope.HDWallet.hwCallistoPath; break; + case nodes.nodeTypes.ETSC: + $scope.HDWallet.dPath = $scope.HDWallet.hwSocialPath; + break; default: $scope.HDWallet.dPath = $scope.HDWallet.trezorPath; } @@ -122,6 +126,9 @@ var decryptWalletCtrl = function($scope, $sce, walletService) { case nodes.nodeTypes.CLO: $scope.HDWallet.dPath = $scope.HDWallet.hwCallistoPath; break; + case nodes.nodeTypes.ETSC: + $scope.HDWallet.dPath = $scope.HDWallet.hwSocialPath; + break; default: $scope.HDWallet.dPath = $scope.HDWallet.defaultDPath; } diff --git a/app/scripts/directives/walletDecryptDrtv.html b/app/scripts/directives/walletDecryptDrtv.html index b5d2ab87f9..541b59a588 100644 --- a/app/scripts/directives/walletDecryptDrtv.html +++ b/app/scripts/directives/walletDecryptDrtv.html @@ -47,7 +47,7 @@