Commit Graph

21407 Commits

Author SHA1 Message Date
Christian
c5c33485d8 Merge remote-tracking branch 'ethereum/develop' into sol_expressionCompiler 2014-10-29 19:26:02 +01:00
Christian
21b01a9647 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
Gav Wood
4c895be53f Merge pull request #434 from CJentzsch/vmtraceBugFix
Vmtrace bug fix
2014-10-29 19:06:54 +01:00
subtly
7f7a800fa1 recover public key from ecdsa,v sig using cryptopp 2014-10-29 18:46:57 +01:00
Christoph Jentzsch
4df3ca25f3 Merge remote-tracking branch 'upstream/develop' into stateTests 2014-10-29 17:25:24 +01:00
Christoph Jentzsch
3565d42a14 Restructure state tests. Remove FakeStateClass 2014-10-29 17:25:02 +01:00
Christian
03a6cf0e81 Compiler for assignments. 2014-10-29 14:33:25 +01:00
Christian
e08065a2fb Compiler for assignments. 2014-10-29 14:33:25 +01:00
Christian
b5a4d12fa3 Compiler for assignments. 2014-10-29 14:33:25 +01:00
Christian
d706631412 NEG->BNOT change 2014-10-29 14:26:37 +01:00
Christian
01224287f5 NEG->BNOT change 2014-10-29 14:26:37 +01:00
Christian
f6fabb268b Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler
Conflicts:
	libsolidity/Types.cpp
2014-10-29 13:54:36 +01:00
Christian
9eacf5737f Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler
Conflicts:
	libsolidity/Types.cpp
2014-10-29 13:54:36 +01:00
Christian
413b315a03 Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler
Conflicts:
	libsolidity/Types.cpp
2014-10-29 13:54:36 +01:00
Christian
f6e24989ec Bugfix: Tag takes one byte (for JUMPDEST) 2014-10-29 13:08:23 +01:00
Christian
2939b180ba Parser fix: Consume break and continue. 2014-10-29 13:00:22 +01:00
Christian
3f4befd6b4 Parser fix: Consume break and continue. 2014-10-29 13:00:22 +01:00
artur-zawlocki
ec9330609f Merge branch 'develop-evmcc' of github.com:imapp-pl/ethereum into develop-evmcc
Conflicts:
	test/vm.cpp
2014-10-29 11:02:37 +00:00
Marek Kotewicz
48f6b4a8c6 whisper polling, not finished 2014-10-29 11:42:15 +01:00
artur-zawlocki
621d7fa4b0 MULMOD/ADDMOD implemented in separate functions [FIXES #80566276] 2014-10-29 10:29:34 +00:00
Paweł Bylica
f73a461e13 Expose VM kind setting of State in FakeExtVM
This reverts commit 6ad065bb3e30b5e67283f70e84ac55368e843e6a.
2014-10-29 10:23:17 +01:00
subtly
3c98874b97 Merge branch 'develop' into crypto 2014-10-29 02:44:30 +01:00
Paweł Bylica
878c41b3e3 Merge branch 'develop' into develop-evmcc
Conflicts:
	libevm/VM.h
2014-10-28 17:41:18 +01:00
Marek Kotewicz
59b3f48637 Merge branch 'develop' into mk_jsonrpc 2014-10-28 17:16:21 +01:00
Christian
eb254f6fdf Adjustments for the NEG->BNOT change. 2014-10-28 17:09:06 +01:00
Christian
f91ddc2788 Adjustments for the NEG->BNOT change. 2014-10-28 17:09:06 +01:00
Christian
bb2b4ed3a3 Merge remote-tracking branch 'ethereum/develop' into sol_expressionCompiler
Conflicts:
	libsolidity/Types.cpp
2014-10-28 17:01:04 +01:00
Christian
d2a474f7fa Merge remote-tracking branch 'ethereum/develop' into sol_expressionCompiler
Conflicts:
	libsolidity/Types.cpp
2014-10-28 17:01:04 +01:00
Christian
2541a403c3 Merge remote-tracking branch 'ethereum/develop' into sol_expressionCompiler
Conflicts:
	libsolidity/Types.cpp
2014-10-28 17:01:04 +01:00
Christian
28ef0f0f1e Forgot some asterisks. 2014-10-28 16:57:20 +01:00
Christian
7bb3311be6 Forgot some asterisks. 2014-10-28 16:57:20 +01:00
Christian
3306835c9d Asterisk-syntax for doxygen class documentation. 2014-10-28 16:51:26 +01:00
Christian
933fbd7d60 Asterisk-syntax for doxygen class documentation. 2014-10-28 16:51:26 +01:00
Paweł Bylica
cacc4477bf Fix VM test code loading conditions 2014-10-28 16:26:33 +01:00
subtly
0466f758dd Merge branch 'develop' into crypto 2014-10-28 16:23:34 +01:00
Marek Kotewicz
45f271a394 Merge branch 'develop' into mk_jsonrpc
Conflicts:
	libevm/VM.h
	libqethereum/QEthereum.h
2014-10-28 15:16:57 +01:00
Marek Kotewicz
7f0440e710 whisper in web3jsonrpc 2014-10-28 13:25:31 +01:00
Paweł Bylica
f8c396c4c1 Merge branch 'develop' into develop-evmcc
Conflicts:
	libevm/ExtVMFace.h
	libevm/VM.h
	test/vm.cpp
	test/vm.h
	windows/LibEthereum.vcxproj.filters
2014-10-28 12:26:45 +01:00
Christoph Jentzsch
3381372200 merge 2014-10-28 12:17:53 +01:00
Christoph Jentzsch
01e9cf0cad Fixed storage output in VMTRACE for vm tests 2014-10-28 12:11:52 +01:00
Marek Kotewicz
79bb03513b ldb access from api 2014-10-28 11:39:55 +01:00
Christian
fae8ca001e Stylistic corrections. 2014-10-28 09:25:01 +01:00
Christoph Jentzsch
6b4d35259a Added tests for SIGNEXTEND and BNOT 2014-10-28 08:50:05 +01:00
Christoph Jentzsch
a54c3ae704 Merge remote-tracking branch 'upstream/develop' into newTests
Conflicts:
	test/vm.cpp
	test/vm.h
2014-10-28 07:28:05 +01:00
Gav Wood
f59a8f5824 Merge pull request #428 from CJentzsch/useETHEREUM_TEST_PATH
use ETHEREUM_TEST_PATH in all tests
2014-10-28 03:41:27 +01:00
Christoph Jentzsch
f1f8e2632d Update vm.h 2014-10-27 22:33:50 +01:00