aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Fuzz: RebaseDimitry2015-07-200-0/+0
| | |
| | * Fuzz: StyleDimitry2015-07-200-0/+0
| | |
| | * Fuzz: Rlp Fuzzing SuiteDimitry2015-07-200-0/+0
| | |
| | * RLP fuzz: invalid rlp generationDimitry2015-07-200-0/+0
| | |
| | * Fuzz: random valid RLP generationDimitry Khokhlov2015-07-200-0/+0
| | |
| * | Merge pull request #2511 from gluk256/_whisperDB_Gav Wood2015-07-210-0/+0
| |\ \ | | | | | | | | Level DB support for Whisper
| | * | installWatch() call in testVlad Gluhovsky2015-07-190-0/+0
| | | |
| | * | Message save/load functionality upgradedVlad Gluhovsky2015-07-190-0/+0
| | | |
| * | | enabled libsecp256k1 on windowsarkpar2015-07-211-3/+1
| | | |
| * | | Merge pull request #2524 from chriseth/sol_windowsFixGav Wood2015-07-211-0/+2
| |\ \ \ | | | | | | | | | | Compile fix for Windows.
| | * | | Windows fix.chriseth2015-07-211-0/+2
| | | | |
| * | | | Merge branch 'whizz' into developGav Wood2015-07-213-32/+91
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'whizz' of github.com:ethereum/cpp-ethereum into whizzGav Wood2015-07-202-2/+6
| | |\ \ \
| | | * | | fixing solidity testsarkpar2015-07-202-2/+6
| | | | | |
| | * | | | Merge branch 'whizz' of https://github.com/ethereum/cpp-ethereum into client_refMarek Kotewicz2015-07-202-41/+89
| | |\| | |
| | | * | | Merge branch 'whizz' of github.com:ethereum/cpp-ethereum into whizzGav Wood2015-07-200-0/+0
| | | |\ \ \
| | | | * | | Fix for stateroot in tests.Gav Wood2015-07-200-0/+0
| | | | | | |
| | | | * | | tests reparedarkpar2015-07-182-40/+88
| | | | | | |
| | | * | | | Fix for stateroot in tests.Gav Wood2015-07-200-0/+0
| | | | | | |
| | | * | | | tests reparedarkpar2015-07-202-40/+88
| | | | | | |
| | | * | | | eth workingarkpar2015-07-201-5/+12
| | | | | | |
| | | * | | | started tests refactoringarkpar2015-07-201-1/+1
| | | | | | |
| | | * | | | All fields of BlockInfo now private.Gav Wood2015-07-202-4/+4
| | | | | | |
| | | * | | | Basic test working with same code for Ethash and BasicAuthority.Gav Wood2015-07-200-0/+0
| | | | | | |
| | | * | | | Modularise nonce, mix hash and seed hash.Gav Wood2015-07-201-1/+1
| | | | |_|/ | | | |/| |
| | * | | | Merge branch 'whizz' of https://github.com/ethereum/cpp-ethereum into client_refMarek Kotewicz2015-07-176-73/+177
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | Conflicts: libethereum/Client.cpp libevm/ExtVMFace.h
| | | * | | Merge branch 'whizz' of github.com:ethereum/cpp-ethereum into whizzGav Wood2015-07-170-0/+0
| | | |\ \ \
| | | | * \ \ Merge branch 'whizz' of github.com:ethereum/cpp-ethereum into whizzGav Wood2015-07-170-0/+0
| | | | |\ \ \
| | | | | * \ \ Merge branch 'whizz' of github.com:ethereum/cpp-ethereum into whizzGav Wood2015-07-170-0/+0
| | | | | |\ \ \
| | | | | | * \ \ Merge branch 'whizz' of github.com:ethereum/cpp-ethereum into whizzGav Wood2015-07-170-0/+0
| | | | | | |\ \ \
| | | | | | | * | | eth workingarkpar2015-07-171-5/+12
| | | | | | | | | |
| | | | | | | * | | started tests refactoringarkpar2015-07-171-1/+1
| | | | | | | | | |
| | | | | | | * | | All fields of BlockInfo now private.Gav Wood2015-07-162-4/+4
| | | | | | | | | |
| | | | | | | * | | Basic test working with same code for Ethash and BasicAuthority.Gav Wood2015-07-160-0/+0
| | | | | | | | | |
| | | | | | | * | | Modularise nonce, mix hash and seed hash.Gav Wood2015-07-161-1/+1
| | | | | | | | | |
| | | | | | * | | | eth workingarkpar2015-07-171-5/+12
| | | | | | | | | |
| | | | | | * | | | started tests refactoringarkpar2015-07-171-1/+1
| | | | | | | | | |
| | | | | | * | | | All fields of BlockInfo now private.Gav Wood2015-07-172-4/+4
| | | | | | | | | |
| | | | | | * | | | Basic test working with same code for Ethash and BasicAuthority.Gav Wood2015-07-170-0/+0
| | | | | | | | | |
| | | | | | * | | | Modularise nonce, mix hash and seed hash.Gav Wood2015-07-171-1/+1
| | | | | | |/ / /
| | | | | * | | | eth workingarkpar2015-07-171-5/+12
| | | | | | | | |
| | | | | * | | | started tests refactoringarkpar2015-07-171-1/+1
| | | | | | | | |
| | | | | * | | | All fields of BlockInfo now private.Gav Wood2015-07-172-4/+4
| | | | | | | | |
| | | | | * | | | Basic test working with same code for Ethash and BasicAuthority.Gav Wood2015-07-170-0/+0
| | | | | | | | |
| | | | | * | | | Modularise nonce, mix hash and seed hash.Gav Wood2015-07-171-1/+1
| | | | | | | | |
| | | | * | | | | eth workingarkpar2015-07-171-5/+12
| | | | | | | | |
| | | | * | | | | started tests refactoringarkpar2015-07-171-1/+1
| | | | | | | | |
| | | | * | | | | All fields of BlockInfo now private.Gav Wood2015-07-172-4/+4
| | | | | | | | |
| | | | * | | | | Basic test working with same code for Ethash and BasicAuthority.Gav Wood2015-07-170-0/+0
| | | | | | | | |
| | | | * | | | | Modularise nonce, mix hash and seed hash.Gav Wood2015-07-171-1/+1
| | | | |/ / / /
| | | * | | | | eth workingarkpar2015-07-171-5/+12
| | | | | | | |
| | | * | | | | started tests refactoringarkpar2015-07-171-1/+1
| | | | | | | |
| | | * | | | | All fields of BlockInfo now private.Gav Wood2015-07-172-4/+4
| | | | | | | |
| | | * | | | | Basic test working with same code for Ethash and BasicAuthority.Gav Wood2015-07-170-0/+0
| | | | | | | |
| | | * | | | | Modularise nonce, mix hash and seed hash.Gav Wood2015-07-171-1/+1
| | | | | | | |
| | * | | | | | Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into ↵Marek Kotewicz2015-07-162-1/+3
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | client_ref
| | * | | | | | getLogsEx && propert order of returned Ex logsMarek Kotewicz2015-07-150-0/+0
| | | | | | | |
| | * | | | | | Merge branch 'develop' into client_refMarek Kotewicz2015-07-153-1/+41
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into ↵Marek Kotewicz2015-07-140-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client_ref
| | * \ \ \ \ \ \ \ Merge branch 'develop' into client_refMarek Kotewicz2015-07-147-110/+466
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libethereum/Client.cpp
| | * \ \ \ \ \ \ \ \ Merge branch 'rpc_fixes' into client_refMarek Kotewicz2015-07-010-0/+0
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'develop' into client_refMarek Kotewicz2015-07-014-13/+195
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into client_refMarek Kotewicz2015-06-262-0/+129
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | getBlockBy** and getBlockTransactionCountBy** return null if block is not foundMarek Kotewicz2015-06-250-0/+0
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | blockchain isKnown block / transactionMarek Kotewicz2015-06-250-0/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Use actual addresses.chriseth2015-07-201-6/+13
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Host: Fix guard. Fix acceptor loop when connection count exceeded. Acceptor ↵subtly2015-07-191-1/+1
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loop exit on shutdown.
| * | | | | | | | | | | Merge pull request #2495 from chriseth/sol_updatedWalletGav Wood2015-07-171-14/+27
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | Updated the wallet contract and tests.
| | * | | | | | | | | | Updated the wallet contract and tests.chriseth2015-07-161-14/+27
| | | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #2438 from subtly/netFixGav Wood2015-07-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | Fixes for #2337, #2349, #2288, #2333, #1398.
| | * | | | | | | | | | Merge branch 'develop' into netFixsubtly2015-07-160-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | * | | | | | | | | | Merge branch 'develop' into netFixsubtly2015-07-155-17/+96
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix deadlineop/ops mutexes. Rerun discovery regardless of whether timer is ↵subtly2015-07-110-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cancelled, due to asio prematurely cancelling timer.
| | * | | | | | | | | | | Fixes for #2337, #2349, #2288, #2333, #1398.subtly2015-07-100-0/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #2481 from gluk256/_continueDBGav Wood2015-07-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Level DB support for Whisper
| | * | | | | | | | | | | | tests updateVlad Gluhovsky2015-07-160-0/+0
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | default parameter changedVlad Gluhovsky2015-07-160-0/+0
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | updated test p2p/hostVlad Gluhovsky2015-07-160-0/+0
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | style updateVlad Gluhovsky2015-07-160-0/+0
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Level DB support for WHisper completedVlad Gluhovsky2015-07-150-0/+0
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | test addedVlad Gluhovsky2015-07-150-0/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | removed unnecessary functionLiana Husikyan2015-07-161-3/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | changedthe output style of the Natspec docstringLiana Husikyan2015-07-161-17/+34
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | now for SolidityEndToEndTest we can use compileRequireThrow<typename>Liana Husikyan2015-07-162-3/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | modified test network to test exceptions during parsing of documentationLiana Husikyan2015-07-163-31/+45
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | todo: - change to work wirh all exceptions - fix white space problems in the output text for Natspec
| * | | | | | | | | | | | Merge pull request #2482 from chriseth/sol_fix_initialiseStorageStringschriseth2015-07-161-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for initialising storage strings.
| | * | | | | | | | | | | | Fix for initialising storage strings.chriseth2015-07-161-0/+15
| | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| * / | | | | | | | | | | Allow structs containing mappings in memory.chriseth2015-07-162-0/+38
| |/ / / / / / / / / / /
| * | | / / / / / / / / Recursive RLP check quick fixDimitry2015-07-160-0/+0
| | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Disable p2p tests.Gav Wood2015-07-152-1/+3
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge pull request #2473 from chriseth/sol_fix_exponentialNotationGav Wood2015-07-151-0/+24
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Check whether a literal is a valid literal before using it.
| | * | | | | | | | | Check whether a literal is a valid literal before using it.chriseth2015-07-141-0/+24
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2078
| * | | | | | | | | Merge pull request #2470 from chriseth/sol_fix_bytesComparisonGav Wood2015-07-151-0/+16
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | Fix comparison between bytes types.
| | * | | | | | | | Fix comparison between bytes types.chriseth2015-07-141-0/+16
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2087
| * | | | | | | | Merge pull request #2463 from arkpar/az-fixGav Wood2015-07-141-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Allow 0x prefix for address entry in AZ
| | * | | | | | | | find instead of find_firt_ofarkpar2015-07-141-1/+1
| | |/ / / / / / /
| * | | | | | | | Merge pull request #2462 from arkpar/key-deleteGav Wood2015-07-140-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Save keys after deletion
| | * | | | | | | | KeyManager::kill testarkpar2015-07-140-0/+0
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge pull request #2464 from debris/rpc_api_filler_forkMarek Kotewicz2015-07-140-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | rpc api test filler with fork simulation
| | * | | | | | | | mark blocks in RPC_API_TestFiller as revertedMarek Kotewicz2015-07-140-0/+0
| | | | | | | | | |
| | * | | | | | | | rpc api test filler with fork simulationMarek Kotewicz2015-07-140-0/+0
| | |/ / / / / / /
| * | | | | | | | Merge pull request #2413 from gluk256/_whisperDBGav Wood2015-07-140-0/+0
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | levelDB for whisper
| | * | | | | | | test fixedVlad Gluhovsky2015-07-140-0/+0
| | | | | | | | |
| | * | | | | | | new tests addedVlad Gluhovsky2015-07-110-0/+0
| | | | | | | | |
| | * | | | | | | naming conventions changedVlad Gluhovsky2015-07-100-0/+0
| | | | | | | | |
| | * | | | | | | levelDB for whisperVlad Gluhovsky2015-07-070-0/+0
| | | | | | | | |
| * | | | | | | | Merge pull request #2179 from ethereum/rlpxGav Wood2015-07-140-0/+0
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | Prep, tests: RLPX Framing (mux, demux, socket prototype)
| | * | | | | | | Remove packet copy constructor. Simplify bool use.subtly2015-07-140-0/+0
| | | | | | | | |
| | * | | | | | | Merge branch 'develop' into rlpxsubtly2015-07-113-15/+51
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'develop' into rlpxsubtly2015-07-073-95/+178
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Cleanup. More fixes. More tests.subtly2015-07-070-0/+0
| | | | | | | | | | |
| | * | | | | | | | | Fixup and document frame writer. Add test for coalesced packets.subtly2015-07-070-0/+0
| | | | | | | | | | |
| | * | | | | | | | | windows compile fixsubtly2015-07-060-0/+0
| | | | | | | | | | |
| | * | | | | | | | | Cleanup. Interface for enqueuing packets. Fix: Include packet type in total ↵subtly2015-07-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | size.
| | * | | | | | | | | Merge branch 'develop' into rlpxsubtly2015-07-054-13/+384
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | mux/demux working testsubtly2015-07-050-0/+0
| | | | | | | | | | | |
| | * | | | | | | | | | Update/fix test for builds.subtly2015-06-270-0/+0
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'netFix' into rlpxsubtly2015-06-271-0/+47
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libp2p/Session.cpp
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into rlpxsubtly2015-06-265-30/+335
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libp2p/Session.cpp
| | * | | | | | | | | | | Initial reader test. Something broken with encframes vector of bytes.subtly2015-06-200-0/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | Windows compile complaint.subtly2015-06-200-0/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'netFix' into rlpxsubtly2015-06-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | rename drain to muxsubtly2015-06-200-0/+0
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | rlpx frame reader fixes. rename writer::drain to mux.subtly2015-06-200-0/+0
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'develop' into rlpxsubtly2015-06-208-48/+271
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Add test for frame writer. Cleanup abstraction in preparation for reader. ↵subtly2015-06-180-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial reader code.
| * | | | | | | | | | | | | | Merge pull request #2435 from CJentzsch/walletTestsUpdateGav Wood2015-07-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update to latest version of wallet code
| | * | | | | | | | | | | | | | update wallet testCJentzsch2015-07-100-0/+0
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | update bcWalletTestCJentzsch2015-07-100-0/+0
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | add new daily limit testCJentzsch2015-07-100-0/+0
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | set daily limitCJentzsch2015-07-100-0/+0
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | add multiOwnedRemoveOwner testCJentzsch2015-07-100-0/+0
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into walletTestsUpdateCJentzsch2015-07-103-15/+51
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | | update to latest version of wallet codeCJentzsch2015-07-100-0/+0
| | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | RLP test refactoring: styleDimitry2015-07-130-0/+0
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | newtests: styleDimitry Khokhlov2015-07-130-0/+0
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | RLPTests RefactoringDimitry2015-07-130-0/+0
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | RLPTests: fill rlp testsDimitry Khokhlov2015-07-130-0/+0
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | RLPTests: refactoringDimitry Khokhlov2015-07-131-0/+1
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Flexible string literals, convertible to bytesX, bytes and string.chriseth2015-07-093-15/+51
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge pull request #2399 from winsvega/fuzzGav Wood2015-07-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | smartcode: fix
| | * | | | | | | | | | | | fuzz: undefined variable build fixDimitry Khokhlov2015-07-080-0/+0
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | smartcode: styleDimitry Khokhlov2015-07-070-0/+0
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | smartcode: fixDimitry Khokhlov2015-07-070-0/+0
| | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #2401 from CJentzsch/addBlockGasLimitTestsGav Wood2015-07-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add block gas limit tests
| | * | | | | | | | | | | | fix wallet test nameCJentzsch2015-07-070-0/+0
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | add blockGasLimitTestsCJentzsch2015-07-070-0/+0
| | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Fix AES TestLefteris Karapetsas2015-07-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the AES tests was making an incorrect assumption about the string constructor of FixedHash. Said constructor only works with hexadecimal string representations
| * | | | | | | | | | | | Merge pull request #2410 from debris/rpc_txReceiptGav Wood2015-07-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | new rpc method eth_getTransactionReceipt
| | * | | | | | | | | | | | eth_getTransactionReceiptMarek Kotewicz2015-07-070-0/+0
| | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #2364 from winsvega/issuesGav Wood2015-07-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issues: BlockChain::rebuild + byteRef test
| | * | | | | | | | | | | | fix: styleDimitry Khokhlov2015-07-070-0/+0
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Issues: BlockChain::rebuild + byteRef testDimitry Khokhlov2015-07-070-0/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #2400 from gluk256/_fixedhashincrGav Wood2015-07-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | FixedHash::operator++() introduced
| | * | | | | | | | | | | | test updatedVlad Gluhovsky2015-07-070-0/+0
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | FixedHash::operator++() introducedVlad Gluhovsky2015-07-070-0/+0
| | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #2398 from chriseth/updateWalletTestsGav Wood2015-07-071-88/+160
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | Updated wallet code.
| | * | | | | | | | | | | Updated wallet code.chriseth2015-07-071-88/+160
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge pull request #2397 from winsvega/issues2Gav Wood2015-07-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | stPreCompiledContracts remove
| | * | | | | | | | | | | stPreCompiledContracts removeDimitry Khokhlov2015-07-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as there is no 'out' when calling contracts from transaction
| * | | | | | | | | | | | Merge pull request #2387 from chfast/fixesGav Wood2015-07-071-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | Fix up rvalue references
| | * | | | | | | | | | | Fix up rvalue references. Avoid a copy of an EVM code in ExtVM.Paweł Bylica2015-07-061-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #2396 from LefterisJP/fixed_hash_testsGav Wood2015-07-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | Some initial tests for libdevcore/FixedHash
| | * | | | | | | | | | | Some initial tests for libdevcore/FixedHashLefteris Karapetsas2015-07-060-0/+0
| | |/ / / / / / / / / /
| * / / / / / / / / / / import transactions in a separate threadarkpar2015-07-060-0/+0
| |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #2376 from arkpar/tq_rfGav Wood2015-07-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | TransactionQueue priority queue
| | * | | | | | | | | | prioritized transaction queuearkpar2015-07-040-0/+0
| | | |_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libethereum/TransactionQueue.cpp msvc build fix
| * | | | | | | | | | Revert "Txqueueasyncverify"Gav Wood2015-07-060-0/+0
| | | | | | | | | | |
| * | | | | | | | | | Merge pull request #2384 from ethereum/txqueueasyncverifyGav Wood2015-07-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Txqueueasyncverify
| | * | | | | | | | | | test for new transaction queue.Gav Wood2015-07-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some cleanups and enhacements to Guards & Notifier. Fix an invariant TransactionQueue.
| * | | | | | | | | | | Merge pull request #2342 from winsvega/fuzzGav Wood2015-07-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | FuzzTests: More Smart Codes
| | * | | | | | | | | | | FuzzTests: More Smart CodesDimitry Khokhlov2015-07-010-0/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | FuzzTest: a few more random codeDimitry Khokhlov2015-07-010-0/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #2372 from ethereum/secp256k1aGav Wood2015-07-061-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use libsepc256k1 for sign, recovery, and verify.
| | * | | | | | | | | | | | fix failing peer test.subtly2015-07-030-0/+0
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'develop' into secp256k1asubtly2015-07-030-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Sign, recovery, and verify.subtly2015-07-031-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #2363 from CJentzsch/findBadStateRootProblemGav Wood2015-07-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add badStateRootTest
| | * | | | | | | | | | | | | add badStateRootTestCJentzsch2015-07-030-0/+0
| | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | Merge pull request #2378 from gluk256/_2_ratingGav Wood2015-07-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial version of the rating system
| | * | | | | | | | | | | | | rating initial version completeVlad Gluhovsky2015-07-040-0/+0
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | another test introducedVlad Gluhovsky2015-07-040-0/+0
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | proof of work bugfixVlad Gluhovsky2015-07-040-0/+0
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | intermediateVlad Gluhovsky2015-07-040-0/+0
| | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #2374 from chfast/pr/smartvmGav Wood2015-07-061-5/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | Smart VM
| | * | | | | | | | | | | | Make --vm command line option syntax consistent with other options.Paweł Bylica2015-07-031-4/+14
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into evmjit-developPaweł Bylica2015-07-030-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: alethzero/Main.ui eth/main.cpp
| | * | | | | | | | | | | | --vm command line option replacing --jit.Paweł Bylica2015-07-031-2/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Struct constructors.chriseth2015-07-032-0/+84
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix for copying arrays to storage.chriseth2015-07-031-8/+17
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Memory structs.chriseth2015-07-031-0/+143
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'develop' of github.com:ethereum/cpp-ethereum into developGav Wood2015-07-030-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge pull request #2360 from CJentzsch/testTxQueueGav Wood2015-07-030-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test tx queue
| | | * | | | | | | | | | | | styleCJentzsch2015-07-030-0/+0
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into fixTxNonceCJentzsch2015-07-024-13/+195
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | | add transactionQueue testsCJentzsch2015-07-020-0/+0
| | | | |_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Merge pull request #2343 from debris/rpc_fixesGav Wood2015-07-030-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | rpc fixes
| | | * | | | | | | | | | | getBlockBy** and getBlockTransactionCountBy** return null if block is not foundMarek Kotewicz2015-07-010-0/+0
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | blockchain isKnown block / transactionMarek Kotewicz2015-07-010-0/+0
| | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
| | * | | | | | | | | | | Merge pull request #2348 from gluk256/_ratingGav Wood2015-07-030-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rating system for outgoing messages introduced
| | | * | | | | | | | | | | build fixVlad Gluhovsky2015-07-020-0/+0
| | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | * / | | | | | | | | | Documentation and tests for RangeMask.chriseth2015-07-020-0/+0
| | |/ / / / / / / / / /
| * / / / / / / / / / / Fix for crap compilers.Gav Wood2015-07-030-0/+0
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for tests.
| * | | | | | | | | | Merge pull request #2329 from gluk256/_distributionGav Wood2015-07-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | Distribution Rate test introduced
| | * | | | | | | | | super mega enhanced updateVlad Gluhovsky2015-07-010-0/+0
| | | | | | | | | | |
| | * | | | | | | | | mega enhanced style fixVlad Gluhovsky2015-07-010-0/+0
| | | | | | | | | | |
| | * | | | | | | | | style fixVlad Gluhovsky2015-07-010-0/+0
| | | | | | | | | | |
| | * | | | | | | | | Distribution Rate test introducedVlad Gluhovsky2015-07-010-0/+0
| | |/ / / / / / / /
| * | | | | | | | | Merge remote-tracking branch 'upstream/develop' into evmjit-developPaweł Bylica2015-07-015-13/+324
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge commit '1e652c0757b5440feb5ba32d46f8a887c32f57c2' into developMarek Kotewicz2015-07-010-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Squashed 'libjsqrc/ethereumjs/' changes from 2a0b46a..d5d2115Marek Kotewicz2015-07-017-32/+368
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d5d2115 example contract using array, fixed #185 21ed235 removed connection keep-alive c44fe01 version 0.7.1 d9b785e fixed #248 490dde5 fixed encoding/decoding strings, #249 b3f5d09 fixed long bytes dynamic decoding/encoding, #249 d097821 small filter improvement d59b1cd removed xhr from browser 42b6e9d version 0.7.0 fe6defd gulp 44dcd24 set connection keepalive 2b17c0f gulpfile changes 4a46c73 Merge pull request #228 from ethereum/strings 93c8006 tests for encoding and decoding prematurely terminated strings and strings containing internal zeros 7dd44e7 Merge branch 'strings' of https://github.com/ethereum/ethereum.js into strings 390a9ff Merge branch 'develop' into strings bcd9cfb updated deps, removed unused karma ef15fc1 Merge pull request #244 from ethereum/allevents 6f74d57 Merge branch 'develop' into allevents 7aca17e Merge branch 'develop' into allevents c5ee34d fix for optional event parameters 8170a0a Merge pull request #245 from ethereum/filterInstantWatch 76a094c fixed all issues noted by marek d78b512 add possible callback to filters e1b17a9 re-build develop af9c027 all events filter b270616 version 0.6.1 c47d6a8 gulp 7cf7cf3 map file 6da1d3e gulp 450042e Update eth.js 3951286 Added sendRawTransaction 323b529 merged develop 16ffdf6 merged master ecf0a2c changed | to Math.floor d2b5ba2 Merge pull request #239 from ethereum/mistFixes 9e6bf9d removed browser XHR 9061116 fixed build issues in formatInputDynamicBytes 0e3b29c fixed coverage issue d51e9a2 merged latest develop f0247aa made meteor package available on the server side as well e97c5f5 fixed and tested meteor package init 3e49f56 add currentProvidor and mist fixes bd6d9ba merged develop 7b730b1 Merge branch 'strings' of github.com:ethereum/web3.js into strings cc533d9 fixed bytes wrong encoding 8c6f976 Merge branch 'develop' into strings 7c970e3 add bytes32 test with leading 0 9c7f7bb re-add .map files 189484f add extra int tests 73cc711 Merge branch 'develop' into strings fa3239f abi string type, fixes #216, #218, #219 git-subtree-dir: libjsqrc/ethereumjs git-subtree-split: d5d2115bf9ad07a736a189e1022b7d3a549e4006
| | * | | | | | | | | Merge pull request #2246 from subtly/netFixGav Wood2015-07-010-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Prep for #2179. Abstract parsing frame header. Catch ASIO exceptions.
| | | * \ \ \ \ \ \ \ \ Merge branch 'develop' into netFixsubtly2015-06-303-12/+115
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge branch 'develop' into netFixsubtly2015-06-271-0/+47
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'develop' into netFixsubtly2015-06-265-30/+335
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / | | | | |/| | | | | | / / | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | | Conflicts: libp2p/Session.cpp
| | | * | | | | | | | | Prep for #2179. Abstract parsing of frame header from Session into struct. ↵subtly2015-06-200-0/+0
| | | | |_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Catch unhandled exceptions thrown by ASIO.
| | * | | | | | | | | Merge pull request #2336 from arkpar/build_fixGav Wood2015-07-010-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed gcc build
| | | * | | | | | | | | stylearkpar2015-06-300-0/+0
| | | | | | | | | | | |
| | * | | | | | | | | | Merge pull request #2330 from gluk256/_bugfixGav Wood2015-06-300-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | libp2p test and bugfix
| | | * | | | | | | | | uninstallWatch() fixed + testVlad Gluhovsky2015-06-300-0/+0
| | | | | | | | | | | |
| | * | | | | | | | | | Fixed checking of abstract functions.chriseth2015-06-301-0/+17
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2264
| | * | | | | | | | | Merge pull request #2297 from subtly/secp-prepGav Wood2015-06-301-1/+3
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Prep for #2094 and supporting both cryptopp and secp256k1
| | | * \ \ \ \ \ \ \ \ Merge branch 'develop' into secp-prepsubtly2015-06-271-0/+47
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | |
| | | * | | | | | | | | Disable libsecp256k1-specific tests for windows compile.subtly2015-06-270-0/+0
| | | | | | | | | | | |
| | | * | | | | | | | | Don't link secp256k1 on windows.subtly2015-06-261-1/+3
| | | | | | | | | | | |
| | | * | | | | | | | | Prep for supporting both cryptopp and secp256k1. Link (old) secp256k1 ↵subtly2015-06-260-0/+0
| | | | |_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | library to devcrypto. Rename cryptopp Secp256k1 to Secp256k1PP. Update toPublic to use secp256k1 library and add test.
| | * | | | | | | | | Merge pull request #2321 from chriseth/sol_memoryArraysNotResizeableGav Wood2015-06-301-0/+13
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Memory arrays cannot be resized.
| | | * | | | | | | | | Memory arrays cannot be resized.chriseth2015-06-301-0/+13
| | | | |_|_|/ / / / / | | | |/| | | | | | |
| | * | | | | | | | | Merge pull request #2263 from gluk256/_topic_advertGav Wood2015-06-300-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | topic advertisement
| | | * | | | | | | | a minor refactoringVlad Gluhovsky2015-06-290-0/+0
| | | | | | | | | | |
| | | * | | | | | | | Topics of interest advertising made asynchronousVlad Gluhovsky2015-06-250-0/+0
| | | | | | | | | | |
| | | * | | | | | | | minor clean upVlad Gluhovsky2015-06-240-0/+0
| | | | | | | | | | |
| | | * | | | | | | | BF size changedVlad Gluhovsky2015-06-240-0/+0
| | | | | | | | | | |
| | | * | | | | | | | deleted unused variableVlad Gluhovsky2015-06-240-0/+0
| | | | | | | | | | |
| | | * | | | | | | | bugfixVlad Gluhovsky2015-06-240-0/+0
| | | | | | | | | | |
| | | * | | | | | | | bloom filter exchage protocolVlad Gluhovsky2015-06-240-0/+0
| | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | * | | | | | | | Merge pull request #2312 from chriseth/sol_updateWalletchriseth2015-06-291-11/+20
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Updated wallet test to latest wallet source.
| | | * | | | | | | | Updated wallet test to latest wallet source.chriseth2015-06-291-11/+20
| | | | |_|/ / / / / | | | |/| | | | | |
| | * | | | | | | | Another test for arrays in constructors.chriseth2015-06-291-1/+40
| | | | | | | | | |
| | * | | | | | | | Delete for memory objects.chriseth2015-06-272-0/+55
| | |/ / / / / / /
| | * | / / / / / Do not copy reference types to memory in-place.chriseth2015-06-271-0/+47
| | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge pull request #2276 from chriseth/sol_memoryArrays7chriseth2015-06-262-0/+129
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Copy routines for non-byte arrays.
| | | * | | | | | Initialisation of memory types.chriseth2015-06-251-0/+22
| | | | | | | | |
| | | * | | | | | Copy routines for non-byte arrays.chriseth2015-06-242-0/+107
| | | | | | | | |
| | * | | | | | | Merge pull request #2291 from CJentzsch/KeyManagerTestsGav Wood2015-06-260-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | fix keymanager test
| | | * | | | | | | fix keymanager testCJentzsch2015-06-260-0/+0
| | | | | | | | | |
| | * | | | | | | | Merge branch 'develop' of github.com:ethereum/cpp-ethereum into developGav Wood2015-06-250-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ethconsole/main.cpp
| | | * | | | | | | Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into ↵arkpar2015-06-251-1/+1
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | | | | | | | | | | | | ldb_limit
| | | * | | | | | | Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into bc_rfarkpar2015-06-244-29/+205
| | | |\ \ \ \ \ \ \
| | * | | | | | | | | Merge branch 'develop' of github.com:ethereum/cpp-ethereum into developGav Wood2015-06-250-0/+0
| | | |_|/ / / / / / | | |/| | | | | | |