Gav Wood
fbdf0b1214
Merge pull request #520 from wanderer/develop
...
added filler
2014-11-20 10:16:07 -05:00
sveneh
5c19ce88ff
Merge remote-tracking branch 'debris/mk_jsonrpc_upgrade' into build_enhancement
...
This basically pulls in libjson-rpc-cpp 0.3.2, updated from previous
0.2.1. v0.3.2 completely changes its own setup, hence such a massive
change
builds fine on Ubuntu, needs check on OS X
Conflicts:
CMakeLists.txt
cmake/EthDependenciesDeprecated.cmake
eth/CMakeLists.txt
libqethereum/CMakeLists.txt
libweb3jsonrpc/CMakeLists.txt
neth/CMakeLists.txt
test/CMakeLists.txt
2014-11-20 10:55:36 +01:00
Christoph Jentzsch
76106f2933
add make money test
2014-11-19 18:39:53 +01:00
Lefteris Karapetsas
6275b1ee93
documentation comments are now always skipped but saved as special tokens at the Scanner
2014-11-19 16:21:42 +01:00
Lefteris Karapetsas
43961a552d
documentation comments are now always skipped but saved as special tokens at the Scanner
2014-11-19 16:21:42 +01:00
Christoph Jentzsch
35bc1b3d44
more log tests
2014-11-19 15:17:03 +01:00
Christoph Jentzsch
b1e26e28e3
Add Log tests
2014-11-19 14:30:42 +01:00
Christian
3ba9649dde
Special handling for constructor.
2014-11-19 13:19:43 +01:00
Christian
4f2008e8d8
Special handling for constructor.
2014-11-19 13:19:43 +01:00
Paweł Bylica
7df5ec34c7
In VM tests, check only if an exception occurred if an exception expected (no post state and output checking)
2014-11-19 13:13:19 +01:00
Christoph Jentzsch
52dc2b4bc5
new push32 test and renaming
2014-11-19 10:55:36 +01:00
Christoph Jentzsch
cfcc9ca096
Changed name of some tests
2014-11-19 10:55:36 +01:00
Christoph Jentzsch
8daa5d37af
more precompiled contract tests
...
Conflicts:
libevm/VM.h
2014-11-19 10:55:28 +01:00
Lefteris Karapetsas
4e6d3a38cd
fixing typo and alignment
2014-11-19 02:05:55 +01:00
Lefteris Karapetsas
a461498300
solidity scanner takes triple slash doc comments into account
...
- Conditionally scanning for the documentation comments and gettings their
contents.
- Adding tests for this functionality of the scanner
2014-11-19 01:58:32 +01:00
Lefteris Karapetsas
3174f5eca3
solidity scanner takes triple slash doc comments into account
...
- Conditionally scanning for the documentation comments and gettings their
contents.
- Adding tests for this functionality of the scanner
2014-11-19 01:58:32 +01:00
Gav Wood
3e57086efe
Fix warnings, release errors.
2014-11-18 17:49:31 +01:00
Marek Kotewicz
0eb527859f
Merge branch 'develop' into mk_jsonrpc_upgrade
...
Conflicts:
libweb3jsonrpc/abstractwebthreestubserver.h
libweb3jsonrpc/spec.json
test/webthreestubclient.h
2014-11-18 16:37:24 +01:00
Gav Wood
9544173e3b
Merge branch 'filter_logs' into develop
2014-11-18 13:40:53 +01:00
Gav Wood
ff9331185c
Merge branch 'filter_logs' into develop
2014-11-18 13:40:53 +01:00
Marek Kotewicz
ede6da24d7
common changes
2014-11-18 13:09:05 +01:00
Marek Kotewicz
2bdb56213a
Merge branch 'filter_logs' of https://github.com/ethereum/cpp-ethereum into logs
...
Conflicts:
libweb3jsonrpc/abstractwebthreestubserver.h
libweb3jsonrpc/spec.json
test/webthreestubclient.h
2014-11-18 12:43:52 +01:00
Marek Kotewicz
ab98c67514
logs in spec
2014-11-18 12:41:53 +01:00
Gav Wood
3d7de75aaa
Renaming and fixes.
2014-11-18 12:41:10 +01:00
Marek Kotewicz
cf58cd7754
fixed test
2014-11-18 12:22:10 +01:00
Gav Wood
00c21e4bcc
Build fix.
2014-11-18 12:01:25 +01:00
Gav Wood
4db1839607
Remove overly verbose log.
2014-11-18 12:00:58 +01:00
Marek Kotewicz
65298a9655
common changes
2014-11-18 11:46:57 +01:00
Marek Kotewicz
1d278d2857
Merge branch 'develop' into mk_jsonrpc_upgrade
...
Conflicts:
alethzero/MainWin.cpp
libweb3jsonrpc/WebThreeStubServer.cpp
libweb3jsonrpc/abstractwebthreestubserver.h
libweb3jsonrpc/spec.json
test/jsonrpc.cpp
test/webthreestubclient.h
2014-11-18 11:46:38 +01:00
chriseth
09be38b0c1
Merge pull request #515 from chriseth/sol_structs
...
Mappings and structs for Solidity
2014-11-17 22:41:23 +01:00
wanderer
4043af1516
added filler.json
2014-11-17 15:27:30 -05:00
Artur Zawłocki
07e6049967
fixed libevmjit dependencies in cmake files
2014-11-17 18:10:54 +01:00
Marek Kotewicz
7b30c14ded
ethereum.js not minified, serpent compiler, jsonrpc handles compilers exceptions
2014-11-17 14:04:57 +01:00
Marek Kotewicz
109f57c75f
Merge branch 'develop' into js_abi
...
Conflicts:
libweb3jsonrpc/WebThreeStubServer.cpp
2014-11-17 12:42:23 +01:00
Paweł Bylica
9cb0f56af2
Merge branch 'develop-evmcc' into pr-jit
2014-11-17 09:48:34 +01:00
Paweł Bylica
578a0391cd
Merge branch 'develop' into develop-evmcc
...
Conflicts:
windows/LibEthereum.vcxproj.filters
2014-11-17 09:48:13 +01:00
Gav Wood
d38e5bc4b0
Windows build fix.
2014-11-16 23:02:53 +01:00
sveneh
9be7f3c030
Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into build_enhancement
...
Conflicts:
libdevcrypto/EC.cpp -> accept-incoming
2014-11-16 21:40:56 +01:00
Paweł Bylica
72fa55410e
Merge branch 'develop-evmcc' into pr-jit
2014-11-14 15:41:26 +01:00
Paweł Bylica
0eecd126f4
Merge branch 'develop' into develop-evmcc
...
Conflicts:
windows/LibEthereum.vcxproj
2014-11-14 15:30:08 +01:00
Marek Kotewicz
7dbfde91e3
Merge branch 'develop' into js_abi
2014-11-14 14:08:44 +01:00
Marek Kotewicz
48b89901c2
Merge branch 'develop' into js_abi
2014-11-14 14:08:44 +01:00
Marek Kotewicz
a792ed89c2
Merge branch 'develop' into js_abi
2014-11-14 14:08:44 +01:00
Christian
c560a62352
Struct types.
2014-11-14 14:08:14 +01:00
Christian
558d0999c8
Struct types.
2014-11-14 14:08:14 +01:00
Christian
46dd629820
Mapping types.
2014-11-14 14:08:14 +01:00
Christian
9f64159620
Mapping types.
2014-11-14 14:08:14 +01:00
subtly
cdfeb725d4
pr fix
2014-11-14 13:14:22 +01:00
subtly
48360a519c
Merge branch 'develop' into crypto
...
Conflicts:
libdevcrypto/EC.cpp
2014-11-14 13:14:07 +01:00
Gav Wood
7e7204ec18
Compile fixes.
...
Version bump.
2014-11-14 12:45:20 +01:00
