-
-
Save churchofthought/36b3c278e86463601590f9e82f6baad5 to your computer and use it in GitHub Desktop.
Gav's web3 alterations
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| import SolidityFunction from 'web3/lib/web3/function'; | |
| import Web3 from 'web3'; | |
| var isManaged = typeof(window.web3) == "object"; | |
| export var web3 = isManaged ? window.web3 : new Web3(new Web3.providers.HttpProvider("http://localhost:8545")); | |
| if (web3.eth.accounts.indexOf(web3.eth.defaultAccount) == -1) { | |
| var best = 0; | |
| web3.eth.accounts.forEach(function(a) { | |
| var b = +web3.eth.getBalance(a); | |
| if (b > best) { | |
| web3.eth.defaultAccount = a; | |
| best = b; | |
| } | |
| }); | |
| if (!isManaged && typeof(web3.eth.defaultAccount) != 'string') { | |
| web3.eth.defaultAccount = "0x4d6bb4ed029b33cf25d0810b029bd8b1a6bcab7b"; | |
| } | |
| console.log("Default account was undefined or invalid. Now set to: " + web3.eth.defaultAccount); | |
| } | |
| // Usage example: | |
| // web3.eth.traceCall({ | |
| // to: theChicken.address, | |
| // data: theChicken.withdraw.getData(100000000000000000), | |
| // gas: 100000 | |
| // }, | |
| // `["trace", "vmTrace", "stateDiff"] | |
| // ) | |
| web3._extend({ | |
| property: 'eth', | |
| methods: [ | |
| new web3._extend.Method({ | |
| name: 'traceCall', | |
| call: 'trace_call', | |
| params: 2, | |
| inputFormatter: [web3._extend.formatters.inputCallFormatter, null] | |
| }) | |
| ] | |
| }); | |
| web3._extend({ | |
| property: 'eth', | |
| methods: [ | |
| new web3._extend.Method({ | |
| name: 'traceSendRawTransaction', | |
| call: 'trace_sendRawTransaction', | |
| params: 2, | |
| inputFormatter: [null, null] | |
| }) | |
| ] | |
| }); | |
| web3._extend({ | |
| property: 'eth', | |
| methods: [ | |
| new web3._extend.Method({ | |
| name: 'traceReplayTransaction', | |
| call: 'trace_replayTransaction', | |
| params: 2, | |
| inputFormatter: [null, null] | |
| }) | |
| ] | |
| }); | |
| web3._extend({ | |
| property: 'eth', | |
| methods: [ | |
| new web3._extend.Method({ | |
| name: 'gasPriceStatistics', | |
| call: 'ethcore_gasPriceStatistics', | |
| params: 0, | |
| outputFormatter: function(a) { return a.map(web3.toBigNumber); } | |
| }) | |
| ] | |
| }); | |
| web3._extend({ | |
| property: 'eth', | |
| methods: [ | |
| new web3._extend.Method({ | |
| name: 'registryAddress', | |
| call: 'ethcore_registryAddress', | |
| params: 0 | |
| }) | |
| ] | |
| }); | |
| web3._extend({ | |
| property: 'eth', | |
| methods: [ | |
| new web3._extend.Method({ | |
| name: 'accountsInfo', | |
| call: 'personal_accountsInfo', | |
| outputFormatter: function(m) { Object.keys(m).forEach(k => { | |
| m[k].meta = JSON.parse(m[k].meta); | |
| m[k].meta.name = m[k].name; | |
| m[k].meta.uuid = m[k].uuid; | |
| m[k] = m[k].meta; | |
| }); return m; }, | |
| params: 0 | |
| }) | |
| ] | |
| }); | |
| web3._extend({ | |
| property: 'eth', | |
| methods: [ | |
| new web3._extend.Method({ | |
| name: 'setAccountName', | |
| call: 'personal_setAccountName', | |
| params: 2, | |
| }) | |
| ] | |
| }); | |
| web3._extend({ | |
| property: 'eth', | |
| methods: [ | |
| new web3._extend.Method({ | |
| name: 'setAccountMeta', | |
| call: 'personal_setAccountMeta', | |
| params: 2, | |
| inputFormatter: [a => a, JSON.stringify] | |
| }) | |
| ] | |
| }); | |
| web3._extend({ | |
| property: 'eth', | |
| methods: [ | |
| new web3._extend.Method({ | |
| name: 'postTransaction', | |
| call: 'eth_postTransaction', | |
| params: 1, | |
| inputFormatter: [web3._extend.formatters.inputCallFormatter] | |
| }) | |
| ] | |
| }); | |
| web3._extend({ | |
| property: 'eth', | |
| methods: [ | |
| new web3._extend.Method({ | |
| name: 'postSign', | |
| call: 'eth_postSign', | |
| params: 1 | |
| }) | |
| ] | |
| }); | |
| web3._extend({ | |
| property: 'eth', | |
| methods: [ | |
| new web3._extend.Method({ | |
| name: 'encryptMessage', | |
| call: 'ethcore_encryptMessage', | |
| params: 2 | |
| }) | |
| ] | |
| }); | |
| web3._extend({ | |
| property: 'eth', | |
| methods: [ | |
| new web3._extend.Method({ | |
| name: 'checkRequest', | |
| call: 'eth_checkRequest', | |
| params: 1 | |
| }) | |
| ] | |
| }); | |
| { | |
| var postTransaction = web3.eth.postTransaction.bind(web3.eth); | |
| var sendTransaction = web3.eth.sendTransaction.bind(web3.eth); | |
| web3.eth.sendTransaction = function(options, f) { | |
| // No callback - do sync API. | |
| if (typeof f != "function") | |
| return sendTransaction(options); | |
| // Callback - use async API. | |
| var id = postTransaction(options); | |
| console.log("Posted trasaction id=" + id); | |
| var timerId = window.setInterval(check, 500); | |
| function check() { | |
| try { | |
| let r = web3.eth.checkRequest(id); | |
| if (typeof r == 'string') { | |
| clearInterval(timerId); | |
| if (r == "0x0000000000000000000000000000000000000000000000000000000000000000") | |
| f("Rejected", r); | |
| else | |
| f(null, r); | |
| } else if (r !== null) { | |
| console.log("checkRequest returned: " + r); | |
| } | |
| } | |
| catch (e) { | |
| clearInterval(timerId); | |
| f("Rejected", null); | |
| } | |
| } | |
| } | |
| } | |
| web3.eth.installInterceptor = function(interceptor) { | |
| var oldSendTransaction = web3.eth.sendTransaction.bind(web3.eth); | |
| web3.eth.sendTransaction = function(options, f) { | |
| if (interceptor(options) == false) | |
| return "0x0000000000000000000000000000000000000000000000000000000000000000"; | |
| return oldSendTransaction(options, f); | |
| }; | |
| } | |
| web3.eth.reporter = function(e, r) { | |
| if (e) { | |
| console.log("Error confirming transaction: " + e); | |
| } else { | |
| var addr = r; | |
| var confirmed = false; | |
| var timer_id = window.setInterval(check, 500); | |
| function check() { | |
| var receipt = web3.eth.getTransactionReceipt(addr); | |
| if (receipt != null) { | |
| if (!confirmed) { | |
| console.log("Transaction confirmed (" + r + "); used " + receipt.gasUsed + " gas; left " + receipt.logs.length + " logs; mining..."); | |
| confirmed = true; | |
| } | |
| if (typeof receipt.blockHash == 'string') { | |
| clearInterval(timer_id); | |
| console.log("Mined into block " + receipt.blockNumber); | |
| } | |
| } | |
| } | |
| } | |
| } | |
| { | |
| var oldSha3 = web3.sha3 | |
| web3.sha3 = function(data, format) { | |
| if (typeof format !== 'string' || (format != 'hex' && format != 'bin')) | |
| format = data.startsWith('0x') ? 'hex' : 'bin'; | |
| return "0x" + oldSha3(data, {encoding: format}); | |
| } | |
| } | |
| { | |
| var Registry = web3.eth.contract([{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setOwner","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"string"}],"name":"confirmReverse","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"}],"name":"reserve","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"},{"name":"_value","type":"bytes32"}],"name":"set","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"}],"name":"drop","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"}],"name":"getAddress","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":false,"inputs":[{"name":"_amount","type":"uint256"}],"name":"setFee","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_to","type":"address"}],"name":"transfer","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"reserved","outputs":[{"name":"reserved","type":"bool"}],"type":"function"},{"constant":false,"inputs":[],"name":"drain","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"string"},{"name":"_who","type":"address"}],"name":"proposeReverse","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"}],"name":"getUint","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"}],"name":"get","outputs":[{"name":"","type":"bytes32"}],"type":"function"},{"constant":true,"inputs":[],"name":"fee","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"reverse","outputs":[{"name":"","type":"string"}],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"},{"name":"_value","type":"uint256"}],"name":"setUint","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":false,"inputs":[],"name":"removeReverse","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"},{"name":"_value","type":"address"}],"name":"setAddress","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"amount","type":"uint256"}],"name":"Drained","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"amount","type":"uint256"}],"name":"FeeChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"owner","type":"address"}],"name":"Reserved","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"oldOwner","type":"address"},{"indexed":true,"name":"newOwner","type":"address"}],"name":"Transferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"owner","type":"address"}],"name":"Dropped","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"owner","type":"address"},{"indexed":true,"name":"key","type":"string"}],"name":"DataChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"string"},{"indexed":true,"name":"reverse","type":"address"}],"name":"ReverseProposed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"string"},{"indexed":true,"name":"reverse","type":"address"}],"name":"ReverseConfirmed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"string"},{"indexed":true,"name":"reverse","type":"address"}],"name":"ReverseRemoved","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"old","type":"address"},{"indexed":true,"name":"current","type":"address"}],"name":"NewOwner","type":"event"}]); | |
| web3.eth.registry = Registry.at(web3.eth.registryAddress()); | |
| web3.eth.registry.lookup = (name, field) => web3.eth.registry.get(web3.sha3(name), field); | |
| web3.eth.registry.lookupAddress = (name, field) => web3.eth.registry.getAddress(web3.sha3(name), field); | |
| web3.eth.registry.lookupUint = (name, field) => web3.eth.registry.getUint(web3.sha3(name), field); | |
| var TokenReg = web3.eth.contract([{"constant":true,"inputs":[{"name":"_id","type":"uint256"}],"name":"token","outputs":[{"name":"o_addr","type":"address"},{"name":"o_tla","type":"string"},{"name":"o_base","type":"uint256"},{"name":"o_name","type":"string"}],"type":"function"},{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setOwner","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_addr","type":"address"},{"name":"_tla","type":"string"},{"name":"_base","type":"uint256"},{"name":"_name","type":"string"}],"name":"register","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_fee","type":"uint256"}],"name":"setFee","outputs":[],"type":"function"},{"constant":true,"inputs":[{"name":"_id","type":"uint256"},{"name":"_key","type":"bytes32"}],"name":"meta","outputs":[{"name":"","type":"bytes32"}],"type":"function"},{"constant":true,"inputs":[{"name":"_tla","type":"string"}],"name":"fromTLA","outputs":[{"name":"o_id","type":"uint256"},{"name":"o_addr","type":"address"},{"name":"o_base","type":"uint256"},{"name":"o_name","type":"string"}],"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":false,"inputs":[],"name":"drain","outputs":[],"type":"function"},{"constant":true,"inputs":[],"name":"tokenCount","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":false,"inputs":[{"name":"_id","type":"uint256"}],"name":"unregister","outputs":[],"type":"function"},{"constant":true,"inputs":[{"name":"_addr","type":"address"}],"name":"fromAddress","outputs":[{"name":"o_id","type":"uint256"},{"name":"o_tla","type":"string"},{"name":"o_base","type":"uint256"},{"name":"o_name","type":"string"}],"type":"function"},{"constant":true,"inputs":[],"name":"fee","outputs":[{"name":"","type":"uint256"}],"type":"function"}]); | |
| web3.eth.tokenReg = TokenReg.at(web3.eth.registry.lookupAddress('tokenreg', 'A')); | |
| } |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment