summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #730v0.9.2Riccardo Spagni2016-03-162-1/+1
|\ | | | | | | | | 435b6e4 bump the version (Riccardo Spagni) e4c2e9e baked-in block headers now go all the way up to 1 million. 1 MILLION (Riccardo Spagni)
| * bump the versionRiccardo Spagni2016-03-161-1/+1
| |
| * baked-in block headers now go all the way up to 1 million. 1 MILLIONRiccardo Spagni2016-03-161-0/+0
|/
* Merge pull request #728Riccardo Spagni2016-03-1610-5/+845
|\ | | | | | | | | | | | | | | | | | | | | | | 7df2baf fixed "undefined reference" for boost::system library (Ilya Kitaev) 62606f1 Wallet::store_to(path, password) implemented; (Ilya Kitaev) 19fcc74 Wallet::address implemented (Ilya Kitaev) 180ac6e WalletManager::recoveryWallet implemented (Ilya Kitaev) 5a4f099 Wallet::setPassword() method for wallet2_api (Ilya Kitaev) 57d7ffc changes in wallet2_api + implemented WalletManager::openWallet (Ilya Kitaev) f1f9279 get_seed() included to interface (Ilya Kitaev) 930bed7 tests for wallet2_api (Ilya Kitaev) 318660d wallet2 public api. initial commit (Ilya Kitaev)
| * fixed "undefined reference" for boost::system libraryIlya Kitaev2016-03-161-1/+2
| |
| * Wallet::store_to(path, password) implemented;Ilya Kitaev2016-03-166-18/+177
| |
| * Wallet::address implementedIlya Kitaev2016-03-163-0/+15
| |
| * WalletManager::recoveryWallet implementedIlya Kitaev2016-03-163-10/+56
| |
| * Wallet::setPassword() method for wallet2_apiIlya Kitaev2016-03-165-13/+80
| |
| * changes in wallet2_api + implemented WalletManager::openWalletIlya Kitaev2016-03-163-33/+155
| |
| * get_seed() included to interfaceIlya Kitaev2016-03-163-23/+65
| |
| * tests for wallet2_apiIlya Kitaev2016-03-166-7/+170
| |
| * wallet2 public api. initial commitIlya Kitaev2016-03-163-2/+227
| |
* | Merge pull request #729Riccardo Spagni2016-03-162-10/+21
|\ \ | |/ |/| | | a74348e Add destructor for readtxns (Howard Chu)
| * Add destructor for readtxnsHoward Chu2016-03-162-10/+21
|/ | | | Only if we created the readtxn. Was missing cleanups from exceptions before.
* Merge pull request #727Riccardo Spagni2016-03-151-46/+50
|\ | | | | | | | | 6b0a903 Small cleanups (Howard Chu) 01c1512 More for 92dd4ec6d6251b15954002e72a7c7faa5059a3ab (Howard Chu)
| * Small cleanupsHoward Chu2016-03-151-24/+28
| | | | | | | | | | Only one return and TXN_POSTFIX_RDONLY() per function Only log rtxn_start if the rtxn wasn't already active
| * More for 92dd4ec6d6251b15954002e72a7c7faa5059a3abHoward Chu2016-03-151-22/+22
| | | | | | | | Make sure we stop the right txn too
* | Merge pull request #726Riccardo Spagni2016-03-152-4/+4
|\ \ | |/ |/| | | | | 5dd91f6 fix formatting error on bitmonero print_block return (Mike C) ee71946 Fix typo on bitmonerod rpc method error. (Mike C)
| * fix formatting error on bitmonero print_block returnMike C2016-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example of current return for `print_block 912345`: timestamp: 1452793716 previous hash: b61c58b2e0be53fad5ef9d9731a55e8a81d972b8d90ed07c04fd37ca6403ff78 nonce: 1646 is orphan: 0 height: 912345 depth: 85434 hash: e22cf75f39ae720e8b71b3d120a5ac03f0db50bba6379e2850975b4859190bc6difficul ty: 815625611 reward: 7388968946286 { "major_version": 1, "minor_version": 2, … Without `std::endl`, the difficulty gets smashed on the end of the hash.
| * Fix typo on bitmonerod rpc method error.Mike C2016-03-141-3/+3
|/
* Merge pull request #723Riccardo Spagni2016-03-142-21/+21
|\ | | | | | | 2abdb2c avoid some val copies (Howard Chu)
| * avoid some val copiesHoward Chu2016-03-142-21/+21
| |
* | Merge pull request #725Riccardo Spagni2016-03-142-42/+31
|\ \ | |/ |/| | | | | 92dd4ec Hack for read/write txn mixup (Howard Chu) b28258a change to LMDB as default, even on 32-bit and ARM (Riccardo Spagni)
| * Hack for read/write txn mixupHoward Chu2016-03-142-42/+31
| | | | | | | | | | save the thread ID of the writer thread so we don't try to use the writetxn from reader threads
| * change to LMDB as default, even on 32-bit and ARMRiccardo Spagni2016-03-141-28/+19
| |
* | Merge pull request #721Riccardo Spagni2016-03-121-28/+19
|\ \ | |/ |/| | | 11de192 change to LMDB as default, even on 32-bit and ARM (Riccardo Spagni)
| * change to LMDB as default, even on 32-bit and ARMRiccardo Spagni2016-03-121-28/+19
| |
* | Merge pull request #719Riccardo Spagni2016-03-121-0/+1
|\ \ | | | | | | | | | e98b26a epee: fix bug deleting more than one connection at once (moneromooo-monero)
| * | epee: fix bug deleting more than one connection at oncemoneromooo-monero2016-03-121-0/+1
| | |
* | | Merge pull request #720Riccardo Spagni2016-03-122-3/+6
|\ \ \ | | |/ | |/| | | | 8689014 switch default utilities DB to lmdb, update checkpoints.dat (Riccardo Spagni)
| * | switch default utilities DB to lmdb, update checkpoints.datRiccardo Spagni2016-03-122-3/+6
|/ /
* | Merge pull request #718Riccardo Spagni2016-03-121-0/+1
|\ \ | | | | | | | | | 41ea91a simplewallet: fix hang when setting auto-refresh to 0 (moneromooo-monero)
| * | simplewallet: fix hang when setting auto-refresh to 0moneromooo-monero2016-03-121-0/+1
| |/ | | | | | | | | | | It would try to join the auto refresh thread, which would only happen after it was done, which would take a long time when doing so on a newly created wallet.
* | Merge pull request #717Riccardo Spagni2016-03-121-0/+4
|\ \ | | | | | | | | | 28bfc90 simplewallet: special ^C handling for windows (moneromooo-monero)
| * | simplewallet: special ^C handling for windowsmoneromooo-monero2016-03-121-0/+4
| |/ | | | | | | | | | | Because obviously it doesn't work as other POSIX platforms. Reported and tested by luigi1111.
* | Merge pull request #716Riccardo Spagni2016-03-123-7/+10
|\ \ | | | | | | | | | | | | 789e275 rpc: do not return bans if they're effectively spent (moneromooo-monero) 474e4c0 p2p: lock access to the blocked ips map (moneromooo-monero)
| * | rpc: do not return bans if they're effectively spentmoneromooo-monero2016-03-121-4/+7
| | | | | | | | | | | | | | | | | | The blocked ip list will still hold them till next time a connection attempt is made with that IP, so the effective length of the ban may be negative.
| * | p2p: lock access to the blocked ips mapmoneromooo-monero2016-03-122-3/+3
| |/
* | Merge pull request #715Riccardo Spagni2016-03-122-4/+15
|\ \ | | | | | | | | | | | | 8bc1bd6 wallet: use minimum mixin when RPC asks for too low mixin (moneromooo-monero) 31d2e0f wallet_rpc_server: make use_fork_rules public (moneromooo-monero)
| * | wallet: use minimum mixin when RPC asks for too low mixinmoneromooo-monero2016-03-111-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | After the fork, normal transfer functions called via RPC use the minimum mixin 2 if 0 or 1 is requested. While the incoming transaction may be valid (eg, it has an unmixable and at most a mixable input), it is a simple way to make sure RPC users can't get a seemingly random accept/reject behavior if they don't update their requested mixin.
| * | wallet_rpc_server: make use_fork_rules publicmoneromooo-monero2016-03-111-1/+2
| |/ | | | | | | We will need it in the wallet RPC server
* | Merge pull request #714Riccardo Spagni2016-03-111-2/+2
|\ \ | | | | | | | | | 4917af2 update donation addresses (Riccardo Spagni)
| * | update donation addressesRiccardo Spagni2016-03-111-2/+2
| | |
* | | Merge pull request #713Riccardo Spagni2016-03-113-4/+25
|\| | | |/ |/| | | | | 5b568b0 minor tweaks, add readme for crypto_ops_builder (Riccardo Spagni) 0a4dd68 minor tweaks, add readme for crypto_ops_builder (Riccardo Spagni)
| * Merge branch 'master' of https://github.com/fluffypony/bitmoneroRiccardo Spagni2016-03-110-0/+0
| |\
| | * minor tweaks, add readme for crypto_ops_builderRiccardo Spagni2016-03-113-4/+25
| | |
| * | minor tweaks, add readme for crypto_ops_builderRiccardo Spagni2016-03-113-4/+25
|/ /
* | Merge pull request #712Riccardo Spagni2016-03-1130-103/+110
|\ \ | | | | | | | | | | | | 66c2fc7 Need to link boost::chrono in more places now (Howard Chu) b937a2c Use boost::thread instead of std::thread (Howard Chu)
| * | Need to link boost::chrono in more places nowHoward Chu2016-03-113-0/+3
| | |