Commit Graph

600 Commits

Author SHA1 Message Date
Fabian Vogelsteller 27d54218a9 merged from ethereum again 2015-03-10 17:09:06 +01:00
Fabian Vogelsteller 3848d3a03c fixed logs 2015-03-10 17:07:16 +01:00
Marek Kotewicz 18e13674c4 gulp 2015-03-10 16:59:47 +01:00
Marek Kotewicz f831ddeacc Merge branch 'apiOverhaul' of https://github.com/frozeman/ethereum.js into apiOverhaul 2015-03-10 16:56:07 +01:00
Marek Kotewicz 27fca175be common fixes 2015-03-10 16:55:57 +01:00
Fabian Vogelsteller 1c9f50feb9 changed topic to topics 2015-03-10 16:22:16 +01:00
Fabian Vogelsteller 8d7d00ded9 fixed input parser test 2015-03-10 16:13:44 +01:00
Marek Kotewicz 1269731c50 Merge branch 'apiOverhaul' of https://github.com/frozeman/ethereum.js into apiOverhaul
Conflicts:
	dist/ethereum.min.js
2015-03-10 15:53:42 +01:00
Fabian Vogelsteller 2c740b08ee add filter value conversion 2015-03-10 14:49:23 +01:00
Marek Kotewicz 38f656734f fixed examples 2015-03-10 13:27:16 +01:00
Marek Kotewicz fa5d4b543b Merge branch 'apiOverhaul' of https://github.com/frozeman/ethereum.js into apiOverhaul
Conflicts:
	dist/ethereum.js.map
	dist/ethereum.min.js
2015-03-10 11:11:19 +01:00
Fabian Vogelsteller 8a2444b4bc add default paramter for getBlock 2015-03-10 11:03:03 +01:00
Marek Kotewicz 2850bee3f6 fixed eth_getFilterChanges 2015-03-10 10:47:44 +01:00
Marek Kotewicz b4545872a6 Merge branch 'develop' of https://github.com/ethereum/ethereum.js into apiOverhaul 2015-03-10 08:54:04 +01:00
Marek Kotewicz ede88f8e09 Merge pull request #105 from jorisbontje/balance-example
update balance example for new api
2015-03-10 08:53:45 +01:00
Fabian Vogelsteller 51a075c62d add in-output until eth_getBlockByHash 2015-03-09 20:06:54 +01:00
Fabian Vogelsteller 9c0d3e3c63 fixed to/fromWei 2015-03-09 18:21:11 +01:00
Fabian Vogelsteller a0b5353f47 changed outputs up to storageAt 2015-03-09 15:09:21 +01:00
Joris Bontje c2ed233912 update balance example for new api 2015-03-09 14:19:42 +01:00
Fabian Vogelsteller 1f6c195934 fixed toBigNumber 2015-03-09 11:27:19 +01:00
Fabian Vogelsteller e5cc5014e6 updated readme 2015-03-09 10:28:14 +01:00
Fabian Vogelsteller 4eb857ecf8 increased meteor package version 2015-03-09 10:24:21 +01:00
Marek Kotewicz c7f8373191 separated formatters files 2015-03-08 18:31:08 +01:00
Marek Kotewicz 068bdd7276 changed project structure 2015-03-08 18:18:52 +01:00
Marek Kotewicz ddb90c24af refactoring formatters 2015-03-08 17:52:52 +01:00
Marek Kotewicz a6110a59a4 common changes 2015-03-08 17:28:32 +01:00
Marek Kotewicz d3569e4ffd more coverage tests 2015-03-08 16:56:21 +01:00
Marek Kotewicz e2352b48d3 utils.js docs 2015-03-08 10:36:16 +01:00
Marek Kotewicz 344428b3b5 tests... 2015-03-08 10:07:32 +01:00
Marek Kotewicz 9fe105e794 fixed from decimal; 2015-03-08 08:48:45 +01:00
Marek Kotewicz 50fc61155e test for utils.toBigNumber 2015-03-08 08:33:22 +01:00
Marek Kotewicz 60ae274f34 code comments 2015-03-07 20:06:26 +01:00
Marek Kotewicz b8505d1761 common changes 2015-03-07 19:55:20 +01:00
Marek Kotewicz ccb37752d3 new api method names 2015-03-07 19:32:05 +01:00
Marek Kotewicz 2b17ad67c9 refactoring 2015-03-07 19:18:22 +01:00
Marek Kotewicz 0a995e1d1f common changes in utils, fixing code complexity 2015-03-07 18:31:09 +01:00
Marek Kotewicz 3f631094af fix all failing karma tests 2015-03-07 17:53:06 +01:00
Marek Kotewicz 1fd1a315bb Merge branch 'develop' into apiOverhaul
Conflicts:
	dist/ethereum.js
	dist/ethereum.js.map
	dist/ethereum.min.js
	lib/utils.js
2015-03-07 17:47:03 +01:00
Marek Kotewicz 0b9d450a4d fixed karma test 2015-03-07 17:43:51 +01:00
Marek Kotewicz 75e92c8048 Merge branch 'master' into develop 2015-03-07 16:48:30 +01:00
Marek Kotewicz a8697801cd Merge branch 'master' into apiOverhaul 2015-03-07 16:32:47 +01:00
Marek Kotewicz 2cdf08babf Merge pull request #101 from chevdor/master
Switch to Karma
2015-03-06 22:12:58 +01:00
Wilfried Kopp 437e2731de Helping travis a bit... old boy! 2015-03-06 21:37:44 +01:00
Wilfried Kopp d88effaedf Add node 0.12 + virtual screen for browsers/karma. 2015-03-06 21:31:45 +01:00
Wilfried Kopp 743eb3049f Including Karma to Travis 2015-03-06 21:12:50 +01:00
Wilfried Kopp f0da6ef78c Merge remote-tracking branch 'upstream/master' 2015-03-06 21:09:45 +01:00
Wilfried Kopp cbb1efe4e1 test(eth): Disable few tests
Disable for now few tests that fail until the switch to karma is done.

test(karma): Replace mocha by Karma.
2015-03-06 20:58:23 +01:00
Fabian Vogelsteller b8193914cb fixed tests 2015-03-06 16:09:21 +01:00
Marek Kotewicz c1136a08c0 Merge branch 'master' into develop
Conflicts:
	dist/ethereum.js.map
	dist/ethereum.min.js
	package.json
2015-03-06 12:05:40 +01:00
Marek Kotewicz 1b475aaa51 downgrade to unreachable-branch-transform 0.1.0 2015-03-06 12:03:19 +01:00