Browse Source

AGP-275, chips

v0.25
pbca26 7 years ago
parent
commit
82d342c103
  1. 11
      react/src/actions/actions/addCoin.js
  2. 33
      react/src/actions/actions/nativeDashboardUpdate.js
  3. 155
      react/src/actions/actions/nativeSyncInfo.js
  4. BIN
      react/src/assets/images/cryptologo/888.png
  5. 0
      react/src/assets/images/cryptologo/anc.png
  6. BIN
      react/src/assets/images/cryptologo/arc.png
  7. BIN
      react/src/assets/images/cryptologo/arg.png
  8. BIN
      react/src/assets/images/cryptologo/bdl.png
  9. BIN
      react/src/assets/images/cryptologo/bta.png
  10. 0
      react/src/assets/images/cryptologo/btc.png
  11. 0
      react/src/assets/images/cryptologo/btcd.png
  12. 0
      react/src/assets/images/cryptologo/btm.png
  13. BIN
      react/src/assets/images/cryptologo/btx.png
  14. 0
      react/src/assets/images/cryptologo/carb.png
  15. BIN
      react/src/assets/images/cryptologo/chips.png
  16. BIN
      react/src/assets/images/cryptologo/crea.png
  17. BIN
      react/src/assets/images/cryptologo/crw.png
  18. BIN
      react/src/assets/images/cryptologo/dash.png
  19. 0
      react/src/assets/images/cryptologo/dgb.png
  20. 0
      react/src/assets/images/cryptologo/doge.png
  21. BIN
      react/src/assets/images/cryptologo/emc2.png
  22. BIN
      react/src/assets/images/cryptologo/erc.png
  23. BIN
      react/src/assets/images/cryptologo/fair.png
  24. BIN
      react/src/assets/images/cryptologo/flo.png
  25. 0
      react/src/assets/images/cryptologo/frk.png
  26. BIN
      react/src/assets/images/cryptologo/glt.png
  27. BIN
      react/src/assets/images/cryptologo/huc.png
  28. BIN
      react/src/assets/images/cryptologo/hush.png
  29. BIN
      react/src/assets/images/cryptologo/i0c.png
  30. BIN
      react/src/assets/images/cryptologo/lbc.png
  31. BIN
      react/src/assets/images/cryptologo/ltc.png
  32. BIN
      react/src/assets/images/cryptologo/mac.png
  33. BIN
      react/src/assets/images/cryptologo/mona.png
  34. BIN
      react/src/assets/images/cryptologo/moon.png
  35. BIN
      react/src/assets/images/cryptologo/mue.png
  36. 0
      react/src/assets/images/cryptologo/mzc.png
  37. BIN
      react/src/assets/images/cryptologo/nav.png
  38. 0
      react/src/assets/images/cryptologo/nmc.png
  39. BIN
      react/src/assets/images/cryptologo/pivx.png
  40. BIN
      react/src/assets/images/cryptologo/sib.png
  41. BIN
      react/src/assets/images/cryptologo/smc.png
  42. BIN
      react/src/assets/images/cryptologo/strat.png
  43. BIN
      react/src/assets/images/cryptologo/sxc.png
  44. 0
      react/src/assets/images/cryptologo/sys.png
  45. BIN
      react/src/assets/images/cryptologo/trc.png
  46. BIN
      react/src/assets/images/cryptologo/uis.png
  47. 0
      react/src/assets/images/cryptologo/uno.png
  48. BIN
      react/src/assets/images/cryptologo/via.png
  49. 0
      react/src/assets/images/cryptologo/vpn.png
  50. BIN
      react/src/assets/images/cryptologo/vtc.png
  51. BIN
      react/src/assets/images/cryptologo/xmy.png
  52. BIN
      react/src/assets/images/cryptologo/xre.png
  53. BIN
      react/src/assets/images/cryptologo/zcl.png
  54. 0
      react/src/assets/images/cryptologo/zec.png
  55. BIN
      react/src/assets/images/cryptologo/zer.png
  56. 0
      react/src/assets/images/cryptologo/zet.png
  57. 1
      react/src/components/addcoin/addcoinOptionsCrypto.js
  58. 3
      react/src/components/addcoin/payload.js
  59. 14
      react/src/components/dashboard/navbar/navbar.render.js
  60. 1
      react/src/components/dashboard/receiveCoin/receiveCoin.js
  61. 2
      react/src/components/dashboard/receiveCoin/receiveCoin.render.js
  62. 2
      react/src/components/dashboard/sendCoin/sendCoin.render.js
  63. 10
      react/src/components/dashboard/walletsBalance/walletsBalance.render.js
  64. 22
      react/src/components/dashboard/walletsProgress/walletsProgress.render.js
  65. 2
      react/src/reducers/activeCoin.js
  66. 1
      react/src/translate/en.js
  67. 4
      react/src/util/coinHelper.js

