92 Commits

Author SHA1 Message Date
Marek Kotewicz
a46b9ea016 Merge branch 'develop' into abi_refactor
Conflicts:
	dist/web3-light.js.map
	dist/web3-light.min.js
	dist/web3.js.map
	dist/web3.min.js
2015-04-20 11:51:10 +02:00
Marek Kotewicz
18cef7c3f5 removed *collapse in contrat, gulp 2015-04-20 10:08:41 +02:00
Péter Szilágyi
b326202314 formatters/whisper: polish corner case handling code 2015-04-17 11:20:40 +03:00
Marek Kotewicz
0567ba1826 outputParser do not require 0x prefix before hash 2015-04-16 22:11:15 +02:00
Péter Szilágyi
6a058b690b Allow unset topics in posts too. 2015-04-16 18:13:47 +03:00
Péter Szilágyi
af443f2acb Fix #162: allow empty topic list in messages 2015-04-16 18:05:08 +03:00
Marek Kotewicz
20fb2e3c70 Merge branch 'develop' of https://github.com/ethereum/ethereum.js into develop
Conflicts:
	dist/web3-light.js.map
	dist/web3-light.min.js
	dist/web3.js.map
	dist/web3.min.js
2015-04-16 12:43:06 +02:00
Marek Kotewicz
96b44682f1 fixed #161, web3.ssh.post 2015-04-16 12:22:20 +02:00
Marek Kotewicz
a320ef8bd9 fixed coverage, unified creating errors 2015-04-16 11:11:33 +02:00
Fabian Vogelsteller
364eab72b1 add callback for async error 2015-04-15 11:48:05 +02:00
Marek Kotewicz
c62f817cc6 picked watch change3 2015-04-13 12:56:14 +02:00
Fabian Vogelsteller
56d13f72fb picked watch change2 2015-04-13 12:55:43 +02:00
Fabian Vogelsteller
2215e7c3af picked watch change 2015-04-13 12:53:26 +02:00
Marek Kotewicz
2ef5efc8f8 fixed #70, creating contract with nondefault constructor 2015-04-09 23:30:18 +02:00
Fabian Vogelsteller
7f75f3e64f fixed gasPrice output
Conflicts:
	dist/ethereum-light.js.map
	dist/ethereum-light.min.js
	dist/ethereum.js.map
	dist/ethereum.min.js
2015-04-09 20:15:38 +02:00
Fabian Vogelsteller
ddec6298dc fixed getUncle parameter count
Conflicts:
	dist/ethereum-light.js.map
	dist/ethereum-light.min.js
	dist/ethereum.js.map
	dist/ethereum.min.js
2015-04-09 20:14:35 +02:00
Marek Kotewicz
e2990ae77e web3.eth.getBlockTransactionCount accepts pending/latest/earliest params 2015-04-02 16:30:40 +02:00
Marek Kotewicz
5e150378c8 fixed formatting address 2015-04-02 13:08:58 +02:00
Marek Kotewicz
57d9f1f036 removed deprecated && unused lines from contract.js 2015-03-31 10:35:36 +02:00
Marek Kotewicz
e53f316db9 tests for transaction && call 2015-03-31 09:34:06 +02:00
Marek Kotewicz
31220d578f removed deprecated code in contract.js 2015-03-30 23:48:03 +02:00
Marek Kotewicz
b837667649 unified asBlock from filter.js with blockNumber formatter 2015-03-30 23:23:34 +02:00
Marek Kotewicz
608d211400 blockNumber can be earliest 2015-03-30 09:27:59 +02:00
Marek Kotewicz
2262276dae defaultBlockNumber accepts latest && pending 2015-03-28 15:52:40 +01:00
Marek Kotewicz
e01bb23759 fixed #148 && fixed polling test 2015-03-28 15:15:44 +01:00
Marek Kotewicz
8c39acc571 merge branch 'develop' of https://github.com/ethereum/ethereum.js into develop
Conflicts:
	dist/ethereum-light.js.map
	dist/ethereum-light.min.js
	dist/ethereum.js.map
	dist/ethereum.min.js
2015-03-28 14:42:16 +01:00
Marek Kotewicz
534e96da9e Merge branch 'master' of https://github.com/ethereum/ethereum.js
Conflicts:
	lib/web3/jsonrpc.js
2015-03-28 14:41:15 +01:00
Marek Kotewicz
2f45df835a fix && tests for #147 2015-03-28 14:38:56 +01:00
cubedro
e750fd9bb4 fixed #147 2015-03-28 00:32:52 +02:00
Fabian Vogelsteller
e0d83d065e removed unecessary callformatter 2015-03-27 14:53:47 +01:00
Marek Kotewicz
f4e5a99be1 default log formatter, improved contract test 2015-03-27 11:27:50 +01:00
Marek Kotewicz
07bcdb441e improved tests for contract.js, fixed few minor issues 2015-03-27 08:42:23 +01:00
Marek Kotewicz
82b18c1aa0 refactored filter.js 2015-03-26 18:11:05 +01:00
Marek Kotewicz
2133d2717d filter changes in progress 2015-03-26 15:43:35 +01:00
Marek Kotewicz
e928e14bc4 Merge branch 'develop' into sandbox
Conflicts:
	dist/ethereum-light.js
	dist/ethereum-light.js.map
	dist/ethereum-light.min.js
	dist/ethereum.js
	dist/ethereum.js.map
	dist/ethereum.min.js
	lib/web3.js
2015-03-26 11:19:12 +01:00
Marek Kotewicz
1a84015bab fixed events topics 2015-03-26 11:12:33 +01:00
Marek Kotewicz
a63d604c57 removed unused function 2015-03-26 07:51:33 +01:00
Marek Kotewicz
04f0aa5d4f fixed filer.js complexity 2015-03-25 21:46:45 +01:00
Marek Kotewicz
722a5bcd69 fixed eth.getTransaction.js location 2015-03-25 15:02:07 +01:00
Marek Kotewicz
c065f174ee Merge branch 'develop' into sandbox
Conflicts:
	dist/ethereum-light.js
	dist/ethereum-light.js.map
	dist/ethereum-light.min.js
	dist/ethereum.js
	dist/ethereum.js.map
	dist/ethereum.min.js
	lib/web3/filter.js
2015-03-25 14:47:55 +01:00
Marek Kotewicz
b78dffaf8b small fix in filter tests 2015-03-25 14:43:41 +01:00
Marek Kotewicz
4f5c5fb2fb first try to test polling 2015-03-25 13:17:21 +01:00
Marek Kotewicz
9f073d9091 applied fixes from cpp-ethereum 2015-03-25 08:08:14 +01:00
Fabian Vogelsteller
c01abfc4bd add db tests 2015-03-24 12:21:52 +01:00
Fabian Vogelsteller
afd7e7ba32 add shh tests 2015-03-24 11:44:33 +01:00
Fabian Vogelsteller
e7304b546e add storage tests 2015-03-24 11:17:06 +01:00
Fabian Vogelsteller
f32b8ad5a8 add runTest module to new tests 2015-03-24 09:48:07 +01:00
Fabian Vogelsteller
c52250e203 add block uncle and block counts 2015-03-24 09:42:09 +01:00
Marek Kotewicz
a4e3645190 Merge branch 'develop' into sandbox
Conflicts:
	dist/ethereum.js.map
	dist/ethereum.min.js
2015-03-23 23:03:50 +01:00
Fabian Vogelsteller
b3b95c5f98 add getBlock test 2015-03-23 18:50:53 +01:00