Commit Graph

14695 Commits

Author SHA1 Message Date
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
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
c4a65cf688 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
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
Paweł Bylica
0e187175b8 Test unexpected storage entries 2014-11-14 11:44:51 +01:00
Paweł Bylica
fda1fd586f Fix VM tester 2014-11-14 11:07:14 +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
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