Skip to content

Commit

Permalink
Merge pull request #2209 from mkrufky/mix
Browse files Browse the repository at this point in the history
Add MIX Blockchain
  • Loading branch information
ConnorBryan authored Oct 24, 2018
2 parents cbfad18 + 5b2441a commit 1ca8873
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 4 deletions.
8 changes: 7 additions & 1 deletion common/config/dpaths.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,11 @@ export const ETHO_DEFAULT: DPath = {
value: "m/44'/1313114'/0'/0"
};

export const MIX_DEFAULT: DPath = {
label: 'Default (MIX)',
value: "m/44'/76'/0'/0"
};

export const DPaths: DPath[] = [
ETH_DEFAULT,
ETH_TREZOR,
Expand Down Expand Up @@ -165,7 +170,8 @@ export const DPaths: DPath[] = [
AKA_DEFAULT,
PIRL_DEFAULT,
ATH_DEFAULT,
ETHO_DEFAULT
ETHO_DEFAULT,
MIX_DEFAULT
];

// PATHS TO BE INCLUDED REGARDLESS OF WALLET FORMAT
Expand Down
2 changes: 1 addition & 1 deletion common/features/config/__snapshots__/sagas.spec.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Object {
"@@redux-saga/IO": true,
"SELECT": Object {
"args": Array [
"ETHO",
"MIX",
],
"selector": [Function],
},
Expand Down
26 changes: 25 additions & 1 deletion common/features/config/networks/static/reducer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ import {
AKA_DEFAULT,
PIRL_DEFAULT,
ATH_DEFAULT,
ETHO_DEFAULT
ETHO_DEFAULT,
MIX_DEFAULT
} from 'config/dpaths';
import { makeExplorer } from 'utils/helpers';
import { TAB } from 'components/Header/components/constants';
Expand Down Expand Up @@ -674,6 +675,29 @@ export const STATIC_NETWORKS_INITIAL_STATE: types.ConfigStaticNetworksState = {
max: 60,
initial: 20
}
},
MIX: {
id: 'MIX',
name: 'Mix',
unit: 'MIX',
chainId: 76,
isCustom: false,
color: '#e59b2b',
blockExplorer: makeExplorer({
name: 'MIX Blockchain Explorer',
origin: 'https://blocks.mix-blockchain.org'
}),
tokens: [],
contracts: [],
dPathFormats: {
[SecureWalletName.LEDGER_NANO_S]: MIX_DEFAULT,
[InsecureWalletName.MNEMONIC_PHRASE]: MIX_DEFAULT
},
gasPriceSettings: {
min: 1,
max: 60,
initial: 20
}
}
};

Expand Down
9 changes: 9 additions & 0 deletions common/libs/nodes/configs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,15 @@ export const NODE_CONFIGS: { [key in StaticNetworkIds]: RawNodeConfig[] } = {
service: 'ether1.org',
url: 'https://rpc.ether1.org'
}
],

MIX: [
{
name: makeNodeName('MIX', 'mix-blockchain.org'),
type: 'rpc',
service: 'rpc2.mix-blockchain.org',
url: 'https://rpc2.mix-blockchain.org:8647'
}
]
};

Expand Down
3 changes: 2 additions & 1 deletion shared/types/network.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ type StaticNetworkIds =
| 'AKA'
| 'PIRL'
| 'ATH'
| 'ETHO';
| 'ETHO'
| 'MIX';

export interface BlockExplorerConfig {
name: string;
Expand Down

0 comments on commit 1ca8873

Please sign in to comment.