summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* 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
| * blockchain_import: Add --drop-hard-fork commandwarptangent2016-02-086-0/+32
| * blockchain_import: Add exception to log outputwarptangent2016-02-081-1/+1
|/
* Merge pull request #648Riccardo Spagni2016-02-081-0/+11
|\
| * simplewallet: check watch-only view key matches standard addressmoneromooo-monero2016-02-051-0/+11
* | Merge pull request #646Riccardo Spagni2016-02-081-12/+49
|\ \
| * | wallet: check a key image isn't already present when adding onemoneromooo-monero2016-02-051-12/+49
| |/
* | Merge pull request #645Riccardo Spagni2016-02-081-1/+0
|\ \
| * | daemon: remove leftover debug logmoneromooo-monero2016-02-051-1/+0
| |/
* | Merge pull request #643Riccardo Spagni2016-02-081-8/+10
|\ \
| * | core: move the db lock to the data directorymoneromooo-monero2016-02-041-8/+10
| |/
* | Merge pull request #641Riccardo Spagni2016-02-084-71/+98
|\ \
| * | blockchain: revert handle_get_objects adding block id on tx not foundmoneromooo-monero2016-02-031-1/+0
| * | berkeleydb: fix delete/free mismatchmoneromooo-monero2016-02-031-2/+2
| * | minor bugfixes and refactoringThomas Winget2016-02-022-56/+88
| * | unit_tests: fix mnemonics unit test testing invalid seedsmoneromooo-monero2016-02-011-13/+9
| |/
* | Merge pull request #640Riccardo Spagni2016-02-081-2/+11
|\ \
| * | Add make option to disable BerkeleyDBwarptangent2016-02-011-2/+11
| |/
* | Merge pull request #639Riccardo Spagni2016-02-082-31/+72
|\ \
| * | unit_tests: fix hard fork unit tests and add a test for major toomoneromooo-monero2016-02-011-30/+68
| * | hardfork: allow passing chain height in get(height) for conveniencemoneromooo-monero2016-02-011-1/+4
| |/
* | Merge pull request #638Riccardo Spagni2016-02-081-1/+1
|\ \ | |/ |/|
| * tests: fix compilation failure after V1 define renamemoneromooo-monero2016-01-311-1/+1
|/
* Merge pull request #636Riccardo Spagni2016-01-311-9/+1
|\
| * Revert "Merge pull request #632"Riccardo Spagni2016-01-311-9/+1
|/
* Merge pull request #635Riccardo Spagni2016-01-312-0/+46
|\
| * core: prevent the database from being used by multiple daemonsmoneromooo-monero2016-01-312-0/+46
* | Merge pull request #634Riccardo Spagni2016-01-313-5/+15
|\ \
| * | wallet: forbid dust altogether in output selection where appropriatemoneromooo-monero2016-01-312-5/+14
| * | blockchain: log number of outputs available for a new txmoneromooo-monero2016-01-311-0/+1
| |/
* | Merge pull request #633Riccardo Spagni2016-01-311-0/+2
|\ \
| * | wallet: guard against exception in process_blocksmoneromooo-monero2016-01-301-0/+2
| |/
* | Merge pull request #632Riccardo Spagni2016-01-311-1/+9
|\ \
| * | wallet: guard against exception in process_blocksmoneromooo-monero2016-01-301-1/+9
| |/
* | Merge pull request #631Riccardo Spagni2016-01-316-44/+51
|\ \
| * | daemon: fix a few issues reported by valgrindmoneromooo-monero2016-01-301-29/+43
| * | tx_pool: fix serialization of new relayed datamoneromooo-monero2016-01-301-2/+0