aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | Fix code duplication in Executive::call overloadings.Paweł Bylica2015-05-211-1/+1
* | | | | | | | | | | | | | Merge branch 'develop' into feature/vm_gas_counter_refactorPaweł Bylica2015-05-211-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #1980 from CJentzsch/shaingTestOutputGav Wood2015-05-211-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | remove eth_solidity dependency for statetestsCJentzsch2015-05-200-0/+0
| | * | | | | | | | | | | | | handle output larger than 4069 bytes in testCJentzsch2015-05-191-2/+7
| | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into feature/vm_gas_counter_r...Paweł Bylica2015-05-213-5/+152
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #1988 from LianaHus/sol_Check_ref_problems_for_structschriseth2015-05-211-0/+86
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Update SolidityEndToEndTest.cppLiana Husikyan2015-05-211-1/+1
| | * | | | | | | | | | | | | Update SolidityEndToEndTest.cppLiana Husikyan2015-05-211-1/+1
| | * | | | | | | | | | | | | style fixLiana Husikyan2015-05-211-2/+2
| | * | | | | | | | | | | | | Update SolidityEndToEndTest.cppLiana Husikyan2015-05-211-1/+0
| | * | | | | | | | | | | | | added tests to check references to struct type.Liana Husikyan2015-05-201-0/+87
| | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #1983 from chriseth/sol_knowledgeableGasEstimationchriseth2015-05-212-5/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Gas estimation taking known state into account.chriseth2015-05-202-5/+66
* | | | | | | | | | | | | | testeth: let expected be expected.Paweł Bylica2015-05-210-0/+0
* | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into feature/vm_gas_counter_r...Paweł Bylica2015-05-206-88/+263
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Pregenerate DAG when mining on AZ/eth/ethminer.Gav Wood2015-05-200-0/+0
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Move OverlayDB (leveldb dependent) back into libdevcrypto.Gav Wood2015-05-200-0/+0
| * | | | | | | | | | | | Merge branch 'bc' of https://github.com/arkpar/cpp-ethereum into arkpar-bcGav Wood2015-05-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | orderedTrieRoot testingarkpar2015-05-190-0/+0
| | * | | | | | | | | | | | use TrieHash for transactions and receipts rootsarkpar2015-05-190-0/+0
| | |/ / / / / / / / / / /
| * | | | | | | | | | | | Move non-cryptopp dependent stuff into devcore.Gav Wood2015-05-202-2/+2
| * | | | | | | | | | | | SHA3, RIPEMD160 and SHA256 are now not cryptopp impls.Gav Wood2015-05-201-7/+3
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #1966 from CJentzsch/addTestsGav Wood2015-05-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | add create retrun value testsCJentzsch2015-05-180-0/+0
| * | | | | | | | | | | | Merge pull request #1899 from debris/web.js4.2Gav Wood2015-05-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ merge commit '89dbcca30b752ecf2b8b56b5f396a6a86c29fc0a' into web.js4.2Marek Kotewicz2015-05-140-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Squashed 'libjsqrc/ethereumjs/' changes from e908439..16861fcMarek Kotewicz2015-05-1415-146/+413
| * | | | | | | | | | | | | Blocktests: SimpleTx3winsvega2015-05-180-0/+0
| * | | | | | | | | | | | | New Testswinsvega2015-05-180-0/+0
| * | | | | | | | | | | | | Merge pull request #1931 from chriseth/sol_callcodechriseth2015-05-181-0/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Bare callcode for addresses and contracts.chriseth2015-05-161-0/+31
| * | | | | | | | | | | | | Fixed error introduced in 953be7886b5681f0fa8ecde94b1fdb8c25afbfd4Martin Holst Swende2015-05-180-0/+0
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #1908 from arkpar/trie_perfGav Wood2015-05-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | stylearkpar2015-05-150-0/+0
| | * | | | | | | | | | | | Trie optimizationsarkpar2015-05-150-0/+0
| | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Parallelised BlockQueue.Gav Wood2015-05-180-0/+0
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #1890 from LefterisJP/ethash_aux_use_seedhashGav Wood2015-05-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Stricter interface for EthashAux::light()Lefteris Karapetsas2015-05-150-0/+0
| * | | | | | | | | | | | Merge pull request #1912 from CJentzsch/fixGasPricerTestsGav Wood2015-05-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | update gas Pricer testsCJentzsch2015-05-150-0/+0
| * | | | | | | | | | | | | Merge pull request #1911 from CJentzsch/ficInChainUncleTestsGav Wood2015-05-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | fix in chain uncle testsCJentzsch2015-05-150-0/+0
| | |/ / / / / / / / / / /
| * | | | | | | | | | | | Store copied assembly items in test. Fixes OSX issues.chriseth2015-05-151-16/+13
| * | | | | | | | | | | | Disable test.chriseth2015-05-151-12/+15
| * | | | | | | | | | | | Merge pull request #1889 from chriseth/sol_multipleTagsOnStackchriseth2015-05-151-0/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Known state: store tags on stack as unions.chriseth2015-05-131-0/+43
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge pull request #1891 from imapp-pl/pr/testsGav Wood2015-05-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Tests: SMOD edge case test.Paweł Bylica2015-05-140-0/+0
| | * | | | | | | | | | | Add support for --singletest filter in VM tests.Paweł Bylica2015-05-140-0/+0
| | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | correct expext value for in chain uncle testsCJentzsch2015-05-140-0/+0
| * | | | | | | | | | | add in chain uncle test for every generationCJentzsch2015-05-140-0/+0
| |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #1870 from subtly/discoveryGav Wood2015-05-130-0/+0
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'develop' into discoverysubtly2015-05-135-86/+190
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into discoverysubtly2015-05-122-0/+65
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Guard m_node.endpoint access and updates.subtly2015-05-120-0/+0
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #1861 from CJentzsch/addTestsGav Wood2015-05-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | styleCJentzsch2015-05-130-0/+0
| | * | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into addTestsCJentzsch2015-05-137-86/+255
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | add identity contract testsCJentzsch2015-05-110-0/+0
| | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #1854 from CJentzsch/optionalWalletTestsGav Wood2015-05-132-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | optional wallet blockChain tests, beacuse it takes a whileCJentzsch2015-05-112-0/+4
| * | | | | | | | | | | | Revert "CMake: set default RUNTIME_OUTPUT_DIRECTORY property to "bin""Gav Wood2015-05-131-7/+2
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #1875 from chriseth/sol_invertIfGav Wood2015-05-131-30/+29
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Reverse if and else body.chriseth2015-05-121-30/+29
| * | | | | | | | | | | | Merge pull request #1873 from chriseth/sol_unifyBlocksGav Wood2015-05-131-1/+37
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Unify blocks with shared code.chriseth2015-05-121-1/+37
| | |/ / / / / / / / / / /
| * | | | | | | | | | | | Merge pull request #1849 from gluk256/developGav Wood2015-05-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Fixed warning: unused parameterVlad Gluhovsky2015-05-120-0/+0
| | * | | | | | | | | | | | Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into developVlad Gluhovsky2015-05-122-0/+65
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Coding Standards fixVlad Gluhovsky2015-05-110-0/+0
| | * | | | | | | | | | | | Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into developVlad Gluhovsky2015-05-112-12/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Coding Standards fixVlad Gluhovsky2015-05-110-0/+0
| | * | | | | | | | | | | | Test for Capability classVlad Gluhovsky2015-05-100-0/+0
| | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #1855 from imapp-pl/pr/cmake_runtime_output_directoryGav Wood2015-05-131-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into pr/cmake_runtime_output_directoryMarek Kotewicz2015-05-124-12/+80
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Create symlink to old testeth location to make bildbot happyPaweł Bylica2015-05-111-2/+7
| | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #1829 from imapp-pl/pr/fix_singletest_optionGav Wood2015-05-132-48/+57
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Ping buildbotPaweł Bylica2015-05-120-0/+0
| | * | | | | | | | | | | | testeth: support for --singletest option with only test name param.Paweł Bylica2015-05-121-3/+18
| | * | | | | | | | | | | | testeth: fix --singletest optionPaweł Bylica2015-05-082-49/+43
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'develop' of github.com:ethereum/cpp-ethereum into developGav Wood2015-05-131-0/+57
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge pull request #1864 from chriseth/sol_knowledgeEngine2chriseth2015-05-121-0/+57
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Compute state intersection.chriseth2015-05-111-0/+36
| | | * | | | | | | | | | | Tests.chriseth2015-05-111-0/+21
| | | | |_|_|/ / / / / / / | | | |/| | | | | | | | |
| * | / | | | | | | | | | Extra diagnostics, assertions and fail-safes for tracking BadRoot bug.Gav Wood2015-05-130-0/+0
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into feature/vm_gas_counter_r...Paweł Bylica2015-05-128-25/+239
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #1816 from LefterisJP/ethash_reloadedGav Wood2015-05-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ 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
| * | | | | | | | | | | | Merge pull request #1808 from imapp-pl/pr/evmjitGav Wood2015-05-122-5/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge commit '13a744559744831e4cb0c13592df070148077359' into web3jsMarek Kotewicz2015-05-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / | | |/| | | | | / / / / / / | | | | |_|_|_|/ / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Squashed 'libjsqrc/ethereumjs/' changes from 3b799d1..e908439Marek Kotewicz2015-05-109-979/+232
| * | | | | | | | | | | | Merge pull request #1858 from CJentzsch/adjustInputLimitsTestsGav Wood2015-05-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | 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.chriseth2015-05-082-12/+15
| | | |_|_|/ / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge pull request #1771 from debris/v8consoleGav Wood2015-05-101-0/+17
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ 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: 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
| | | |_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into core_...arkpar2015-05-092-7/+138
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #1813 from chriseth/sol_knowledgeEnginechriseth2015-05-091-7/+54
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | 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 LianaHus/sol_Deny_overwriting_attribute_by_func...chriseth2015-05-091-0/+84
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | 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
| |\| | | | | | | | | | | | |
| * | | | | | | | | | | | | | set and map to hash tablesarkpar2015-05-071-1/+1
* | | | | | | | | | | | | | | Remove gas counter from interpreter VM. OnOp callback signature changed.Paweł Bylica2015-05-110-0/+0
* | | | | | | | | | | | | | | Remove gas counter from VM interface (VMFace)Paweł Bylica2015-05-110-0/+0
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1706 from subtly/discoveryGav Wood2015-05-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'develop' into discoverysubtly2015-05-072-3/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | Merge pull request #1822 from CJentzsch/addTestsGav Wood2015-05-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | remove wrong stateroot uncle header testCJentzsch2015-04-071-95/+1
* | | | | | | | | | | | | | | | | | | Merge pull request #1805 from CJentzsch/walletTestsGav Wood2015-05-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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.chriseth2015-05-061-0/+98
| | |_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #1806 from winsvega/newtestsGav Wood2015-05-072-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | singletest when refillwinsvega2015-05-060-0/+0
| * | | | | | | | | | | | | | | | | | 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 Params.h/.cpp to libevmcore.chriseth2015-04-302-6/+6
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | libp2p testVlad Gluhovsky2015-05-050-0/+0
| |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Fix for broken continue in for loop.chriseth2015-05-041-0/+46
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge remote-tracking branch 'up/develop' into bugFix2yann3002015-04-291-596/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | 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
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #1761 from chriseth/sol_fix_deleteBytesGav Wood2015-04-281-0/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Fix for deleting byte array elements.chriseth2015-04-281-0/+20
| * | | | | | | | | | | | | | | Merge pull request #1725 from debris/web3.js-v3.1Gav Wood2015-04-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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
| | * | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | Merge pull request #1758 from chriseth/sol_astRefactorGav Wood2015-04-281-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Removed visit functions for abstract AST nodes.chriseth2015-04-281-2/+0
| | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #1716 from CJentzsch/gasPricerTestsGav Wood2015-04-281-579/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | 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: 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: allfields to compact Hex fixwinsvega2015-04-241-1/+1
| | * | | | | | | | | | | | | | | | blockweight: stateroot is hashwinsvega2015-04-241-1/+1
| | * | | | | | | | | | | | | | | | BlockWeight: jsonrpc fixwinsvega2015-04-240-0/+0
| | * | | | | | | | | | | | | | | | BlockWeight: data fixwinsvega2015-04-241-4/+4
| | * | | | | | | | | | | | | | | | BlockWeight: toCompactHexwinsvega2015-04-242-38/+19
| | * | | | | | | | | | | | | | | | blockweight: random test windows fixwinsvega2015-04-240-0/+0
| | * | | | | | | | | | | | | | | | 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 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.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
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Merge branch 'develop' into cmake3.2.1Marek Kotewicz2015-04-2190-51122/+823
| | |\| | | | | | | | |
| | * | | | | | | | | | 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.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.chriseth2015-04-211-0/+19
| | |/ / / / / / / / / /