aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into build_enhancementMarek Kotewicz2014-12-102-2/+37
|\| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #582 from chriseth/sol_varSizeVariableschriseth2014-12-102-2/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Variable-size stack elements for expression compiler.Christian2014-12-091-0/+35
| | * | | | | | | | | | | | | | | | | | | | | | | Register variably-sized variables on stack.Christian2014-12-081-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | fix for windows compliation (circular dependency between statics initialized ...subtly2014-12-101-0/+9
* | | | | | | | | | | | | | | | | | | | | | | | | empty sha test && common fix on macMarek Kotewicz2014-12-091-0/+9
* | | | | | | | | | | | | | | | | | | | | | | | | added curl libaries, which are required for testeth projectdebris2014-12-091-0/+1
* | | | | | | | | | | | | | | | | | | | | | | | | msvc changes in tests, but tests not yet working theredebris2014-12-096-51/+32
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into build_enhancementMarek Kotewicz2014-12-082-4/+139
|\| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into networksubtly2014-12-087-41/+235
| |\| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Calling functions of other contracts.Christian2014-12-081-4/+131
| * | | | | | | | | | | | | | | | | | | | | | | | cryptopp crash w/null plaintext passed to decryptsubtly2014-12-081-0/+8
| | |_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into build_enhancementMarek Kotewicz2014-12-0815-86/+2082
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ethereum/develop' into sol_importChristian2014-12-0813-52/+2176
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into stateLogTestsCJentzsch2014-12-072-14/+429
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | state log testsCJentzsch2014-12-069-49/+1978
| | * | | | | | | | | | | | | | | | | | | | | | | fix stackoverflow in calldataload, codecopy, extcodecopy + some testsCJentzsch2014-12-053-0/+195
| | | |_|/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Comments and braces.Christian2014-12-071-2/+0
| * | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ethereum/develop' into sol_importChristian2014-12-053-20/+435
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Improved external interface for multi-source and multi-contract compilation.Christian2014-12-041-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | Multi-source and multi-contract compiler.Christian2014-12-043-3/+6
| * | | | | | | | | | | | | | | | | | | | | | | Import directive.Christian2014-12-034-37/+102
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into build_enhancementMarek Kotewicz2014-12-075-14/+624
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge pull request #568 from CJentzsch/newTestsGav Wood2014-12-063-0/+195
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | fix stackoverflow in calldataload, codecopy, extcodecopy + some testsCJentzsch2014-12-063-0/+195
| | | |_|/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Replacing old cstyle enums with c++11 enums in natspecLefteris Karapetsas2014-12-052-3/+3
| | |_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Stack compiler now correctly returns a string and not a pointerLefteris Karapetsas2014-12-052-3/+3
| * | | | | | | | | | | | | | | | | | | | | | Newline right after doctag is now a valid natspec entryLefteris Karapetsas2014-12-051-0/+51
| * | | | | | | | | | | | | | | | | | | | | | Using iterators in Natspec comment parsingLefteris Karapetsas2014-12-051-3/+3
| * | | | | | | | | | | | | | | | | | | | | | Natspec @return tag parsingLefteris Karapetsas2014-12-051-2/+72
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into natspec_export_jsonLefteris Karapetsas2014-12-059-20/+141
| |\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Natspec parsing @param doctagsLefteris Karapetsas2014-12-051-16/+101
| * | | | | | | | | | | | | | | | | | | | | | Parsing notice and dev doxytags.Lefteris Karapetsas2014-12-041-11/+47
| * | | | | | | | | | | | | | | | | | | | | | Moving all Interface and Documentation functionality to own classLefteris Karapetsas2014-12-032-3/+3
| * | | | | | | | | | | | | | | | | | | | | | Separate user and dev natspec documentationLefteris Karapetsas2014-12-031-15/+22
| * | | | | | | | | | | | | | | | | | | | | | More Natspec JSON export tests and better error reportingLefteris Karapetsas2014-12-022-3/+90
| * | | | | | | | | | | | | | | | | | | | | | Using jsoncpp for exporting ABI interface from solidityLefteris Karapetsas2014-12-021-12/+14
| * | | | | | | | | | | | | | | | | | | | | | Exporting Natspec documentation to a JSON interfaceLefteris Karapetsas2014-12-021-0/+77
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into build_enhancementMarek Kotewicz2014-12-0418-37/+1996
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #555 from CJentzsch/newTestsGav Wood2014-12-031-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | test update due to CALLCODA <-> RETURNCJentzsch2014-12-031-6/+6
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #549 from chriseth/sol_saveScopeGav Wood2014-12-031-0/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Disallow assignments to structs and mappings.Christian2014-12-021-0/+30
| | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:ethereum/cpp-ethereum into developGav Wood2014-12-038-14/+264
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | styleCJentzsch2014-12-023-38/+37
| | * | | | | | | | | | | | | | | | | | | | updated createRandomTest to correct exception behaviorCJentzsch2014-12-021-9/+16
| | * | | | | | | | | | | | | | | | | | | | added logs to state testsCJentzsch2014-12-026-39/+87
| | |/ / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | Adding natspec comment test being between keyword and signatureLefteris Karapetsas2014-12-011-2/+24
| | * | | | | | | | | | | | | | | | | | | Solidity natspec docstring test improvementsLefteris Karapetsas2014-11-281-23/+47
| | * | | | | | | | | | | | | | | | | | | Solidity FunctionDefinition used ASTString shared ptr for docstringsLefteris Karapetsas2014-11-281-9/+11
| | * | | | | | | | | | | | | | | | | | | Adding solidity natspec comment inside function bodyLefteris Karapetsas2014-11-281-0/+30
| | * | | | | | | | | | | | | | | | | | | Fixing multiline comment parsing in solidityLefteris Karapetsas2014-11-281-2/+0
| | * | | | | | | | | | | | | | | | | | | Solidity work for documentation stringsLefteris Karapetsas2014-11-281-0/+52
| | * | | | | | | | | | | | | | | | | | | Solidity function AST nodes get documentation attributeLefteris Karapetsas2014-11-271-1/+32
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | |
| * / | | | | | | | | | | | | | | | | | PV46. Minor protocol alterations.Gav Wood2014-12-031-1/+1
| |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Global functions.Christian2014-11-261-1/+90
| * | | | | | | | | | | | | | | | | | Sending ether.Christian2014-11-261-0/+15
| * | | | | | | | | | | | | | | | | | More general function types and references.Christian2014-11-261-0/+20
| * | | | | | | | | | | | | | | | | | Merge pull request #540 from chriseth/sol_actualBlockchainAccessGav Wood2014-11-251-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Access to blockchain data.Christian2014-11-241-0/+13
| * | | | | | | | | | | | | | | | | | | Merge pull request #533 from CJentzsch/stateTestsGav Wood2014-11-251-3/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | styleChristoph Jentzsch2014-11-211-1/+1
| | * | | | | | | | | | | | | | | | | | | Specify user defined testChristoph Jentzsch2014-11-211-3/+16
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge pull request #529 from CJentzsch/newTestsGav Wood2014-11-2510-4/+1474
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | styleChristoph Jentzsch2014-11-212-4/+2
| | * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into newTestsChristoph Jentzsch2014-11-204-37/+106
| | |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | add make money testChristoph Jentzsch2014-11-202-0/+46
| | * | | | | | | | | | | | | | | | | | more log testsChristoph Jentzsch2014-11-191-7/+1160
| | * | | | | | | | | | | | | | | | | | Add Log testsChristoph Jentzsch2014-11-195-1/+177
| | * | | | | | | | | | | | | | | | | | new push32 test and renamingChristoph Jentzsch2014-11-191-1/+30
| | * | | | | | | | | | | | | | | | | | Changed name of some testsChristoph Jentzsch2014-11-191-2/+2
| | * | | | | | | | | | | | | | | | | | more precompiled contract testsChristoph Jentzsch2014-11-191-0/+68
| * | | | | | | | | | | | | | | | | | | Another test for struct references.Christian2014-11-241-0/+28
| * | | | | | | | | | | | | | | | | | | Magic variables.Christian2014-11-244-22/+22
| * | | | | | | | | | | | | | | | | | | Contracts as types and framework for special global variables.Christian2014-11-245-12/+43
* | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into build_enhancementMarek Kotewicz2014-12-045-33/+142
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge pull request #524 from LefterisJP/sol_parse_commentschriseth2014-11-211-0/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | extra comments scanning testLefteris Karapetsas2014-11-211-0/+11
| | * | | | | | | | | | | | | | | | | | documentation comments are now always skipped but saved as special tokens at ...Lefteris Karapetsas2014-11-191-20/+5
| | * | | | | | | | | | | | | | | | | | solidity scanner takes triple slash doc comments into accountLefteris Karapetsas2014-11-191-0/+44
| * | | | | | | | | | | | | | | | | | | Merge pull request #528 from chriseth/sol_constructorGav Wood2014-11-201-0/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | Special handling for constructor.Christian2014-11-191-0/+22
| | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge pull request #527 from imapp-pl/pr-changesGav Wood2014-11-202-33/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | In VM tests, check only if an exception occurred if an exception expected (no...Paweł Bylica2014-11-192-33/+45
| | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge pull request #520 from wanderer/developGav Wood2014-11-201-0/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | added filler.jsonwanderer2014-11-181-0/+35
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | common changesMarek Kotewicz2014-12-021-0/+1
* | | | | | | | | | | | | | | | | | | use CMAKE_PREFIX_PATH instead of CMAKE_FILE_ROOT_PATH; removed thesveneh2014-11-281-1/+0
* | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'debris/mk_jsonrpc_upgrade' into build_enhancementsveneh2014-11-207-423/+645
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Merge branch 'develop' into mk_jsonrpc_upgradeMarek Kotewicz2014-11-182-4/+110
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge branch 'filter_logs' into developGav Wood2014-11-182-17/+134
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | common changesMarek Kotewicz2014-11-181-11/+24
| | | * | | | | | | | | | | | | | | | | Merge branch 'filter_logs' of https://github.com/ethereum/cpp-ethereum into logsMarek Kotewicz2014-11-181-24/+11
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | Renaming and fixes.Gav Wood2014-11-181-2/+2
| | | * | | | | | | | | | | | | | | | | | logs in specMarek Kotewicz2014-11-181-11/+24
| | | |/ / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | ethereum.js not minified, serpent compiler, jsonrpc handles compilers exceptionsMarek Kotewicz2014-11-171-0/+13
| | | * | | | | | | | | | | | | | | | | Merge branch 'develop' into js_abiMarek Kotewicz2014-11-172-199/+129
| | | |\| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge branch 'develop' into js_abiMarek Kotewicz2014-11-146-112/+404
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | storage dump testMarek Kotewicz2014-11-141-0/+38
| | | * | | | | | | | | | | | | | | | | added storageAt which dumps contract storageMarek Kotewicz2014-11-141-0/+13
| | | * | | | | | | | | | | | | | | | | removed unnecessary methods from jsonrpc and added contract call testsMarek Kotewicz2014-11-132-27/+28
| | | * | | | | | | | | | | | | | | | | contract calls working from jsMarek Kotewicz2014-11-131-2/+1
| | | * | | | | | | | | | | | | | | | | Merge branch 'develop' into js_abiMarek Kotewicz2014-11-123-5/+104
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | contract create and contract call workingMarek Kotewicz2014-11-111-3/+2
| | | * | | | | | | | | | | | | | | | | Merge branch 'develop' into js_abiMarek Kotewicz2014-11-110-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | mergeMarek Kotewicz2014-11-119-222/+2335
| | | * | | | | | | | | | | | | | | | | | js abi connectionMarek Kotewicz2014-11-111-14/+56
| | * | | | | | | | | | | | | | | | | | | Build fix.Gav Wood2014-11-181-1/+1
| | * | | | | | | | | | | | | | | | | | | Remove overly verbose log.Gav Wood2014-11-181-1/+1
| * | | | | | | | | | | | | | | | | | | | fixed testMarek Kotewicz2014-11-181-3/+4
| * | | | | | | | | | | | | | | | | | | | common changesMarek Kotewicz2014-11-181-4/+4
| * | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into mk_jsonrpc_upgradeMarek Kotewicz2014-11-1832-2021/+5930
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge pull request #515 from chriseth/sol_structschriseth2014-11-183-2/+242
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Struct types.Christian2014-11-142-0/+75
| | | * | | | | | | | | | | | | | | | | | Mapping types.Christian2014-11-142-2/+167
| | | | |_|_|/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Windows build fix.Gav Wood2014-11-171-1/+1
| * | | | | | | | | | | | | | | | | | | fixed WebThreeStubServer constructorMarek Kotewicz2014-11-041-1/+3
| * | | | | | | | | | | | | | | | | | | little cleanup after upgrading jsonrpcMarek Kotewicz2014-11-042-3/+1
| * | | | | | | | | | | | | | | | | | | jsonrpc 0.3.0 working, needs cleanupMarek Kotewicz2014-11-033-424/+301
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into build...sveneh2014-11-178-311/+533
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | pr fixsubtly2014-11-141-2/+1
| * | | | | | | | | | | | | | | | | | Merge branch 'develop' into cryptosubtly2014-11-146-112/+404
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Compile fixes.Gav Wood2014-11-141-6/+6
| | * | | | | | | | | | | | | | | | | Merge pull request #512 from ethereum/sol_jsonInterfaceTestsGav Wood2014-11-141-0/+214
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | solidity json interface tests fixesMarek Kotewicz2014-11-121-3/+4
| | | * | | | | | | | | | | | | | | | | solidity JSON interface testsMarek Kotewicz2014-11-121-0/+213
| | * | | | | | | | | | | | | | | | | | Merge pull request #510 from CJentzsch/NewStateTestsGav Wood2014-11-143-41/+78
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | changed name of command line option to filltestsChristoph Jentzsch2014-11-121-1/+1
| | | * | | | | | | | | | | | | | | | | Create state test with commandline flagChristoph Jentzsch2014-11-122-22/+59
| | | * | | | | | | | | | | | | | | | | Store return value of call to precompiled contract in testChristoph Jentzsch2014-11-121-19/+19
| | | | |_|_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge pull request #509 from chriseth/sol_jsonInterfaceGav Wood2014-11-141-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Provide interface for calls in JSON and some other formatting changes.Christian2014-11-121-1/+1
| | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Merge pull request #501 from chriseth/sol_testFrameworkGav Wood2014-11-141-63/+88
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Working template magic for void function.Christian2014-11-111-19/+22
| | | * | | | | | | | | | | | | | | | Allow void return type.Christian2014-11-111-23/+35
| | | * | | | | | | | | | | | | | | | Tests on ranges of input data.Christian2014-11-101-52/+62
| | | | |_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge pull request #500 from chriseth/sol_jumptableGav Wood2014-11-142-7/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge remote-tracking branch 'ethereum/develop' into sol_jumptableChristian2014-11-119-210/+2324
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Replace function selector jump table by more resilient linear time check.Christian2014-11-102-7/+23
| | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | changes for code reviewsubtly2014-11-141-1/+1
| * | | | | | | | | | | | | | | | Merge branch 'develop' into cryptosubtly2014-11-133-5/+104
| |\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | refactor and thread-safe cryptopp. for now, remove secp256klib calls. ecdh an...subtly2014-11-131-98/+45
| * | | | | | | | | | | | | | | | cryptopp recover public keysubtly2014-11-121-4/+4
| * | | | | | | | | | | | | | | | ecdh, ecdhe, initial aes classessubtly2014-11-122-105/+89
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into build...sveneh2014-11-1130-1929/+5384
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #504 from CJentzsch/NewStateTestsGav Wood2014-11-112-5/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into NewStateTestsChristoph Jentzsch2014-11-113-222/+355
| | |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | All unintended VM exceptions work like OOG in testsChristoph Jentzsch2014-11-112-5/+20
| * | | | | | | | | | | | | | | | Make OOG on precompileds consistent.Gav Wood2014-11-111-0/+84
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #499 from CJentzsch/NewStateTestsGav Wood2014-11-117-21/+2134
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | build fixChristoph Jentzsch2014-11-114-4/+6
| | * | | | | | | | | | | | | | added generic userDefinedTest functionChristoph Jentzsch2014-11-114-74/+44
| | * | | | | | | | | | | | | | undefine FILL_TESTSChristoph Jentzsch2014-11-101-1/+1
| | * | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into NewStateTestsChristoph Jentzsch2014-11-107-85/+38
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | specified user defined testChristoph Jentzsch2014-11-102-21/+71
| | * | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into NewStateTestsChristoph Jentzsch2014-11-077-74/+203
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Added random test executionChristoph Jentzsch2014-11-072-8/+36
| | * | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into NewStateTestsChristoph Jentzsch2014-11-071-0/+49
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Added precompiledContracts testsChristoph Jentzsch2014-11-073-27/+741
| | * | | | | | | | | | | | | | | | Merge branch 'stateTests' into NewStateTestsChristoph Jentzsch2014-11-0611-352/+1059
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | update SIGNEXTEND testsChristoph Jentzsch2014-11-062-8/+8
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | added state system operations testChristoph Jentzsch2014-11-053-13/+81
| | * | | | | | | | | | | | | | | | Merge branch 'StateBug' into NewStateTestsChristoph Jentzsch2014-11-053-10/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into NewStateTestsChristoph Jentzsch2014-11-051-51/+45
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge branch 'newTests' into NewStateTestsChristoph Jentzsch2014-11-056-971/+1023
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Added stSystemOperationsTestChristoph Jentzsch2014-11-054-19/+1283
| | * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into NewStateTestsChristoph Jentzsch2014-11-041-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #486 from chriseth/sol_optimizerGav Wood2014-11-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'ethereum/develop' into sol_optimizerChristian2014-11-108-139/+207
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ethereum/develop' into sol_optimizerChristian2014-11-075-72/+201
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ethereum/develop' into sol_optimizerChristian2014-11-061-0/+49
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #482 from ethereum/jsonrpc_interfaceGav Wood2014-11-112-189/+190
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into jsonrpc_interfaceMarek Kotewicz2014-11-096-105/+41
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into jsonrpc_interfaceMarek Kotewicz2014-11-087-71/+249
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | added eth_lllMarek Kotewicz2014-11-061-0/+13
| | * | | | | | | | | | | | | | | | | | | | | renaming calls to include a subprotocol prefixMarek Kotewicz2014-11-062-195/+183
| | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #494 from chriseth/sol_stateVariablesGav Wood2014-11-101-0/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'ethereum/develop' into sol_stateVariablesChristian2014-11-106-105/+41
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | State variables.Christian2014-11-081-0/+25
| | | |_|/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #488 from LefterisJP/developGav Wood2014-11-101-33/+140
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | style fixesLefteris Karapetsas2014-11-091-10/+20
| | * | | | | | | | | | | | | | | | | | | | solidity endToEnd testing gets equivalent CPP contractsLefteris Karapetsas2014-11-091-33/+130
| | | |_|_|_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:ethereum/cpp-ethereum into developGav Wood2014-11-096-105/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #490 from CJentzsch/StateBugGav Wood2014-11-095-66/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | styleChristoph Jentzsch2014-11-072-2/+2
| | | * | | | | | | | | | | | | | | | | | | | Clean up state testsChristoph Jentzsch2014-11-073-59/+0
| | | * | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into StateBugChristoph Jentzsch2014-11-0719-1326/+2263
| | | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into StateBugChristoph Jentzsch2014-11-051-51/+45
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ / / / / / / / / / / | | | | |/| | | | | | | | / / / / / / / / / / | | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into StateBugChristoph Jentzsch2014-11-041-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Fix ABAcalls OOG bugChristoph Jentzsch2014-11-043-10/+8
| | | | |_|_|_|_|_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge pull request #487 from chriseth/sol_arbitraryEvaluationOrderGav Wood2014-11-091-39/+34
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Evaluate expressions in convenient order.Christian2014-11-071-39/+34
| | | | |_|_|/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| | * / | | | | | | | | | | | | | | | | small fix in solidityCompilerMarek Kotewicz2014-11-071-1/+1
| | |/ / / / / / / / / / / / / / / / /
| * / / / / / / / / / / / / / / / / / Fixes for warnings. Take note.Gav Wood2014-11-071-1/+1
| |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Merge pull request #478 from chriseth/sol_typePromotionGav Wood2014-11-075-72/+201
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'ethereum/develop' into sol_typePromotionChristian2014-11-071-0/+49
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Support for negative literals.Christian2014-11-062-5/+62
| | * | | | | | | | | | | | | | | | | Fixes for test framework (sign the transaction).Christian2014-11-061-62/+49
| | * | | | | | | | | | | | | | | | | Type promotion fixes and tests.Christian2014-11-063-20/+63
| | * | | | | | | | | | | | | | | | | Proper type promotion and conversion.Christian2014-11-061-1/+27
| | * | | | | | | | | | | | | | | | | Tests for type conversion at comparison.Christian2014-11-061-0/+16
| | | |_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge pull request #483 from chriseth/libevmcoreGav Wood2014-11-072-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | | | | / / / / / / / / / / / | | | |_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Moved instructions and assembly to new libevmcore.Christian2014-11-062-2/+2
| | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Ignore break and continue outside of loops.Christian2014-11-061-0/+13
| * | | | | | | | | | | | | | | Tests for break and continue in nested loops.Christian2014-11-061-0/+36
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Compile warnings fixed.Gav Wood2014-11-061-12/+12
| * | | | | | | | | | | | | | Merge pull request #460 from CJentzsch/stateTestsGav Wood2014-11-0614-482/+674
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | styleChristoph Jentzsch2014-11-062-4/+4
| | * | | | | | | | | | | | | | undefine FILL_TESTSChristoph Jentzsch2014-11-062-3/+1
| | * | | | | | | | | | | | | | Added dynamic jump out of code testChristoph Jentzsch2014-11-062-1/+29
| | * | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into stateTestsChristoph Jentzsch2014-11-066-1042/+1233
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Moved code export to export function in ImportHelperChristoph Jentzsch2014-11-061-2/+24
| | * | | | | | | | | | | | | | | Update transactions, style fixChristoph Jentzsch2014-11-065-85/+35
| | * | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into stateTestsChristoph Jentzsch2014-11-053-36/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | uncomment vmIOandFlowOPerations testChristoph Jentzsch2014-11-051-4/+4
| | * | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into stateTestsChristoph Jentzsch2014-11-052-51/+47
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / | | |/| | | | / / / / / / / / / / / | | | | |_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | styleChristoph Jentzsch2014-11-043-25/+1
| | * | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into stateTestsChristoph Jentzsch2014-11-036-4/+1072
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Clean up and organize tests + state class testsChristoph Jentzsch2014-11-0312-501/+326
| | * | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into stateTestsChristoph Jentzsch2014-10-311-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Clean up FakeExtVM - move to state testsChristoph Jentzsch2014-10-316-284/+197
| | * | | | | | | | | | | | | | | New BNOT and SIGNEXTEND tetsChristoph Jentzsch2014-10-303-39/+375
| | * | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into stateTestsChristoph Jentzsch2014-10-301-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into stateTestsChristoph Jentzsch2014-10-301-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Restructure state tests. Remove FakeStateClassChristoph Jentzsch2014-10-307-255/+780
| * | | | | | | | | | | | | | | | Merge pull request #461 from chriseth/sol_contractCompilerGav Wood2014-11-063-152/+736
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Further framework fix.Christian2014-11-061-10/+12
| | * | | | | | | | | | | | | | | Fix test framework after change to Transaction.Christian2014-11-061-15/+32
| | * | | | | | | | | | | | | | | Merge remote-tracking branch 'ethereum/develop' into HEADChristian2014-11-065-95/+70
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Test adjustments.Christian2014-11-032-7/+6
| | * | | | | | | | | | | | | | | Merge remote-tracking branch 'ethereum/develop' into sol_contractCompilerChristian2014-11-033-2/+841
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Some tests and bugfixes for the compiler.Christian2014-11-032-1/+212
| | * | | | | | | | | | | | | | | Bugfix: Swap before mod and div.Christian2014-11-031-0/+2
| | * | | | | | | | | | | | | | | Merge remote-tracking branch 'ethereum/develop' into sol_contractCompilerChristian2014-11-017-17/+353
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Actual contract creator and add solidity to AlethZero interface.Christian2014-10-311-16/+19
| | * | | | | | | | | | | | | | | Function selector and variable (un)packing.Christian2014-10-311-21/+37
| | * | | | | | | | | | | | | | | Renamed file.Christian2014-10-311-0/+1
| | * | | | | | | | | | | | | | | Merge remote-tracking branch 'ethereum/develop' into sol_contractCompilerChristian2014-10-302-31/+35
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Contract compiler and also add ExpressionStatement to AST.Christian2014-10-303-194/+479
| | * | | | | | | | | | | | | | | Compiler for assignments.Christian2014-10-291-5/+57
| | * | | | | | | | | | | | | | | NEG->BNOT changeChristian2014-10-291-3/+1
| | * | | | | | | | | | | | | | | Merge remote-tracking branch 'ethereum/develop' into sol_contractCompilerChristian2014-10-2911-31/+144
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'develop' into cryptosubtly2014-11-067-955/+1083
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #473 from CJentzsch/newTestsGav Wood2014-11-066-943/+1071
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | remove vmSystemOperationsTest completelyChristoph Jentzsch2014-11-051-5/+0
| | | | |_|_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into newTestsChristoph Jentzsch2014-11-051-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Update tests to latest protocol changes (PoC7)Christoph Jentzsch2014-11-046-942/+1075
| | | | |_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Transaction documentation and build fixes.Gav Wood2014-11-051-8/+8
| | * | | | | | | | | | | | | | | Documentation for Transaction.Gav Wood2014-11-052-3/+3
| | | |_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'develop' into cryptosubtly2014-11-053-43/+16
| |\| | | | | | | | | | | | | |