11
react/src/actions/actions/addCoin.js

@ -103,13 +103,22 @@ export function shepherdHerd(coin, mode, path, startupParams) {
}
return dispatch => {
let _herd;
if (coin === 'CHIPS') {
_herd = 'chipsd';
herdData = {};
} else {
_herd = coin !== 'ZEC' ? 'komodod' : 'zcashd';
}
return fetch(`http://127.0.0.1:${Config.agamaPort}/shepherd/herd`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({
'herd': coin !== 'ZEC' ? 'komodod' : 'zcashd',
'herd': _herd,
'options': herdData,
}),
})

33
react/src/actions/actions/nativeDashboardUpdate.js

@ -70,15 +70,28 @@ export function getDashboardUpdateState(json, coin, fakeResponse) {
_listtransactions = 'no data';
}
return {
type: DASHBOARD_UPDATE,
progress: json.result['getinfo'].result,
opids: json.result['z_getoperationstatus'].result,
txhistory: _listtransactions,
balance: json.result['z_gettotalbalance'].result,
addresses: json.result['addresses'],
coin: coin,
rescanInProgress: false,
};
if (coin === 'CHIPS') {
return {
type: DASHBOARD_UPDATE,
progress: json.result['getinfo'].result,
opids: null,
txhistory: _listtransactions,
balance: { transparent: json.result['getbalance'].result, total: json.result['getbalance'].result },
addresses: json.result['addresses'],
coin: coin,
rescanInProgress: false,
};
} else {
return {
type: DASHBOARD_UPDATE,
progress: json.result['getinfo'].result,
opids: json.result['z_getoperationstatus'].result,
txhistory: _listtransactions,
balance: json.result['z_gettotalbalance'].result,
addresses: json.result['addresses'],
coin: coin,
rescanInProgress: false,
};
}
}
}

155
react/src/actions/actions/nativeSyncInfo.js

