Commit Graph

14695 Commits

Author SHA1 Message Date
Marek Kotewicz
a82385d541 Squashed 'libjsqrc/ethereumjs/' changes from a0cfa3c..f3e1797
f3e1797 fixed jsonrpc response 0 not handled properly

git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: f3e1797153ebf5b19ca3e154cf1240be738e4f08
2015-02-04 11:24:10 +01:00
Marek Kotewicz
d5e876c106 Merge commit '2d09638fdec853d0d303141ad5ce97b1289153e0' into ethereumjs 2015-02-04 11:24:10 +01:00
CJentzsch
a41e173d59 Merge remote-tracking branch 'upstream/develop' into blockTests 2015-02-04 10:23:52 +01:00
Gav Wood
4c4c4866d5 Merge pull request #942 from LefterisJP/accesorsFix
Fixing accesors test after visibility merge
2015-02-03 16:30:59 -08:00
Gav Wood
350b99c1d1 Test for named args. 2015-02-03 16:29:31 -08:00
Lefteris Karapetsas
434e70472d Fixing accesors test after visibility merge 2015-02-04 01:17:15 +01:00
Marek Kotewicz
c3e6dc773d Merge branch 'develop' into ethereumjs 2015-02-03 23:29:02 +01:00
Marek Kotewicz
d9b422cfbc Squashed 'libjsqrc/ethereumjs/' changes from f1a5cf9..a0cfa3c
a0cfa3c version upgrade
e58e2f5 jsonrpc.js tests && jsonrpc response validation is more strict
45134de jsonrpc.js file && batch polling
f3ce1f0 simplified polling && jsonrpc payload creation
ddc1719 tests && fixes for utils methods
fdcc1af clearing tests
4a54b8c version upgrade 0.0.12

git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: a0cfa3ca21163f26f3f71a0e2ce0a1e617554c72
2015-02-03 23:14:19 +01:00
Marek Kotewicz
8147642312 Merge commit 'f1cf1b28d797f0761c7cf6ea5236396326f0f682' into ethereumjs 2015-02-03 23:14:19 +01:00
Gav Wood
db263bd9d7 Fixes. 2015-02-03 12:45:16 -08:00
Gav Wood
2ff4a80b62 Fixes for named-args. 2015-02-03 12:25:08 -08:00
Gav Wood
04164b612c Merge branch 'named-args' of https://github.com/guanqun/cpp-ethereum into guanqun-named-args 2015-02-03 11:57:36 -08:00
Gav Wood
d5b2f8a2ce Merge branch 'sol_visibility' of https://github.com/chriseth/cpp-ethereum into chriseth-sol_visibility
Conflicts:
	test/SolidityNameAndTypeResolution.cpp
2015-02-03 08:50:39 -08:00
Gav Wood
e321b956a1 Merge branch 'sol_visibility' of https://github.com/chriseth/cpp-ethereum into chriseth-sol_visibility
Conflicts:
	test/SolidityNameAndTypeResolution.cpp
2015-02-03 08:50:39 -08:00
Gav Wood
7050893bc1 Minor typo. 2015-02-03 08:48:11 -08:00
Gav Wood
74e7e3eaf9 Merge pull request #922 from LefterisJP/sol_AccessorsMapping
Sol state variable accessors for mapping
2015-02-03 08:47:46 -08:00
Gav Wood
61c701b9ff Merge pull request #922 from LefterisJP/sol_AccessorsMapping
Sol state variable accessors for mapping
2015-02-03 08:47:46 -08:00
Marek Kotewicz
d816e0f99e Merge commit '699bed10c09a86983f357d3c2fd421c2dc28a2f6' into ethereumjs
Conflicts:
	libjsqrc/ethereumjs/dist/ethereum.js.map
	libjsqrc/ethereumjs/dist/ethereum.min.js
2015-02-03 16:32:23 +01:00
Marek Kotewicz
46f47eaf38 Squashed 'libjsqrc/ethereumjs/' changes from d516691..f1a5cf9
f1a5cf9 Merge branch 'develop' into cpp
a5909d8 parsing events output
1860b3d gulp
03faec9 event outputParser && tests
4bb5ba7 reverted ethereum.js
9d9c23e common cleanup
1a6b7de removed splitter.qml
011fdd9 event_inc example
0994efa Better HTML template in Mix. Use happened in JS. Debugging QML enabled.

