Commit Graph

536 Commits

Author SHA1 Message Date
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
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
8a9da8648d Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler
Conflicts:
	alethzero/CMakeLists.txt
2014-11-03 16:13:40 +01:00
Christian
dab09c595a Some tests and bugfixes for the compiler. 2014-11-03 16:11:40 +01:00
Christian
6951657c59 Bugfix: Swap before mod and div. 2014-11-03 15:44:22 +01:00
Christian
47d37b12a3 Bugfix: Swap before mod and div. 2014-11-03 12:23:53 +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
Marek Kotewicz
07d08e3af3 boost_auto_test_suite for jsonrpc && @brief description for WebThreeStubServer 2014-10-31 17:30:04 +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
Christian
c0528f511a Actual contract creator and add solidity to AlethZero interface. 2014-10-31 14:37:23 +01:00
Gav Wood
882b8ad089 Big fixes. 2014-10-31 14:35:13 +01:00
chriseth
be45d11e4c Merge pull request #415 from chriseth/sol_expressionCompiler
Solidity expression compiler
2014-10-31 13:42:24 +01:00
Gav Wood
882ee7db3e Merge pull request #432 from CJentzsch/newTests
Added tests for SIGNEXTEND and BNOT
2014-10-31 13:12:25 +01:00
Marek Kotewicz
53b422c64a applied changes from ethereum.js 5538ff725235f30a9afbbedc098fd18dfd9f1293 2014-10-31 11:49:28 +01:00
Marek Kotewicz
57ef1fbd9b Merge branch 'develop' into mk_jsonrpc 2014-10-31 11:27:49 +01:00
Christoph Jentzsch
bc1aaa78a8 Merge remote-tracking branch 'upstream/develop' into stateTests
Conflicts:
	libethereum/AddressState.h
	test/vm.cpp
2014-10-31 09:46:20 +01:00
Christoph Jentzsch
3d17d7b2f1 Clean up FakeExtVM - move to state tests 2014-10-31 09:41:02 +01:00
Christian
f6c46c57f3 Function selector and variable (un)packing. 2014-10-30 21:21:25 +01:00
Christian
fa24c954a5 Renamed file. 2014-10-30 21:21:25 +01:00
Gav Wood
bf763824f3 Fix for Trie roots.
AddressState -> Account.
2014-10-30 13:47:28 +01:00
Marek Kotewicz
f301ee29f7 common changes 2014-10-30 13:06:45 +01:00
Marek Kotewicz
7aa61b8297 Merge branch 'develop' into mk_jsonrpc 2014-10-30 11:56:53 +01:00
Christian
6642992c97 Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler 2014-10-30 01:25:42 +01:00
Christian
b0d4e0dedf Contract compiler and also add ExpressionStatement to AST.
ExpressionStatement functions as glue between Statements and Expressions.

This way it is possible to detect when the border between statements and
expressions is crossed while walking the AST. Note that ExpressionStatement is
not the only border, almost every statement can contains expressions.
2014-10-30 01:25:42 +01:00
Christoph Jentzsch
5de54b4c0d Clean up 2014-10-29 22:22:56 +01:00
Christoph Jentzsch
7fd46aacf6 Update tests to new definition 2014-10-29 22:22:56 +01:00
Christoph Jentzsch
02e232857d clean up PR 2014-10-29 22:22:55 +01:00
Christoph Jentzsch
e551b63cd1 Update SIGNEXTEND definition and tests
Conflicts:
	libevm/VM.h
	test/vmBitwiseLogicOperationTestFiller.json
2014-10-29 22:19:23 +01:00
Christoph Jentzsch
7f4fa9e2e1 New BNOT and SIGNEXTEND tets 2014-10-29 21:26:51 +01:00
Christian
70d7d9b3bc Further const placement changes. 2014-10-29 19:41:07 +01:00
Christian
c5c33485d8 Merge remote-tracking branch 'ethereum/develop' into sol_expressionCompiler 2014-10-29 19:26:02 +01:00
subtly
b62bb50f6c Merge branch 'develop' into crypto 2014-10-29 19:25:03 +01:00
subtly
88481e0f26 remove asserts for recid being 2, which is rare, but may occur 2014-10-29 19:24:23 +01:00
Christoph Jentzsch
a5ae5f4fe9 Merge remote-tracking branch 'upstream/develop' into stateTests 2014-10-29 19:22:56 +01:00
Gav Wood
5110ffe304 Merge pull request #442 from chriseth/sol_fix_break
Parser fix: Consume break and continue.
2014-10-29 19:07:39 +01:00