summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* Merge pull request #578Riccardo Spagni2015-12-30101-3053/+4689
|\
| * fix missing unbound testsRiccardo Spagni2015-12-302-1/+9
| * update unbound, fix unbound openssl issue on OS XRiccardo Spagni2015-12-30101-3053/+4681
* | Merge pull request #577Riccardo Spagni2015-12-3085-2573/+6418
|\|
| * no longer need to pass the size to rapidjsonRiccardo Spagni2015-12-3031-1141/+3761
| * add missing miniupnpc files, modify cmake to not build miniupnpc tests and to...Riccardo Spagni2015-12-3011-2/+629
| * updated miniupnpcRiccardo Spagni2015-12-3045-1451/+2049
|/
* Merge pull request #575Riccardo Spagni2015-12-301-6/+8
|\
| * wallet: store cache to file without unnecessary memory buffermoneromooo-monero2015-12-291-6/+8
* | Merge pull request #574Riccardo Spagni2015-12-302-6/+11
|\ \
| * | wallet_rpc_server: exit async, so we reply to stop_wallet RPCmoneromooo-monero2015-12-282-1/+11
| * | wallet: do not return error if incoming_transfers finds nonemoneromooo-monero2015-12-281-5/+0
* | | Merge pull request #573Riccardo Spagni2015-12-301-0/+22
|\ \ \
| * | | blockchain_db: inform user about new format if blockchain.bin is foundmoneromooo-monero2015-12-281-0/+22
| |/ /
* | | Merge pull request #572Riccardo Spagni2015-12-302-3/+11
|\ \ \
| * \ \ Merge pull request #1 from LMDB/crash-fixmoneromooo-monero2015-12-291-5/+5
| |\ \ \
| | * | | Tweak 45800a25e9374e63caaabba05c89585c86acd668hyc2015-12-291-5/+5
| |/ / /
| * | | blockchain: always stop the ioservice before returningmoneromooo-monero2015-12-281-0/+2
| * | | db_lmdb: safety close db at exitmoneromooo-monero2015-12-281-0/+3
| * | | db_lmdb: fix a strdup/delete[] mistmatchmoneromooo-monero2015-12-281-3/+6
| |/ /
* | | Merge pull request #571Riccardo Spagni2015-12-302-75/+75
|\ \ \
| * | | MDB_VL32 - resync with masterHoward Chu2015-12-282-75/+75
| |/ /
* | | Merge pull request #570Riccardo Spagni2015-12-301-1/+1
|\ \ \
| * | | Remove assert from status commandhyc2015-12-271-1/+1
| |/ /
* | | Merge pull request #569Riccardo Spagni2015-12-306-0/+32
|\ \ \
| * | | BlockchainDB: skip fixup check if read-only databasewarptangent2015-12-266-0/+32
| |/ /
* | | Merge pull request #568Riccardo Spagni2015-12-302-9/+2
|\ \ \ | |_|/ |/| |
| * | blockchain: remove obsolete containersmoneromooo-monero2015-12-262-8/+1
| * | blockchain: Fix height in call to on_blockchain_decmoneromooo-monero2015-12-261-1/+1
| |/
* | Merge pull request #566Riccardo Spagni2015-12-293-1/+85
|\ \ | |/ |/|
| * hardfork: ensure current_fork_index can not become negative on rescanmoneromooo-monero2015-12-261-1/+1
| * tests: add a unit test for canonical decomposed amountsmoneromooo-monero2015-12-262-0/+84
|/
* Merge pull request #565Riccardo Spagni2015-12-269-63/+121
|\
| * tests: fix various tests by using parameters better suited to moneromoneromooo-monero2015-12-253-8/+8
| * tests: fix some double spending testsmoneromooo-monero2015-12-251-7/+8
| * tests: use 255 as a "too high" block versionmoneromooo-monero2015-12-251-2/+2
| * blockchain: fix a few block addition bugsmoneromooo-monero2015-12-252-34/+46
| * blockchain: fix an off by one error in unlocked time checkmoneromooo-monero2015-12-251-1/+1
| * blockchain: reinstate double spending checks in check_tx_inputsmoneromooo-monero2015-12-251-3/+7
| * blockchain: make some flag twiddling code closer to the originalmoneromooo-monero2015-12-251-2/+2
| * blockchain: fix bitflipping test with quantized block rewardsmoneromooo-monero2015-12-254-3/+8
| * blockchain: add missing m_tx_pool.on_blockchain_decmoneromooo-monero2015-12-251-0/+1
| * blockchain: fix switch to alternative blockchain for more than one blockmoneromooo-monero2015-12-251-1/+1
| * blockchain: add a missing validity check to rollback_blockchain_switchingmoneromooo-monero2015-12-251-0/+6
| * core: catch exceptions from get_output_keymoneromooo-monero2015-12-251-2/+18
| * db: throw when given a non txout_to_key output to addmoneromooo-monero2015-12-253-0/+13
* | Merge pull request #564Riccardo Spagni2015-12-2558-16989/+2461
|\ \
| * | Update liblmdb, unify 32/64 sourcesHoward Chu2015-12-2558-16989/+2461
| |/
* | Merge pull request #562Riccardo Spagni2015-12-251-3/+5
|\ \
| * | BlockchainDB: Remove txs in reverse orderwarptangent2015-12-241-3/+5