git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: f1a5cf9128170b85428259c8b0ecfaed5b3e17d1
2015-02-03 16:31:18 +01:00
Gav Wood
aa0554269e Revert State class changes for Mix. 2015-02-02 17:07:15 -08:00
CJentzsch
cbfd094a17 add refundoverflow test 2015-02-03 01:25:41 +01:00
subtly
e5f9016eb6 update whisper test for node-network 2015-02-02 09:47:16 -08:00
Lefteris Karapetsas
3b0ca66cd2 Accessors for multiple mappings implemented 2015-02-02 17:52:50 +01:00
Lefteris Karapetsas
8cd3d4b4b7 Accessors for multiple mappings implemented 2015-02-02 17:52:50 +01:00
Christian
a38b8890bd Visibility specifiers. 2015-02-02 17:24:09 +01:00
Christian
e157364fe8 Visibility specifiers. 2015-02-02 17:24:09 +01:00
Lefteris Karapetsas
5a374afe62 Simple mapping accessors working 2015-02-02 15:03:44 +01:00
Gav Wood
bd3fed43b9 Don't count same messages twice. 2015-02-01 22:48:52 -08:00
subtly
2a4951c111 Merge branch 'develop' into p2p
Conflicts:
	test/whisperTopic.cpp
2015-02-01 22:39:52 -08:00
Gav Wood
ded08e82a7 Merge pull request #923 from arkpar/mix_tx
mix: Mining fixed
2015-02-01 20:47:27 -08:00
arkpar
71396ad7f1 fixed block generation on mine 2015-02-01 16:43:24 +01:00
Lefteris Karapetsas
33f86b8af3 Code generation for mapping state variable accessor
- Work in progress
2015-02-01 02:41:14 +01:00
Lefteris Karapetsas
82bcb7e33a Code generation for mapping state variable accessor
- Work in progress
2015-02-01 02:41:14 +01:00
Christian
adce36ff58 Make tests resistant to changes in order of declaration. 2015-02-01 00:47:54 +01:00
Christian
9838780d24 Make tests resistant to changes in order of declaration. 2015-02-01 00:47:54 +01:00
Lefteris Karapetsas
c742c09ae6 Adding mapping treatment to FunctionType
Plus a TypeResolution test for it
2015-02-01 00:20:35 +01:00
Lefteris Karapetsas
ec7a9bf919 Adding mapping treatment to FunctionType
Plus a TypeResolution test for it
2015-02-01 00:20:35 +01:00
winsvega
56125431cb Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into develop 2015-01-31 23:25:18 +03:00
winsvega
f7f26d0fbd state test conditions to filler files 2015-01-31 21:00:35 +03:00
winsvega
7b51526a2c transaction address length test fix 2015-01-31 20:36:14 +03:00
Gav Wood
ef05913743 Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop
Conflicts:
	libsolidity/InterfaceHandler.cpp
2015-01-31 08:43:37 -08:00
Gav Wood
69fa5db471 Merge pull request #913 from arkpar/sol_abi_fix
Fixed json ABI generation for events
2015-01-31 08:29:50 -08:00
Gav Wood
bd66ebd7ee Merge pull request #913 from arkpar/sol_abi_fix
Fixed json ABI generation for events
2015-01-31 08:29:50 -08:00
Gav Wood
c08600ac75 Merge pull request #912 from debris/ethereumjs
ethereumjs events
2015-01-31 08:28:54 -08:00
Gav Wood
a52da46168 Code for outputing events as well as functions. 2015-01-31 08:23:58 -08:00
Christian
4e440b6e5d Fix scoping of event arguments. 2015-01-31 16:50:33 +01:00
Christian
bf5f476a83 Fix scoping of event arguments. 2015-01-31 16:50:33 +01:00
Marek Kotewicz
8cbaec5ce6 Squashed 'libjsqrc/ethereumjs/' changes from a8a2e32..589c4fb
589c4fb formatInput && formatOutput simplified
b20e972 few methods moved to utils

git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: 589c4fb30f2e68972b898c5ce084cda5b0831266
2015-01-31 15:53:50 +01:00
Marek Kotewicz
81cf9e514b Merge commit 'b0eff3fea412c5e33a5b8b98dc08f2d066d06513' into ethereumjs 2015-01-31 15:53:50 +01:00
arkpar
bc9d376590 style 2015-01-31 14:44:04 +01:00