grassrootseconomics/openethereum
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ropsten chain for beta (#3622)

Browse Source 
Former-commit-id: bae5efe71be575f149691e21111260ef6a2694df
This commit is contained in:
Jaco Greeff 2016-11-25 19:35:49 +01:00 committed by Arkadiy Paronyan
parent bfe513c954
commit ac331613ab
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/dapps/basiccoin/services.js
View File

@ -105,7 +105,7 @@ export function attachInstances () {
]) ])
.then(([registryAddress, netChain]) => { .then(([registryAddress, netChain]) => {
const registry = api.newContract(abis.registry, registryAddress).instance; const registry = api.newContract(abis.registry, registryAddress).instance;
isTest = netChain === 'morden' || netChain === 'testnet'; isTest = netChain === 'ropsten' || netChain === 'morden' || netChain === 'testnet';
console.log(`contract was found at registry=${registryAddress}`); console.log(`contract was found at registry=${registryAddress}`);
console.log(`running on ${netChain}, isTest=${isTest}`); console.log(`running on ${netChain}, isTest=${isTest}`);

2
js/src/redux/providers/status.js
View File

@ -109,7 +109,7 @@ export default class Status {
this._api.eth.syncing() this._api.eth.syncing()
]) ])
.then(([clientVersion, coinbase, defaultExtraData, extraData, gasFloorTarget, hashrate, minGasPrice, netChain, netPeers, netPort, nodeName, rpcSettings, syncing, traceMode]) => { .then(([clientVersion, coinbase, defaultExtraData, extraData, gasFloorTarget, hashrate, minGasPrice, netChain, netPeers, netPort, nodeName, rpcSettings, syncing, traceMode]) => {
const isTest = netChain === 'morden' || netChain === 'testnet'; const isTest = netChain === 'ropsten' || netChain === 'morden' || netChain === 'testnet';
this._store.dispatch(statusCollection({ this._store.dispatch(statusCollection({
clientVersion, clientVersion,

2
js/src/redux/providers/statusReducer.js
View File

@ -30,7 +30,7 @@ const initialState = {
gasFloorTarget: new BigNumber(0), gasFloorTarget: new BigNumber(0),
hashrate: new BigNumber(0), hashrate: new BigNumber(0),
minGasPrice: new BigNumber(0), minGasPrice: new BigNumber(0),
netChain: 'morden', netChain: 'ropsten',
netPeers: { netPeers: {
active: new BigNumber(0), active: new BigNumber(0),
connected: new BigNumber(0), connected: new BigNumber(0),

2
js/src/views/Signer/components/Account/AccountLink/AccountLink.js
View File

@ -57,7 +57,7 @@ export default class AccountLink extends Component {
} }
updateLink (address, chain) { updateLink (address, chain) {
const link = addressLink(address, chain === 'morden' || chain === 'testnet'); const link = addressLink(address, chain === 'ropsten' || chain === 'morden' || chain === 'testnet');
this.setState({ this.setState({
link link

2
js/src/views/Signer/components/TxHashLink/TxHashLink.js
View File

@ -32,7 +32,7 @@ export default class TxHashLink extends Component {
return ( return (
<a <a
href={ txLink(txHash, chain === 'morden' || chain === 'testnet') } href={ txLink(txHash, chain === 'ropsten' || chain === 'morden' || chain === 'testnet') }
target='_blank' target='_blank'
className={ className }> className={ className }>
{ children || txHash } { children || txHash }