Commit Graph

2248 Commits

Author SHA1 Message Date
Marek Kotewicz
608a9565db merge commit '89dbcca30b752ecf2b8b56b5f396a6a86c29fc0a' into web.js4.2 2015-05-14 14:05:30 +02:00
Marek Kotewicz
710a1463c1 Squashed 'libjsqrc/ethereumjs/' changes from e908439..16861fc
16861fc version 0.4.2
e4f7dde fixed failing lint
69e7d9d fixed #133
55553d7 add async error test
d02a375 Merge branch 'develop' of github.com:ethereum/web3.js into develop
ff48da1 fixed callback error issue
471bce1 #133 in progress
dc69085 version 0.4.1
2ae0afa critical bugfix
09f2a92 updated examples
a0a36e5 Merge branch 'develop' of https://github.com/ethereum/ethereum.js into develop
2b179a8 updated node install test
8f63640 Merge pull request #203 from frozeman/develop
22ef4a1 added estimateGas method
cd2e462 version 0.4.0
ae7762a Merge pull request #198 from ethereum/minerMethods
d1e1206 removed byte formatter methods
6fd17d9 merged develop
373fd1b Merge pull request #201 from debris/batch
274fc29 Merge pull request #200 from debris/contract_overhaul
b2ff2ff Merge branch 'contract_overhaul' into batch
99a3bda removed redundant lines
7cafac9 Merge branch 'develop' into contract_overhaul
fa8db32 Merge pull request #202 from debris/async_properties
5f9272c asyncGet -> getAsync
cd0df61 gulp
80c0792 async getting properties, remove property setters
744bb9e batch for requests with calls/transacts
8636077 initial support for batch requests
a0b9cfb contract async call && transact
1272780 sendTransaction && call async
6afb1f9 Merge branch 'async-contract-calls' of https://github.com/niran/web3.js into contract_overhaul
611f640 asynchronous contract creation, breaking changes
e3796bf merged develop
edf808a add getWork and submitWork functions and toXBytes utils
9812b01 Merge branch 'blockFilterProposal' of https://github.com/ethereum/ethereum.js into develop
6f466f6 add miner functions
3af8e27 add newblockfilter Proposal
e86552f Use async contract calls when a callback is passed

git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: 16861fc1944cca721672bb8faa81909d69be2b99
2015-05-14 14:05:30 +02:00
Paweł Bylica
e73e07e32f Add support for --singletest filter in VM tests.
Add & correct arithmetic VM tests.
2015-05-13 19:35:19 +02:00
Gav Wood
070adc33bc Merge pull request #1870 from subtly/discovery
Guard m_node.endpoint access and updates.
2015-05-13 18:41:10 +03:00
Gav Wood
c1040ce184 Merge pull request #1861 from CJentzsch/addTests
add identity contract tests
2015-05-13 18:38:10 +03:00
Gav Wood
021f20a640 Merge pull request #1854 from CJentzsch/optionalWalletTests
optional wallet blockChain tests, because it takes a while
2015-05-13 18:37:45 +03:00
chriseth
b50362042e Known state: store tags on stack as unions. 2015-05-13 17:15:32 +02:00
subtly
616c953f92 Merge branch 'develop' into discovery 2015-05-13 11:01:28 +02:00
Gav Wood
b0b3223fed Revert "CMake: set default RUNTIME_OUTPUT_DIRECTORY property to "bin"" 2015-05-13 11:45:18 +03:00
CJentzsch
80c328863c style 2015-05-13 10:38:23 +02:00
CJentzsch
1230062ff0 Merge remote-tracking branch 'upstream/develop' into addTests 2015-05-13 10:35:51 +02:00
Gav Wood
e3aca3dca9 Merge pull request #1875 from chriseth/sol_invertIf
Reverse if and else body.
2015-05-13 00:59:56 +03:00
Gav Wood
7353624d7f Merge pull request #1873 from chriseth/sol_unifyBlocks
Unify blocks that share code.
2015-05-13 00:58:55 +03:00
Gav Wood
e59874b321 Merge pull request #1849 from gluk256/develop
Test for Capability class
2015-05-13 00:56:01 +03:00
Gav Wood
f98f77ec14 Merge pull request #1855 from imapp-pl/pr/cmake_runtime_output_directory
CMake: set default RUNTIME_OUTPUT_DIRECTORY property to "bin"
2015-05-13 00:55:38 +03:00
Gav Wood
c600607eae Merge pull request #1829 from imapp-pl/pr/fix_singletest_option
testeth: fix --singletest option
2015-05-13 00:55:03 +03:00
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
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
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
CJentzsch
af9dbf9520 reorganize inout Limits tests 2015-05-11 14:26: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