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
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
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
Marek Kotewicz
9ae6dcc5d1
solidity JSON interface tests
2014-11-12 11:39:42 +01:00
subtly
e4fd613821
cryptopp recover public key
2014-11-12 02:01:27 +01:00
Christoph Jentzsch
4f589053a0
changed name of command line option to filltests
2014-11-11 22:28:43 +01:00
Christoph Jentzsch
508b7f14d8
Create state test with commandline flag
2014-11-11 22:25:21 +01:00
Christoph Jentzsch
d010b15523
Store return value of call to precompiled contract in test
2014-11-11 21:56:17 +01:00
subtly
3842c3c9bd
ecdh, ecdhe, initial aes classes
2014-11-11 18:31:23 +01:00
Christian
1b405a6957
Provide interface for calls in JSON and some other formatting changes.
2014-11-11 17:41:48 +01:00
sveneh
74a49676be
Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into build_enhancement
...
Conflicts:
alethzero/CMakeLists.txt
cmake/EthDependenciesDeprecated.cmake
libdevcrypto/CryptoPP.h
libdevcrypto/EC.cpp
third/CMakeLists.txt
2014-11-11 15:04:19 +01:00
Gav Wood
e4f4eaf7c8
Merge pull request #504 from CJentzsch/NewStateTests
...
All unintended VM exceptions work like OOG in tests
2014-11-11 10:57:47 +00:00
Gav Wood
a12aa613ca
Make OOG on precompileds consistent.
...
Warning fix.
Use high-res clock for randoms.
Whisper test.
2014-11-11 10:54:48 +00:00
Christian
381bec8284
Working template magic for void function.
2014-11-11 11:41:49 +01:00
Christian
9d8fe1a091
Merge remote-tracking branch 'ethereum/develop' into sol_jumptable
...
Conflicts:
libsolidity/Compiler.cpp
2014-11-11 10:39:59 +01:00
Marek Kotewicz
3b2a0063c0
contract create and contract call working
2014-11-11 09:06:35 +01:00