Commit Graph

17282 Commits

Author SHA1 Message Date
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
arkpar
2da380e849 json and solidity ABI generted for events 2015-01-31 14:41:11 +01:00
arkpar
d6d7c9219b json and solidity ABI generted for events 2015-01-31 14:41:11 +01:00
Marek Kotewicz
9475733a2d Squashed 'libjsqrc/ethereumjs/' changes from 600c9dd..0b82a05
0b82a05 events
80c97ca events
2491c99 abi.js cleanup && new types.js, utils.js
cf534d4 gulp
5689086 formatters separated
995861d event options

git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: 0b82a05a75a0a7592e4fe391120f90d7cee495ac
2015-01-31 04:11:09 +01:00
Marek Kotewicz
443d11cd56 Merge commit 'f8a1f53e759ac2232d5a2a2a899645a9a79c344e' into ethereumjs 2015-01-31 04:11:09 +01:00
subtly
f4233598c1 import/export peers and nodes 2015-01-30 17:53:27 -08:00
Gav Wood
6c8b5cabdc Merge pull request #908 from chriseth/sol_fix_eventsWithoutParameters
Fix: No parameters for event.
2015-01-30 16:40:34 -08:00
Gav Wood
4ea0493b9e Merge pull request #908 from chriseth/sol_fix_eventsWithoutParameters
Fix: No parameters for event.
2015-01-30 16:40:34 -08:00
arkpar
ab366d140c updated json abi tests 2015-01-31 01:28:43 +01:00
arkpar
54676604f5 fixed ABI generator 2015-01-31 01:21:45 +01:00
Christian
ab9dec320a Fix: No parameters for event. 2015-01-30 21:49:01 +01:00
Christian
b6de953430 Fix: No parameters for event. 2015-01-30 21:49:01 +01:00
Christian
c797df7307 Workaround for a problem with git merge. 2015-01-30 20:49:45 +01:00
Christian
06e846b45c Fix standard sources test. 2015-01-30 13:57:23 +01:00