Commit Graph

17563 Commits

Author SHA1 Message Date
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
Paweł Bylica
6d8de298ed Merge branch 'develop' into develop-evmcc
Conflicts:
	libdevcrypto/EC.cpp
	test/vm.cpp
2014-11-12 12:37:19 +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
ad4b027781 Provide interface for calls in JSON and some other formatting changes. 2014-11-11 17:41:48 +01:00
Christian
8c6bf21c01 Provide interface for calls in JSON and some other formatting changes. 2014-11-11 17:41:48 +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
d1789250b6 Merge remote-tracking branch 'ethereum/develop' into sol_jumptable
Conflicts:
	libsolidity/Compiler.cpp
2014-11-11 10:39:59 +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
Marek Kotewicz
a5e5516a01 Merge branch 'develop' into js_abi
Conflicts:
	libjsqrc/main.js
	libweb3jsonrpc/WebThreeStubServer.cpp
	libweb3jsonrpc/WebThreeStubServer.h
	libweb3jsonrpc/abstractwebthreestubserver.h
	libweb3jsonrpc/spec.json
	test/webthreestubclient.h
2014-11-10 23:04:35 +01:00
Marek Kotewicz
c3e80e69f9 Merge branch 'develop' into js_abi
Conflicts:
	libjsqrc/main.js
	libweb3jsonrpc/WebThreeStubServer.cpp
	libweb3jsonrpc/WebThreeStubServer.h
	libweb3jsonrpc/abstractwebthreestubserver.h
	libweb3jsonrpc/spec.json
	test/webthreestubclient.h
2014-11-10 23:04:35 +01:00
Marek Kotewicz
af5b12b249 Merge branch 'develop' into js_abi
Conflicts:
	libjsqrc/main.js
	libweb3jsonrpc/WebThreeStubServer.cpp
	libweb3jsonrpc/WebThreeStubServer.h
	libweb3jsonrpc/abstractwebthreestubserver.h
	libweb3jsonrpc/spec.json
	test/webthreestubclient.h
2014-11-10 23:04:35 +01:00
Marek Kotewicz
a44bd8c987 merge 2014-11-10 22:51:10 +01:00
Marek Kotewicz
5a3a5b9abc merge 2014-11-10 22:51:10 +01:00
Marek Kotewicz
4309464384 merge 2014-11-10 22:51:10 +01:00
Christoph Jentzsch
5654600311 Merge remote-tracking branch 'upstream/develop' into NewStateTests 2014-11-10 22:26:29 +01:00
Christoph Jentzsch
d3910593a0 All unintended VM exceptions work like OOG in tests 2014-11-10 22:26:07 +01:00
Marek Kotewicz
96292f9199 js abi connection 2014-11-10 21:32:13 +01:00
sveneh
c492df94fb compiles fine now (on Linux) with both cryptopp and json-rpc-cpp dependencies 2014-11-10 20:31:15 +01:00
Gav Wood
4c05e6c967 Merge pull request #499 from CJentzsch/NewStateTests
New state tests, precompiled contracts tests and user defined tests
2014-11-10 17:34:01 +00:00
Gav Wood
0ae55a16a9 Merge pull request #486 from chriseth/sol_optimizer
Fix and activate optimizer for Solidity, add some new rules.
2014-11-10 17:31:18 +00:00
Christoph Jentzsch
9b14af5c15 build fix 2014-11-10 18:30:35 +01:00
Gav Wood
c153afafbf Merge pull request #482 from ethereum/jsonrpc_interface
renaming calls to include a subprotocol prefix
2014-11-10 17:28:47 +00:00
Christian
f0dd0d797e Allow void return type. 2014-11-10 18:08:26 +01:00
Christoph Jentzsch
3c45877e2a added generic userDefinedTest function 2014-11-10 17:37:55 +01:00
Christian
315223fc41 Tests on ranges of input data. 2014-11-10 15:38:06 +01:00
Christian
a0c72065fe Merge remote-tracking branch 'ethereum/develop' into sol_optimizer
Conflicts:
	libevmcore/Instruction.cpp
2014-11-10 13:30:59 +01:00
Christian
3fbe72cc47 Merge remote-tracking branch 'ethereum/develop' into sol_optimizer
Conflicts:
	libevmcore/Instruction.cpp
2014-11-10 13:30:59 +01:00
Christian
41b26e491b Replace function selector jump table by more resilient linear time check. 2014-11-10 13:13:53 +01:00
Christian
3a016ea0b4 Replace function selector jump table by more resilient linear time check. 2014-11-10 13:13:53 +01:00
Gav Wood
d9822190c6 Merge pull request #498 from ethereum/solidity_cmake
add headers to solidity's add_library
2014-11-10 11:57:29 +00:00
Gav Wood
16007bd191 Merge pull request #494 from chriseth/sol_stateVariables
State variables for Solidity
2014-11-10 11:57:01 +00:00
Gav Wood
af4f3e1eff Merge pull request #488 from LefterisJP/develop
solidity endToEnd testing gets equivalent CPP contracts
2014-11-10 11:56:09 +00:00
Christoph Jentzsch
99c3957eca undefine FILL_TESTS 2014-11-10 07:30:56 +01:00
Christoph Jentzsch
43bab79fbc Merge remote-tracking branch 'upstream/develop' into NewStateTests
Conflicts:
	test/state.cpp
	test/tmpFiller.json
2014-11-10 07:15:27 +01:00