Commit Graph

1100 Commits

Author SHA1 Message Date
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
8147642312 Merge commit 'f1cf1b28d797f0761c7cf6ea5236396326f0f682' into ethereumjs 2015-02-03 23:14:19 +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
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
74e7e3eaf9 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
Lefteris Karapetsas
3b0ca66cd2 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
Gav Wood
bd3fed43b9 Don't count same messages twice. 2015-02-01 22:48: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
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
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
c08600ac75 Merge pull request #912 from debris/ethereumjs
ethereumjs events
2015-01-31 08:28:54 -08: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
2da380e849 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
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
Christian
b6de953430 Fix: No parameters for event. 2015-01-30 21:49:01 +01:00
Gav Wood
7ed2dd65c8 Whisper now 100% encrypted. 2015-01-29 20:22:08 -08:00
Gav Wood
72af3456df Various fixes. 2015-01-29 16:14:50 -08:00
Gav Wood
27f3e92a2f Dev. 2015-01-29 16:13:28 -08:00
Gav Wood
b1043c8651 Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop
Conflicts:
	test/SolidityEndToEndTest.cpp
	test/SolidityNameAndTypeResolution.cpp
	test/SolidityParser.cpp
2015-01-29 16:05:17 -08:00
Gav Wood
7925610ab4 Merge pull request #893 from chriseth/sol_events
Events in Solidity
2015-01-29 15:44:42 -08:00
Gav Wood
6dd6e55d31 Merge pull request #892 from debris/ethereumjs
ethereumjs events && more
2015-01-29 15:36:09 -08:00
Christian
a55a99a2b0 Fallback functions. 2015-01-29 22:50:20 +01:00
Christian
dbfd0c6019 Padding fixes. 2015-01-29 21:33:46 +01:00
Christian
99a8f58ee3 Code generation for events. 2015-01-29 21:33:46 +01:00
Christian
a86a3a2452 Parsing of events. 2015-01-29 21:26:11 +01:00
Lefteris Karapetsas
5da76a3bbd FunctionType now returns const ref for Declaration 2015-01-29 19:18:50 +01:00
Lefteris Karapetsas
866bd01bef Removing Function and Param Description
- Removing FunctionDescription and ParamDescription. All the data should
  now be in the FunctionType

- Plus using the FunctionTypePointer alias in a few places
2015-01-29 17:12:17 +01:00
Lefteris Karapetsas
e77fc5c7e0 Contract Interface Functions now return FunctionType
- Enchanced Function Type by declaration so that it can provide all the
  required information at each place interface functions are consumed

- Changed all places where interface functions was used.

- Simplified Mix's FunctionDefinition code
2015-01-29 17:11:13 +01:00
Marek Kotewicz
4f0002b007 Merge commit '86b70485a615c65919513426d407d7ab3c498a6f' into ethereumjs
Conflicts:
	libjsqrc/ethereumjs/dist/ethereum.js.map
	libjsqrc/ethereumjs/dist/ethereum.min.js
2015-01-29 15:27:17 +01:00
Marek Kotewicz
2994eb4e63 Squashed 'libjsqrc/ethereumjs/' changes from 6d59047..94e0e5a
94e0e5a Merge branch 'cpp' into cpp2
8613382 moved comment
df17c33 event example
c8ee08c contract.js simplified
842b8cf event.js
e1c0862 Fix for API.
61e8ae2 events init
2544d2c tests for abi.filters
ea7c2fc abi function type
63d9c07 fixed incoming messages
1345a8c log error on console, if api returns an error
83fad0f removed fromFixed, toFixed && offset from tests
c2cb2be removed web3.eth.account, fixed #37
09f6335 fixed #23
42a25f2 evaluating solidity method input params

git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: 94e0e5ab7d8ec9adcd03fedc3abe5cf6444a5123
2015-01-29 15:26:42 +01:00
chriseth
d6e77f193a Merge pull request #889 from LefterisJP/sol_ExprCompilerEncapsulation
No longer exposing retrieveValueFromStorage() as a public function
2015-01-29 14:53:10 +01:00
Lefteris Karapetsas
bdb4462673 No longer exposing retrieveValueFromStorage() as a public function
- plus small fix in EndToEndTests
2015-01-29 13:34:07 +01:00
chriseth
8c27fccae9 Merge pull request #887 from chriseth/sol_excludeStd
Exclude standard contracts by default.
2015-01-29 10:41:04 +01:00
Christian
f054a4af7b Exclude standard contracts by default. 2015-01-29 01:29:43 +01:00