aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2087Riccardo Spagni2017-06-181-1/+1
|\ | | | | | | 4e13ab30 wallet_api: fix missing transaction parameter in callback (moneromooo-monero)
| * wallet_api: fix missing transaction parameter in callbackmoneromooo-monero2017-06-131-1/+1
| | | | | | | | | | | | It was unused, so harmless Reported by erikd on IRC
* | Merge pull request #2082Riccardo Spagni2017-06-186-5/+30
|\ \ | | | | | | | | | 235df7f4 blockchain_db: add a txpool tx getter which returns existence (moneromooo-monero)
| * | blockchain_db: add a txpool tx getter which returns existencemoneromooo-monero2017-06-116-5/+30
| |/ | | | | | | Avoids exception spam for the "nope, not found" case
* | Merge pull request #2081Riccardo Spagni2017-06-182-0/+15
|\ \ | | | | | | | | | b2319a03 simplewallet: new command to generate a random payment id (moneromooo-monero)
| * | simplewallet: new command to generate a random payment idmoneromooo-monero2017-06-102-0/+15
| |/ | | | | | | | | This is trivial, but often requested, and possibly hard to do in Windows. That makes it more user friendly.
* | Merge pull request #2078Riccardo Spagni2017-06-181-16/+13
|\ \ | | | | | | | | | 1dd52415 Fix #1991 asm multiply again (Howard Chu)
| * | Fix #1991 asm multiply againHoward Chu2017-06-081-16/+13
| |/ | | | | | | | | Tweak temp variables and constraints. Was working before if not inlined but newer gcc tends to inline it.
* | Merge pull request #2076Riccardo Spagni2017-06-181-0/+9
|\ \ | | | | | | | | | ac0714dc add simplewallet --generate-new-wallet arg checks (Michael Shick)
| * | add simplewallet --generate-new-wallet arg checksMichael Shick2017-06-071-0/+9
| |/ | | | | | | | | | | | | Add fail-fast paths that reduce frustration around the misuse of --wallet-file combined with --restore-deterministic-wallet. Flow now gives more descriptive errors and avoids having users type in their whole seed before the failure condition is noticed.
* | Merge pull request #2074Riccardo Spagni2017-06-182-0/+14
|\ \ | | | | | | | | | e1f3dfcc Add readline support to cli (jethro)
| * | Add readline support to clijethro2017-06-182-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR adds readline support to the daemon and monero-wallet-cli. Only GNU readline is supported (e.g. not libedit) and there are cmake checks to ensure this. There is a cmake variable, Readline_ROOT_DIR that can specify a directory to find readline, otherwise some default paths are searched. There is also a cmake option, USE_READLINE, that defaults to ON. If set to ON, if readline is not found, the build continues but without readline support. One negative side effect of using readline is that the color prompt in the wallet-cli now has no color and just uses terminal default. I know how to fix this but it's quite a big change so will tackle another time.
* | | Merge pull request #2070Riccardo Spagni2017-06-183-2/+17
|\ \ \ | | | | | | | | | | | | 71f8249a Prevent crash if performing certain actions before wallet is initialized (Robby Weinberg)
| * | | Prevent crash if performing certain actions before wallet is initializedRobby Weinberg2017-06-033-2/+17
| | |/ | |/|
* | | Merge pull request #2066Riccardo Spagni2017-06-183-3/+105
|\ \ \ | | | | | | | | | | | | | | | | 3fc22e7b Add histogram to poolstats (Howard Chu) d09620b0 Fix PR#2039 (Howard Chu)
| * | | Add histogram to poolstatsHoward Chu2017-06-043-3/+105
| |/ /
* | | Merge pull request #2064Riccardo Spagni2017-06-181-3/+1
|\ \ \ | |_|/ |/| | | | | 6fc2dc39 cryptonote_protocol_handler: fix crash in debug log (moneromooo-monero)
| * | cryptonote_protocol_handler: fix crash in debug logmoneromooo-monero2017-06-011-3/+1
| |/
* | Merge pull request #2055Riccardo Spagni2017-06-182-1/+43
|\ \ | | | | | | | | | 1b75ad91 Add OSX background mining (jethro)
| * | Add OSX background miningjethro2017-06-082-1/+43
| |/ | | | | | | | | Implements miner::get_system_times, miner::get_process_time and miner::on_battery_power for OSX so that background mining works on OSX.
* | Merge pull request #2052Riccardo Spagni2017-06-1810-230/+385
|\ \ | |/ |/| | | 072102cf abstracted nework addresses (moneromooo-monero)
| * abstracted nework addressesmoneromooo-monero2017-05-2710-231/+386
| | | | | | | | | | | | | | | | | | | | All code which was using ip and port now uses a new IPv4 object, subclass of a new network_address class. This will allow easy addition of I2P addresses later (and also IPv6, etc). Both old style and new style peer lists are now sent in the P2P protocol, which is inefficient but allows peers using both codebases to talk to each other. This will be removed in the future. No other subclasses than IPv4 exist yet.
* | Merge pull request #2058Riccardo Spagni2017-06-011-4/+4
|\ \ | | | | | | | | | 6bcd3b2d fix get_upper_transaction rename (schnerchi)
| * | fix get_upper_transaction renameschnerchi2017-05-311-4/+4
| | |
* | | Merge pull request #2063Riccardo Spagni2017-06-016-14/+31
|\ \ \ | | | | | | | | | | | | d17c0fc2 Don't copy blockchain for coinbase_tx_sum (Howard Chu)
| * | | Don't copy blockchain for coinbase_tx_sumHoward Chu2017-06-016-14/+31
| | | | | | | | | | | | | | | | | | | | Changed Blockchain::for_all_blocks() to for_blocks_range() Operate on blockchain in-place instead of building a copy first.
* | | | Merge pull request #2062Riccardo Spagni2017-06-011-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | 31417d57 tx_pool: add missing blockchain lock in add_tx (moneromooo-monero)
| * | | | tx_pool: add missing blockchain lock in add_txmoneromooo-monero2017-05-311-0/+5
| |/ / /
* / / / Speedup print_pool_statsHoward Chu2017-06-018-34/+112
|/ / / | | | | | | | | | Since we're just counting txs, there's no reason to deserialize all the blobs.
* | | Merge pull request #2053Riccardo Spagni2017-05-301-10/+13
|\ \ \ | | | | | | | | | | | | 05f3dcf7 simplewallet: fix refresh height for new wallets (moneromooo-monero)
| * | | simplewallet: fix refresh height for new walletsmoneromooo-monero2017-05-281-10/+13
| | |/ | |/| | | | | | | | | | | | | | | | With the recent change to wallet creation code, the code was calling to the daemon before the wallet's daemon address was initialized, and thus failing. This was causing all new wallets to refresh from 0 instead of just fetching early block hashes.
* | | Merge pull request #2042Riccardo Spagni2017-05-301-1/+2
|\ \ \ | | | | | | | | | | | | 740bc24c Wallet API: Set seed lang when recovering form keys (Jaquee)
| * | | Wallet API: Set seed lang when recovering form keysJaquee2017-05-231-1/+2
| |/ /
* | | Merge pull request #2039Riccardo Spagni2017-05-309-12/+12
|\ \ \ | | | | | | | | | | | | 4b932ff3 changed crypto to cncrypto so it generated libcncrypto (Gentian)
| * | | changed crypto to cncrypto so it generated libcncryptoGentian2017-05-239-12/+12
| |/ / | | | | | | | | | fix a cmakelist
* | | Merge pull request #2038Riccardo Spagni2017-05-301-1/+1
|\ \ \ | | | | | | | | | | | | 89e20bb9 Fix typo (xmr-eric)
| * | | Fix typoxmr-eric2017-05-191-1/+1
| |/ /
* | | Merge pull request #2036Riccardo Spagni2017-05-301-0/+4
|\ \ \ | | | | | | | | | | | | | | | | 89b2f306 tests: fix invalid key image test (moneromooo-monero) a374a522 wallet2: check key image validity domain in import_key_images (moneromooo-monero)
| * | | wallet2: check key image validity domain in import_key_imagesmoneromooo-monero2017-05-181-0/+4
| |/ /
* | | Merge pull request #2032Riccardo Spagni2017-05-301-0/+1
|\ \ \ | | | | | | | | | | | | dd8e3266 shared libs build (i.e. make debug) (stoffu)
| * | | shared libs build (i.e. make debug)stoffu2017-05-171-0/+1
| |/ /
* | | Merge pull request #2026Riccardo Spagni2017-05-301-1/+1
|\ \ \ | |_|/ |/| | | | | a5739201 Update sync time copy (xmr-eric)
| * | Update sync time copyxmr-eric2017-05-101-1/+1
| |/
* | Merge pull request #2022Riccardo Spagni2017-05-302-4/+4
|\ \ | | | | | | | | | | | | e2529347 Correct spelling of 'get_upper_transaction_size_limit' (Nano Akron) 3029d0ef Remove the 1.25x multiplier in max transaction size in just the wallet (Nano Akron)
| * | Correct spelling of 'get_upper_transaction_size_limit'Nano Akron2017-05-092-3/+3
| | |
| * | Remove the 1.25x multiplier in max transaction size in just the walletNano Akron2017-05-091-1/+1
| |/
* | Merge pull request #2021Riccardo Spagni2017-05-301-1/+1
|\ \ | | | | | | | | | 8ac2496c corrected typo in help regarding min-outputs-* (stoffu)
| * | corrected typo in help regarding min-outputs-*stoffu2017-05-091-1/+1
| |/
* | Merge pull request #2020Riccardo Spagni2017-05-301-0/+3
|\ \ | | | | | | | | | 6cb1ad1f wallet fix: ensure iterator to be valid (stoffu)
| * | wallet fix: ensure iterator to be validstoffu2017-05-091-0/+3
| |/