aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* blockchain testsCJentzsch2015-03-064-554/+609
* New Proof-of-Work.Gav Wood2015-03-063-25/+36
* remove genesis state from state testsCJentzsch2015-03-063-43/+23
* state rebase.Gav Wood2015-03-061-18/+0
* Update precompiled stuff.Gav Wood2015-03-061-0/+62
* add memory testsCJentzsch2015-03-061-5/+34
* only check rootHash of state if FATDB is offCJentzsch2015-03-061-0/+1
* State integration test.Gav Wood2015-03-061-62/+0
* Update precompiled stuff.Gav Wood2015-03-061-0/+62
* add memory testsCJentzsch2015-03-063-37/+37
* only check rootHash of state if FATDB is offCJentzsch2015-03-061-0/+10
* Fix FakeExtVM.Gav Wood2015-03-061-0/+1
* State integration test.Gav Wood2015-03-063-10/+48
* Fat Trie and tests for it.Gav Wood2015-03-061-2/+42
* Implemented passing arguments to the base constructor.Liana Husikyan2015-03-021-0/+64
* Merge pull request #1146 from LefterisJP/sol_fixBaseClassAccessorschriseth2015-03-021-1/+53
|\
| * getInheritableMembers() does not look at BaseContractsLefteris Karapetsas2015-03-021-0/+29
| * VisibleInDerivedContracts() is now virtual()Lefteris Karapetsas2015-03-021-1/+12
| * Add structs to inheritable membersLefteris Karapetsas2015-03-021-2/+2
| * Adding test for base class statevar accessorsLefteris Karapetsas2015-03-021-0/+12
* | Merge pull request #1157 from chriseth/sol_arrayShorteningchriseth2015-03-022-0/+233
|\ \ | |/ |/|
| * Array copy storage to storage.Christian2015-02-281-0/+88
| * Type checks for array assignment.Christian2015-02-281-0/+55
| * Shortening of dynamic arrays.Christian2015-02-281-0/+90
* | Merge pull request #1160 from CJentzsch/addTestsGav Wood2015-03-018-96/+861
|\ \
| * | move extrem memory test to stMemoryStressTest.jsonCJentzsch2015-03-014-68/+92
| * | more memmory hard quadratic complexity testsCJentzsch2015-03-011-0/+330
| * | more jump testsCJentzsch2015-02-271-0/+85
| * | add more addmod mulmod overflow testsCJentzsch2015-02-271-0/+224
| * | A calls B to refundCJentzsch2015-02-271-28/+130
| |/
* / add several var related test casesLu Guanqun2015-03-011-0/+34
|/
* Merge pull request #1149 from winsvega/developGav Wood2015-02-273-23/+182
|\
| * Test Helperwinsvega2015-02-271-2/+2
| * More Transaction Testswinsvega2015-02-263-23/+182
* | more calldatacopy return tests (for Pawel)CJentzsch2015-02-272-1/+205
* | Merge branch 'memTests' into addTestsCJentzsch2015-02-261-7/+231
|\ \
| * \ Merge remote-tracking branch 'upstream/develop' into memTestsCJentzsch2015-02-2612-115/+1136
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/develop' into memTestsCJentzsch2015-02-237-14/+35
| |\ \ \
| * | | | add new mem test for quadratic mem gas costsCJentzsch2015-02-231-7/+231
* | | | | adjust to new quadratic memory ruleCJentzsch2015-02-261-9/+9
* | | | | Merge remote-tracking branch 'upstream/develop' into addTestsCJentzsch2015-02-263-2/+132
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | LValue refactoring.Christian2015-02-251-1/+1
| * | | | Merge pull request #1132 from LefterisJP/sol_DebuggingInformationchriseth2015-02-253-1/+131
| |\ \ \ \
| | * | | | Re-adding braces to if in test/Assembly.cppLefteris Karapetsas2015-02-251-0/+4
| | * | | | Move SourceLocation to evmcoreLefteris Karapetsas2015-02-251-1/+1
| | * | | | Tighter coupling for Assembly items retrievalLefteris Karapetsas2015-02-251-1/+1
| | * | | | LocationSetter in some extra places during CompilingLefteris Karapetsas2015-02-251-2/+3
| | * | | | Styling changes for SourceLocation and friendsLefteris Karapetsas2015-02-251-5/+1
| | * | | | Simple Assembly Locations testLefteris Karapetsas2015-02-251-0/+128
| | * | | | Reset CompilerContext's visited nodes at compile startLefteris Karapetsas2015-02-251-0/+1
| | * | | | Moving Source Location libdevcoreLefteris Karapetsas2015-02-251-1/+1
* | | | | | add more sdiv smod testsCJentzsch2015-02-261-1/+141
* | | | | | tests for mem at 32,64 KB +- 1, 31,32,33 for mstore and mstore8CJentzsch2015-02-261-0/+1360
* | | | | | include invalid transaction rlp block testCJentzsch2015-02-251-0/+5
* | | | | | add memory testsCJentzsch2015-02-252-0/+142
* | | | | | add commandline flag for tt10MBtxTestCJentzsch2015-02-251-1/+15
* | | | | | use 50000 bytes for CALLDATACOPYCJentzsch2015-02-251-3/+3
* | | | | | add --all flag for time consuming testsCJentzsch2015-02-251-3/+3
* | | | | | add quadratic complexity testsCJentzsch2015-02-253-60/+321
* | | | | | add test for quadratic complexityCJentzsch2015-02-254-1/+102
* | | | | | add wrong v value tx testCJentzsch2015-02-252-6/+21
* | | | | | add create contract with existing address testCJentzsch2015-02-252-464/+506
|/ / / / /
* | | | | Merge pull request #1129 from imapp-pl/pr/old_testsGav Wood2015-02-254-1/+729
|\ \ \ \ \
| * | | | | Move old VM jump tests from EVM JIT to JSON filePaweł Bylica2015-02-251-28/+280
| * | | | | Move old VM stack tests from EVM JIT to JSON filePaweł Bylica2015-02-242-0/+141
| * | | | | Move old VM return tests from EVM JIT to JSON filePaweł Bylica2015-02-241-0/+56
| * | | | | Move old VM memory tests from EVM JIT to JSON filePaweł Bylica2015-02-241-0/+84
| * | | | | Move old VM environmental test from EVM JIT to JSON filePaweł Bylica2015-02-241-1/+29
| * | | | | Move old VM arithmetic tests from EVM JIT to JSON filePaweł Bylica2015-02-241-0/+167
| |/ / / /
* | | | | Merge pull request #1110 from winsvega/developGav Wood2015-02-251-30/+74
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Solidity Testswinsvega2015-02-241-3/+3
| * | | Solidity Testswinsvega2015-02-241-5/+4
| * | | Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into developwinsvega2015-02-237-13/+176
| |\ \ \
| * | | | Quadratic complexity testwinsvega2015-02-231-30/+75
* | | | | Merge pull request #1119 from chriseth/sol_arraysIndexAccesschriseth2015-02-241-0/+101
|\ \ \ \ \
| * | | | | Out-of-bounds checking.Christian2015-02-241-2/+47
| * | | | | Index and length access for dynamic arrays.Christian2015-02-241-0/+29
| * | | | | Implementation of index access.Christian2015-02-241-0/+27
* | | | | | fixed test buidarkpar2015-02-241-1/+1
|/ / / / /
* | | | | Merge pull request #1113 from CJentzsch/addTestsGav Wood2015-02-242-82/+40
|\ \ \ \ \
| * | | | | remove tests with impossible pre conditionsCJentzsch2015-02-232-82/+40
| | |_|_|/ | |/| | |
* | | | | Merge pull request #1100 from chriseth/sol_arraysGav Wood2015-02-232-0/+60
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Allow conversion to dynamic arrays and update grammar.Christian2015-02-221-0/+11
| * | | | Parsing of array types and basic implementation.Christian2015-02-212-0/+49
| | |_|/ | |/| |
* | | | Merge remote-tracking branch 'upstream/develop' into addTestsCJentzsch2015-02-2349-1824/+7736
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #1109 from CJentzsch/TransactionBugFixGav Wood2015-02-232-3/+8
| |\ \ \
| | * | | fix too-small-address-length bug in transactionCJentzsch2015-02-232-3/+8
| | |/ /
| * | | Merge pull request #1107 from chriseth/sol_inheritableIsInternalGav Wood2015-02-232-9/+9
| |\ \ \
| | * | | Replaced "inheritable" by "internal".Christian2015-02-232-9/+9
| | |/ /
| * / / Stack height checks and fix.Christian2015-02-231-1/+0
| |/ /
| * | Inline member initialisationLiana Husikyan2015-02-211-0/+55
| * | Merge pull request #1091 from chriseth/accountProxyQueuesGav Wood2015-02-212-0/+104
| |\ \ | | |/ | |/|
| | * Implemented account proxy queues.Christian2015-02-212-0/+104
| * | New Solidity Testswinsvega2015-02-202-4/+355
| * | Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into developwinsvega2015-02-202-0/+15
| |\|
| | * Merge pull request #1092 from LefterisJP/sol_BugOverrideFunctionByteArrayParamchriseth2015-02-201-0/+13
| | |\
| | | * Bugfix for functions overrideLefteris Karapetsas2015-02-201-0/+13
| | * | Merge pull request #1071 from winsvega/developGav Wood2015-02-202-18/+229
| | |\ \
| | * \ \ Merge pull request #1082 from debris/jsonrpcGav Wood2015-02-200-0/+0
| | |\ \ \
| | | * \ \ Merge branch 'develop' into jsonrpcMarek Kotewicz2015-02-193-9/+45
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | Merge commit '4fbeff27d613a4e13452489acd6cfc5e94e8f620' into jsonrpcMarek Kotewicz2015-02-180-0/+0
| | | |\ \ \
| | | | * | | Squashed 'libjsqrc/ethereumjs/' changes from 82cc5f6..9a85b09Marek Kotewicz2015-02-183-0/+40
| | * | | | | Fix gas limit.Gav Wood2015-02-201-0/+2
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into developwinsvega2015-02-193-9/+45
| |\| | | |
| | * | | | Merge pull request #1087 from chriseth/sol_changeProtectedToInheritableGav Wood2015-02-182-9/+9
| | |\ \ \ \
| | | * | | | Rename "protected" to "inheritable".Christian2015-02-182-9/+9
| | | |/ / /
| | * / / / Fixes for assigning and deleting structs containing byte arrays.Christian2015-02-181-0/+36
| | |/ / /
| * | | / Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into developwinsvega2015-02-1819-97/+3832
| |\| | | | | |_|/ | |/| |
| | * | Merge pull request #1080 from debris/transactionCountGav Wood2015-02-181-0/+40
| | |\ \
| | | * | JSON-RPC transactionCount && uncleCount, fixed #1027Marek Kotewicz2015-02-181-0/+40
| | * | | Merge pull request #1072 from chriseth/sol_externalGav Wood2015-02-184-8/+149
| | |\ \ \
| | | * | | Calldata byte arrays stored on the stack.Christian2015-02-171-4/+32
| | | * | | loadFromMemoryDynamicChristian2015-02-171-5/+5
| | | * | | No write access to parameters of external functions.Christian2015-02-172-0/+45
| | | * | | "external" visibility specifier.Christian2015-02-172-0/+68
| | | |/ /
| | * | | Merge pull request #1070 from debris/shh_getMessagesGav Wood2015-02-181-0/+10
| | |\ \ \
| | | * | | added shh_getMessages, fixed #899Marek Kotewicz2015-02-171-0/+10
| | * | | | Merge pull request #1068 from imapp-pl/pr/performance_testsGav Wood2015-02-183-0/+1566
| | |\ \ \ \
| | | * | | | ManyFunctions performance test: replace xor with correct exp operatorPaweł Bylica2015-02-173-201/+229
| | | * | | | ManyFunctions performance test: ~200 functions in a contract, half of them ar...Paweł Bylica2015-02-163-0/+1538
| | | |/ / /
| | * | | | Merge pull request #1066 from debris/include_orderGav Wood2015-02-181-1/+1
| | |\ \ \ \
| | | * | | | fixed #1022Marek Kotewicz2015-02-161-1/+1
| | | |/ / /
| | * | | | Merge pull request #1065 from CJentzsch/blockTestsGav Wood2015-02-187-48/+1626
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | OS independency by using file systemCJentzsch2015-02-162-337/+373
| | | * | | remove unnecessary functionCJentzsch2015-02-161-1/+0
| | | * | | fix typoCJentzsch2015-02-162-51/+2
| | | * | | add invalid block header testsCJentzsch2015-02-163-52/+1083
| | | * | | extra data fixCJentzsch2015-02-163-132/+120
| | | * | | Merge remote-tracking branch 'upstream/develop' into blockTestsCJentzsch2015-02-162-1/+16
| | | |\| |
| | | * | | Merge remote-tracking branch 'upstream/develop' into blockTestsCJentzsch2015-02-147-28/+297
| | | |\ \ \
| | | * | | | add possibility to create bad blocks in fillersCJentzsch2015-02-143-277/+186
| | | * | | | Merge remote-tracking branch 'upstream/develop' into blockTestsCJentzsch2015-02-1310-29/+529
| | | |\ \ \ \
| | | * | | | | switch to secretKey in fillersCJentzsch2015-02-133-43/+64
| | | * | | | | fix tx outputCJentzsch2015-02-131-2/+2
| | | * | | | | fix import transactionCJentzsch2015-02-131-2/+29
| | | * | | | | Merge remote-tracking branch 'upstream/develop' into blockTestsCJentzsch2015-02-132-1/+61
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into blockTestsCJentzsch2015-02-137-91/+349
| | | |\ \ \ \ \ \
| | | * | | | | | | add valid tx outputCJentzsch2015-02-133-75/+266
| | | * | | | | | | Merge remote-tracking branch 'upstream/develop' into blockTestsCJentzsch2015-02-121-6/+6
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | styleCJentzsch2015-02-121-26/+22
| | | * | | | | | | | avoid code doublingCJentzsch2015-02-121-291/+223
| | | * | | | | | | | check transactionsCJentzsch2015-02-115-85/+113
| | | * | | | | | | | Merge remote-tracking branch 'upstream/develop' into blockTestsCJentzsch2015-02-1126-1682/+2096
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | validate block (the not fill tests path)CJentzsch2015-02-112-163/+179
| | | * | | | | | | | | Merge remote-tracking branch 'upstream/develop' into blockTestsCJentzsch2015-02-1010-75/+311
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | start with test defined genesis blockCJentzsch2015-02-104-182/+274
| | | * | | | | | | | | | write block header and uncle listCJentzsch2015-02-091-5/+27
| | | * | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into blockTestsCJentzsch2015-02-0711-3/+515
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | create block from transaction with genesis block as parentCJentzsch2015-02-075-101/+169
| | | * | | | | | | | | | | include transaction listCJentzsch2015-02-061-0/+22
| | | * | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into blockTestsCJentzsch2015-02-0610-12/+77
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | first definition of block tests - header onlyCJentzsch2015-02-052-2/+203
| | | * | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into blockTestsCJentzsch2015-02-0421-109/+2302
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | new file block.cppCJentzsch2015-01-211-0/+21
| | * | | | | | | | | | | | | | Removing events from Solidity InterfaceLefteris Karapetsas2015-02-171-26/+2
| | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Forced cleanup for conversion to enum.Christian2015-02-141-0/+15
| | * | | | | | | | | | | | | Some changes to enums.Christian2015-02-141-1/+1
| | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge pull request #1011 from LefterisJP/jsonrpc_cpp_v0.4.2Gav Wood2015-02-141-15/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Changes required for upgrade to jsonrpccpp 0.4.2Lefteris Karapetsas2015-02-131-15/+15
| | | | |_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Removing ';' from the end of EnumDefinitionLefteris Karapetsas2015-02-143-10/+10
| | * | | | | | | | | | | | Explicit conversion from int to EnumLefteris Karapetsas2015-02-141-0/+17
| | * | | | | | | | | | | | Addressing issues with Enums in SolidityLefteris Karapetsas2015-02-142-20/+3
| | * | | | | | | | | | | | Indentation fixesLefteris Karapetsas2015-02-141-2/+2
| | * | | | | | | | | | | | Enum Value member access should now work properlyLefteris Karapetsas2015-02-141-0/+17
| | * | | | | | | | | | | | Enum type conversion and member value access.Lefteris Karapetsas2015-02-142-1/+35
| | * | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ 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
| | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Test Correctionwinsvega2015-02-172-19/+92
| * | | | | | | | | | | | Suicide Testswinsvega2015-02-131-3/+141
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | New Testswinsvega2015-02-133-8/+157
| * | | | | | | | | | | Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into developwinsvega2015-02-137-94/+352
| |\| | | | | | | | | |
| | * | | | | | | | | | 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
| | |\| | | | | | | |
| | * | | | | | | | | Merge branch 'develop' into p2psubtly2015-02-103-6/+41
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | |
| | * | | | | | | | | Merge branch 'develop' into p2psubtly2015-02-103-0/+140
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'develop' into p2psubtly2015-02-091-2/+63
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | update for cr. update whisper test.subtly2015-02-091-8/+11
| | * | | | | | | | | | | Merge branch 'develop' into p2psubtly2015-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
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | updates for code-reviewsubtly2015-02-072-15/+15
| | * | | | | | | | | | | | fix whispertopic testsubtly2015-02-051-10/+10
| | * | | | | | | | | | | | Merge branch 'develop' into p2psubtly2015-02-058-12/+49
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'develop' into p2psubtly2015-02-055-19/+190
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | update whisper test for node-networksubtly2015-02-031-6/+11
| | * | | | | | | | | | | | | Merge branch 'develop' into p2psubtly2015-02-0219-105/+2104
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | coding standardssubtly2015-01-171-1/+1
| | * | | | | | | | | | | | | | | | cleanupsubtly2015-01-171-1/+0
| | * | | | | | | | | | | | | | | | Merge branch 'develop' into p2psubtly2015-01-174-53/+58
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into p2psubtly2015-01-1513-110/+817
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Connectivity and nodetable callbacks. Disable stale code.subtly2015-01-121-0/+23
| | * | | | | | | | | | | | | | | | | | Merge branch 'develop' into p2psubtly2015-01-1121-283/+3696
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | Merging in new data structure for nodes from node-table. End result will be c...subtly2015-01-112-9/+9
| | * | | | | | | | | | | | | | | | | | | Consolidate use of pingAll into keepAlivePeers. Add bool operators for Node a...subtly2015-01-091-1/+1
| | * | | | | | | | | | | | | | | | | | | Pass 2 integrating node table. Pruning and merging old node lifecycle logic w...subtly2015-01-072-2/+2
| | * | | | | | | | | | | | | | | | | | | Merge branch 'p2p-udp-nodetable' into p2psubtly2015-01-071-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'p2p-udp-nodetable' into p2psubtly2015-01-062-7/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'p2p-udp-nodetable' into p2psubtly2015-01-063-149/+2312
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into p2psubtly2015-01-057-12/+440
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | New Testswinsvega2015-02-133-20/+292
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into developwinsvega2015-02-115-3/+85
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Test stuff into cpp from header.Gav Wood2015-02-112-3/+3
| | * | | | | | | | | | | | | | | | | | | | | | | Merge pull request #916 from winsvega/developGav Wood2015-02-1124-1705/+2009
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \