summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | blockchain_import: Add database type argumentwarptangent2016-02-142-4/+4
| * | | blockchain_import: Make LMDB-specific names generalwarptangent2016-02-142-33/+33
| |/ /
* | | Merge pull request #665Riccardo Spagni2016-02-172-23/+76
|\ \ \
| * | | Resync with masterHoward Chu2016-02-162-23/+76
| |/ /
* | | Merge pull request #664Riccardo Spagni2016-02-172-3/+21
|\ \ \
| * | | Keep a running blocksize countHoward Chu2016-02-152-0/+15
| * | | Win32 import batchsize tweaksHoward Chu2016-02-141-3/+6
| |/ /
* | | Merge pull request #660Riccardo Spagni2016-02-171-1/+1
|\ \ \
| * | | epee: always call the PRNG through the locked APImoneromooo-monero2016-02-131-1/+1
| |/ /
* | | Merge pull request #659Riccardo Spagni2016-02-171-1/+1
|\ \ \ | |/ / |/| |
| * | core_tests: fix a compile problem with CLANGmoneromooo-monero2016-02-131-1/+1
* | | Merge pull request #658Riccardo Spagni2016-02-132-0/+295
|\ \ \ | |/ / |/| / | |/
| * Add the new test filesmoneromooo-monero2016-02-132-0/+295
|/
* Merge pull request #657Riccardo Spagni2016-02-132-12/+50
|\
| * BlockchainLMDB: Deal with DB exceptions at block level with particularitywarptangent2016-02-132-2/+21
| * BlockchainLMDB: Add sanity check for inconsistent statewarptangent2016-02-131-2/+13
| * BlockchainLMDB: Call destructor on allocated txn if setup failswarptangent2016-02-131-0/+8
| * BlockchainLMDB: Replace remaining txn pointer NULLs with nullptrwarptangent2016-02-131-9/+9
* | Merge pull request #656Riccardo Spagni2016-02-134-10/+12
|\ \
| * | cmake: Include OpenSSL libraries in static linkingwarptangent2016-02-123-6/+11
| * | cmake: Remove unused variablewarptangent2016-02-121-1/+1
| * | cmake: Fix unbound config compile settingswarptangent2016-02-122-0/+6
| * | cmake: Fix overly broad use of dynamic link settingswarptangent2016-02-121-9/+0
| |/
* | Merge pull request #652Riccardo Spagni2016-02-131-1/+21
|\ \
| * | crypto: only check MONERO_USE_SOFTWARE_AES oncemoneromooo-monero2016-02-091-5/+15
| * | crypto: use software AES based on the MONERO_USE_SOFTWARE_AES env varmoneromooo-monero2016-02-091-1/+11
| |/
* | Merge pull request #651Riccardo Spagni2016-02-1317-35/+77
|\ \ | |/ |/|
| * unit_tests: fix blockchain unit test after hard fork import fixmoneromooo-monero2016-02-081-1/+10
| * hardfork: add a default fork entry for v1 if none existmoneromooo-monero2016-02-081-0/+5
| * blockchain: initialize m_hardfork to NULLmoneromooo-monero2016-02-081-1/+1
| * blockchain_db: pass hard fork object as a simple pointermoneromooo-monero2016-02-082-2/+2
| * core_tests: add tests for hard fork behaviors (MRL-0004)moneromooo-monero2016-02-0810-25/+48
| * core_tests: allow setting miner tx max_outs when creating a blockmoneromooo-monero2016-02-082-4/+6
| * unit_tests: fix hard fork unit test compilationmoneromooo-monero2016-02-081-0/+4
| * blockchain_utilities: remove unused num_blocks variablemoneromooo-monero2016-02-081-2/+0
| * blockchain: reset hardfork object when resetting blockchainmoneromooo-monero2016-02-081-0/+1
|/
* Merge pull request #650Riccardo Spagni2016-02-088-34/+130
|\
| * Blockchain: Update comments on removing blockwarptangent2016-02-081-0/+5
| * blockchain_import: Get hard fork version from HardForkwarptangent2016-02-081-4/+1
| * Move HardFork DB update to BlockchainDB::add_block()warptangent2016-02-083-6/+1
| * Make HardFork object available to BlockchainDB and derived DB implementationswarptangent2016-02-085-0/+18
| * BlockchainDB/LMDB: Refactor block-scope DB txn handling for add blockwarptangent2016-02-082-20/+10
| * BlockchainDB/LMDB/BDB: Extract DB txn functions for block add/removewarptangent2016-02-085-0/+65
| * BlockchainLMDB: Allow two HardFork functions to update DB during block addwarptangent2016-02-081-4/+4
| * BlockchainLMDB: extract txn macros used during block add/removewarptangent2016-02-081-0/+26
|/
* Merge pull request #644Riccardo Spagni2016-02-089-8/+81
|\
| * blockchain_import: Add hard fork data for each block when verify mode is offwarptangent2016-02-081-0/+3
| * blockchain_utilities: Have fake_core create HardFork objectwarptangent2016-02-081-1/+13
| * Blockchain: Optionally pass in HardFork objectwarptangent2016-02-082-4/+21
| * fake_core: Check if hard fork subdbs need reset at startwarptangent2016-02-082-2/+11