aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1864 from chriseth/sol_knowledgeEngine2chriseth2015-05-121-0/+57
|\ | | | | Transfer knowledge about the state across jumps.
| * Compute state intersection.chriseth2015-05-111-0/+36
| |
| * Tests.chriseth2015-05-111-0/+21
| |
* | Merge pull request #1816 from LefterisJP/ethash_reloadedGav Wood2015-05-120-0/+0
|\ \ | | | | | | Ethash reloaded
| * \ Merge branch 'develop' into ethash_reloadedLefteris Karapetsas2015-05-124-12/+80
| |\ \
| * \ \ Merge branch 'develop' into ethash_reloadedLefteris Karapetsas2015-05-114-8/+156
| |\ \ \
| * \ \ \ Merge branch 'develop' into ethash_reloadedLefteris Karapetsas2015-05-081-0/+98
| |\ \ \ \
| * | | | | Further fixes in Ethash integration and testingLefteris Karapetsas2015-05-080-0/+0
| | | | | |
| * | | | | New ethash API integration part 1Lefteris Karapetsas2015-05-070-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - cpp-ethereum now compiles with the new API - Proper integration with testing will come with the next commits
* | | | | | Merge pull request #1808 from imapp-pl/pr/evmjitGav Wood2015-05-122-5/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Smart VM
| * | | | | SmartVM: initial implementationPaweł Bylica2015-05-062-5/+3
| | | | | |
* | | | | | Integrate KeyManager.Gav Wood2015-05-120-0/+0
| | | | | |
* | | | | | Merge pull request #1848 from debris/web3jsGav Wood2015-05-120-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | web3.js 0.3.6 - new ABI encoding implementation
| * \ \ \ \ \ Merge commit '13a744559744831e4cb0c13592df070148077359' into web3jsMarek Kotewicz2015-05-100-0/+0
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Squashed 'libjsqrc/ethereumjs/' changes from 3b799d1..e908439Marek Kotewicz2015-05-109-979/+232
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge pull request #1858 from CJentzsch/adjustInputLimitsTestsGav Wood2015-05-120-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | reorganize input Limittests
| * | | | | | | reorganize inout Limits testsCJentzsch2015-05-110-0/+0
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Update SolidityABIJSON.cppLiana Husikyan2015-05-111-1/+1
| | | | | | |
* | | | | | | updated unit testLiana Husikyan2015-05-112-30/+27
| | | | | | |
* | | | | | | bug in abi. fixed external type for return parametersLiana Husikyan2015-05-112-1/+69
|/ / / / / /
* | | | | | Merge pull request #1831 from chriseth/sol_newABIEncodingchriseth2015-05-112-12/+15
|\ \ \ \ \ \ | |/ / / / / |/| | | | | New ABI encoding for dynamic types.
| * | | | | New ABI encoding for dynamic types.chriseth2015-05-082-12/+15
| | |_|_|/ | |/| | |
* | | | | Merge pull request #1771 from debris/v8consoleGav Wood2015-05-101-0/+17
|\ \ \ \ \ | | | | | | | | | | | | v8 javascript console
| * \ \ \ \ Merge branch 'develop' into v8consoleMarek Kotewicz2015-05-074-9/+15
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'develop' into v8consoleMarek Kotewicz2015-05-051-0/+46
| |\ \ \ \ \
| * | | | | | wrap const char* in jsstringMarek Kotewicz2015-05-050-0/+0
| | | | | | |
| * | | | | | rpc provider in progressMarek Kotewicz2015-05-040-0/+0
| | | | | | |
| * | | | | | printing v8 errorsMarek Kotewicz2015-04-300-0/+0
| | | | | | |
| * | | | | | jsconsole optional for testsMarek Kotewicz2015-04-301-3/+16
| | | | | | |
| * | | | | | Merge branch 'develop' into v8consoleMarek Kotewicz2015-04-301-626/+0
| |\ \ \ \ \ \
| * | | | | | | console command line optionMarek Kotewicz2015-04-290-0/+0
| | | | | | | |
| * | | | | | | Merge branch 'develop' into v8consoleMarek Kotewicz2015-04-298-611/+731
| |\ \ \ \ \ \ \
| * | | | | | | | jsvalueprinterMarek Kotewicz2015-04-280-0/+0
| | | | | | | | |
| * | | | | | | | libjsconsole initMarek Kotewicz2015-04-280-0/+0
| | | | | | | | |
| * | | | | | | | cleanup, libjsengineMarek Kotewicz2015-04-283-30/+2
| | | | | | | | |
| * | | | | | | | v8 integration initial commitMarek Kotewicz2015-04-283-0/+32
| | | | | | | | |
* | | | | | | | | Merge pull request #1753 from winsvega/blockweight2Gav Wood2015-05-090-0/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Total Difficulty
| * | | | | | | | | Total Difficulty: last block hash fixwinsvega2015-05-080-0/+0
| | | | | | | | | |
| * | | | | | | | | Total Difficulty: bug fixwinsvega2015-05-080-0/+0
| | | | | | | | | |
| * | | | | | | | | Total Difficulty: lastblockhash checkwinsvega2015-05-080-0/+0
| | | | | | | | | |
| * | | | | | | | | Total Difficulty: style + rebasewinsvega2015-05-080-0/+0
| | | | | | | | | |
| * | | | | | | | | Total Difficulty: new testswinsvega2015-05-080-0/+0
| | | | | | | | | |
| * | | | | | | | | Total Difficulty: test fillerwinsvega2015-05-081-106/+0
| | | | | | | | | |
| * | | | | | | | | Total Difficulty: blockweight test fillerwinsvega2015-05-081-0/+106
| | | | | | | | | |
| * | | | | | | | | Total Difficulty: merge revertwinsvega2015-05-080-0/+0
| | | | | | | | | |
| * | | | | | | | | Total Difficultywinsvega2015-05-080-0/+0
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | test
* | | | | | | | | Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into ↵arkpar2015-05-092-7/+138
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | core_perf
| * \ \ \ \ \ \ \ \ Merge pull request #1813 from chriseth/sol_knowledgeEnginechriseth2015-05-091-7/+54
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Static Analysis Engine.
| | * | | | | | | | | CFG returns vector of blocks instead of assembly items.chriseth2015-05-061-2/+6
| | | | | | | | | | |
| | * | | | | | | | | Common subexpression elimination ready for using pre-known state.chriseth2015-05-061-4/+45
| | | | | | | | | | |
| | * | | | | | | | | Split known state from common subexpression eliminator.chriseth2015-05-061-2/+4
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge pull request #1802 from ↵chriseth2015-05-091-0/+84
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LianaHus/sol_Deny_overwriting_attribute_by_function_via_inheritance Proper overwriting of attribute and functions.
| | * | | | | | | | | added one more testLiana Husikyan2015-05-081-0/+55
| | | | | | | | | | |
| | * | | | | | | | | fixed the testLiana Husikyan2015-05-082-19/+29
| | | | | | | | | | |
| | * | | | | | | | | added testLiana Husikyan2015-05-081-0/+19
| | | |/ / / / / / / | | |/| | | | | | |
| * / | | | | | | | Basic key manager.Gav Wood2015-05-080-0/+0
| |/ / / / / / / /
* | | | | | | | | Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum intoarkpar2015-05-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | core_perf Conflicts: libp2p/NodeTable.cpp libp2p/NodeTable.h
| * | | | | | | | Merge pull request #1706 from subtly/discoveryGav Wood2015-05-070-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Discovery protocol updates
| | * \ \ \ \ \ \ \ Merge branch 'develop' into discoverysubtly2015-05-072-3/+9
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libp2p/Host.cpp libp2p/NodeTable.cpp libp2p/NodeTable.h
| | * | | | | | | | Merge branch 'develop' into discoverysubtly2015-05-073-6/+52
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | * | | | | | | | Merge branch 'develop' into discoverysubtly2015-04-301-626/+0
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | * | | | | | | | Merge branch 'develop' into discoverysubtly2015-04-282-2/+20
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | * | | | | | | | Merge branch 'develop' into discoverysubtly2015-04-286-609/+711
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | encapsulate IP endpoint address as byte stringsubtly2015-04-270-0/+0
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'develop' into discoverysubtly2015-04-241-6/+6
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libp2p/NodeTable.cpp
| | * | | | | | | | | Merge branch 'develop' into discoverysubtly2015-04-231-0/+61
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | handle new endpoint properties for pingsubtly2015-04-230-0/+0
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'develop' into discoverysubtly2015-04-2315-86/+245
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | more test updates (v4 endpoints. #1557, #1558)subtly2015-04-220-0/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | update peer host test. support unspecified ip.subtly2015-04-210-0/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | update net tests (v4 endpoint)subtly2015-04-210-0/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | update tests (v4 endpoint)subtly2015-04-210-0/+0
| | | | | | | | | | | | |
* | | | | | | | | | | | | set and map to hash tablesarkpar2015-05-071-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1822 from CJentzsch/addTestsGav Wood2015-05-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests
| * | | | | | | | | | | | gasPrice 0 testCJentzsch2015-05-070-0/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | xMerge remote-tracking branch 'upstream/develop' into addTestsCJentzsch2015-05-0788-51242/+610
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into addTestsCJentzsch2015-04-1742-456/+7134
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/bcUncleHeaderValiditiyFiller.json
| * | | | | | | | | | | | | remove wrong stateroot uncle header testCJentzsch2015-04-071-95/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1805 from CJentzsch/walletTestsGav Wood2015-05-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wallet tests
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into walletTestsCJentzsch2015-05-075-9/+61
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | add bc wallet testCJentzsch2015-05-050-0/+0
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | finish wallet state testsCJentzsch2015-05-050-0/+0
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | add day limit testsCJentzsch2015-05-050-0/+0
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | tests for contract multiownedCJentzsch2015-05-050-0/+0
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | first wallet testsCJentzsch2015-05-020-0/+0
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | add wallet testCJentzsch2015-04-300-0/+0
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1810 from chriseth/sol_gasEstimatorchriseth2015-05-071-0/+98
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | Structural gas estimator.
| * | | | | | | | | | | | | Structural gas estimator.chriseth2015-05-061-0/+98
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1806 from winsvega/newtestsGav Wood2015-05-072-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifing concrete test when filling testsuite
| * | | | | | | | | | | | | singletest when refillwinsvega2015-05-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Solidity Contract Inheritance Test
| * | | | | | | | | | | | | Solidity: cryptographic ecrecover testwinsvega2015-05-052-9/+7
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Specifing concrete test when filling testsuitewinsvega2015-05-052-0/+8
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Solidity: Cryptographic funcs fixwinsvega2015-05-050-0/+0
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Initial stab at KeyManager.Gav Wood2015-05-060-0/+0
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1743 from chriseth/evmasmGav Wood2015-05-052-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Move assembly related files to libevmasm and split parameters.
| * | | | | | | | | | | | Move assembly related files to libevmasm and Params.h/.cpp to libevmcore.chriseth2015-04-302-6/+6
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | libp2p testVlad Gluhovsky2015-05-050-0/+0
| |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test for requirePeer function
* | | | | | | | | | | Fix for broken continue in for loop.chriseth2015-05-041-0/+46
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1789.
* | | | | | | | | | Merge remote-tracking branch 'up/develop' into bugFix2yann3002015-04-291-596/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/webthreestubclient.h
| * | | | | | | | | | removed webthreestubclient.harkpar2015-04-291-626/+0
| | | | | | | | | | |
| * | | | | | | | | | import/export statearkpar2015-04-290-0/+0
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge remote-tracking branch 'up/develop' into bugFix2yann3002015-04-288-617/+111
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/webthreestubclient.h
| * | | | | | | | | Merge pull request #1761 from chriseth/sol_fix_deleteBytesGav Wood2015-04-281-0/+20
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix for deleting byte array elements.
| | * | | | | | | | | Fix for deleting byte array elements.chriseth2015-04-281-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1759.
| * | | | | | | | | | Merge pull request #1725 from debris/web3.js-v3.1Gav Wood2015-04-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Web3.js v3.3
| | * \ \ \ \ \ \ \ \ \ Merge commit '1c979d7311461f2e658c99f818d2b62a9936ddaa' into web3.js-v3.1Marek Kotewicz2015-04-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | | * | | | | | | | | Squashed 'libjsqrc/ethereumjs/' changes from c74c854..3b799d1Marek Kotewicz2015-04-265-26/+219
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b799d1 fixed typos c5f6379 version 0.3.3 d795d36 fixed trimming call output prefix a2f561f fixed calling contract only with array param 4912ec6 tests for decoding solidity params 2b4fd21 solidity param encoding tests git-subtree-dir: libjsqrc/ethereumjs git-subtree-split: 3b799d128452639463424c657956ee90a28daec6
| | * | | | | | | | | | Merge branch 'develop' into web3.js-v3.1Marek Kotewicz2015-04-261-6/+6
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| | * | | | | | | | | | Merge commit 'e9ebbb67c4289d15b5f3dff6ca9a31025b6b0a04' into web3.js-v3.1Marek Kotewicz2015-04-240-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Squashed 'libjsqrc/ethereumjs/' changes from f8a43ed..c74c854Marek Kotewicz2015-04-242-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c74c854 version 0.3.2 9fa9cc7 fixed fixed size bytes encoding and decoding git-subtree-dir: libjsqrc/ethereumjs git-subtree-split: c74c854b56cb76bfc941d7aef8a135b7c1cfc4b3
| | * | | | | | | | | | Merge branch 'develop' into web3.js-v3.1Marek Kotewicz2015-04-240-0/+0
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge commit '99f713fa869f41401e9383f2626ed46d3821cc29' into developMarek Kotewicz2015-04-230-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | / / | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| | | * | | | | | | | | Squashed 'libjsqrc/ethereumjs/' changes from 4def095..f8a43edMarek Kotewicz2015-04-2323-380/+696
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f8a43ed Merge pull request #180 from ethereum/develop 4dc6e23 realease version 0.3.1 ee0ec4b Merge branch 'master' of github.com:ethereum/web3.js into develop 08dc2b2 add missing inputBlockNumberFormatter 99e89a1 Merge pull request #179 from ethereum/latest_pending dfbad66 add pending and latest to getBlockTransactionCount and getUncle dbf3ff0 latest and pending as possible blockNumber arg everywhere 3897bc2 version 0.3.0 d2068eb improved solidity event decoding 11f23ce Merge pull request #178 from ethereum/stringTopics 50f4a2b add new test filter 40c5c9e merged develop c9cd31b add test for the new toTopic filter e21ee7a Merge pull request #174 from ethereum/events_refactor 960e9c9 test for explicit sendTransaction && call a6ac6ed add new toTopic formatter in filters 3d3db61 tests for decoding event logs 7c16dbf one additional test for event encode 9f7d6a9 anonymous events implementation && tests b5eabd8 proper formatting event options 93b323f removed unused function findIndex from utils 9158ac7 removed unused function 1ac1ef9 cleaned event.encode test 5f2eb33 fixed filters encoding null 4482d5b Merge branch 'develop' into events_refactor 76ced9a basic tests for event encoding f767a9a removed unused formatOutputHash, renamed formatXXXString to formatXXXBytes 888a970 coder.encodeParam, coder.decodeParam tests template 983e4b1 removed signature.js f37057e Merge branch 'develop' of github.com:ethereum/web3.js into develop c8f4226 add possible 2d topic arrays fixes #175 e910736 eth_filter complex topics, #175 836529a Merge branch 'develop' into events_refactor 42e759e 0.10 on travis is painfully slow, lets remove it d411492 call && sendTransaction f84a68c changed the way functions are being called c8e5768 fixed log fields d38f5a2 Merge branch 'develop' into events_refactor a5c1bcc changed default providor port to 8545 closes #160 9e8cb8d removed non existing eth.flush method eeb0bc0 Merge branch 'develop' into events_refactor cdf02ec Merge pull request #173 from ethereum/failing_develop 501e3bc utils cleanup a88be00 docs 9d8a51d event.js refactored ea6bda4 event refactor in progress a827076 fixed tx/block return value tests 99a3696 events refactor, function.js 04cdb6c format also tx nonce to number 385cc2c removed minGasPrice from blocks c06d75b Merge pull request #170 from ethereum/abi_refactor e80ff10 Merge branch 'master' into abi_refactor 38641df fixed #154 1c8cd7d web3.eth.defaultAccount property, updated event_inc example, fixed #96 4aeba40 fixed event_inc example 5362e2a Merge branch 'develop' into abi_refactor 2a11852 Merge branch 'master' into develop ea413a8 updated gitter badge a46b9ea Merge branch 'develop' into abi_refactor 779a608 documentation 941535f SolidityParam moved to its own file && documented 18cef7c removed *collapse in contrat, gulp 677bb68 add bundle version 135b044 Merge pull request #164 from karalabe/empty-topics-fix b326202 formatters/whisper: polish corner case handling code 0567ba1 outputParser do not require 0x prefix before hash b5c6aa6 little cleanup && renaming dccfca1 solidity abi refactor in progress 6a058b6 Allow unset topics in posts too. af443f2 Fix #162: allow empty topic list in messages d643d06 solidity abi refactor in progress 271b00f bumped version f4cf699 rebuild 4eeaf19 rebuild 20fb2e3 Merge branch 'develop' of https://github.com/ethereum/ethereum.js into develop ac69640 Merge pull request #158 from ethereum/watchImprovement2 96b4468 fixed #161, web3.ssh.post a320ef8 fixed coverage, unified creating errors 364eab7 add callback for async error c62f817 picked watch change3 56d13f7 picked watch change2 2215e7c picked watch change dc0f231 merged meteor package fixes c89ad86 renamed meteor package a0709f3 fixed meteor package 1a8032c version 0.2.7 dfb8dea gulp b1ada8d gulp a25a9e1 Merge branch 'master' of https://github.com/ethereum/ethereum.js 05343ea use version of bignumber.js without lookaheads 2651fd8 Update README.md git-subtree-dir: libjsqrc/ethereumjs git-subtree-split: f8a43eddfb450d0e0ba1669a6916babe0ea43642
| * | | | | | | | | | | Merge pull request #1758 from chriseth/sol_astRefactorGav Wood2015-04-281-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | AST visitor refactoring.
| | * | | | | | | | | | Removed visit functions for abstract AST nodes.chriseth2015-04-281-2/+0
| | | |_|_|_|/ / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge pull request #1716 from CJentzsch/gasPricerTestsGav Wood2015-04-281-579/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Gas pricer
| | * | | | | | | | | | optimization - higher precision and single gas price handlingCJentzsch2015-04-230-0/+0
| | | | | | | | | | | |
| | * | | | | | | | | | styleCJentzsch2015-04-220-0/+0
| | | | | | | | | | | |
| | * | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into gasPricerTestsCJentzsch2015-04-221-0/+61
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | really nice scientific gasPricerCJentzsch2015-04-220-0/+0
| | | | | | | | | | | |
| | * | | | | | | | | | fix StateLoaderCJentzsch2015-04-221-579/+0
| | | | | | | | | | | |
| | * | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into gasPricerTestsCJentzsch2015-04-2215-86/+245
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | add gasPrice testsCJentzsch2015-04-220-0/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | avoid stack overflow and div by zeroCJentzsch2015-04-210-0/+0
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge pull request #1692 from winsvega/newtestsGav Wood2015-04-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Newtests
| | * | | | | | | | | | | newtests: Transaction Data Zerobyteswinsvega2015-04-240-0/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | newtests: r=s transaction testwinsvega2015-04-240-0/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | newtests: new rs value testwinsvega2015-04-240-0/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | New Transaction Testswinsvega2015-04-240-0/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | transaction testswinsvega2015-04-240-0/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | New Transaction Testswinsvega2015-04-240-0/+0
| | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Tidy and conformalise the toHex API.Gav Wood2015-04-281-11/+11
| | | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #1655 from winsvega/blockweightGav Wood2015-04-282-28/+41
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | BlockWeight: blockchain test refactoring
| | * | | | | | | | | | | blockweight: allfields to compact Hex fixwinsvega2015-04-241-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | blockweight: stateroot is hashwinsvega2015-04-241-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | BlockWeight: jsonrpc fixwinsvega2015-04-240-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactoring
| | * | | | | | | | | | | BlockWeight: data fixwinsvega2015-04-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactoring
| | * | | | | | | | | | | BlockWeight: toCompactHexwinsvega2015-04-242-38/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactoring
| | * | | | | | | | | | | blockweight: random test windows fixwinsvega2015-04-240-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attempt 1
| | * | | | | | | | | | | Blockweight: rebase + commentswinsvega2015-04-240-0/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | BlockWeight: tests refactoringwinsvega2015-04-242-28/+60
| | | | | | | | | | | | |
| | * | | | | | | | | | | BlockWeight: blockchain test refactoringwinsvega2015-04-240-0/+0
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge branch 'develop' of github.com:ethereum/cpp-ethereum into developGav Wood2015-04-282-2/+44
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge pull request #1740 from chriseth/sol_sourceLocationForOptimizerchriseth2015-04-271-2/+14
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Try to keep source location during optimisation.
| | | * | | | | | | | | | Try to keep source location during optimization.chriseth2015-04-271-2/+14
| | | |/ / / / / / / / /
| | * | | | | | | | | | changed the test so constructor will have input parametersLiana Husikyan2015-04-271-4/+17
| | | | | | | | | | | |
| | * | | | | | | | | | changed the implementationLiana Husikyan2015-04-271-5/+2
| | | | | | | | | | | |
| | * | | | | | | | | | fixed the output of the testLiana Husikyan2015-04-271-10/+9
| | | | | | | | | | | |
| | * | | | | | | | | | test for resaltsLiana Husikyan2015-04-271-0/+21
| | |/ / / / / / / / /
| * / / / / / / / / / Full ICAP implementation (Direct, Indirect-ETH, Indirect-XET).Gav Wood2015-04-281-0/+626
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #1729 from chriseth/sol_interfaceOutputchriseth2015-04-241-6/+6
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | Use non-implemented functions for solidity interface output.
| | * | | | | | | | Use non-implemented functions for solidity interface output.chriseth2015-04-231-6/+6
| | | |_|/ / / / / | | |/| | | | | |
* | / | | | | | | Deploy To Network: users choose which state to use for deployingyann3002015-04-271-0/+596
|/ / / / / / / /
* | | | | | | | Merge branch 'develop' of github.com:ethereum/cpp-ethereum into developGav Wood2015-04-232-2/+84
|\| | | | | | |
| * | | | | | | Fix regarding memory overwrite during sha3 computation.chriseth2015-04-221-1/+19
| | | | | | | |
| * | | | | | | bytes parameters for events and sha3.chriseth2015-04-221-0/+43
| | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #1593 from debris/cmake3.2.1Marek Kotewicz2015-04-220-0/+0
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | fixed #1590, msvc build with cmake 3.2.1
| | * | | | | Merge branch 'develop' into cmake3.2.1Marek Kotewicz2015-04-2190-51122/+823
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/CMakeLists.txt
| | * | | | | Merge branch 'develop' into cmake3.2.1Marek Kotewicz2015-04-1515-225/+860
| | |\ \ \ \ \
| | * | | | | | fixed #1590, msvc build with cmake 3.2.1debris2015-04-121-4/+4
| | | | | | | |
| * | | | | | | Merge pull request #1685 from chriseth/sol_fix_ripemd_alignmentGav Wood2015-04-211-2/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fixed byte alignment for return type of ripemd160 built-in contract.
| | * | | | | | | Fixed byte alignment for return type of ripemd160 built-in contract.chriseth2015-04-211-2/+2
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge pull request #1699 from chriseth/sol_fix_contractTypesAsArgumentsGav Wood2015-04-211-0/+19
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix for Contract and Enum types as external function arguments.
| | * | | | | | | Fix for Contract and Enum types as external function arguments.chriseth2015-04-211-0/+19
| | |/ / / / / /
| * | | | | | | Merge pull request #1695 from imapp-pl/pr/testethGav Wood2015-04-211-0/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | testeth: Handle command line options for user defined tests
| | * | | | | | | testeth: Handle command line options for user defined testsPaweł Bylica2015-04-211-0/+2
| | | | | | | | |
* | | | | | | | | More logging stuff.Gav Wood2015-04-230-0/+0
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1680
* | | | | | | | Merge pull request #1634 from chriseth/sol_overloadingFunctionschriseth2015-04-214-26/+217
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Function overloading.
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'ethereum/develop' into sol_overloadingFunctionschriseth2015-04-2190-51194/+634
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge remote-tracking branch 'ethereum/develop' into sol_overloadingFunctionschriseth2015-04-205-14/+48
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libsolidity/AST.cpp libsolidity/AST.h
| * | | | | | | | Merge remote-tracking branch 'ethereum/develop' into sol_overloadingFunctionschriseth2015-04-1716-67/+294
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'ethereum/develop' into sol_overloadingFunctionschriseth2015-04-1540-454/+6939
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libsolidity/Types.cpp
| * | | | | | | | | Fixed function overloads.chriseth2015-04-152-91/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tests, disallowed non-calling usage of non-unique function references.
| * | | | | | | | | Merge remote-tracking branch 'ethereum/develop' into sol_overloadingFunctionschriseth2015-04-0758-1238/+9800
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | add another var x = f; overloaded function test caseLu Guanqun2015-03-081-0/+21
| | | | | | | | | |
| * | | | | | | | | add two overloaded function test casesLu Guanqun2015-03-082-7/+38
| | | | | | | | | |
| * | | | | | | | | add test cases for functions in derived overload functions in baseLu Guanqun2015-03-082-4/+28
| | | | | | | | | |
| * | | | | | | | | fix test code due to API changes in DeclarationContainerLu Guanqun2015-03-081-1/+3
| | | | | | | | | |
| * | | | | | | | | add end to end test cases related to overloaded functionsLu Guanqun2015-03-081-1/+42
| | | | | | | | | |
| * | | | | | | | | add two parsing test cases related to overloaded functionsLu Guanqun2015-03-081-0/+25
| | | | | | | | | |
* | | | | | | | | | Removed (and added) some #ifs (but removed more than I added).chriseth2015-04-2114-58/+5
| |_|_|_|_|/ / / / |/| | | | | | | |
* | | | | | | | | Version bump and client rename.Gav Wood2015-04-210-0/+0
| | | | | | | | |
* | | | | | | | | Merge branch 'develop' of github.com:ethereum/cpp-ethereum into developGav Wood2015-04-2188-50949/+55
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | properly mv webthreestubclient.hCJentzsch2015-04-211-596/+0
| | | | | | | | | |
| * | | | | | | | | fixesCJentzsch2015-04-212-23/+15
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'upstream/develop' into RestructureTestFoldersCJentzsch2015-04-211-0/+579
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/libethereum/BlockTestsFiller/bcJS_API_TestFiller.json test/libethereum/blockchain.cpp
| * | | | | | | | | | Restructure test foldersCJentzsch2015-04-2188-50610/+75
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | More colourful logging.Gav Wood2015-04-211-2/+2
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | fix hex encoding blockheader and use tmp directories for stateDBCJentzsch2015-04-201-7/+9
| | | | | | | | |
* | | | | | | | | xMerge remote-tracking branch 'upstream/develop' into JSON_testContractCJentzsch2015-04-205-14/+48
|\| | | | | | | |
| * | | | | | | | Remote miner fixes.Gav Wood2015-04-201-1/+2
| | | | | | | | |
| * | | | | | | | Minor fix for integration tests.Gav Wood2015-04-191-2/+2
| | | | | | | | |
| * | | | | | | | Merge pull request #1666 from CJentzsch/allhexfixGav Wood2015-04-192-9/+9
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | 0x -> 0x0 for numbers
| | * | | | | | | | simplificationCJentzsch2015-04-182-8/+8
| | | | | | | | | |
| | * | | | | | | | 0x -> 0x0 for numbersCJentzsch2015-04-182-9/+9
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #1501 from LefterisJP/abstract_contract_contructorschriseth2015-04-171-2/+35
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Abstract contract contructors
| | * | | | | | | Check all constructors in inheritance chain get argsLefteris Karapetsas2015-04-171-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Also add a missing override in a function of EnumValue
| | * | | | | | | Allowing abstract contracts constructor to have no argsLefteris Karapetsas2015-04-171-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - If a constructor is part of an abstract contract we can omit its arguments - IF a contract is abstract make sure to not create and/or request Assembly code about it since it's not compiled
* | | | | | | | | update test after solidity fixCJentzsch2015-04-171-1/+1
| | | | | | | | |
* | | | | | | | | Merge remote-tracking branch 'upstream/develop' into JSON_testContractCJentzsch2015-04-173-12/+97
|\| | | | | | | |
| * | | | | | | | Merge pull request #1654 from chriseth/sol_fix_smallNegativeStorageValueschriseth2015-04-171-0/+23
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Fix for small negative storage values.
| | * | | | | | | Tests for signed integers in storage.chriseth2015-04-171-0/+23
| | | | | | | | |
| * | | | | | | | network save/restore: merge fixes, simpler code, limit parse of require flag ↵subtly2015-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to peers (reflecting save code).
| * | | | | | | | Merge branch 'develop' into discoveryEndpointssubtly2015-04-1710-53/+96
| |\| | | | | | |
| * | | | | | | | stylesubtly2015-04-172-2/+2
| | | | | | | | |
| * | | | | | | | Merge branch 'develop' into discoveryEndpointssubtly2015-04-171-0/+80
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | test constantssubtly2015-04-172-0/+50
| | | | | | | | |
| * | | | | | | | Merge branch 'develop' into discoveryEndpointssubtly2015-04-162-1/+20
| |\ \ \ \ \ \ \ \
| * | | | | | | | | update testsubtly2015-04-161-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'develop' into discoveryEndpointssubtly2015-04-166-85/+112
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'p2p' into discoveryEndpointssubtly2015-04-1411-142/+738
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | cleanup/prep endpoint semantics for #1558 and #1557subtly2015-04-142-10/+22
| | | | | | | | | | | |
* | | | | | | | | | | | use this_thread::sleep_for instead of sleepCJentzsch2015-04-171-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | retrigger buildCJentzsch2015-04-171-1/+0
| | | | | | | | | | | |
* | | | | | | | | | | | styleCJentzsch2015-04-170-0/+0
| | | | | | | | | | | |
* | | | | | | | | | | | add sleep 1 second to avoid invalid blocks due to same timestamp during creationCJentzsch2015-04-172-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/blockchain.cpp
* | | | | | | | | | | | update JSON_test.solCJentzsch2015-04-170-0/+0
| | | | | | | | | | | |
* | | | | | | | | | | | remove old contractCJentzsch2015-04-171-235/+70
| | | | | | | | | | | |
* | | | | | | | | | | | add JSON testCJentzsch2015-04-173-249/+746
| |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/bcJS_API_TestFiller.json
* | | | | | | | | | | Merge pull request #1569 from winsvega/allfieldshexGav Wood2015-04-179-53/+90
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | All Test Fields As Hex
| * | | | | | | | | | | All Fields Hex: remove linewinsvega2015-04-161-1/+0
| | | | | | | | | | | |
| * | | | | | | | | | | All Fields Hex: ttTransaction Fillerwinsvega2015-04-161-1/+2
| | | | | | | | | | | |
| * | | | | | | | | | | All fields Hex: stylewinsvega2015-04-163-9/+9
| | | | | | | | | | | |
| * | | | | | | | | | | AllFieldsHex: transaction test fixwinsvega2015-04-161-3/+4
| | | | | | | | | | | |
| * | | | | | | | | | | All Fields Hexwinsvega2015-04-161-23/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rebase + merge error fix
| * | | | | | | | | | | All Fields As Hex: Secret Keywinsvega2015-04-163-3/+3
| | | | | | | | | | | |
| * | | | | | | | | | | All Fields Hex: block testswinsvega2015-04-161-0/+8
| | | | | | | | | | | |
| * | | | | | | | | | | All Fields Hex: VMTestswinsvega2015-04-161-0/+15
| | | | | | | | | | | |
| * | | | | | | | | | | AllFieldsHex: State Testswinsvega2015-04-161-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | All Fields Hex: block testswinsvega2015-04-162-17/+20
| | | | | | | | | | | |
| * | | | | | | | | | | All Fields Hex: VMTestswinsvega2015-04-162-9/+17
| | | | | | | | | | | |
| * | | | | | | | | | | AllFieldsHex: State Testswinsvega2015-04-164-42/+66
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Fix for fix #1475, #1476.subtly2015-04-171-0/+6
| |_|_|_|/ / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #1503 from chriseth/sol_mergeBasicBlockschriseth2015-04-161-0/+80
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Control flow analysis.
| * | | | | | | | | Fixed test.chriseth2015-04-161-1/+1
| | | | | | | | | |
| * | | | | | | | | Control flow analysis.chriseth2015-04-161-0/+80
| | |_|/ / / / / / | |/| | | | | | |
* / | | | | | | | Bugfixes concerning variable declarations.chriseth2015-04-162-1/+20
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1637
* | | | | / / / Attempt a fix of dagger tests to fix the buildLefteris Karapetsas2015-04-151-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge pull request #1575 from debris/web3jsGav Wood2015-04-150-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | web3.js v0.2.6
| * \ \ \ \ \ \ Merge commit '60313959de74d8f4786858ee6e5425b7964478e9' into developMarek Kotewicz2015-04-100-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libjsqrc/ethereumjs/dist/web3-light.js libjsqrc/ethereumjs/dist/web3-light.js.map libjsqrc/ethereumjs/dist/web3-light.min.js libjsqrc/ethereumjs/dist/web3.js libjsqrc/ethereumjs/dist/web3.js.map libjsqrc/ethereumjs/dist/web3.min.js libjsqrc/ethereumjs/lib/web3/eth.js
| | * | | | | | Squashed 'libjsqrc/ethereumjs/' changes from 73b9ed2..4def095Marek Kotewicz2015-04-108-18/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4def095 updated README.md 15b4dbd updated bower && package.json files 0ccc05a web3 in global namespace ccc59d1 version 0.2.6 9c2c946 Merge branch 'web3' into develop 6763f34 tests for creating new contract with nondefault constructor, added missing files 2ef5efc fixed #70, creating contract with nondefault constructor dbe4015 Merge branch 'master' into develop 48b351a add gasPrice test and fixed failing uncle tests 7f75f3e fixed gasPrice output ddec629 fixed getUncle parameter count 1e89ef0 changed to eth_protocolVersion 6add9bd Merge pull request #151 from ethereum/develop git-subtree-dir: libjsqrc/ethereumjs git-subtree-split: 4def0958d35cb5b8d92d277423af4d435dd89f16
* | | | | | | | Merge branch 'develop' into netFixsubtly2015-04-155-85/+85
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'minerefactor' of github.com:ethereum/cpp-ethereum into ↵Gav Wood2015-04-140-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minerefactor Conflicts: libethereum/Client.cpp
| | * | | | | | | | Various fixes for mining.Gav Wood2015-04-145-85/+85
| | | | | | | | | |
| | * | | | | | | | Some early refactoring to support async miners better.Gav Wood2015-04-111-2/+2
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Various fixes for mining.Gav Wood2015-04-145-85/+85
| | | | | | | | |
| * | | | | | | | Some early refactoring to support async miners better.Gav Wood2015-04-141-2/+2
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'p2p' into netFixsubtly2015-04-1411-142/+738
|\| | | | | | |
| * | | | | | | Merge pull request #1587 from subtly/neighboursGav Wood2015-04-141-0/+33
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Drop unsolicited neighbours packets.
| | * | | | | | | Merge branch 'develop' into neighbourssubtly2015-04-143-5/+17
| | |\| | | | | |