From df1ac0586ad251421c04fa7f64bd1f0c13064d17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B2=D0=B5=D1=82=D0=BE=D0=B7=D0=B0=D1=80=20=D0=90?= =?UTF-8?q?=D0=BD=D1=82=D0=BE=D0=BD=D0=BE=D0=B2?= Date: Fri, 18 May 2018 13:35:12 +0300 Subject: [PATCH 1/4] Added x888 info --- app/scripts/nodes.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/app/scripts/nodes.js b/app/scripts/nodes.js index 1d3eb4eaf2..6f62bfd937 100644 --- a/app/scripts/nodes.js +++ b/app/scripts/nodes.js @@ -21,6 +21,7 @@ nodes.nodeTypes = { CLO: "CLO", CLOT: "Testnet CLO", EAST: "EAST", + X888: "X88", Custom: "CUSTOM ETH" }; nodes.ensNodeTypes = [nodes.nodeTypes.ETH, nodes.nodeTypes.Ropsten]; @@ -310,6 +311,19 @@ nodes.nodeList = { 'estimateGas': true, 'service': 'easthub.io', 'lib': new nodes.customNode('https://node.easthub.io', '') + + }, + 'x888': { + 'name': 'X888', + 'blockExplorerTX': 'https://myetherwallet.com/?[[txHash]]#check-tx-status', + 'blockExplorerAddr': 'https://myetherwallet.com/?[[address]]#view-wallet-info', + 'type': nodes.nodeTypes.X888, + 'eip155': true, + 'chainId': 888, + 'tokenList': require('./tokens/x888Tokens.json'), + 'abiList': require('./abiDefinitions/x888Abi.json'), + 'estimateGas': true, + 'service': 'eightereum', + 'lib': new nodes.customNode('https://eightereum.x888.io', '') } }; From c42710cd82a7d0d6107cbcb36d2cd9d249ab9626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B2=D0=B5=D1=82=D0=BE=D0=B7=D0=B0=D1=80=20=D0=90?= =?UTF-8?q?=D0=BD=D1=82=D0=BE=D0=BD=D0=BE=D0=B2?= Date: Fri, 18 May 2018 13:37:51 +0300 Subject: [PATCH 2/4] x888Abi.json added --- app/scripts/abiDefinitions/x888Abi.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 app/scripts/abiDefinitions/x888Abi.json diff --git a/app/scripts/abiDefinitions/x888Abi.json b/app/scripts/abiDefinitions/x888Abi.json new file mode 100644 index 0000000000..303da1df75 --- /dev/null +++ b/app/scripts/abiDefinitions/x888Abi.json @@ -0,0 +1,7 @@ +[ + { + "name": "Meta Exchange x888", + "address": "0xce18cb36a1338dece50950649a3121c6aee6fa7a", + "abi": '[{"constant":true,"inputs":[],"name":"name","outputs":[{"name":"","type":"string"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_value","type":"uint256"}],"name":"approve","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"totalSupply","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_from","type":"address"},{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"decimals","outputs":[{"name":"","type":"uint8"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"_verify","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"tradeContract","type":"address"}],"name":"verify","outputs":[{"name":"valid","type":"bool"},{"name":"owner","type":"address"},{"name":"asset","type":"address"},{"name":"units","type":"uint256"},{"name":"buyPrice","type":"uint256"},{"name":"sellPrice","type":"uint256"},{"name":"buysTokens","type":"bool"},{"name":"sellsTokens","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_subtractedValue","type":"uint256"}],"name":"decreaseApproval","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_owner","type":"address"}],"name":"balanceOf","outputs":[{"name":"balance","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"makersCount","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"partner","type":"address"},{"name":"value","type":"uint256"}],"name":"bva","outputs":[],"payable":true,"type":"function"},{"constant":true,"inputs":[],"name":"avgRate","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"symbol","outputs":[{"name":"","type":"string"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"stuff","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"teama","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transfer","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"id","type":"uint256"}],"name":"getTrader","outputs":[{"name":"valid","type":"bool"},{"name":"trade","type":"address"},{"name":"owner","type":"address"},{"name":"asset","type":"address"},{"name":"units","type":"uint256"},{"name":"buyPrice","type":"uint256"},{"name":"sellPrice","type":"uint256"},{"name":"buysTokens","type":"bool"},{"name":"sellsTokens","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"_mks","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"asset","type":"address"},{"name":"exchange","type":"address"},{"name":"units","type":"uint256"},{"name":"buyPrice","type":"uint256"},{"name":"sellPrice","type":"uint256"},{"name":"buysTokens","type":"bool"},{"name":"sellsTokens","type":"bool"}],"name":"createTradeContract","outputs":[{"name":"trader","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"exchFee","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_addedValue","type":"uint256"}],"name":"increaseApproval","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_owner","type":"address"},{"name":"_spender","type":"address"}],"name":"allowance","outputs":[{"name":"remaining","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"baseowner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"startTimestamp","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"inputs":[],"payable":false,"type":"constructor"},{"payable":true,"type":"fallback"},{"anonymous":false,"inputs":[{"indexed":false,"name":"sender","type":"address"},{"indexed":false,"name":"to","type":"address"},{"indexed":false,"name":"amount","type":"uint256"}],"name":"LogTransfer","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"ownerAddress","type":"address"},{"indexed":true,"name":"tokenTraderAddress","type":"address"},{"indexed":true,"name":"asset","type":"address"},{"indexed":false,"name":"buyPrice","type":"uint256"},{"indexed":false,"name":"sellPrice","type":"uint256"},{"indexed":false,"name":"buysTokens","type":"bool"},{"indexed":false,"name":"sellsTokens","type":"bool"}],"name":"TradeListing","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"tokenAddress","type":"address"},{"indexed":false,"name":"tokens","type":"uint256"}],"name":"OwnerWithdrewERC20Token","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"owner","type":"address"},{"indexed":true,"name":"spender","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Transfer","type":"event"}]' + } +] From 5c5bc5836fe7e8d85c0720a13a88e627677c6a01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B2=D0=B5=D1=82=D0=BE=D0=B7=D0=B0=D1=80=20=D0=90?= =?UTF-8?q?=D0=BD=D1=82=D0=BE=D0=BD=D0=BE=D0=B2?= Date: Fri, 18 May 2018 13:38:37 +0300 Subject: [PATCH 3/4] x888Tokens.json added --- app/scripts/tokens/x888Tokens.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 app/scripts/tokens/x888Tokens.json diff --git a/app/scripts/tokens/x888Tokens.json b/app/scripts/tokens/x888Tokens.json new file mode 100644 index 0000000000..fe51488c70 --- /dev/null +++ b/app/scripts/tokens/x888Tokens.json @@ -0,0 +1 @@ +[] From 60a45bb796c8e43080b9b2ca74fde39f47bbd1f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B2=D0=B5=D1=82=D0=BE=D0=B7=D0=B0=D1=80=20=D0=90?= =?UTF-8?q?=D0=BD=D1=82=D0=BE=D0=BD=D0=BE=D0=B2?= Date: Fri, 18 May 2018 13:50:46 +0300 Subject: [PATCH 4/4] Syntax error correction --- app/scripts/nodes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/nodes.js b/app/scripts/nodes.js index 6f62bfd937..fda5c825f7 100644 --- a/app/scripts/nodes.js +++ b/app/scripts/nodes.js @@ -311,7 +311,7 @@ nodes.nodeList = { 'estimateGas': true, 'service': 'easthub.io', 'lib': new nodes.customNode('https://node.easthub.io', '') - + }, + }, 'x888': { 'name': 'X888', 'blockExplorerTX': 'https://myetherwallet.com/?[[txHash]]#check-tx-status',