aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' into natspecMarek Kotewicz2015-01-233-6/+46
|\
| * Merge branch 'develop' of github.com:ethereum/cpp-ethereum into developGav Wood2015-01-212-5/+45
| |\
| | * Merge pull request #830 from chriseth/sol_overridesInConstructorContextGav Wood2015-01-211-0/+22
| | |\
| | | * Include virtual function overrides in constructor context.Christian2015-01-201-0/+22
| | * | Absence of tag in Natspec is now considered @noticeLefteris Karapetsas2015-01-201-5/+23
| | |/
| * / Cleanups and addition AZ info.Gav Wood2015-01-211-1/+1
| |/
* | Merge commit 'eb4984c0d036c1420e782ca136810e851e33fb37' into natspecMarek Kotewicz2015-01-220-0/+0
|\ \
| * | Squashed 'libjsqrc/ethereumjs/' changes from e1fcffc..edfb874Marek Kotewicz2015-01-225-5/+1
* | | Merge commit '53b4fda16d0b191be8ab986379a328aa38aaf916' into natspecMarek Kotewicz2015-01-210-0/+0
|\| | | |/ |/|
| * Squashed 'libjsqrc/ethereumjs/' changes from 6a58db6..848c54dMarek Kotewicz2015-01-211-3/+4
* | Merge pull request #810 from debris/ethereumjsGav Wood2015-01-200-0/+0
|\ \
| * | Merge commit '2b4d38b9bf059014596e1ab00c99dc2ad4ab3761' into ethereumjsMarek Kotewicz2015-01-190-0/+0
| |\|
| | * Squashed 'libjsqrc/ethereumjs/' changes from 823fb29..6a58db6Marek Kotewicz2015-01-191-2/+81
| * | Merge commit '6a383d6ed3fb37cf6739f6ac441652adfdb70463' into ethereumjsMarek Kotewicz2015-01-170-0/+0
| |\|
| | * Squashed 'libjsqrc/ethereumjs/' changes from e94da80..823fb29Marek Kotewicz2015-01-171-27/+108
| * | Merge commit '29333fc213b62b27ef826616cf77430947fb6eab' into ethereumjsMarek Kotewicz2015-01-160-0/+0
| |\|
| | * Squashed 'libjsqrc/ethereumjs/' changes from 2c36d5f..e94da80Marek Kotewicz2015-01-161-0/+25
| * | Merge commit 'd876522bc0614fea3180a54be57bcb61784b352e' into ethereumjsMarek Kotewicz2015-01-160-0/+0
| |\|
| | * Squashed 'libjsqrc/ethereumjs/' changes from ec74fc0..2c36d5fMarek Kotewicz2015-01-161-7/+102
| * | Merge commit '1a6dbeff6e86d65cae6d7db366cbaa4182eaff7f' into ethereumjsMarek Kotewicz2015-01-160-0/+0
| |\|
| | * Squashed 'libjsqrc/ethereumjs/' changes from ab745d3..ec74fc0Marek Kotewicz2015-01-167-72/+576
* | | Implicit conversion from derived to base.Christian2015-01-201-0/+21
* | | Call constructors of base classes.Christian2015-01-202-0/+78
* | | Constructor arguments for base classes.Christian2015-01-201-0/+15
* | | Explicit calls to base class function.Christian2015-01-201-0/+15
* | | Inheritance in compiler.Christian2015-01-201-0/+60
* | | Magic variables are only needed durinng name and type resolution, not during ...Christian2015-01-201-1/+1
* | | Check overrides and provide inherited public interface.Christian2015-01-201-0/+49
* | | Import inherited members into the contract's scope.Christian2015-01-201-1/+34
* | | Inheritance parser.Christian2015-01-201-0/+30
* | | Improved handling of exceptions in some Solidity TestsLefteris Karapetsas2015-01-203-18/+6
* | | Adding blockhash test in Solidity ExpressionCompilerLefteris Karapetsas2015-01-202-11/+24
* | | Some addition to Solidity Execution FrameworkLefteris Karapetsas2015-01-191-2/+24
* | | Merge pull request #805 from LianaHus/deleteStructchriseth2015-01-191-0/+89
|\ \ \ | |/ / |/| |
| * | - corrected delete in case we have more than one localsliana2015-01-161-3/+5
| * | removed spacesliana2015-01-161-4/+0
| * | Corrected "delete" for local variables i.e. set them to 0liana2015-01-161-2/+31
| * | - added functionality to set values to 0 when deleting structure(not for mapp...liana2015-01-151-0/+62
* | | Merge pull request #807 from CJentzsch/addTestsGav Wood2015-01-152-24/+29
|\ \ \
| * \ \ Merge remote-tracking branch 'upstream/develop' into addTestsCJentzsch2015-01-151-1/+107
| |\ \ \
| * | | | included vmInpulLimit Tests, updated vmSystemOperationTestsCJentzsch2015-01-152-24/+29
| | |/ / | |/| |
* | | | Re-enable MSVC warning 4307.Christian2015-01-151-8/+8
* | | | Merge pull request #798 from LefterisJP/natspec_OnContractCreationLefteris Karapetsas2015-01-151-21/+21
|\ \ \ \ | |_|/ / |/| | |
| * | | Natspec method key is now the Canonical SignatureLefteris Karapetsas2015-01-131-21/+21
* | | | Merge pull request #799 from chriseth/sol_gasAndValuechriseth2015-01-151-1/+107
|\ \ \ \ | |_|/ / |/| | |
| * | | Specify value for contract creation.Christian2015-01-141-0/+28
| * | | Modify gas and value for external function call.Christian2015-01-141-1/+79
* | | | Merge pull request #801 from chriseth/sol_parseErrorForHashCollisionchriseth2015-01-141-0/+12
|\ \ \ \
| * | | | Check for hash collisions already before compiling.Christian2015-01-141-0/+12
| |/ / /
* | | | Merge pull request #796 from CJentzsch/randomTestEfficiencyGav Wood2015-01-142-11/+19
|\ \ \ \
| * | | | less invalid opcode testsCJentzsch2015-01-141-1/+1
| * | | | replace BOOST_REQUIRE with assert, because it is used outside the boost test ...CJentzsch2015-01-141-4/+4
| * | | | more randomness in the optimizationsCJentzsch2015-01-141-3/+3
| * | | | Merge remote-tracking branch 'upstream/develop' into randomTestEfficiencyCJentzsch2015-01-133-2/+6
| |\| | |
| * | | | random test optimizationCJentzsch2015-01-131-1/+1
| * | | | reinclude invalid opcode in random testsCJentzsch2015-01-131-3/+3
| * | | | Merge remote-tracking branch 'upstream/develop' into randomTestEfficiencyCJentzsch2015-01-132-0/+181
| |\ \ \ \
| * | | | | rests current gas limit in vm testCJentzsch2015-01-121-2/+2
| * | | | | start with block info opcodesCJentzsch2015-01-121-7/+15
* | | | | | fix spaces->tab, detailed callcreate checkCJentzsch2015-01-131-228/+246
* | | | | | fix callcreates imoportCJentzsch2015-01-133-3/+19
* | | | | | Merge remote-tracking branch 'upstream/develop' into randomtestsCJentzsch2015-01-133-2/+6
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | fixed warnings for msvc buildarkpar2015-01-133-2/+6
| | |/ / / | |/| | |
* | | | | check test with JIT for random test simulationsCJentzsch2015-01-134-34/+287
* | | | | Merge remote-tracking branch 'upstream/develop' into randomtestsCJentzsch2015-01-132-0/+181
|\| | | |
| * | | | addmod mulmod div by zero testsCJentzsch2015-01-121-0/+168
| | |/ / | |/| |
| * | | Fixing bug where empty tagless docstring in Natspec would result in infinite ...Lefteris Karapetsas2015-01-121-0/+13
| |/ /
* | | call to precomppiled contract testCJentzsch2015-01-131-0/+30
* | | read in vm test over standard inCJentzsch2015-01-121-0/+34
|/ /
* | Merge commit 'a1023a5dffee7c06e8b75a21f5c9b8826e820942' into developGav Wood2015-01-120-0/+0
|\|
| * Squashed 'libjsqrc/ethereumjs/' changes from 47687cf..ab745d3Gav Wood2015-01-127-0/+151
* Merge commit 'ab745d3b0eb89d67db1ed953020c665be3d072ed' into developGav Wood2015-01-120-0/+0
|\
| * spec reporter instead of nyanMarek Kotewicz2015-01-121-1/+1
| * mocha opts file && init of parser testsMarek Kotewicz2015-01-092-0/+39
| * methods existance tests in progressMarek Kotewicz2015-01-096-49/+112
| * mocha test initMarek Kotewicz2015-01-091-0/+49
* Merge pull request #768 from chriseth/sol_contractsAreAddressesGav Wood2015-01-111-0/+33
|\
| * Contracts are Addresses.Christian2015-01-101-3/+21
| * Correct type conversions.Christian2015-01-101-0/+15
* | Merge pull request #767 from chriseth/sol_abi_paddingGav Wood2015-01-112-94/+106
|\ \
| * | Coding style: Prefix for const variables.Christian2015-01-101-19/+19
| * | Padding for ABI types.Christian2015-01-102-82/+94
| |/
* | Merge pull request #766 from debris/web3sha3testGav Wood2015-01-102-0/+28
|\ \ | |/ |/|
| * disabled jsonrpc tests againMarek Kotewicz2015-01-101-1/+1
| * removed resizeMarek Kotewicz2015-01-091-1/+0
| * web3.sha3 testMarek Kotewicz2015-01-092-1/+30
* | Merge pull request #765 from chriseth/sol_someLogFixesGav Wood2015-01-091-20/+25
|\ \
| * | Some changes to the log functions.Christian2015-01-091-20/+25
* | | Merge branch 'develop' of github.com:ethereum/cpp-ethereum into developGav Wood2015-01-0913-205/+1641
|\ \ \
| * \ \ Merge pull request #745 from chriseth/sol_integerConstantsGav Wood2015-01-094-61/+55
| |\ \ \
| | * | | Arbitrary precision integer constants.Christian2015-01-094-61/+55
| | | |/ | | |/|
| * | | Merge pull request #760 from CJentzsch/blockhashGav Wood2015-01-095-11/+67
| |\ \ \ | | |/ / | |/| |
| | * | add blockhash test fo vm testsCJentzsch2015-01-095-11/+67
| * | | Merge pull request #746 from CJentzsch/jumpdestGav Wood2015-01-093-2/+1383
| |\ \ \ | | |_|/ | |/| |
| | * | long jumpdest listCJentzsch2015-01-081-0/+28
| | * | sdiv int256.min -1CJentzsch2015-01-081-0/+28
| | * | sdiv with negative fractional resultCJentzsch2015-01-081-0/+28
| | * | add valid jumpdest with jumpdest at beginningCJentzsch2015-01-081-0/+28
| | * | more dynamic jump testsCJentzsch2015-01-082-2/+1271
| * | | Buildfix after semantical merge conflict.Christian2015-01-091-5/+5
| * | | Merge pull request #754 from LefterisJP/sol_abiFunctionHashchriseth2015-01-095-187/+186
| |\ \ \ | | |_|/ | |/| |
| | * | Fixing SolidityABIJSON testLefteris Karapetsas2015-01-091-14/+14
| | * | Adjusting Solidity Optimizer TestsLefteris Karapetsas2015-01-091-7/+7
| | * | Adjustments to Solidity compiler code for Function HashLefteris Karapetsas2015-01-091-1/+1
| | * | adjusting byte difference in optimizer large integers testLefteris Karapetsas2015-01-091-1/+1
| | * | merging developLefteris Karapetsas2015-01-0911-85/+2088
| | |\|
| | * | Compiler EVM generation now takes into account for the new function hashLefteris Karapetsas2015-01-093-184/+167
| | * | work in progress in testing the new function selector in the end to end testsLefteris Karapetsas2015-01-081-5/+24
| | * | Adjusting SolidityCompiler testsLefteris Karapetsas2015-01-081-10/+7
* | | | Merge branch 'sol_integerConstants' of https://github.com/chriseth/cpp-ethere...Gav Wood2015-01-094-61/+55
|\ \ \ \ | |/ / / |/| | |
| * | | Arbitrary precision integer constants.Christian2015-01-084-61/+55
| | |/ | |/|
* | | Rename "JSON Documentation" -> Metadata.Gav Wood2015-01-092-3/+3
* | | Documentation update.Gav Wood2015-01-091-0/+1
* | | Unit testing for log in Solidity.Gav Wood2015-01-092-0/+94
|/ /
* | Merge pull request #742 from chriseth/sol_optimizerChangeGav Wood2015-01-071-7/+7
|\ \
| * | Some changes to the optimizer.Christian2015-01-071-7/+7
* | | Merge pull request #740 from CJentzsch/vmtestsGav Wood2015-01-072-15/+879
|\ \ \
| * | | add tests for OOG at max call depthCJentzsch2015-01-071-0/+110
| * | | memory test: high offset, zero size -> zero gas costCJentzsch2015-01-071-0/+69
| * | | check address input greater then 2**160CJentzsch2015-01-072-16/+494
| * | | Merge remote-tracking branch 'upstream/develop' into vmtestsCJentzsch2015-01-074-55/+239
| |\| |
| * | | add zero memory expansion tests for vmCJentzsch2015-01-061-2/+92
| * | | add zero memory expansion testsCJentzsch2015-01-061-0/+117
* | | | Merge pull request #738 from LefterisJP/sol_abiFunctionHashGav Wood2015-01-071-1/+37
|\ \ \ \ | | |_|/ | |/| |
| * | | Small issues with Canonical Function SignatureLefteris Karapetsas2015-01-071-1/+18
| * | | Test for the Canonical Signature of a functionLefteris Karapetsas2015-01-071-1/+20
| |/ /
* | | Merge pull request #734 from CJentzsch/blockhashGav Wood2015-01-072-1/+117
|\ \ \
| * | | Blockhash testsCJentzsch2015-01-072-1/+117
| | |/ | |/|
* | | Merge pull request #731 from CJentzsch/jumpdestGav Wood2015-01-071-5/+760
|\ \ \
| * | | jump onto jump, dynamic and static jump with same destinationCJentzsch2015-01-071-0/+56
| * | | added more jumpdest testsCJentzsch2015-01-061-5/+704
| | |/ | |/|
* | | Merge pull request #729 from CJentzsch/addTestsGav Wood2015-01-071-3/+87
|\ \ \ | |_|/ |/| |
| * | Blockhash correction and some testsCJentzsch2015-01-061-3/+87
| |/
* | stl sleep_for, for windowssubtly2015-01-071-1/+1
* | define constructors for windowssubtly2015-01-061-1/+1
* | Merge branch 'develop' into p2p-udp-nodetablesubtly2015-01-061-0/+7
|\|
| * Merge pull request #721 from LefterisJP/sol_fixMultiLCommentScanGav Wood2015-01-061-0/+7
| |\
| | * Fix for sol scanner where empty multiline comment became Natspec commentLefteris Karapetsas2015-01-051-0/+7
* | | code reviewsubtly2015-01-061-6/+6
* | | Merge branch 'develop' into p2p-udp-nodetablesubtly2015-01-061-1/+64
|\| |
| * | Merge pull request #711 from CJentzsch/fixTestGav Wood2015-01-051-1/+64
| |\ \
| | * | use boost_fail instead of warningCJentzsch2015-01-021-2/+2
| | * | add trie_tests_orderedCJentzsch2015-01-021-2/+21
| | * | clean upCJentzsch2015-01-021-374/+0
| | * | Merge remote-tracking branch 'upstream/develop' into fixTestCJentzsch2015-01-0227-554/+1725
| | |\ \
| | * \ \ Merge remote-tracking branch 'upstream/develop' into fixTestCJentzsch2014-12-138-13/+19
| | |\ \ \
| | * | | | include original trie testCJentzsch2014-12-131-1/+45
| | * | | | include original trie testCJentzsch2014-12-131-0/+374
| | * | | | Merge remote-tracking branch 'upstream/develop' into fixTestCJentzsch2014-12-139-31/+120
| | |\ \ \ \
| | * | | | | efficiency, use reference instead of copyCJentzsch2014-12-121-2/+2
| | * | | | | remove permuatations in trietest (order is critical for test)CJentzsch2014-12-121-1/+0
| | * | | | | fix trie test#CJentzsch2014-12-121-3/+10
* | | | | | | Merge branch 'develop' into p2p-udp-nodetablesubtly2015-01-058-160/+2688
|\| | | | | |
| * | | | | | added complete exp testsCJentzsch2015-01-021-0/+2100
| * | | | | | retuning gas prices of recursive bombs to test limitsCJentzsch2015-01-021-2/+2
| * | | | | | undo origin address change (in test)CJentzsch2015-01-021-146/+146
| | |_|_|_|/ | |/| | | |
| * | | | | Merge pull request #703 from wanderer/testsGav Wood2015-01-022-0/+132
| |\ \ \ \ \
| | * | | | | added balance testswanderer2014-12-291-0/+102
| | * | | | | Merge remote-tracking branch 'upstream/develop' into testswanderer2014-12-294-4/+4
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | added stackUnder Flow testwanderer2014-12-231-0/+30
| * | | | | | Merge pull request #666 from winsvega/developGav Wood2015-01-022-8/+304
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Transaction Testswinsvega2014-12-281-1/+136
| | * | | | | Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into developwinsvega2014-12-288-26/+67
| | |\| | | |
| | * | | | | comments in jsonwinsvega2014-12-241-9/+9
| | * | | | | Contract Creation Init Codeswinsvega2014-12-211-13/+175
| | * | | | | Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into developwinsvega2014-12-203-0/+251
| | |\ \ \ \ \
| | * | | | | | Cteate Contract From Contract Init Code Testwinsvega2014-12-191-10/+9
| * | | | | | | Implemented 256-long history for PREVHASH, though still optional.Gav Wood2014-12-244-4/+4
| | |_|/ / / / | |/| | | | |
* | | | | | | coding standards, h512 node id, mute warnings for clang builds. attempt inher...subtly2015-01-052-0/+10
* | | | | | | manually populate nodes for test rather than leveraging pingsubtly2014-12-281-5/+6
* | | | | | | inline << operator, mute loggingsubtly2014-12-261-7/+7
* | | | | | | test encoding/decoding neighbors. add MAC.subtly2014-12-261-39/+62
* | | | | | | memorysubtly2014-12-241-7/+36
* | | | | | | message signing and verification. shutdown io/thread before dealloc in nodeta...subtly2014-12-241-9/+25
* | | | | | | basic implementation of packetssubtly2014-12-231-6/+0
* | | | | | | send/receive messages (not yet interepreted)subtly2014-12-231-20/+32
* | | | | | | refactor constants to be determined during compile. added RLPXDatagram. const...subtly2014-12-231-17/+54
* | | | | | | Merge branch 'develop' into p2psubtly2014-12-223-3/+6
|\| | | | | |
| * | | | | | Fixes/workarounds for tests.Gav Wood2014-12-222-2/+5
| * | | | | | const-> constantGav Wood2014-12-221-1/+1
* | | | | | | repot.subtly2014-12-221-488/+1
* | | | | | | Merge branch 'develop' into p2psubtly2014-12-2213-26/+404
|\| | | | | |
| * | | | | | Allow interaction with PV49.Gav Wood2014-12-221-1/+1
| * | | | | | Fixed #683Gav Wood2014-12-211-8/+8
| * | | | | | Merge branch 'poc-7+' into developGav Wood2014-12-211-1/+1
| |\ \ \ \ \ \
| | * | | | | | SHA-3 hashing to web3.Gav Wood2014-12-211-1/+1
| | | |/ / / / | | |/| | | |
| * | | | | | Remove unnecessary changesPaweł Bylica2014-12-191-20/+20
| * | | | | | Merge branch 'develop-evmcc' into pr-jitPaweł Bylica2014-12-1926-567/+1783
| |\ \ \ \ \ \
| | * | | | | | Merge remote-tracking branch 'upstream/develop' into develop-evmccPaweł Bylica2014-12-191-0/+163
| | |\| | | | |
| | | * | | | | Merge pull request #663 from CJentzsch/NewStateTestsGav Wood2014-12-191-0/+163
| | | |\ \ \ \ \
| | | | * | | | | more refunds testsCJentzsch2014-12-191-0/+163
| | * | | | | | | Merge remote-tracking branch 'upstream/develop' into develop-evmccPaweł Bylica2014-12-199-11/+188
| | |\| | | | | |
| | | * | | | | | Merge pull request #664 from chriseth/sol_fix_compoundAssignchriseth2014-12-191-0/+35
| | | |\ \ \ \ \ \
| | | | * | | | | | Bugfix: Additional swap for compound assignment.Christian2014-12-191-0/+35
| | | | |/ / / / /
| | | * | / / / / Adding const attribute to ABI outputLefteris Karapetsas2014-12-191-0/+53
| | | | |/ / / / | | | |/| | | |
| | | * | | | | Merge pull request #655 from chriseth/sol_precedencechriseth2014-12-191-0/+10
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | Also test non-equality comparison operator.Christian2014-12-191-1/+1
| | | | * | | | Bit operators should bind more strongly than comparison operators.Christian2014-12-191-0/+10
| | | * | | | | updating solidity parser natspec tests to comply with recent changesLefteris Karapetsas2014-12-191-7/+7
| | | * | | | | Merge branch 'develop' into sol_natspecMultilineLefteris Karapetsas2014-12-189-2/+2
| | | |\| | | |
| | | * | | | | More multiline natspec tests and small issue fixLefteris Karapetsas2014-12-181-0/+24
| | | * | | | | Changes in InterfaceHandler to deal with multiline natspecLefteris Karapetsas2014-12-181-0/+29
| | | * | | | | Scanner properly scans multiline natspec commentsLefteris Karapetsas2014-12-181-3/+22
| | | * | | | | Work in progress for /** ... */ natspec commentsLefteris Karapetsas2014-12-181-0/+7
| | * | | | | | Clean up and remove some explicit dependencies in cmake filesPaweł Bylica2014-12-191-3/+0
| | * | | | | | Merge branch 'develop' into develop-evmccPaweł Bylica2014-12-1920-523/+1307
| | |\| | | | |
| | * | | | | | Windows fixPaweł Bylica2014-12-181-1/+3
| | * | | | | | Merge commit '1b8f9fdc3b44503890ed1bcb5da8bd5cb8dd83a5' into develop-evmccPaweł Bylica2014-12-1512-31/+124
| | |\ \ \ \ \ \
| * | | | | | | | Merge branch 'develop-evmcc' into pr-jitPaweł Bylica2014-12-1226-267/+3318
| |\| | | | | | |
| | * | | | | | | Merge remote-tracking branch 'upstream/develop' into develop-evmccPaweł Bylica2014-12-124-8/+8
| | |\ \ \ \ \ \ \
| | * | | | | | | | Add "--jit" option to State testsPaweł Bylica2014-12-124-14/+25
| | * | | | | | | | Merge remote-tracking branch 'upstream/develop' into develop-evmccPaweł Bylica2014-12-122-7/+11
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | * | | | | | | | Merge remote-tracking branch 'origin/vm' into develop-evmccPaweł Bylica2014-12-126-126/+385
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/vm' into develop-evmccPaweł Bylica2014-12-1119-112/+2473
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'develop-evmcc' of https://github.com/imapp-pl/cpp-ethereum into...Artur Zawłocki2014-12-052-14/+429
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into develop-evmccPaweł Bylica2014-12-052-14/+429
| | | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | jit-related CMakeLists.txt fixesArtur Zawłocki2014-12-051-4/+2
| | |/ / / / / / / / / / /
| | * | | | | | | | | | | Fix random test generatorPaweł Bylica2014-12-051-13/+16
| * | | | | | | | | | | | Merge branch 'develop-evmcc' into pr-jitPaweł Bylica2014-12-0510-24/+301
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'develop' into develop-evmccPaweł Bylica2014-12-059-23/+141
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pr-fixes' into develop-evmccPaweł Bylica2014-12-011-1/+160
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Merge branch 'develop-evmcc' into pr-jitPaweł Bylica2014-12-012-4/+9
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | resolved circular dependency between libevm and libevmjitArtur Zawłocki2014-11-282-4/+9
| * | | | | | | | | | | | | | Merge branch 'develop-evmcc' into pr-jitPaweł Bylica2014-11-2715-31/+1750
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'develop' into develop-evmccPaweł Bylica2014-11-2715-31/+1750
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Merge branch 'develop-evmcc' into pr-jitPaweł Bylica2014-11-219-35/+454
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Do not catch OutOfGas exception in tests separatelyPaweł Bylica2014-11-211-15/+6
| | * | | | | | | | | | | | | | Merge branch 'develop' into develop-evmccPaweł Bylica2014-11-218-21/+447
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | fixed libevmjit dependencies in cmake filesArtur Zawłocki2014-11-181-0/+2
| * | | | | | | | | | | | | | | | Merge branch 'develop-evmcc' into pr-jitPaweł Bylica2014-11-172-199/+129
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge branch 'develop' into develop-evmccPaweł Bylica2014-11-172-199/+129
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Merge branch 'develop-evmcc' into pr-jitPaweł Bylica2014-11-1419-421/+3129
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge branch 'develop' into develop-evmccPaweł Bylica2014-11-146-112/+404
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Test unexpected storage entriesPaweł Bylica2014-11-141-0/+6
| | * | | | | | | | | | | | | | | | | Fix VM testerPaweł Bylica2014-11-141-1/+1
| | * | | | | | | | | | | | | | | | | Merge branch 'develop' into develop-evmccPaweł Bylica2014-11-1218-384/+2794
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Merge branch 'develop-evmcc' into pr-jitPaweł Bylica2014-11-071-0/+49
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge branch 'develop' into develop-evmccPaweł Bylica2014-11-071-0/+49
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Merge branch 'develop-evmcc' into pr-jitPaweł Bylica2014-11-0723-1726/+2713
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge branch 'develop' into develop-evmccPaweł Bylica2014-11-0723-1726/+2713
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'develop-evmcc' into pr-jitPaweł Bylica2014-11-051-51/+45
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into develop-evmccPaweł Bylica2014-11-051-51/+45
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop-evmcc' into pr-jitPaweł Bylica2014-11-054-3/+843
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into develop-evmccPaweł Bylica2014-11-051-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into develop-evmccPaweł Bylica2014-11-033-3/+841
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop-evmcc' into pr-jitPaweł Bylica2014-10-316-11/+578
| |\| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into develop-evmccPaweł Bylica2014-10-315-8/+573
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop-evmcc' of github.com:imapp-pl/ethereum into develop-evmccartur-zawlocki2014-10-311-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | allow --jit as non first argumentartur-zawlocki2014-10-311-3/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop-evmcc' into pr-jitPaweł Bylica2014-10-311-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | |