Paweł Bylica
631d8300ea
Merge branch 'develop-evmcc' into pr-jit
2014-11-05 13:06:01 +01:00
Paweł Bylica
e2c84a98d9
Merge branch 'develop' into develop-evmcc
2014-11-05 12:59:18 +01:00
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
Paweł Bylica
7b3a2d65a6
Merge branch 'develop-evmcc' into pr-jit
2014-11-04 18:57:58 +01:00
Paweł Bylica
557fe30588
Merge branch 'develop' into develop-evmcc
2014-11-04 17:26:15 +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
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
subtly
2d7176b79c
json rpc only runs once, and only when json rpc test suite is invoked
2014-11-04 10:56:22 +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
Marek Kotewicz
07d08e3af3
boost_auto_test_suite for jsonrpc && @brief description for WebThreeStubServer
2014-10-31 17:30:04 +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
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
Paweł Bylica
e9ec6ae8fd
Merge branch 'develop-evmcc' into pr-jit
2014-10-31 12:50:10 +01:00
Paweł Bylica
d56553dfb6
Merge branch 'develop' into develop-evmcc
2014-10-31 12:35:51 +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
Paweł Bylica
b2cd52eb0d
Merge branch 'develop-evmcc' into pr-jit
2014-10-30 18:10:24 +01:00
artur-zawlocki
609d460025
CMakeLists updated, should now build without LLVM when EVMJIT is not enabled [ #81588646 ]
2014-10-30 16:42:44 +00: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
Paweł Bylica
fdca7c8eed
Merge branch 'develop' into develop-evmcc
...
Conflicts:
libevm/VM.h
test/vm.cpp
2014-10-30 12:37:21 +01:00
Marek Kotewicz
7aa61b8297
Merge branch 'develop' into mk_jsonrpc
2014-10-30 11:56:53 +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
Paweł Bylica
0a89d037e1
Merge branch 'develop' into pr-jit
...
Conflicts:
libevm/VM.h
test/vm.cpp
2014-10-29 20:19:07 +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
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
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
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