Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions app/assets/v2/js/tokens.js
Original file line number Diff line number Diff line change
Expand Up @@ -172,14 +172,16 @@ var tokens = function(network_id) {
{ 'addr': '0xfa6f7881E52fDF912c4a285D78a3141B089cE859', 'name': 'AVO', 'decimals': 18 },
{ 'addr': '0x58b6a8a3302369daec383334672404ee733ab239', 'name': 'LPT', 'decimals': 18 },
{ 'addr': '0x09617f6fd6cf8a71278ec86e23bbab29c04353a7', 'name': 'ULT', 'decimals': 18 },
{'addr': '0x4CEdA7906a5Ed2179785Cd3A40A69ee8bc99C466', 'name': 'AION', 'decimals': 8}
{ 'addr': '0x4CEdA7906a5Ed2179785Cd3A40A69ee8bc99C466', 'name': 'AION', 'decimals': 8 },
{ 'addr': '0x4162178B78D6985480A308B2190EE5517460406D', 'name': 'CLN', 'decimals': 18 }

];
} else if (network_id == 'ropsten') { // ropsten
_tokens = [
{ 'addr': '0x0000000000000000000000000000000000000000', 'name': 'ETH', 'decimals': 18, 'priority': 999 },
{ 'addr': '0x2941deaad71adb02b944bd38ebce2f1f4c9a62dc', 'name': 'COLO', 'decimals': 18 },
{ 'addr': '0xeccb46ebe07c5a2b249586796f921ddfe0d46271', 'name': 'FOO', 'decimals': 18 }
{ 'addr': '0xeccb46ebe07c5a2b249586796f921ddfe0d46271', 'name': 'FOO', 'decimals': 18 },
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same qeustion as below on ropsten

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@owocki no problem, it makes much easier to view the changes.
but now I've got a linting error and so I can't merge :(. Add a rule exception for that file?

{ 'addr': '0x41C9d91E96b933b74ae21bCBb617369CBE022530', 'name': 'CLN', 'decimals': 18 }
];
} else if (network_id == 'rinkeby') { // ropsten
_tokens = [
Expand Down
6 changes: 4 additions & 2 deletions app/assets/yge/youvegoteth/tokens.js
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,15 @@ var tokens = function(network_id) {
{'addr': '0xfa6f7881E52fDF912c4a285D78a3141B089cE859', 'name': 'AVO', 'decimals': 18},
{'addr': '0x58b6a8a3302369daec383334672404ee733ab239', 'name': 'LPT', 'decimals': 18},
{'addr': '0x09617f6fd6cf8a71278ec86e23bbab29c04353a7', 'name': 'ULT', 'decimals': 18},
{'addr': '0x4CEdA7906a5Ed2179785Cd3A40A69ee8bc99C466', 'name': 'AION', 'decimals': 8}
{'addr': '0x4CEdA7906a5Ed2179785Cd3A40A69ee8bc99C466', 'name': 'AION', 'decimals': 8},
{'addr': '0x4162178B78D6985480A308B2190EE5517460406D', 'name': 'CLN', 'decimals': 18}
];
} else if (network_id == 'ropsten') { // ropsten
_tokens = [
{ 'addr': '0x0000000000000000000000000000000000000000', 'name': 'ETH', 'decimals': 18 },
{ 'addr': '0x2941deaad71adb02b944bd38ebce2f1f4c9a62dc', 'name': 'COLO', 'decimals': 18 },
{ 'addr': '0xeccb46ebe07c5a2b249586796f921ddfe0d46271', 'name': 'GIT', 'decimals': 18 }
{ 'addr': '0xeccb46ebe07c5a2b249586796f921ddfe0d46271', 'name': 'GIT', 'decimals': 18 },
{ 'addr': '0x41C9d91E96b933b74ae21bCBb617369CBE022530', 'name': 'CLN', 'decimals': 18 }
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is ropsten is the address the same on ropsten as it is mainnet?

];
} else if (network_id == 'custom network') { // testrpc
_tokens = [
Expand Down
6 changes: 4 additions & 2 deletions app/dashboard/tokens.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,10 @@
{"addr": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359", "name": "DAI", "decimals": 18},
{"addr": "0xfa6f7881E52fDF912c4a285D78a3141B089cE859", "name": "AVO", "decimals": 18},
{"addr": "0x58b6a8a3302369daec383334672404ee733ab239", "name": "LPT", "decimals": 18},
{'addr': '0x09617f6fd6cf8a71278ec86e23bbab29c04353a7', 'name': 'ULT', 'decimals': 18},
{'addr': '0x4CEdA7906a5Ed2179785Cd3A40A69ee8bc99C466', 'name': 'AION', 'decimals': 8},
{"addr": "0x09617f6fd6cf8a71278ec86e23bbab29c04353a7", "name": "ULT", "decimals": 18},
{"addr": "0x4CEdA7906a5Ed2179785Cd3A40A69ee8bc99C466", "name": "AION", "decimals": 8},
{"addr": "0x4162178B78D6985480A308B2190EE5517460406D", "name": "CLN", "decimals": 18},

]


Expand Down