subtly
4aeeb68d77
coding standards, documentation, new exception syntax
2014-11-05 14:13:27 +01:00
subtly
127747fd4e
Merge branch 'develop' into crypto
2014-11-05 13:30:58 +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
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
subtly
7562f8fff2
codereview fixes
2014-11-04 10:54:46 +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
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
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
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
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
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
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
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
Christian
3f4befd6b4
Parser fix: Consume break and continue.
2014-10-29 13:00:22 +01:00
Marek Kotewicz
48f6b4a8c6
whisper polling, not finished
2014-10-29 11:42:15 +01:00
subtly
3c98874b97
Merge branch 'develop' into crypto
2014-10-29 02:44:30 +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
d2a474f7fa
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
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
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