@ -184,12 +184,161 @@ export function getSyncInfoNative(coin, skipDebug, skipRemote, suppressErrors) {
}
}
if (coin === 'CHIPS') {
dispatch(
getBlockTemplate(
json,
coin
)
);
} else {
dispatch(
getSyncInfoNativeState(
json,
coin,
skipDebug,
skipRemote
)
);
}
}
})
}
}
export function getBlockTemplate(_json, coin) {
const payload = {
mode: null,
chain: coin,
cmd: 'getblocktemplate',
};
return dispatch => {
const _fetchConfig = {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({ 'payload': payload }),
};
return fetch(
`http://127.0.0.1:${Config.agamaPort}/shepherd/cli`,
_fetchConfig
)
.catch(function(error) {
console.log(error);
dispatch(
triggerToaster(
'getBlockTemplate',
'Error',
'error'
)
);
})
.then(function(response) {
const _response = response.text().then(function(text) { return text; });
return _response;
})
.then(json => {
if (!json) {
} else {
json = JSON.parse(json);
}
if (_json.result &&
json.result) {
_json.result.longestchain = json.result.height - 1;
}
if (json.result) {
dispatch(
getSyncInfoNativeState(
json,
_json,
coin,
skipDebug,
skipRemote
true
)
);
} else {
if (json.error && json.error.code === -10) {
console.log('debuglog');
dispatch(
getDebugLogProgress(_json, coin)
);
}
}
})
}
}
export function getDebugLogProgress(_json, coin) {
const payload = {
mode: null,
chain: coin,
cmd: 'debug',
};
return dispatch => {
const _fetchConfig = {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({ 'payload': payload }),
};
return fetch(
`http://127.0.0.1:${Config.agamaPort}/shepherd/cli`,
_fetchConfig
)
.catch(function(error) {
console.log(error);
dispatch(
triggerToaster(
'getDebugLogProgress',
'Error',
'error'
)
);
})
.then(function(response) {
const _response = response.text().then(function(text) { return text; });
return _response;
})
.then(json => {
if (!json) {
} else {
json = JSON.parse(json);
}
if (json.result && json.result.blocks && json.result.headers) {
_json.result.longestchain = json.result.headers;
_json.result.progress = json.result.blocks * 100 / json.result.headers;
} else if (json.result &&
json.result.indexOf('UpdateTip:') > -1) {
const _debugProgress = json.result.split(' ');
let _height = '';
let _progress = '';
for (let i = 0; i < _debugProgress.length; i++) {
if (_debugProgress[i].indexOf('height=') > -1) {
_height = Number(_debugProgress[i].replace('height=', ''));
}
if (_debugProgress[i].indexOf('progress=') > -1) {
_progress = Number(_debugProgress[i].replace('progress=', ''));
}
_json.result.progress = _progress * 100;
}
}
if (_json.result &&
_json.result.progress) {
dispatch(
getSyncInfoNativeState(
_json,
coin,
true
)
);
}

BIN
react/src/assets/images/cryptologo/888.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

0
react/src/assets/images/cryptologo/anoncoin.png → react/src/assets/images/cryptologo/anc.png

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

BIN
react/src/assets/images/cryptologo/arc.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
react/src/assets/images/cryptologo/arg.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.9 KiB

BIN
react/src/assets/images/cryptologo/bdl.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
react/src/assets/images/cryptologo/bta.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

0
react/src/assets/images/cryptologo/bitcoin.png → react/src/assets/images/cryptologo/btc.png

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

0
react/src/assets/images/cryptologo/bitcoindark.png → react/src/assets/images/cryptologo/btcd.png

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

0
react/src/assets/images/cryptologo/bitmark.png → react/src/assets/images/cryptologo/btm.png

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
react/src/assets/images/cryptologo/btx.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

0
react/src/assets/images/cryptologo/carboncoin.png → react/src/assets/images/cryptologo/carb.png

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
react/src/assets/images/cryptologo/chips.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

BIN
react/src/assets/images/cryptologo/crea.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 45 KiB

BIN
react/src/assets/images/cryptologo/crw.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
react/src/assets/images/cryptologo/dash.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

0
react/src/assets/images/cryptologo/digibyte.png → react/src/assets/images/cryptologo/dgb.png

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

0
react/src/assets/images/cryptologo/dogecoin.png → react/src/assets/images/cryptologo/doge.png

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
react/src/assets/images/cryptologo/emc2.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

BIN
react/src/assets/images/cryptologo/erc.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

BIN
react/src/assets/images/cryptologo/fair.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
react/src/assets/images/cryptologo/flo.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

0
react/src/assets/images/cryptologo/franko.png → react/src/assets/images/cryptologo/frk.png

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
react/src/assets/images/cryptologo/glt.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

BIN
react/src/assets/images/cryptologo/huc.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

BIN
react/src/assets/images/cryptologo/hush.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
react/src/assets/images/cryptologo/i0c.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

BIN
react/src/assets/images/cryptologo/lbc.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

BIN
react/src/assets/images/cryptologo/ltc.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

BIN
react/src/assets/images/cryptologo/mac.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

BIN
react/src/assets/images/cryptologo/mona.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
react/src/assets/images/cryptologo/moon.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
react/src/assets/images/cryptologo/mue.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

0
react/src/assets/images/cryptologo/mazacoin.png → react/src/assets/images/cryptologo/mzc.png

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

BIN
react/src/assets/images/cryptologo/nav.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

0
react/src/assets/images/cryptologo/namecoin.png → react/src/assets/images/cryptologo/nmc.png

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

BIN
react/src/assets/images/cryptologo/pivx.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.3 KiB

BIN
react/src/assets/images/cryptologo/sib.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
react/src/assets/images/cryptologo/smc.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
react/src/assets/images/cryptologo/strat.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.9 KiB

BIN
react/src/assets/images/cryptologo/sxc.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

0
react/src/assets/images/cryptologo/syscoin.png → react/src/assets/images/cryptologo/sys.png

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

BIN
react/src/assets/images/cryptologo/trc.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

BIN
react/src/assets/images/cryptologo/uis.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

0
react/src/assets/images/cryptologo/unobtanium.png → react/src/assets/images/cryptologo/uno.png

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

BIN
react/src/assets/images/cryptologo/via.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

0
react/src/assets/images/cryptologo/vpncoin.png → react/src/assets/images/cryptologo/vpn.png

Before

Width:  |  Height:  |  Size: 9.7 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

BIN
react/src/assets/images/cryptologo/vtc.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

BIN
react/src/assets/images/cryptologo/xmy.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

BIN
react/src/assets/images/cryptologo/xre.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
react/src/assets/images/cryptologo/zcl.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

0
react/src/assets/images/cryptologo/zcash.png → react/src/assets/images/cryptologo/zec.png

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
react/src/assets/images/cryptologo/zer.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

0
react/src/assets/images/cryptologo/zetacoin.png → react/src/assets/images/cryptologo/zet.png

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

1
react/src/components/addcoin/addcoinOptionsCrypto.js

@ -11,6 +11,7 @@ class AddCoinOptionsCrypto extends React.Component {
return (
<optgroup label={ translate('ADD_COIN.CRYPTO_CURRENCIES') }>
<option value="KMD|native">Komodo (KMD)</option>
<option value="CHIPS|native">Chips (CHIPS)</option>
</optgroup>
);
}

3
react/src/components/addcoin/payload.js

@ -512,6 +512,9 @@ export function startCrypto(confpath, coin, mode) {
if (coin === 'KMD') {
AddCoinData.KMD = {'coin':'KMD','conf':'komodo.conf','path':confpath,'unitval':'20','zcash':1,'RELAY':-1,'VALIDATE':0,'prefetchlag':-1,'poll':10,'active':1,'agent':'iguana','method':'addcoin','startpend':8,'endpend':8,'services':0,'maxpeers':32,'newcoin':'KMD','name':'Komodo','hasheaders':1,'useaddmultisig':0,'netmagic':'f9eee48d','p2p':7770,'rpc':7771,'pubval':60,'p2shval':85,'wifval':188,'txfee_satoshis':'10000','isPoS':0,'minoutput':10000,'minconfirms':2,'genesishash':'027e3758c3a65b12aa1046462b486d0a63bfa1beae327897f56c5cfb7daaae71','protover':170002,'genesisblock':'0100000000000000000000000000000000000000000000000000000000000000000000003ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4a000000000000000000000000000000000000000000000000000000000000000029ab5f490f0f0f200b00000000000000000000000000000000000000000000000000000000000000fd4005000d5ba7cda5d473947263bf194285317179d2b0d307119c2e7cc4bd8ac456f0774bd52b0cd9249be9d40718b6397a4c7bbd8f2b3272fed2823cd2af4bd1632200ba4bf796727d6347b225f670f292343274cc35099466f5fb5f0cd1c105121b28213d15db2ed7bdba490b4cedc69742a57b7c25af24485e523aadbb77a0144fc76f79ef73bd8530d42b9f3b9bed1c135ad1fe152923fafe98f95f76f1615e64c4abb1137f4c31b218ba2782bc15534788dda2cc08a0ee2987c8b27ff41bd4e31cd5fb5643dfe862c9a02ca9f90c8c51a6671d681d04ad47e4b53b1518d4befafefe8cadfb912f3d03051b1efbf1dfe37b56e93a741d8dfd80d576ca250bee55fab1311fc7b3255977558cdda6f7d6f875306e43a14413facdaed2f46093e0ef1e8f8a963e1632dcbeebd8e49fd16b57d49b08f9762de89157c65233f60c8e38a1f503a48c555f8ec45dedecd574a37601323c27be597b956343107f8bd80f3a925afaf30811df83c402116bb9c1e5231c70fff899a7c82f73c902ba54da53cc459b7bf1113db65cc8f6914d3618560ea69abd13658fa7b6af92d374d6eca9529f8bd565166e4fcbf2a8dfb3c9b69539d4d2ee2e9321b85b331925df195915f2757637c2805e1d4131e1ad9ef9bc1bb1c732d8dba4738716d351ab30c996c8657bab39567ee3b29c6d054b711495c0d52e1cd5d8e55b4f0f0325b97369280755b46a02afd54be4ddd9f77c22272b8bbb17ff5118fedbae2564524e797bd28b5f74f7079d532ccc059807989f94d267f47e724b3f1ecfe00ec9e6541c961080d8891251b84b4480bc292f6a180bea089fef5bbda56e1e41390d7c0e85ba0ef530f7177413481a226465a36ef6afe1e2bca69d2078712b3912bba1a99b1fbff0d355d6ffe726d2bb6fbc103c4ac5756e5bee6e47e17424ebcbf1b63d8cb90ce2e40198b4f4198689daea254307e52a25562f4c1455340f0ffeb10f9d8e914775e37d0edca019fb1b9c6ef81255ed86bc51c5391e0591480f66e2d88c5f4fd7277697968656a9b113ab97f874fdd5f2465e5559533e01ba13ef4a8f7a21d02c30c8ded68e8c54603ab9c8084ef6d9eb4e92c75b078539e2ae786ebab6dab73a09e0aa9ac575bcefb29e930ae656e58bcb513f7e3c17e079dce4f05b5dbc18c2a872b22509740ebe6a3903e00ad1abc55076441862643f93606e3dc35e8d9f2caef3ee6be14d513b2e062b21d0061de3bd56881713a1a5c17f5ace05e1ec09da53f99442df175a49bd154aa96e4949decd52fed79ccf7ccbce32941419c314e374e4a396ac553e17b5340336a1a25c22f9e42a243ba5404450b650acfc826a6e432971ace776e15719515e1634ceb9a4a35061b668c74998d3dfb5827f6238ec015377e6f9c94f38108768cf6e5c8b132e0303fb5a200368f845ad9d46343035a6ff94031df8d8309415bb3f6cd5ede9c135fdabcc030599858d803c0f85be7661c88984d88faa3d26fb0e9aac0056a53f1b5d0baed713c853c4a2726869a0a124a8a5bbc0fc0ef80c8ae4cb53636aa02503b86a1eb9836fcc259823e2692d921d88e1ffc1e6cb2bde43939ceb3f32a611686f539f8f7c9f0bf00381f743607d40960f06d347d1cd8ac8a51969c25e37150efdf7aa4c2037a2fd0516fb444525ab157a0ed0a7412b2fa69b217fe397263153782c0f64351fbdf2678fa0dc8569912dcd8e3ccad38f34f23bbbce14c6a26ac24911b308b82c7e43062d180baeac4ba7153858365c72c63dcf5f6a5b08070b730adb017aeae925b7d0439979e2679f45ed2f25a7edcfd2fb77a8794630285ccb0a071f5cce410b46dbf9750b0354aae8b65574501cc69efb5b6a43444074fee116641bb29da56c2b4a7f456991fc92b2','debug':0}
}
if (coin === 'CHIPS') {
AddCoinData.KMD = {'coin':'CHIPS','conf':'chips.conf','path':confpath,'unitval':'20','zcash':1,'RELAY':-1,'VALIDATE':0,'prefetchlag':-1,'poll':10,'active':1,'agent':'iguana','method':'addcoin','startpend':8,'endpend':8,'services':0,'maxpeers':32,'newcoin':'CHIPS','name':'Chips','hasheaders':1,'useaddmultisig':0,'netmagic':'f9eee48d','p2p':57775,'rpc':57776,'pubval':60,'p2shval':85,'wifval':188,'txfee_satoshis':'10000','isPoS':0,'minoutput':10000,'minconfirms':2,'genesishash':'027e3758c3a65b12aa1046462b486d0a63bfa1beae327897f56c5cfb7daaae71','protover':170002,'genesisblock':'0100000000000000000000000000000000000000000000000000000000000000000000003ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4a000000000000000000000000000000000000000000000000000000000000000029ab5f490f0f0f200b00000000000000000000000000000000000000000000000000000000000000fd4005000d5ba7cda5d473947263bf194285317179d2b0d307119c2e7cc4bd8ac456f0774bd52b0cd9249be9d40718b6397a4c7bbd8f2b3272fed2823cd2af4bd1632200ba4bf796727d6347b225f670f292343274cc35099466f5fb5f0cd1c105121b28213d15db2ed7bdba490b4cedc69742a57b7c25af24485e523aadbb77a0144fc76f79ef73bd8530d42b9f3b9bed1c135ad1fe152923fafe98f95f76f1615e64c4abb1137f4c31b218ba2782bc15534788dda2cc08a0ee2987c8b27ff41bd4e31cd5fb5643dfe862c9a02ca9f90c8c51a6671d681d04ad47e4b53b1518d4befafefe8cadfb912f3d03051b1efbf1dfe37b56e93a741d8dfd80d576ca250bee55fab1311fc7b3255977558cdda6f7d6f875306e43a14413facdaed2f46093e0ef1e8f8a963e1632dcbeebd8e49fd16b57d49b08f9762de89157c65233f60c8e38a1f503a48c555f8ec45dedecd574a37601323c27be597b956343107f8bd80f3a925afaf30811df83c402116bb9c1e5231c70fff899a7c82f73c902ba54da53cc459b7bf1113db65cc8f6914d3618560ea69abd13658fa7b6af92d374d6eca9529f8bd565166e4fcbf2a8dfb3c9b69539d4d2ee2e9321b85b331925df195915f2757637c2805e1d4131e1ad9ef9bc1bb1c732d8dba4738716d351ab30c996c8657bab39567ee3b29c6d054b711495c0d52e1cd5d8e55b4f0f0325b97369280755b46a02afd54be4ddd9f77c22272b8bbb17ff5118fedbae2564524e797bd28b5f74f7079d532ccc059807989f94d267f47e724b3f1ecfe00ec9e6541c961080d8891251b84b4480bc292f6a180bea089fef5bbda56e1e41390d7c0e85ba0ef530f7177413481a226465a36ef6afe1e2bca69d2078712b3912bba1a99b1fbff0d355d6ffe726d2bb6fbc103c4ac5756e5bee6e47e17424ebcbf1b63d8cb90ce2e40198b4f4198689daea254307e52a25562f4c1455340f0ffeb10f9d8e914775e37d0edca019fb1b9c6ef81255ed86bc51c5391e0591480f66e2d88c5f4fd7277697968656a9b113ab97f874fdd5f2465e5559533e01ba13ef4a8f7a21d02c30c8ded68e8c54603ab9c8084ef6d9eb4e92c75b078539e2ae786ebab6dab73a09e0aa9ac575bcefb29e930ae656e58bcb513f7e3c17e079dce4f05b5dbc18c2a872b22509740ebe6a3903e00ad1abc55076441862643f93606e3dc35e8d9f2caef3ee6be14d513b2e062b21d0061de3bd56881713a1a5c17f5ace05e1ec09da53f99442df175a49bd154aa96e4949decd52fed79ccf7ccbce32941419c314e374e4a396ac553e17b5340336a1a25c22f9e42a243ba5404450b650acfc826a6e432971ace776e15719515e1634ceb9a4a35061b668c74998d3dfb5827f6238ec015377e6f9c94f38108768cf6e5c8b132e0303fb5a200368f845ad9d46343035a6ff94031df8d8309415bb3f6cd5ede9c135fdabcc030599858d803c0f85be7661c88984d88faa3d26fb0e9aac0056a53f1b5d0baed713c853c4a2726869a0a124a8a5bbc0fc0ef80c8ae4cb53636aa02503b86a1eb9836fcc259823e2692d921d88e1ffc1e6cb2bde43939ceb3f32a611686f539f8f7c9f0bf00381f743607d40960f06d347d1cd8ac8a51969c25e37150efdf7aa4c2037a2fd0516fb444525ab157a0ed0a7412b2fa69b217fe397263153782c0f64351fbdf2678fa0dc8569912dcd8e3ccad38f34f23bbbce14c6a26ac24911b308b82c7e43062d180baeac4ba7153858365c72c63dcf5f6a5b08070b730adb017aeae925b7d0439979e2679f45ed2f25a7edcfd2fb77a8794630285ccb0a071f5cce410b46dbf9750b0354aae8b65574501cc69efb5b6a43444074fee116641bb29da56c2b4a7f456991fc92b2','debug':0}
}
if (coin === 'ZEC') {
AddCoinData.ZEC = {'coin':'ZEC','conf':'zcash.conf','path':confpath,'unitval':'20','zcash':1,'RELAY':-1,'VALIDATE':0,'prefetchlag':-1,'poll':10,'active':1,'agent':'iguana','method':'addcoin','startpend':8,'endpend':8,'services':129,'maxpeers':32,'newcoin':'ZEC','name':'Zcash','hasheaders':0,'useaddmultisig':0,'netmagic':'24e92764','p2p':8233,'rpc':8232,'pubval':184,'p2shval':189,'wifval':128,'txfee_satoshis':'10000','isPoS':0,'minoutput':10000,'minconfirms':2,'genesishash':'00040fe8ec8471911baa1db1266ea15dd06b4a8a5c453883c000b031973dce08','protover':170002,'genesisblock':'040000000000000000000000000000000000000000000000000000000000000000000000db4d7a85b768123f1dff1d4c4cece70083b2d27e117b4ac2e31d087988a5eac4000000000000000000000000000000000000000000000000000000000000000090041358ffff071f5712000000000000000000000000000000000000000000000000000000000000fd4005000a889f00854b8665cd555f4656f68179d31ccadc1b1f7fb0952726313b16941da348284d67add4686121d4e3d930160c1348d8191c25f12b267a6a9c131b5031cbf8af1f79c9d513076a216ec87ed045fa966e01214ed83ca02dc1797270a454720d3206ac7d931a0a680c5c5e099057592570ca9bdf6058343958b31901fce1a15a4f38fd347750912e14004c73dfe588b903b6c03166582eeaf30529b14072a7b3079e3a684601b9b3024054201f7440b0ee9eb1a7120ff43f713735494aa27b1f8bab60d7f398bca14f6abb2adbf29b04099121438a7974b078a11635b594e9170f1086140b4173822dd697894483e1c6b4e8b8dcd5cb12ca4903bc61e108871d4d915a9093c18ac9b02b6716ce1013ca2c1174e319c1a570215bc9ab5f7564765f7be20524dc3fdf8aa356fd94d445e05ab165ad8bb4a0db096c097618c81098f91443c719416d39837af6de85015dca0de89462b1d8386758b2cf8a99e00953b308032ae44c35e05eb71842922eb69797f68813b59caf266cb6c213569ae3280505421a7e3a0a37fdf8e2ea354fc5422816655394a9454bac542a9298f176e211020d63dee6852c40de02267e2fc9d5e1ff2ad9309506f02a1a71a0501b16d0d36f70cdfd8de78116c0c506ee0b8ddfdeb561acadf31746b5a9dd32c21930884397fb1682164cb565cc14e089d66635a32618f7eb05fe05082b8a3fae620571660a6b89886eac53dec109d7cbb6930ca698a168f301a950be152da1be2b9e07516995e20baceebecb5579d7cdbc16d09f3a50cb3c7dffe33f26686d4ff3f8946ee6475e98cf7b3cf9062b6966e838f865ff3de5fb064a37a21da7bb8dfd2501a29e184f207caaba364f36f2329a77515dcb710e29ffbf73e2bbd773fab1f9a6b005567affff605c132e4e4dd69f36bd201005458cfbd2c658701eb2a700251cefd886b1e674ae816d3f719bac64be649c172ba27a4fd55947d95d53ba4cbc73de97b8af5ed4840b659370c556e7376457f51e5ebb66018849923db82c1c9a819f173cccdb8f3324b239609a300018d0fb094adf5bd7cbb3834c69e6d0b3798065c525b20f040e965e1a161af78ff7561cd874f5f1b75aa0bc77f720589e1b810f831eac5073e6dd46d00a2793f70f7427f0f798f2f53a67e615e65d356e66fe40609a958a05edb4c175bcc383ea0530e67ddbe479a898943c6e3074c6fcc252d6014de3a3d292b03f0d88d312fe221be7be7e3c59d07fa0f2f4029e364f1f355c5d01fa53770d0cd76d82bf7e60f6903bc1beb772e6fde4a70be51d9c7e03c8d6d8dfb361a234ba47c470fe630820bbd920715621b9fbedb49fcee165ead0875e6c2b1af16f50b5d6140cc981122fcbcf7c5a4e3772b3661b628e08380abc545957e59f634705b1bbde2f0b4e055a5ec5676d859be77e20962b645e051a880fddb0180b4555789e1f9344a436a84dc5579e2553f1e5fb0a599c137be36cabbed0319831fea3fddf94ddc7971e4bcf02cdc93294a9aab3e3b13e3b058235b4f4ec06ba4ceaa49d675b4ba80716f3bc6976b1fbf9c8bf1f3e3a4dc1cd83ef9cf816667fb94f1e923ff63fef072e6a19321e4812f96cb0ffa864da50ad74deb76917a336f31dce03ed5f0303aad5e6a83634f9fcc371096f8288b8f02ddded5ff1bb9d49331e4a84dbe1543164438fde9ad71dab024779dcdde0b6602b5ae0a6265c14b94edd83b37403f4b78fcd2ed555b596402c28ee81d87a909c4e8722b30c71ecdd861b05f61f8b1231795c76adba2fdefa451b283a5d527955b9f3de1b9828e7b2e74123dd47062ddcc09b05e7fa13cb2212a6fdbc65d7e852cec463ec6fd929f5b8483cf3052113b13dac91b69f49d1b7d1aec01c4a68e41ce157','debug':0}
}

14
react/src/components/dashboard/navbar/navbar.render.js

@ -52,7 +52,7 @@ const NavbarRender = function() {
<i className="site-menu-icon"></i> { translate('INDEX.WALLETS') }
</a>
</li>
<li className={ 'hide ' + (this.isSectionActive('edex') ? 'active nav-top-menu' : 'nav-top-menu') }>
<li className={ this.isSectionActive('edex') ? 'hide active nav-top-menu' : 'hide nav-top-menu' }>
<a onClick={ () => this.dashboardChangeSection('edex') }>
<i className="site-menu-icon"></i> BarterDEX
</a>
@ -64,11 +64,13 @@ const NavbarRender = function() {
</a>
</li>
}
<li className="nav-top-menu">
<a onClick={ this.openImportKeyModal }>
<i className="site-menu-icon"></i> { translate('IMPORT_KEY.IMPORT_KEY') }
</a>
</li>
{ this.props.ActiveCoin.coin !== 'CHIPS' &&
<li className="nav-top-menu">
<a onClick={ this.openImportKeyModal }>
<i className="site-menu-icon"></i> { translate('IMPORT_KEY.IMPORT_KEY') }
</a>
</li>
}
</ul>
<ul className="nav navbar-toolbar navbar-right navbar-toolbar-right">
<li>

1
react/src/components/dashboard/receiveCoin/receiveCoin.js

@ -17,7 +17,6 @@ import {
class ReceiveCoin extends React.Component {
constructor() {
super();
this.state = {
openDropMenu: false,
hideZeroAdresses: false,

2
react/src/components/dashboard/receiveCoin/receiveCoin.render.js

@ -104,7 +104,7 @@ export const ReceiveCoinRender = function() {
<i className="icon fa-eye"></i> { translate('INDEX.TRANSPARENT_ADDRESS') }
</a>
</li>
<li>
<li className={ this.props.coin === 'CHIPS' ? 'hide' : '' }>
<a onClick={ () => this.getNewAddress('private') }>
<i className="icon fa-eye-slash"></i> { translate('INDEX.PRIVATE_Z_ADDRESS') }
</a>

2
react/src/components/dashboard/sendCoin/sendCoin.render.js

@ -61,7 +61,7 @@ export const _SendFormRender = function() {
onChange={ this.updateInput }
value={ this.state.sendTo }
id="kmdWalletSendTo"
placeholder={ translate('SEND.ENTER_T_OR_Z_ADDR') }
placeholder={ this.props.ActiveCoin.coin === 'CHIPS' ? translate('SEND.ENTER_ADDRESS') : translate('SEND.ENTER_T_OR_Z_ADDR') }
autoComplete="off"
required />
</div>

10
react/src/components/dashboard/walletsBalance/walletsBalance.render.js

@ -9,7 +9,7 @@ const WalletsBalanceRender = function() {
id="wallet-widgets"
className="wallet-widgets">
<div className="col-xs-12 flex">
<div className="col-lg-3 col-xs-12">
<div className={ this.props.ActiveCoin.coin === 'CHIPS' ? 'col-lg-12 col-xs-12' : 'col-lg-3 col-xs-12' }>
<div className="widget widget-shadow">
<div className="widget-content">
<i
@ -19,7 +19,7 @@ const WalletsBalanceRender = function() {
<div className="clearfix">
<div className="pull-left padding-vertical-10">
<i className="icon fa-eye font-size-24 vertical-align-bottom margin-right-5"></i>
{ translate('INDEX.TRANSPARENT_BALANCE') }
{ this.props.ActiveCoin.coin === 'CHIPS' ? translate('INDEX.BALANCE') : translate('INDEX.TRANSPARENT_BALANCE') }
</div>
<span
className="pull-right padding-top-10 font-size-22"
@ -32,7 +32,7 @@ const WalletsBalanceRender = function() {
</div>
</div>
<div className="col-lg-3 col-xs-12">
<div className={ this.props.ActiveCoin.coin !== 'CHIPS' ? 'col-lg-3 col-xs-12' : 'hide' }>
<div className="widget widget-shadow">
<div className="padding-20 padding-top-10">
<div className="clearfix">
@ -50,7 +50,7 @@ const WalletsBalanceRender = function() {
</div>
</div>
<div className="col-lg-3 col-xs-12">
<div className={ this.props.ActiveCoin.coin !== 'CHIPS' ? 'col-lg-3 col-xs-12' : 'hide' }>
<div className="widget widget-shadow">
<div className="widget-content">
<div className="padding-20 padding-top-10">
@ -70,7 +70,7 @@ const WalletsBalanceRender = function() {
</div>
</div>
<div className="col-lg-3 col-xs-12">
<div className={ this.props.ActiveCoin.coin !== 'CHIPS' ? 'col-lg-3 col-xs-12' : 'hide' }>
<div className="widget widget-shadow">
<div className="widget-content">
<div className="padding-20 padding-top-10">

22
react/src/components/dashboard/walletsProgress/walletsProgress.render.js

@ -96,15 +96,19 @@ export const TranslationComponentsRender = function(translationID) {
};
export const ChainActivationNotificationRender = function() {
return (
<div className="alert alert-info alert-dismissible margin-bottom-50 margin-top-40">
<h4>
{ translate('INDEX.ACTIVATING_CHAIN') }&nbsp;
{ this.props.ActiveCoin.rescanInProgress ? (this.renderRescanProgress() ? `: ${this.renderRescanProgress().toFixed(2)}% ${translate('INDEX.PROGRESS_RESCANNING_BLOCKS')}` : translate('INDEX.PROGRESS_RESCANNING_BLOCKS')) : this.renderActivatingBestChainProgress() }
</h4>
<p>{ this.renderLB('INDEX.KMD_STARTED') }</p>
</div>
);
if (this.props.ActiveCoin.coin !== 'CHIPS') {
return (
<div className="alert alert-info alert-dismissible margin-bottom-50">
<h4>
{ translate('INDEX.ACTIVATING_CHAIN') }&nbsp;
{ this.props.ActiveCoin.rescanInProgress ? (this.renderRescanProgress() ? `: ${this.renderRescanProgress().toFixed(2)}% ${translate('INDEX.PROGRESS_RESCANNING_BLOCKS')}` : translate('INDEX.PROGRESS_RESCANNING_BLOCKS')) : this.renderActivatingBestChainProgress() }
</h4>
<p>{ this.renderLB('INDEX.KMD_STARTED') }</p>
</div>
);
} else {
return null;
}
};
export const WalletsProgressRender = function() {

2
react/src/reducers/activeCoin.js

@ -213,7 +213,7 @@ export function ActiveCoin(state = {
if (state.coin === action.coin) {
return {
...state,
progress: action.progress,
// progress: action.progress,
opids: action.opids,
txhistory: action.txhistory,
balance: action.balance,

1
react/src/translate/en.js

@ -609,6 +609,7 @@ export const _lang = {
'UPDATE': 'Update',
'SELECT_T_OR_Z_ADDR': 'Select Transparent or Private Address',
'ENTER_T_OR_Z_ADDR': 'Enter Transparent or Private address',
'ENTER_ADDRESS': 'Enter address',
'AWAITING': 'Awaiting in queue',
'PROCESSING': 'Processing',
'ERROR_CODE': 'Error Code',

4
react/src/util/coinHelper.js

@ -6,6 +6,10 @@ export function getCoinTitle(coin) {
let hideTitle = false;
switch (coin) {
case 'CHIPS':
coinlogo = 'chips';
coinname = 'Chips';
break;
case 'BTC':
coinlogo = 'bitcoin';
coinname = 'Bitcoin';

Loading…
Cancel
Save