Commit Graph

16548 Commits

Author SHA1 Message Date
Gav Wood
2d9771e4fe Merge pull request #465 from ethereum/bugfix
jsonrpc to run once, and only when jsonrpc test suite is invoked
2014-11-04 20:08:48 +00:00
chriseth
1de66d6e9e Added doxygen comment. 2014-11-04 19:52:04 +01:00
Paweł Bylica
7b3a2d65a6 Merge branch 'develop-evmcc' into pr-jit 2014-11-04 18:57:58 +01:00
Christoph Jentzsch
415a73f52b Merge remote-tracking branch 'upstream/develop' into newTests 2014-11-04 18:19:23 +01:00
Paweł Bylica
557fe30588 Merge branch 'develop' into develop-evmcc 2014-11-04 17:26:15 +01:00
Christoph Jentzsch
6199f74aaf Merge remote-tracking branch 'upstream/develop' into StateBug 2014-11-04 16:24:45 +01:00
subtly
838b6b4b44 coding standards. suite setup struct. 2014-11-04 15:24:02 +01:00
Gav Wood
b01be526db Merge pull request #468 from CJentzsch/bugfix
bugfix jumps after push
2014-11-04 13:29:40 +00:00
Christoph Jentzsch
f49fbb16a0 Merge remote-tracking branch 'upstream/develop' into NewStateTests 2014-11-04 14:04:17 +01:00
subtly
adc08af7c6 Merge branch 'develop' into bugfix 2014-11-04 13:46:33 +01:00
Christoph Jentzsch
37939c565d Merge pull request #454 from jorisbontje/423-dockerfile
update Dockerfile with cryptopp and jsonrpc dependencies, fixes #423

Cleaned up jsonrpc test

Forgot the #if

Undo jsonrpc test changes
2014-11-04 13:43:13 +01:00
Christoph Jentzsch
919d3c56eb # This is a combination of 2 commits.
# The first commit's message is:

Merge pull request #454 from jorisbontje/423-dockerfile

update Dockerfile with cryptopp and jsonrpc dependencies, fixes #423

Cleaned up jsonrpc test

# This is the 2nd commit message:

Forgot the #if
2014-11-04 13:43:04 +01:00
Christoph Jentzsch
3a5808c39f Update tests to latest protocol changes (PoC7) 2014-11-04 13:36:29 +01:00
Marek Kotewicz
51a0ca457f fixed WebThreeStubServer constructor 2014-11-04 12:03:24 +01:00
chriseth
ef546e789a Stylistic changes. 2014-11-04 11:56:19 +01:00
Marek Kotewicz
de3e2acdca little cleanup after upgrading jsonrpc 2014-11-04 11:15:16 +01:00
subtly
2d7176b79c json rpc only runs once, and only when json rpc test suite is invoked 2014-11-04 10:56:22 +01:00
subtly
7562f8fff2 codereview fixes 2014-11-04 10:54:46 +01:00
Christoph Jentzsch
1310011f77 Fix ABAcalls OOG bug 2014-11-03 23:49:05 +01:00
subtly
2fe6c6c472 Merge branch 'crypto' into cryptable 2014-11-03 18:17:52 +01:00
subtly
9557fea39c Merge branch 'develop' into cryptable 2014-11-03 18:17:31 +01:00
Christoph Jentzsch
c931e3ceec style 2014-11-03 17:53:29 +01:00
Marek Kotewicz
cde59bdb90 jsonrpc 0.3.0 working, needs cleanup 2014-11-03 16:54:03 +01:00
Christoph Jentzsch
72c7132a3a Merge remote-tracking branch 'upstream/develop' into stateTests
Conflicts:
	test/vmBitwiseLogicOperationTestFiller.json
2014-11-03 16:34:40 +01:00
Christoph Jentzsch
6eeef2762c Clean up and organize tests + state class tests 2014-11-03 16:33:02 +01:00
Christian
bfb2ae9f3c Test adjustments. 2014-11-03 16:30:11 +01:00
Christian
e9f8ebe4dc Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler
Conflicts:
	alethzero/CMakeLists.txt
