aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Correcting and testing enum member accessLefteris Karapetsas2015-02-141-1/+16
* Enums NameAndTypeResolution - WIPLefteris Karapetsas2015-02-142-0/+35
* Disallow trailing comma in Enum DeclarationLefteris Karapetsas2015-02-141-0/+14
* Introducing EnumType and some Parser testsLefteris Karapetsas2015-02-141-0/+14
* Adding test for Enum ParsingLefteris Karapetsas2015-02-141-0/+14
* Merge pull request #1040 from CJentzsch/performanceTestsGav Wood2015-02-141-2/+2
|\
| * style - autoCJentzsch2015-02-131-2/+2
* | Performance tests: more ackermann calls, fibonacci.Paweł Bylica2015-02-132-11/+137
* | Merge pull request #1039 from CJentzsch/performanceTestsGav Wood2015-02-132-0/+64
|\|
| * use auto for steady clock and chrono::millisecondsCJentzsch2015-02-131-8/+6
| * style fixCJentzsch2015-02-131-32/+32
| * performance testCJentzsch2015-02-132-0/+66
* | Merge pull request #1037 from chriseth/sol_bytesCalldataToMemoryGav Wood2015-02-131-0/+15
|\ \
| * | Copying calldata directly to memory.Christian2015-02-131-0/+15
| |/
* | Merge pull request #1035 from winsvega/developGav Wood2015-02-136-28/+449
|\ \
| * | New Testswinsvega2015-02-133-8/+157
| * | Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into developwinsvega2015-02-137-94/+352
| |\ \
| * | | New Testswinsvega2015-02-133-20/+292
| * | | Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into developwinsvega2015-02-115-3/+85
| |\ \ \
| * \ \ \ Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into developwinsvega2015-02-1023-136/+1249
| |\ \ \ \
* | \ \ \ \ Merge pull request #1038 from debris/before_jsoncppGav Wood2015-02-131-2/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | fixed issue with including wrong json/json.h fileMarek Kotewicz2015-02-131-2/+3
* | | | | | Copying structs.Christian2015-02-132-1/+61
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'develop' into p2psubtly2015-02-131-0/+39
|\ \ \ \ \
| * \ \ \ \ Merge pull request #1029 from chriseth/sol_bytesContinuationGav Wood2015-02-131-0/+39
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | length member for byte arrays.Christian2015-02-121-0/+15
| | * | | | Test for bytes in mapping.Christian2015-02-121-0/+24
* | | | | | Merge branch 'develop' into p2psubtly2015-02-134-7/+138
|\| | | | |
| * | | | | Merge pull request #1019 from chriseth/sol_bytesGav Wood2015-02-122-2/+133
| |\| | | |
| | * | | | Moved copy code to CompilerUtils.Christian2015-02-122-11/+60
| | * | | | Dynamic copy to memory.Christian2015-02-121-44/+42
| | * | | | Simple copy of bytes to storage.Christian2015-02-121-3/+62
| | * | | | Tests and some code for msg.data.Christian2015-02-121-0/+25
| * | | | | Merge pull request #999 from debris/jsoncpp_pathGav Wood2015-02-122-2/+2
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'jsoncpp_path' of https://github.com/debris/cpp-ethereum into js...Marek Kotewicz2015-02-120-0/+0
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'develop' into jsoncpp_pathdebris2015-02-1131-1772/+2158
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | * | | | | | Merge branch 'develop' into jsoncpp_pathMarek Kotewicz2015-02-121-6/+6
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | * | | | | | Merge branch 'develop' into jsoncpp_pathMarek Kotewicz2015-02-1131-1772/+2158
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | / / / | | | | |/ / / | | | |/| | |
| | * | | | | fixed jsoncpp find_pathMarek Kotewicz2015-02-102-2/+2
| * | | | | | Another try in fixing windows build.Christian2015-02-121-3/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'develop' into p2psubtly2015-02-121-6/+6
|\| | | | |
| * | | | | Some windows fixes.Christian2015-02-121-6/+6
* | | | | | Merge branch 'develop' into p2psubtly2015-02-120-0/+0
|\| | | | |
| * | | | | Merge pull request #979 from debris/win_fixesMarek Kotewicz2015-02-120-0/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | fixed transitive dependencies for msvcdebris2015-02-111-6/+0
| | * | | | cmake messdebris2015-02-091-0/+6
* | | | | | Merge branch 'develop' into p2psubtly2015-02-1131-1772/+2158
|\| | | | |
| * | | | | Test stuff into cpp from header.Gav Wood2015-02-112-3/+3
| * | | | | Merge pull request #916 from winsvega/developGav Wood2015-02-1124-1705/+2009
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Test relatedwinsvega2015-02-102-8/+9
| | * | | | Bigintwinsvega2015-02-101-2/+2
| | * | | | Style Changeswinsvega2015-02-075-261/+260
| | * | | | TransactionTestwinsvega2015-02-072-68/+87
| | * | | | nonce value from 0 to "0" in fillerswinsvega2015-02-0621-1410/+1707
| | * | | | Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into developwinsvega2015-02-0112-97/+1257
| | |\ \ \ \
| | * | | | | state test conditions to filler fileswinsvega2015-02-011-0/+16
| | * | | | | transaction address length test fixwinsvega2015-02-012-33/+5
| * | | | | | small fixes per chris's commentsLu Guanqun2015-02-102-5/+5
| * | | | | | add two more exp testsLu Guanqun2015-02-101-0/+18
| * | | | | | add exponent operatorLu Guanqun2015-02-102-0/+41
| * | | | | | Arbitrary parameters for call() and all hash functions.Christian2015-02-101-0/+23
| | |_|_|_|/ | |/| | | |
| * | | | | Merge pull request #986 from LefterisJP/sol_StyleFixchriseth2015-02-105-67/+67
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Addressing issues in Enum style fixLefteris Karapetsas2015-02-101-1/+1
| | * | | | Styling in Natspec EnumsLefteris Karapetsas2015-02-093-4/+4
| | * | | | Camelcasing enums in Types.hLefteris Karapetsas2015-02-091-1/+1
| | * | | | Changing Solidity Code to use CamelCase enum valuesLefteris Karapetsas2015-02-091-62/+62
* | | | | | Merge branch 'develop' into p2psubtly2015-02-103-6/+41
|\| | | | |
| * | | | | Fixed #988.Gav Wood2015-02-102-3/+8
| * | | | | Merge pull request #975 from debris/jsonrpcstubGav Wood2015-02-101-3/+33
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | missing commands in clientMarek Kotewicz2015-02-071-0/+20
| | * | | | Merge branch 'develop' into jsonrpcstubMarek Kotewicz2015-02-079-2/+412
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | jsonrpcstub integreted into cmake build processMarek Kotewicz2015-02-071-3/+13
* | | | | | Merge branch 'develop' into p2psubtly2015-02-103-0/+140
|\| | | | |
| * | | | | - implemented Empty parameter name story. Now the name of input/return parame...Liana Husikyan2015-02-093-0/+140
* | | | | | Merge branch 'develop' into p2psubtly2015-02-091-2/+63
|\| | | | |
| * | | | | Merge pull request #937 from LefterisJP/sol_MultiArgSHA3chriseth2015-02-091-2/+63
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Small fixes for proper multitype/multiarg SHA3Lefteris Karapetsas2015-02-071-9/+8
| | * | | | SHA3 of string literals now should workLefteris Karapetsas2015-02-061-1/+44
| | * | | | appendArgumentsCopyToMemory() has more complicated logic nowLefteris Karapetsas2015-02-061-1/+1
| | * | | | Solidity SHA3 can now take multiple argumentsLefteris Karapetsas2015-02-061-0/+19
* | | | | | update for cr. update whisper test.subtly2015-02-091-8/+11
* | | | | | Merge branch 'develop' into p2psubtly2015-02-071-0/+18
|\| | | | |
| * | | | | Merge pull request #972 from chriseth/sol_structAccessorsGav Wood2015-02-071-0/+18
| |\ \ \ \ \
| | * | | | | Accessors for structs.Christian2015-02-071-0/+18
* | | | | | | update packet testsubtly2015-02-071-1/+1
* | | | | | | update remaining whisper testssubtly2015-02-071-24/+24
* | | | | | | update whisper topic and forwarding tests for node-discoverysubtly2015-02-071-40/+47
* | | | | | | Merge branch 'develop' into p2psubtly2015-02-0710-3/+497
|\| | | | | |
| * | | | | | Merge pull request #971 from CJentzsch/addTestsGav Wood2015-02-074-2/+246
| |\ \ \ \ \ \
| | * | | | | | Merge remote-tracking branch 'upstream/develop' into addTestsCJentzsch2015-02-072-0/+35
| | |\| | | | |
| | * | | | | | sha3 performance testCJentzsch2015-02-071-25/+25
| | * | | | | | Merge remote-tracking branch 'upstream/develop' into addTestsCJentzsch2015-02-064-1/+103
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | * | | | | | failing tests from random simulation as state tests and transaction testsCJentzsch2015-02-061-0/+70
| | * | | | | | Merge branch 'RefundOverflow' into addTestsCJentzsch2015-02-061-1/+29
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into RefundOverflowCJentzsch2015-02-0610-33/+237
| | | |\ \ \ \ \ \
| | | * | | | | | | add refundoverflow testCJentzsch2015-02-031-1/+29
| | * | | | | | | | test block gas limitCJentzsch2015-02-061-1/+63
| | * | | | | | | | Merge remote-tracking branch 'upstream/develop' into addTestsCJentzsch2015-02-0624-136/+2825
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | * | | | | | | | test with sha3 and gas = 2**32CJentzsch2015-01-191-1/+85
| * | | | | | | | | Merge pull request #965 from debris/libnatspecGav Wood2015-02-072-0/+113
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | removed output messages in tests && spacesMarek Kotewicz2015-02-061-25/+0
| | * | | | | | | | Merge branch 'develop' into libnatspecMarek Kotewicz2015-02-061-0/+6
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | * | | | | | | | Merge branch 'develop' into libnatspecMarek Kotewicz2015-02-063-1/+97
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | * | | | | | | | fixed natspec evaluator result on errorMarek Kotewicz2015-02-061-19/+32
| | * | | | | | | | separated libnatspecMarek Kotewicz2015-02-052-0/+125
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Some fixes for the ether units parser.Christian2015-02-062-0/+35
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge pull request #963 from guanqun/disallow-void-varchriseth2015-02-061-0/+6
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | disallow declaration of void typeLu Guanqun2015-02-061-0/+6
| | |/ / / / /
| * | | | | | Merge pull request #953 from LefterisJP/sol_ethSubDenominationsGav Wood2015-02-063-1/+97
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Minor Style fixesLefteris Karapetsas2015-02-061-4/+4
| | * | | | | Tests and fixes for ether subdenominationsLefteris Karapetsas2015-02-051-13/+50
| | * | | | | Tests for ether subdenominations. Work in progressLefteris Karapetsas2015-02-053-1/+60
* | | | | | | updates for code-reviewsubtly2015-02-072-15/+15
* | | | | | | fix whispertopic testsubtly2015-02-051-10/+10
* | | | | | | Merge branch 'develop' into p2psubtly2015-02-058-12/+49
|\| | | | | |
| * | | | | | Move CommonJS to libethcore. Split it up ready for refactoring intoGav Wood2015-02-052-3/+4
| * | | | | | Merge branch 'develop' of github.com:ethereum/cpp-ethereum into developGav Wood2015-02-051-0/+36
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pull request #949 from guanqun/add-some-tests-for-named-argsGav Wood2015-02-051-0/+36
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | add several type error test casesLu Guanqun2015-02-051-0/+36
| * | | | | | | Split canon blockchain and basic blockchain.Gav Wood2015-02-055-9/+9
| |/ / / / / /
* | | | | | | Merge branch 'develop' into p2psubtly2015-02-055-19/+190
|\| | | | | |
| * | | | | | Merge pull request #948 from guanqun/add-some-tests-for-named-argsGav Wood2015-02-052-0/+28
| |\| | | | |
| | * | | | | add two test cases parser error for named argsLu Guanqun2015-02-051-0/+18
| | * | | | | add a test case for disorder named argsLu Guanqun2015-02-051-0/+10
| * | | | | | Merge commit '2d09638fdec853d0d303141ad5ce97b1289153e0' into ethereumjsMarek Kotewicz2015-02-040-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Squashed 'libjsqrc/ethereumjs/' changes from a0cfa3c..f3e1797Marek Kotewicz2015-02-041-0/+15
| * | | | | | Merge pull request #942 from LefterisJP/accesorsFixGav Wood2015-02-041-4/+4
| |\ \ \ \ \ \
| | * | | | | | Fixing accesors test after visibility mergeLefteris Karapetsas2015-02-041-4/+4
| * | | | | | | Test for named args.Gav Wood2015-02-041-0/+10
| * | | | | | | Merge branch 'develop' into ethereumjsMarek Kotewicz2015-02-043-18/+146
| |\| | | | | |
| | * | | | | | Merge branch 'sol_visibility' of https://github.com/chriseth/cpp-ethereum int...Gav Wood2015-02-043-19/+107
| | |\ \ \ \ \ \
| | | * | | | | | Visibility specifiers.Christian2015-02-033-17/+105
| | | | |_|/ / / | | | |/| | | |
| | * | | | | | Merge pull request #922 from LefterisJP/sol_AccessorsMappingGav Wood2015-02-042-1/+41
| | |\ \ \ \ \ \
| | | * | | | | | Accessors for multiple mappings implementedLefteris Karapetsas2015-02-032-2/+16
| | | * | | | | | Code generation for mapping state variable accessorLefteris Karapetsas2015-02-011-0/+18
| | | * | | | | | Adding mapping treatment to FunctionTypeLefteris Karapetsas2015-02-011-1/+9
| | | | |_|_|_|/ | | | |/| | | |
| * | | | | | | Merge commit 'f1cf1b28d797f0761c7cf6ea5236396326f0f682' into ethereumjsMarek Kotewicz2015-02-040-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Squashed 'libjsqrc/ethereumjs/' changes from f1a5cf9..a0cfa3cMarek Kotewicz2015-02-0412-442/+777
| * | | | | | | Merge commit '699bed10c09a86983f357d3c2fd421c2dc28a2f6' into ethereumjsMarek Kotewicz2015-02-030-0/+0
| |\| | | | | | | | |/ / / / / | |/| | | | |
| | * | | | | Squashed 'libjsqrc/ethereumjs/' changes from d516691..f1a5cf9Marek Kotewicz2015-02-033-124/+206
| * | | | | | Revert State class changes for Mix.Gav Wood2015-02-031-3/+4
| | |_|/ / / | |/| | | |
| * | | | | Don't count same messages twice.Gav Wood2015-02-021-0/+4
| * | | | | Merge pull request #923 from arkpar/mix_txGav Wood2015-02-021-2/+2
| |\ \ \ \ \
| | * | | | | fixed block generation on minearkpar2015-02-011-2/+2
| | | |/ / / | | |/| | |
* | | | | | update whisper test for node-networksubtly2015-02-031-6/+11
* | | | | | Merge branch 'develop' into p2psubtly2015-02-0219-105/+2104
|\| | | | |
| * | | | | Make tests resistant to changes in order of declaration.Christian2015-02-012-29/+186
| |/ / / /
| * | | | Merge pull request #913 from arkpar/sol_abi_fixGav Wood2015-02-011-10/+147
| |\ \ \ \
| | * | | | json and solidity ABI generted for eventsarkpar2015-01-311-10/+147
| * | | | | Merge pull request #912 from debris/ethereumjsGav Wood2015-02-010-0/+0
| |\ \ \ \ \
| | * \ \ \ \ Merge commit 'b0eff3fea412c5e33a5b8b98dc08f2d066d06513' into ethereumjsMarek Kotewicz2015-01-310-0/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Squashed 'libjsqrc/ethereumjs/' changes from a8a2e32..589c4fbMarek Kotewicz2015-01-311-4/+4
| | * | | | | Merge commit 'f8a1f53e759ac2232d5a2a2a899645a9a79c344e' into ethereumjsMarek Kotewicz2015-01-310-0/+0
| | |\| | | | | | | |/ / / | | |/| | |
| | | * | | Squashed 'libjsqrc/ethereumjs/' changes from 600c9dd..0b82a05Marek Kotewicz2015-01-311-4/+106
| * | | | | Fix scoping of event arguments.Christian2015-01-311-0/+9
| |/ / / /
| * | | | Merge pull request #908 from chriseth/sol_fix_eventsWithoutParametersGav Wood2015-01-311-0/+19
| |\ \ \ \
| | * | | | Fix: No parameters for event.Christian2015-01-311-0/+19
| * | | | | updated json abi testsarkpar2015-01-311-0/+8
| |/ / / /
| * | | | Whisper now 100% encrypted.Gav Wood2015-01-301-6/+6
| * | | | Various fixes.Gav Wood2015-01-301-9/+9
| * | | | Dev.Gav Wood2015-01-301-1/+1
| * | | | Merge branch 'develop' of github.com:ethereum/cpp-ethereum into developGav Wood2015-01-304-1/+121
| |\ \ \ \
| | * \ \ \ Merge pull request #893 from chriseth/sol_eventsGav Wood2015-01-304-1/+121
| | |\ \ \ \
| | | * | | | Padding fixes.Christian2015-01-301-3/+3
| | | * | | | Code generation for events.Christian2015-01-302-1/+51
| | | * | | | Parsing of events.Christian2015-01-302-0/+70
| | * | | | | Merge pull request #892 from debris/ethereumjsGav Wood2015-01-300-0/+0
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Merge commit '86b70485a615c65919513426d407d7ab3c498a6f' into ethereumjsMarek Kotewicz2015-01-290-0/+0
| | | |\| | |
| | | | * | | Squashed 'libjsqrc/ethereumjs/' changes from 6d59047..94e0e5aMarek Kotewicz2015-01-296-4/+309
| * | | | | | Fallback functions.Christian2015-01-305-5/+101
| |/ / / / /
| * | | | | FunctionType now returns const ref for DeclarationLefteris Karapetsas2015-01-301-1/+1
| * | | | | Removing Function and Param DescriptionLefteris Karapetsas2015-01-301-3/+3
| * | | | | Contract Interface Functions now return FunctionTypeLefteris Karapetsas2015-01-301-9/+9
| |/ / / /
| * | | | Merge pull request #889 from LefterisJP/sol_ExprCompilerEncapsulationchriseth2015-01-292-2/+2
| |\ \ \ \
| | * | | | No longer exposing retrieveValueFromStorage() as a public functionLefteris Karapetsas2015-01-292-2/+2
| * | | | | Merge pull request #887 from chriseth/sol_excludeStdchriseth2015-01-292-2/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Exclude standard contracts by default.Christian2015-01-292-2/+3
| * | | | | Merge pull request #877 from chriseth/sol_superGav Wood2015-01-293-54/+29
| |\ \ \ \ \
| | * | | | | Remove test different_argument_numbers.Christian2015-01-291-51/+0
| | * | | | | Super keyword.Christian2015-01-293-4/+30
| | |/ / / /
| * | | | | Merge pull request #883 from debris/corsGav Wood2015-01-291-2/+0
| |\ \ \ \ \
| | * | | | | removed CorsHTTPServerMarek Kotewicz2015-01-281-2/+0
| * | | | | | Merge pull request #719 from winsvega/developGav Wood2015-01-297-13/+724
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | namespace linewinsvega2015-01-281-1/+0
| | * | | | some state testswinsvega2015-01-282-2/+46
| | * | | | style changeswinsvega2015-01-242-10/+4
| | * | | | minor changeswinsvega2015-01-241-12/+3
| | * | | | Chris suggestionswinsvega2015-01-231-16/+15
| | * | | | transaction.cpp update due to the code changeswinsvega2015-01-232-4/+4
| | * | | | Merge remote-tracking branch 'ethereum/develop' into developwinsvega2015-01-2331-598/+7530
| | |\ \ \ \
| | * | | | | transaction tests, bound testswinsvega2015-01-234-27/+268
| | * | | | | some testwinsvega2015-01-221-0/+28
| | * | | | | Transaction Testswinsvega2015-01-225-11/+426
| * | | | | | Various fixes pertaining to State Variable accessorsLefteris Karapetsas2015-01-291-2/+2
| * | | | | | Function name clashing with Statevariable accessor testLefteris Karapetsas2015-01-291-0/+12
| * | | | | | Multiple elementary state variable accessors testLefteris Karapetsas2015-01-291-0/+25
| * | | | | | EVM Code for simple accessor function is properly generatedLefteris Karapetsas2015-01-291-0/+12
| * | | | | | Various small fixes for Sol Automatic AccessorsLefteris Karapetsas2015-01-292-4/+4
| * | | | | | State variable accessors code is now more organizedLefteris Karapetsas2015-01-291-5/+29
| * | | | | | Tests for variable state accessors are in progressLefteris Karapetsas2015-01-291-1/+61
| * | | | | | Fix in addStateVariableAccessor and adjustment of parser testsLefteris Karapetsas2015-01-291-15/+24
| * | | | | | Fix stack size of typetypes.Christian2015-01-291-0/+16
| * | | | | | Cleaner solution to provide standard sources.Christian2015-01-284-2/+23
| | |_|/ / / | |/| | | |
| * | | | | LogFilter supports new, better, filter mechanism.Gav Wood2015-01-281-0/+184
| * | | | | Merge branch 'ethereumjs' into natspecMarek Kotewicz2015-01-270-0/+0
| |\ \ \ \ \
| | * \ \ \ \ Merge commit 'ec71f23423a3f681e0106ae1b77070f10decd1bc' into ethereumjsMarek Kotewicz2015-01-270-0/+0
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Squashed 'libjsqrc/ethereumjs/' changes from d223ac0..1f5a6f1Marek Kotewicz2015-01-274-7/+0
| * | | | | | Merge pull request #857 from LianaHus/StringToHashchriseth2015-01-271-0/+91
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | -added test case for hash8 to string1 conversionliana2015-01-271-1/+15
| | * | | | | - modifications according to PR reviewliana2015-01-261-7/+18
| | * | | | | - added conversion for string/hash of equal sizesliana2015-01-241-0/+66
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'develop' of github.com:ethereum/cpp-ethereum into developGav Wood2015-01-274-1/+256
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #856 from chriseth/sol_modifiersGav Wood2015-01-274-1/+256
| | |\ \ \ \ \
| | | * | | | | Call modifiers on constructor.Christian2015-01-261-0/+17
| | | * | | | | Modifier overrides and callgraph analysis.Christian2015-01-261-2/+36
| | | * | | | | Compilation of function modifiers.Christian2015-01-263-11/+75
| | | * | | | | Type resolution for function modifiers.Christian2015-01-263-0/+113
| | | * | | | | Function modifier parsing.Christian2015-01-261-0/+27
| * | | | | | | Merge branch 'develop' of github.com:ethereum/cpp-ethereum into developGav Wood2015-01-273-3/+60
| |\| | | | | |
| | * | | | | | Merge pull request #871 from debris/commonjs_testsGav Wood2015-01-261-0/+57
| | |\ \ \ \ \ \
| | | * | | | | | failing commonjs testsMarek Kotewicz2015-01-261-0/+57
| | | |/ / / / /
| | * / / / / / Reverse order of inheritance in base list.Christian2015-01-262-3/+3
| | |/ / / / /
| * / / / / / Fix jsTo...Gav Wood2015-01-271-1/+1
| |/ / / / /
* | | | | | import/export peers and nodessubtly2015-01-312-1/+47
* | | | | | add test-require to p2p/hostsubtly2015-01-262-2/+4
* | | | | | Merge branch 'develop' into p2psubtly2015-01-261-0/+31
|\| | | | |
| * | | | | Merge pull request #839 from debris/natspecGav Wood2015-01-240-0/+0
| |\ \ \ \ \
| | * | | | | Merge branch 'develop' into natspecMarek Kotewicz2015-01-233-6/+46
| | |\| | | |
| | * | | | | 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
| * | | | | | correct testCJentzsch2015-01-231-2/+0
| * | | | | | fix gasPrice*gasLimit + value overflowCJentzsch2015-01-231-0/+33
| | |_|/ / / | |/| | | |
* | | | | | fix ping-timeoutssubtly2015-01-262-10/+14
* | | | | | updates and fixes for code reviewsubtly2015-01-262-24/+20
* | | | | | update whisper test. move ports out of private ranges and specify ip address.subtly2015-01-231-5/+6
* | | | | | Merge branch 'develop' into p2psubtly2015-01-239-23/+476
|\| | | | |
| * | | | | 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 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