Marek Kotewicz
82dbdce5ee
Merge branch 'develop' into build_enhancement
2014-12-04 00:32:05 +01:00
Marek Kotewicz
f5ed8c8ce3
common changes
2014-12-01 21:30:00 +01:00
sveneh
8fd474d10b
use CMAKE_PREFIX_PATH instead of CMAKE_FILE_ROOT_PATH; removed the
...
requirement to use EXACT version numbers for dependencies, cleanup
2014-11-27 20:01:34 +01:00
chriseth
596e7030f7
Merge pull request #524 from LefterisJP/sol_parse_comments
...
Solidity scanner taking documentation comments into account
2014-11-21 15:35:17 +01:00
Lefteris Karapetsas
70a5c84095
extra comments scanning test
2014-11-20 23:18:05 +01:00
Gav Wood
a879115143
Merge pull request #528 from chriseth/sol_constructor
...
Special handling for constructor.
2014-11-20 10:18:04 -05:00
Gav Wood
82af8f5579
Merge pull request #527 from imapp-pl/pr-changes
...
Check only if an exception occurred if an exception expected
2014-11-20 10:16:16 -05:00
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
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
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
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
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
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
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
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
Marek Kotewicz
a792ed89c2
Merge branch 'develop' into js_abi
2014-11-14 14:08:44 +01:00
Christian
558d0999c8
Struct 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
Gav Wood
2e794b55bd
Merge pull request #512 from ethereum/sol_jsonInterfaceTests
...
Solidity json interface tests
2014-11-14 12:18:29 +01:00
Gav Wood
c82174c1dd
Merge pull request #510 from CJentzsch/NewStateTests
...
create new tests with command line options
2014-11-14 12:08:49 +01:00
Gav Wood
a0a8c61a7e
Merge pull request #509 from chriseth/sol_jsonInterface
...
Provide interface for calls in JSON and some other formatting changes.
2014-11-14 12:07:33 +01:00
Gav Wood
d064028e16
Merge pull request #501 from chriseth/sol_testFramework
...
Tests on ranges of input data.
2014-11-14 12:07:07 +01:00
Gav Wood
e4228083ed
Merge pull request #500 from chriseth/sol_jumptable
...
Replace function selector jump table by more resilient linear time check.
2014-11-14 12:06:25 +01:00
Marek Kotewicz
ae062ac119
storage dump test
2014-11-13 18:52:21 +01:00
Marek Kotewicz
385408f038
added storageAt which dumps contract storage
2014-11-13 18:29:01 +01:00
subtly
4294fb9cbd
changes for code review
2014-11-13 17:40:44 +01:00
Marek Kotewicz
5c67fd341b
removed unnecessary methods from jsonrpc and added contract call tests
2014-11-13 12:26:52 +01:00
subtly
00d92ca54e
Merge branch 'develop' into crypto
...
Conflicts:
libdevcrypto/Common.cpp
libdevcrypto/EC.cpp
2014-11-13 02:05:54 +01:00
subtly
84b3fb6168
refactor and thread-safe cryptopp. for now, remove secp256klib calls. ecdh and tests. move sha3mac into sha3.
2014-11-13 02:00:19 +01:00
Marek Kotewicz
8e5b6d67cc
contract calls working from js
2014-11-12 20:47:05 +01:00
Marek Kotewicz
a519e83504
solidity json interface tests fixes
2014-11-12 13:00:11 +01:00
Marek Kotewicz
1c9bc82d88
Merge branch 'develop' into js_abi
2014-11-12 11:45:35 +01:00