2014-11-03 16:13:40 +01:00
Christian
8a9da8648d Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler
Conflicts:
	alethzero/CMakeLists.txt
2014-11-03 16:13:40 +01:00
Christian
4dfd6dfa13 Some tests and bugfixes for the compiler. 2014-11-03 16:11:40 +01:00
Christian
dab09c595a Some tests and bugfixes for the compiler. 2014-11-03 16:11:40 +01:00
Christian
643c781a6d Bugfix: Swap before mod and div. 2014-11-03 15:44:22 +01:00
Christian
6951657c59 Bugfix: Swap before mod and div. 2014-11-03 15:44:22 +01:00
Christian
e9eef77489 Bugfix: Swap before mod and div. 2014-11-03 12:23:53 +01:00
Christian
47d37b12a3 Bugfix: Swap before mod and div. 2014-11-03 12:23:53 +01:00
Paweł Bylica
ea726b8ef8 Merge branch 'develop' into develop-evmcc
Conflicts:
	test/CMakeLists.txt
2014-11-03 10:30:59 +01:00
subtly
af35240e37 Merge branch 'develop' into crypto 2014-11-03 01:35:29 +01:00
subtly
51fea10bbe Placeholder kdf. More cleanup and tests. 2014-11-02 04:41:16 +01:00
Gav Wood
577503539e Fix for assembler. 2014-10-31 20:29:38 +01:00
Marek Kotewicz
07d08e3af3 boost_auto_test_suite for jsonrpc && @brief description for WebThreeStubServer 2014-10-31 17:30:04 +01:00
Christian
245efb0280 Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler
Conflicts:
	libsolidity/AST.cpp
	libsolidity/AST.h
	libsolidity/Compiler.cpp
	libsolidity/Compiler.h
	libsolidity/NameAndTypeResolver.h
	libsolidity/Types.cpp
	solc/main.cpp
	test/solidityCompiler.cpp
2014-10-31 17:20:27 +01:00
Christian
6d2b660ba7 Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler
Conflicts:
	libsolidity/AST.cpp
	libsolidity/AST.h
	libsolidity/Compiler.cpp
	libsolidity/Compiler.h
	libsolidity/NameAndTypeResolver.h
	libsolidity/Types.cpp
	solc/main.cpp
	test/solidityCompiler.cpp
2014-10-31 17:20:27 +01:00
Christian
25c0e08bdf Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler
Conflicts:
	libsolidity/AST.cpp
	libsolidity/AST.h
	libsolidity/Compiler.cpp
	libsolidity/Compiler.h
	libsolidity/NameAndTypeResolver.h
	libsolidity/Types.cpp
	solc/main.cpp
	test/solidityCompiler.cpp
2014-10-31 17:20:27 +01:00
Christian
2088aaa85b Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler
Conflicts:
	libsolidity/AST.cpp
	libsolidity/AST.h
	libsolidity/Compiler.cpp
	libsolidity/Compiler.h
	libsolidity/NameAndTypeResolver.h
	libsolidity/Types.cpp
	solc/main.cpp
	test/solidityCompiler.cpp
2014-10-31 17:20:27 +01:00
Marek Kotewicz
f64c53ac62 Merge branch 'develop' into mk_jsonrpc 2014-10-31 17:13:32 +01:00
Marek Kotewicz
d645388fa9 fixed style issue 2014-10-31 17:13:06 +01:00
Paweł Bylica
973781d4a7 Merge branch 'develop-evmcc' into pr-jit 2014-10-31 16:59:36 +01:00
Paweł Bylica
cf26020ecc Merge branch 'develop' into develop-evmcc 2014-10-31 16:41:23 +01:00
artur-zawlocki
5546ac9f94 Merge branch 'develop-evmcc' of github.com:imapp-pl/ethereum into develop-evmcc
Conflicts:
	libevmjit/Compiler.cpp
2014-10-31 15:08:10 +00:00
artur-zawlocki
f19bc2cfef allow --jit as non first argument 2014-10-31 14:47:16 +00:00
Christian
a36db1f241 Actual contract creator and add solidity to AlethZero interface. 2014-10-31 14:37:23 +01:00