Gav Wood
2087d3b6e3
Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop
2015-05-13 00:35:44 +03:00
Gav Wood
a5fcf4ecd0
Extra diagnostics, assertions and fail-safes for tracking BadRoot bug.
2015-05-13 00:26:43 +03:00
chriseth
43338fac9f
Reverse if and else body.
2015-05-12 17:50:51 +02:00
chriseth
ca73a40170
Unify blocks with shared code.
2015-05-12 16:27:43 +02:00
chriseth
b6bd56bccd
Merge pull request #1864 from chriseth/sol_knowledgeEngine2
...
Transfer knowledge about the state across jumps.
2015-05-12 16:17:31 +02:00
Paweł Bylica
0785602ad5
Ping buildbot
2015-05-12 16:14:18 +02:00
Paweł Bylica
d5841327a2
Merge remote-tracking branch 'upstream/develop' into feature/vm_gas_counter_refactor
...
Conflicts:
evmjit/libevmjit-cpp/JitVM.cpp
libevm/VMFactory.cpp
libevm/VMFactory.h
2015-05-12 11:53:46 +02:00
Gav Wood
fba1cc6e98
Merge pull request #1816 from LefterisJP/ethash_reloaded
...
Ethash reloaded
2015-05-12 12:20:49 +03:00
Gav Wood
ae14cb9647
Merge pull request #1808 from imapp-pl/pr/evmjit
...
Smart VM
2015-05-12 12:10:39 +03:00
Lefteris Karapetsas
617dbcb9dd
Merge branch 'develop' into ethash_reloaded
2015-05-12 10:58:19 +02:00
Paweł Bylica
2e169a9947
testeth: support for --singletest option with only test name param.
2015-05-12 09:37:39 +02:00
Marek Kotewicz
3b37952f2f
Merge branch 'develop' into pr/cmake_runtime_output_directory
2015-05-12 09:00:49 +02:00
subtly
f3acbcce2f
Merge branch 'develop' into discovery
2015-05-12 02:04:59 +02:00
subtly
07df8175f0
Guard m_node.endpoint access and updates.
2015-05-12 02:03:36 +02:00
Vlad Gluhovsky
e365643edc
Fixed warning: unused parameter
2015-05-11 22:54:12 +02:00
Vlad Gluhovsky
6ebf0ffcd3
Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into develop
2015-05-11 22:29:12 +02:00
Gav Wood
cf23eea716
Integrate KeyManager.
2015-05-11 21:21:00 +03:00
Gav Wood
df32882669
Merge pull request #1848 from debris/web3js
...
web3.js 0.3.6 - new ABI encoding implementation
2015-05-11 19:58:46 +03:00
Gav Wood
ce8a0d7c87
Merge pull request #1858 from CJentzsch/adjustInputLimitsTests
...
reorganize input Limittests
2015-05-11 19:57:31 +03:00
subtly
f9955c8ba1
Merge branch 'develop' into whisper
2015-05-11 17:40:01 +02:00
Paweł Bylica
976b64f660
Create symlink to old testeth location to make bildbot happy
2015-05-11 17:40:00 +02:00
Vlad Gluhovsky
a4d4cf89da
Coding Standards fix
2015-05-11 17:27:11 +02:00
Liana Husikyan
14b30c87ab
Update SolidityABIJSON.cpp
2015-05-11 17:17:50 +02:00
Liana Husikyan
23925040a1
updated unit test
2015-05-11 17:16:52 +02:00
Liana Husikyan
ccc3d56542
bug in abi. fixed external type for return parameters
2015-05-11 16:46:17 +02:00
chriseth
54bc7dda53
Compute state intersection.
2015-05-11 16:40:28 +02:00
CJentzsch
1532574367
add identity contract tests
2015-05-11 15:59:57 +02:00
Paweł Bylica
5c283ffeef
Remove gas counter from interpreter VM. OnOp callback signature changed.
2015-05-11 15:47:34 +02:00
CJentzsch
af9dbf9520
reorganize inout Limits tests
2015-05-11 14:26:27 +02:00
Paweł Bylica
504eff7cb3
Remove gas counter from VM interface (VMFace)
2015-05-11 14:07:27 +02:00
Vlad Gluhovsky
5249fa9d18
Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into develop
2015-05-11 12:57:56 +02:00
chriseth
cc6647e671
Tests.
2015-05-11 12:56:40 +02:00
Vlad Gluhovsky
520dcc7e70
Coding Standards fix
2015-05-11 12:39:37 +02:00
chriseth
2cc62fbbfb
Merge pull request #1831 from chriseth/sol_newABIEncoding
...
New ABI encoding for dynamic types.
2015-05-11 12:27:24 +02:00
Lefteris Karapetsas
b3a3b2f260
Merge branch 'develop' into ethash_reloaded
2015-05-11 11:06:00 +02:00
CJentzsch
2add2a4de9
optional wallet blockChain tests, beacuse it takes a while
2015-05-11 10:11:36 +02:00
Marek Kotewicz
5a516b27ed
Merge commit '13a744559744831e4cb0c13592df070148077359' into web3js
2015-05-10 15:52:26 +02:00
Marek Kotewicz
2958ad88f3
Squashed 'libjsqrc/ethereumjs/' changes from 3b799d1..e908439
...
e908439 version 0.3.6
091c8e5 Merge branch 'develop' into tcoulter
272837e cleaned up param.js
38a13bc removed unused functions from coder.js
8e3158f Merge pull request #196 from debris/new_abi
c6a57b3 cleanup and documentation
6e60e1f new solidity abi decoding
3f0d1c8 new abi proposal implementation of encoding
39d70e8 Merge pull request #195 from debris/fixed_abi
f963855 removed unused functions from abi.js
c59419e added new "dave" example
860ad2c fixed #194
22ca9b0 Merge branch 'develop' of https://github.com/ethereum/ethereum.js into develop
6739a1b "dave" example
08f3aae add optional nonce property to sendTransaction
2ca4240 Add error handling to synchronous methods (obligatory warning against using synchronous calls at all).
4690130 version 0.3.5
7949f6a Merge pull request #187 from debris/encoding
944c5cc removed unused test files
8a9c9c5 Merge branch 'develop' into encoding
330b0da more tests for encoding and decoding solidity params
b064eab Handle this error properly. For instance, without this, if we cannot connect to the RPC client, JSON won't be able to parse the result (there is none), in which case would cause a RuntimeException.
7989607 version 0.3.4
afb61d5 Merge branch 'master' into develop
97f6e7d build files again
539ef7b Merge pull request #186 from ethereum/eventFilterFix
ec0dc44 Merge pull request #188 from ethereum/develop
bd73ccc added eth_hashrate
baed4c8 fixed old encoding
e9ec708 fixed event from and toBlock
git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: e90843973f3ae554069347b61cb5b393091c34d1
2015-05-10 15:52:25 +02:00
Vlad Gluhovsky
e69cdcd2d6
Test for Capability class
...
Basic configuration for sending and receiving messgaes.
2015-05-10 15:18:13 +02:00
Gav Wood
c07ab5aa36
Merge pull request #1771 from debris/v8console
...
v8 javascript console
2015-05-10 13:21:44 +03:00
Gav Wood
497392c64c
Merge pull request #1753 from winsvega/blockweight2
...
Total Difficulty
2015-05-09 18:42:14 +03:00
arkpar
1a673bfb6d
Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into core_perf
2015-05-08 23:05:31 +02:00
chriseth
202ea5c3a1
Merge pull request #1813 from chriseth/sol_knowledgeEngine
...
Static Analysis Engine.
2015-05-08 18:58:42 +02:00
chriseth
2f85a0aeb2
Merge pull request #1802 from LianaHus/sol_Deny_overwriting_attribute_by_function_via_inheritance
...
Proper overwriting of attribute and functions.
2015-05-08 18:29:26 +02:00
subtly
235cad6f19
update whisper test to use fixture for new network code, to allow private addresses and encapsulate host/port information in NodeIPEndpoint.
2015-05-08 18:19:31 +02:00
subtly
b23873c2ba
Merge branch 'develop' into whisper
2015-05-08 18:00:22 +02:00
Liana Husikyan
37fbf06c98
added one more test
2015-05-08 17:52:09 +02:00
Liana Husikyan
960033de6b
fixed the test
2015-05-08 17:51:53 +02:00
Liana Husikyan
757972b4e3
added test
2015-05-08 17:51:52 +02:00
Lefteris Karapetsas
34dde6118c
Merge branch 'develop' into ethash_reloaded
2015-05-08 17:34:55 +02:00