aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Consolidate use of pingAll into keepAlivePeers. Add bool operators for Node ↵subtly2015-01-091-1/+1
| | | | and NodeIPEndpoint population. NodeTable returns Node instead of NodeEntry (subject to change). Begin transition from NodeInfo to NodeTable Node.
* Pass 2 integrating node table. Pruning and merging old node lifecycle logic ↵subtly2015-01-072-2/+2
| | | | | | | with new. Begin moving node identification and authentication into Host so session can be directly-constructed with NodeInfo and is not created until after authentication. Require session to be passed a valid node.
* Merge branch 'p2p-udp-nodetable' into p2psubtly2015-01-071-1/+1
|\
| * stl sleep_for, for windowssubtly2015-01-071-1/+1
| |
* | Merge branch 'p2p-udp-nodetable' into p2psubtly2015-01-062-7/+14
|\| | | | | | | | | Conflicts: libp2p/NodeTable.h
| * 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 comment
| | | * Fix for sol scanner where empty multiline comment became Natspec commentLefteris Karapetsas2015-01-051-0/+7
| | | |
| * | | code reviewsubtly2015-01-061-6/+6
| | | |
* | | | Merge branch 'p2p-udp-nodetable' into p2psubtly2015-01-063-149/+2312
|\| | | | | | | | | | | | | | | | | | | Conflicts: libp2p/NodeTable.cpp
| * | | Merge branch 'develop' into p2p-udp-nodetablesubtly2015-01-061-1/+64
| |\| |
| | * | Merge pull request #711 from CJentzsch/fixTestGav Wood2015-01-051-1/+64
| | |\ \ | | | | | | | | | | added trie_tests_ordered
| | | * | 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
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/trie.cpp
| | | * | | | | 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 branch 'develop' into p2psubtly2015-01-057-12/+440
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | Merge pull request #703 from wanderer/testsGav Wood2015-01-022-0/+132
| |\ \ \ \ \ | | | | | | | | | | | | | | added stackUnder Flow test
| | * | | | | 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
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Cteate Contract From Contract Init Code Test
| | * | | | | 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 ↵subtly2015-01-052-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | inherited constructor fix for windows.
* | | | | | | 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 ↵subtly2014-12-241-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | nodetable/testnodetables.
* | | | | | | 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. ↵subtly2014-12-231-17/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | constructors and updates to datagram constructors. docs and logging. WIP tests and host/harness for NodeTable.
* | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unneeded include.
| * | | | | | 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
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: windows/Eth.vcxproj windows/TestEthereum.vcxproj
| | * | | | | | 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 tests
| | | | * | | | | 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.
| | | | * | | | | | 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
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | | Bit operators should bind more strongly than comparison operators.
| | | | * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Also now Solidity scanner considers Carriage Return as whitespace - Tests for Natspec generation with the new multiline comments
| | | * | | | | Scanner properly scans multiline natspec commentsLefteris Karapetsas2014-12-181-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Single and multiline natspect comments get the initial whitespace skipped now - Some rules introduced for the multiline comments. If first line is empty then no newline is added to the literal. Same thing with the last line. Finally in all lines initial '*' are skipped
| | | * | | | | Work in progress for /** ... */ natspec commentsLefteris Karapetsas2014-12-181-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Work in progress on the scanner for recognizing the second type of doxygen comments for Natspec.
| | * | | | | | 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
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CMakeLists.txt alethzero/CMakeLists.txt eth/CMakeLists.txt exp/CMakeLists.txt libethereum/CMakeLists.txt neth/CMakeLists.txt test/CMakeLists.txt test/TestHelper.cpp windows/Eth.vcxproj windows/Ethereum.sln windows/LibEthereum.vcxproj windows/LibEthereum.vcxproj.filters windows/TestEthereum.vcxproj windows/TestEthereum.vcxproj.filters windows/bootstrap.sh
| | * | | | | | Windows fixPaweł Bylica2014-12-181-1/+3
| | | | | | | |
| | * | | | | | Merge commit '1b8f9fdc3b44503890ed1bcb5da8bd5cb8dd83a5' into develop-evmccPaweł Bylica2014-12-1512-31/+124
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/TestHelper.cpp
| * | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libethereum/Executive.cpp libethereum/Executive.h libethereum/State.cpp libevm/VM.cpp libevm/VM.h libevm/VMFace.h test/createRandomTest.cpp test/vm.cpp windows/LibEthereum.vcxproj.filters
| | * \ \ \ \ \ \ \ \ \ Merge branch 'develop-evmcc' of https://github.com/imapp-pl/cpp-ethereum ↵Artur Zawłocki2014-12-052-14/+429
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into develop-evmcc
| | | * \ \ \ \ \ \ \ \ \ 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
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: windows/Eth.vcxproj windows/TestEthereum.vcxproj
| | * | | | | | | | | | | Merge branch 'develop' into develop-evmccPaweł Bylica2014-12-059-23/+141
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libevm/VM.h test/createRandomTest.cpp
| | * \ \ \ \ \ \ \ \ \ \ \ 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libevm/VM.h test/vm.cpp
| * | | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/vm.cpp
| | * | | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: windows/LibEthereum.vcxproj.filters
| * | | | | | | | | | | | | | | | | Merge branch 'develop-evmcc' into pr-jitPaweł Bylica2014-11-1419-421/+3129
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge branch 'develop' into develop-evmccPaweł Bylica2014-11-146-112/+404
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: windows/LibEthereum.vcxproj
| | * | | | | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libdevcrypto/EC.cpp test/vm.cpp
| * | | | | | | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libevm/VM.h test/vm.cpp
| * | | | | | | | | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/CMakeLists.txt
| * | | | | | | | | | | | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libevmjit/Compiler.cpp
| | * | | | | | | | | | | | | | | | | | | | | | | | | allow --jit as non first argumentartur-zawlocki2014-10-311-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop-evmcc' into pr-jitPaweł Bylica2014-10-311-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into develop-evmccPaweł Bylica2014-10-311-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop-evmcc' into pr-jitPaweł Bylica2014-10-311-3/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | CMakeLists updated, should now build without LLVM when EVMJIT is not enabled ↵artur-zawlocki2014-10-311-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [#81588646]
| | * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into develop-evmccPaweł Bylica2014-10-303-33/+37
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libevm/VM.h test/vm.cpp
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into pr-jitPaweł Bylica2014-10-303-33/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| / / / / / / / / / / / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libevm/VM.h test/vm.cpp
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop-evmcc' of github.com:imapp-pl/ethereum into develop-evmccartur-zawlocki2014-10-2920-193/+1215
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/vm.cpp
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Expose VM kind setting of State in FakeExtVMPaweł Bylica2014-10-292-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6ad065bb3e30b5e67283f70e84ac55368e843e6a.
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into develop-evmccPaweł Bylica2014-10-291-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libevm/VM.h
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into develop-evmccPaweł Bylica2014-10-2820-170/+1190
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libevm/ExtVMFace.h libevm/VM.h test/vm.cpp test/vm.h windows/LibEthereum.vcxproj.filters
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | MULMOD/ADDMOD implemented in separate functions [FIXES #80566276]artur-zawlocki2014-10-291-2/+24
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Expose VM kind setting of State in FakeExtVM"Paweł Bylica2014-10-232-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2d0557e2ee236b73546d6dd9f3ed7d19ec852a0f.
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose VM kind setting of State in FakeExtVMPaweł Bylica2014-10-232-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Update createRandomTest.cpp to use new VM construction methodPaweł Bylica2014-10-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the way VMs are created (mostly for tracking where are created)Paweł Bylica2014-10-231-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Update VM test engine to use VMFace interfacePaweł Bylica2014-10-221-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement VMFace with jit::VMPaweł Bylica2014-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix remaining gas testing [#81118624]Paweł Bylica2014-10-221-16/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | cmake: added dependency on libevmjit to target createRandomTestartur-zawlocki2014-10-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into develop-evmccPaweł Bylica2014-10-2112-43/+542
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libevm/FeeStructure.cpp test/vm.cpp
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enhance VM tests reportsPaweł Bylica2014-10-211-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove dead codePaweł Bylica2014-10-211-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop-evmcc' of https://github.com/imapp-pl/ethereum into ↵Paweł Bylica2014-10-201-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-evmcc
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated cmake files after moving the jit compiler to a lib.artur-zawlocki2014-10-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Another round of fixing ExtVM interfacePaweł Bylica2014-10-202-13/+24
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable test fillingPaweł Bylica2014-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turn on JIT testing with "--jit" command line parameterPaweł Bylica2014-10-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running vm_tests with JITPaweł Bylica2014-10-171-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare VM test engine for running JIT-ed testsPaweł Bylica2014-10-171-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | test/rlp bugfix: expectedText can be emptyPaweł Bylica2014-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move some things for udp. added a class for kademlia.subtly2014-12-221-37/+530
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix the fixsubtly2014-12-201-15/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initialize atomics so udp messages are delivered on linux #656subtly2014-12-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stashsubtly2014-12-191-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spacingsubtly2014-12-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into p2psubtly2014-12-1911-2/+157
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Solidity Tests names are now more consistentLefteris Karapetsas2014-12-189-2/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - File names and Boost Test Suite have the same name now for every solidity Test, so that there is no need to guess or check when you want to run a specific suite from the command line
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | styleCJentzsch2014-12-181-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | more refund testsCJentzsch2014-12-181-2/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | refund test inclusionCJentzsch2014-12-181-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | refund testsCJentzsch2014-12-181-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into p2psubtly2014-12-188-7/+266
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed msvc not expanding macros correctlyethdev2014-12-173-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #623 from chriseth/sol_constructorCheckschriseth2014-12-171-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checks for the constructor and ability to call functions
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Add functions needed by constructor.Christian2014-12-171-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #639 from debris/msvc_fixGav Wood2014-12-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | windows fix for initializer-list cannot convert to dev::bytes
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | initializer-list fixethdev2014-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | windows fix for initializer-list cannot convert to dev::bytesethdev2014-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #636 from chriseth/sol_fix_foreignFunctionsGav Wood2014-12-173-3/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: Resolve function types of all contracts before checking types inside functions.
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: Resolve function types of all contracts before checking types inside ↵Christian2014-12-173-3/+30
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functions.
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clang requires explicit initialization of mapMarek Kotewicz2014-12-171-1/+5
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #599 from wanderer/developGav Wood2014-12-172-5/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed output stacktrace format to json
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | append JSON objects to logwanderer2014-12-171-20/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | using json_spiritwanderer2014-12-172-32/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed output stacktrace format to jsonwanderer2014-12-171-3/+36
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Solidity: More tests for the ForStatementLefteris Karapetsas2014-12-171-1/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Solidity ForStatement Compiler partLefteris Karapetsas2014-12-171-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Work in progress
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor issues, grammar update, new ForStatement testLefteris Karapetsas2014-12-171-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Solidity ForStatements expressions are now optionalLefteris Karapetsas2014-12-171-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | new ForStatement parsing test and small grammar fixLefteris Karapetsas2014-12-171-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a ForStatement solidity AST Node.Lefteris Karapetsas2014-12-171-0/+28
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Adding ForStatement node - Implemented Parsing for ForStatement - A simple parsing test for the ForStatement - Work in progress
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #621 from chriseth/sol_createContractschriseth2014-12-173-1/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contract creation ("new" operator).
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Check that constructor does not have "returns" directive.Christian2014-12-151-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Packing and unpacking of constructor arguments.Christian2014-12-151-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Create contracts.Christian2014-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initial interface for udp. test sending/receiving udp.subtly2014-12-182-38/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | udp != tcp. history-commit.subtly2014-12-172-0/+33
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into windows_debugMarek Kotewicz2014-12-163-0/+498
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #3 from winsvega/NewStateTestsChristoph Jentzsch2014-12-161-0/+191
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transaction Test Filler
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transaction Test Fillerwinsvega2014-12-161-0/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into NewStateTestsCJentzsch2014-12-162-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into NewStateTestsCJentzsch2014-12-141-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'NewStateTests' of https://github.com/CJentzsch/cpp-ethereum ↵CJentzsch2014-12-141-0/+302
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into NewStateTests
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Init code test fillerwinsvega2014-12-131-0/+302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into NewStateTestsCJentzsch2014-12-142-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into NewStateTestsCJentzsch2014-12-1433-907/+6517
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/state.cpp
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mergeCJentzsch2014-12-141-1/+24
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | boost library -> librariesethdev2014-12-161-2/+2
| |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update to the correct file nameLu Guanqun2014-12-142-2/+2
| |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Silly windows fix.Gav Wood2014-12-141-1/+1
| |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes for windows?Gav Wood2014-12-142-3/+3
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Another Windows fix?Gav Wood2014-12-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows fix?Gav Wood2014-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #601 from CJentzsch/newTestsGav Wood2014-12-143-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added recursive create test + lesser output for safe VM exceptions
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added recursive create test + lesser output for safe VM exceptionsCJentzsch2014-12-133-1/+6
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into ↵sveneh2014-12-1313-37/+138
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | build_enhancement Conflicts: windows/LibEthereum.vcxproj windows/LibEthereum.vcxproj.filters Solved by removing files (not necessary anymore)
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #600 from CJentzsch/bugfixGav Wood2014-12-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set first 12 bytes to zero in ecrecover
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into bugfixCJentzsch2014-12-1323-254/+3199
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libevm/VM.h
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | fix stackoverflow in calldataload, codecopy, extcodecopy + some testsCJentzsch2014-12-063-0/+195
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix import state for state testsCJentzsch2014-12-131-4/+4
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/TestHelper.cpp
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Style fix.Gav Wood2014-12-131-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #594 from imapp-pl/testsGav Wood2014-12-131-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test unexpected storage entries
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Replace spaces with tabsPaweł Bylica2014-12-121-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Report wrong account address in case of unexpected storege keyPaweł Bylica2014-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Test unexpected storage entriesPaweł Bylica2014-12-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:ethereum/cpp-ethereum into developGav Wood2014-12-134-9/+102
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ethereum/develop' into sol_swapConstantsChristian2014-12-1310-26/+108
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/solidityOptimizerTest.cpp
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #584 from chriseth/sol_stringschriseth2014-12-132-0/+78
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | String types.
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Support empty strings.Christian2014-12-112-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Tests for empty and too long strings.Christian2014-12-111-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | String types.Christian2014-12-101-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not add at the end of the function selector "loop".Christian2014-12-121-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Swap literals to the end if optimizing.Christian2014-12-121-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanups.Gav Wood2014-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Beginnings of cleaning up the Executive/State code.Gav Wood2014-12-126-12/+14
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor warning fix.Gav Wood2014-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:ethereum/cpp-ethereum into developGav Wood2014-12-122-7/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #583 from imapp-pl/vmGav Wood2014-12-122-7/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | VM interface & factory
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into vmPaweł Bylica2014-12-126-126/+385
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libethereum/Executive.cpp libethereum/Executive.h libethereum/State.cpp
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into vmPaweł Bylica2014-12-118-43/+280
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | VMFactory - a new way of creating VMsPaweł Bylica2014-12-112-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into vmPaweł Bylica2014-12-0813-52/+2176
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Use safe pointers in ExecutivePaweł Bylica2014-12-061-0/+1
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix tests.Gav Wood2014-12-123-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce verbosity.Gav Wood2014-12-121-1/+2
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | jsonrpc _library -> _librariesMarek Kotewicz2014-12-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | renamed _DIR -> _DIRS && _LIBRARY -> _LIBRARIES according to cmake guidelinesMarek Kotewicz2014-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into build_enhancementMarek Kotewicz2014-12-122-7/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Whisper test fix.Gav Wood2014-12-121-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Fix genesis test.Gav Wood2014-12-121-1/+1
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor/cleaning.
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into build_enhancementMarek Kotewicz2014-12-125-126/+297
|\| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Remove extraneous old stuff for PoC-7.Gav Wood2014-12-122-6/+4
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix gas remaining issue.
| * | | | | | | | | | | | | | | | | | | | | | | | | Whitespace change.chriseth2014-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Some (few) tests for the optimizer.Christian2014-12-113-120/+293
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | fixed styling issuesMarek Kotewicz2014-12-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'macox_fixes' into build_enhancementMarek Kotewicz2014-12-111-1/+89
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/solidityNatspecJSON.cpp
| * | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #586 from LefterisJP/natspec_contract_tagschriseth2014-12-111-0/+88
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | Natspec title and author tag.
| | * | | | | | | | | | | | | | | | | | | | | | | Natspec title and author tag.Lefteris Karapetsas2014-12-101-0/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Adding the title and author natspec documentation tags for contracts - Also using the author tag for functions now - Tests