Commit Graph

1114 Commits

Author SHA1 Message Date
CJentzsch
017d9ed09a Merge branch 'RefundOverflow' into addTests 2015-02-05 22:43:53 +01:00
CJentzsch
1298b8605c Merge remote-tracking branch 'upstream/develop' into RefundOverflow 2015-02-05 22:43:29 +01:00
CJentzsch
630681094e test block gas limit 2015-02-05 22:42:17 +01:00
CJentzsch
f168904410 Merge remote-tracking branch 'upstream/develop' into addTests 2015-02-05 22:41:40 +01:00
Gav Wood
969366f46b Move CommonJS to libethcore. Split it up ready for refactoring into
libdevcore/libdevcrypto.
2015-02-04 11:26:58 -08:00
Gav Wood
8b8097ec03 Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop
Conflicts:
	mix/MixClient.cpp
2015-02-04 10:44:42 -08:00
Gav Wood
4dc5909072 Split canon blockchain and basic blockchain. 2015-02-04 10:29:56 -08:00
Gav Wood
4833b45fb3 Merge pull request #949 from guanqun/add-some-tests-for-named-args
fix bug of duplicate name args due to refactoring of m_names
2015-02-04 10:19:16 -08:00
Lu Guanqun
7eece799f2 add several type error test cases 2015-02-05 01:01:41 +08:00
Gav Wood
458e65f3cb Merge pull request #948 from guanqun/add-some-tests-for-named-args
Add some tests for named args
2015-02-04 08:48:12 -08:00
Lu Guanqun
bade3d98e9 add two test cases parser error for named args 2015-02-05 00:36:04 +08:00
Lu Guanqun
9f5d8342a6 add a test case for disorder named args 2015-02-05 00:06:35 +08:00
Marek Kotewicz
d5e876c106 Merge commit '2d09638fdec853d0d303141ad5ce97b1289153e0' into ethereumjs 2015-02-04 11:24:10 +01:00
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
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
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
CJentzsch
cbfd094a17 add refundoverflow test 2015-02-03 01:25:41 +01: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