Merge branch 'develop' into reorder-wallet-unlock

This commit is contained in:
Connor Bryan 2018-08-15 15:09:51 -05:00 committed by GitHub
commit c02570d6a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 1 deletions

View File

@ -467,6 +467,32 @@ export const STATIC_NETWORKS_INITIAL_STATE: StaticNetworksState = {
}
},
GO_TESTNET: {
id: 'GO_TESTNET',
name: 'GO',
unit: 'GO',
chainId: 31337,
isCustom: false,
color: '#00b04a',
blockExplorer: makeExplorer({
name: 'GoChain Testnet Explorer',
origin: 'https://testnet-explorer.gochain.io'
}),
tokens: [],
contracts: [],
isTestnet: true,
dPathFormats: {
[SecureWalletName.TREZOR]: GO_DEFAULT,
[SecureWalletName.SAFE_T]: GO_DEFAULT,
[InsecureWalletName.MNEMONIC_PHRASE]: GO_DEFAULT
},
gasPriceSettings: {
min: 2,
max: 60,
initial: 2
}
},
EOSC: {
id: 'EOSC',
name: 'EOS Classic',
@ -491,6 +517,7 @@ export const STATIC_NETWORKS_INITIAL_STATE: StaticNetworksState = {
initial: 20
}
},
ESN: {
id: 'ESN',
name: 'EthersocialNetwork',

View File

@ -195,6 +195,15 @@ export const NODE_CONFIGS: { [key in StaticNetworkIds]: RawNodeConfig[] } = {
}
],
GO_TESTNET: [
{
name: makeNodeName('GO_TESTNET', 'go_testnet'),
type: 'rpc',
service: 'testnet-rpc.gochain.io',
url: 'https://testnet-rpc.gochain.io/'
}
],
EOSC: [
{
name: makeNodeName('EOSC', 'eosc'),

View File

@ -35,7 +35,6 @@
var passphrase = "";
function unlockWithPassphrase() {
if (!passphrase.length) return;
ipcRenderer.send('$EVENT', passphrase);
}

View File

@ -18,6 +18,7 @@ type StaticNetworkIds =
| 'RSK'
| 'RSK_TESTNET'
| 'GO'
| 'GO_TESTNET'
| 'EOSC'
| 'ESN';