aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #984Riccardo Spagni2016-08-262-2/+5
|\ | | | | | | 78035d2 Fix fake 'network synchronized, begin using' messages (Thomas Winget)
| * Fix fake 'network synchronized, begin using' messagesThomas Winget2016-08-232-2/+5
| |
* | Merge pull request #982Riccardo Spagni2016-08-261-1/+1
|\ \ | | | | | | | | | 65238d2 fix #691 removed help about leaving wallet name empty on --generate-new-wallet (guzzi_jones)
| * | fix #691 removed help about leaving wallet name empty on --generate-new-walletguzzi_jones2016-08-241-1/+1
| | |
* | | Merge pull request #978Riccardo Spagni2016-08-262-4/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 99dd572 libwallet_api: tests: checking for result while opening wallet (Ilya Kitaev) bcf7b67 libwallet_api: Wallet::amountFromString fixed (Ilya Kitaev) 32bc7b4 libwallet_api: helper method to return maximumAllowedAmount (Ilya Kitaev) cbe534d libwallet_api: tests: removed logged passwords (Ilya Kitaev) b1a5a93 libwallet_api: do not store wallet on close if status is not ok (Ilya Kitaev)
| * | | libwallet_api: Wallet::amountFromString fixedIlya Kitaev2016-08-231-1/+1
| | | |
| * | | libwallet_api: helper method to return maximumAllowedAmountIlya Kitaev2016-08-232-0/+6
| | | |
| * | | libwallet_api: do not store wallet on close if status is not okIlya Kitaev2016-08-221-3/+5
| |/ /
* | | Merge pull request #976Riccardo Spagni2016-08-261-1/+8
|\ \ \ | |_|/ |/| | | | | c2f4e16 simplewallet: default to max-concurrency 1 on MacOS X (moneromooo-monero)
| * | simplewallet: default to max-concurrency 1 on MacOS Xmoneromooo-monero2016-08-211-1/+8
| |/ | | | | | | | | | | | | A suspected bug in pthread/kernel, though might be that I messed something up too... This might rope in more platforms though.
* | Merge pull request #972Riccardo Spagni2016-08-221-1/+1
|\ \ | | | | | | | | | 2c5e68f cmake: fix typo in handling of STACK_TRACE (redfish)
| * | cmake: fix typo in handling of STACK_TRACEredfish2016-08-191-1/+1
| |/ | | | | | | This fixes the log output not getting redirected to log file.
* | Merge pull request #970Riccardo Spagni2016-08-221-0/+3
|\ \ | | | | | | | | | 25f529a wallet: store key images after importing them (moneromooo-monero)
| * | wallet: store key images after importing themmoneromooo-monero2016-08-171-0/+3
| |/ | | | | | | It avoids rescan_spent resetting spent status, for example.
* | Merge pull request #968Riccardo Spagni2016-08-221-0/+1
|\ \ | | | | | | | | | 9cca53a wallet: fix build on Mac and Windows (missing include) (moneromooo-monero)
| * | wallet: fix build on Mac and Windows (missing include)moneromooo-monero2016-08-171-0/+1
| |/ | | | | | | Reported by RaskaRuby, tested by iDunk5400.
* / simplewallet: do not suggest removing cache if the password was wrongmoneromooo-monero2016-08-161-1/+3
|/
* daemon: print time to next forkmoneromooo-monero2016-08-125-2/+50
|
* Merge pull request #948Riccardo Spagni2016-08-1115-75/+340
|\ | | | | | | | | 11dc091 Fake outs set is now decided by the wallet (moneromooo-monero) 1593553 new unlocked parameter to output_histogram (moneromooo-monero)
| * Fake outs set is now decided by the walletmoneromooo-monero2016-08-1112-57/+299
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This plugs a privacy leak from the wallet to the daemon, as the daemon could previously see what input is included as a transaction input, which the daemon hadn't previously supplied. Now, the wallet requests a particular set of outputs, including the real one. This can result in transactions that can't be accepted if the wallet happens to select too many outputs with non standard unlock times. The daemon could know this and select another output, but the wallet is blind to it. It's currently very unlikely since I don't think anything uses non default unlock times. The wallet requests more outputs than necessary so it can use spares if any of the returns outputs are still locked. If there are not enough spares to reach the desired mixin, the transaction will fail.
| * new unlocked parameter to output_histogrammoneromooo-monero2016-08-019-18/+41
| | | | | | | | | | | | | | | | This constrains the number of instances of any amount to the unlocked ones (as defined by the default unlock time setting: outputs with non default unlock time are not considered, so may be counted as unlocked even if they are not actually unlocked).
* | Merge pull request #953Riccardo Spagni2016-08-111-2/+1
|\ \ | | | | | | | | | 240864f db_lmdb: errors dropping hf starting height db on reset are not fatal (moneromooo-monero)
| * | db_lmdb: errors dropping hf starting height db on reset are not fatalmoneromooo-monero2016-08-101-2/+1
| |/ | | | | | | | | This db is now dropped unconditionally, so may or may not be there in the first place.
* | Merge pull request #952Riccardo Spagni2016-08-112-4/+9
|\ \ | | | | | | | | | | | | 709c724 Better fix (#4) (hyc) d2644c1 fix restore-deterministic height (luigi1111)
| * | Better fix (#4)hyc2016-08-092-4/+9
| | |
| * | fix restore-deterministic heightluigi11112016-08-091-2/+2
| |/ | | | | | | | | | | | | | | | | | | Simplewallet improperly skipped the restore from height code if restoring a deterministic wallet AND not specifying a wallet file in the command line. The other generate options require a wallet file as an argument, which prevents "ask_wallet_create_if_needed()" from being called, which in turn causes "m_generate_new" to remain unset. Specifying a wallet file at launch with --restore-deterministic emulated this behavior.
* | Merge pull request #949Riccardo Spagni2016-08-112-69/+64
|\ \ | | | | | | | | | da1007f simplewallet: make the refresh thread into more generic idle thread (moneromooo-monero)
| * | simplewallet: make the refresh thread into more generic idle threadmoneromooo-monero2016-08-072-69/+64
| |/
* | Merge pull request #947Riccardo Spagni2016-08-111-1/+2
|\ \ | | | | | | | | | 663fc32 wallet2: if importing key images fails, print failure index (moneromooo-monero)
| * | wallet2: if importing key images fails, print failure indexmoneromooo-monero2016-08-041-1/+2
| |/
* | Merge pull request #943Riccardo Spagni2016-08-114-53/+106
|\ \ | | | | | | | | | f0c0a3f Fix #864 Squashed commit of the following: commit 9af9e4223b58bbb65a3519af2c2bfc273cbd23d6 fixed some formatting commit c7920e1cf88ff46eb9294101344d9a567f22e2da Merge: 97eb28b 1da1c68 fix#864 fix using boolean commit 97eb28ba5dd49ddde8c8785f39b24d955e5de31c Fix #864 boolean value used to verify on new wallet commit 1da1c68bd3a9a373c70482b6e6e95251096149f1 fix #864 changed to boolean to prompt for verify commit 5bee96652434762d2c91ce31a1b1c9f169446ddc fix 864; made variable names easier for understanding branching. commit 45715960d30293f781b2ff9e5e647c2ec893f4a3 fix #864; allow password to be entered twice for new wallets for verification. fix #864 password entry verification; ammended boolean fix #864 ; default constructor for password_container should set verify=true (guzzi_jones)
| * | Fix #864guzzi_jones2016-08-014-53/+106
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 9af9e4223b58bbb65a3519af2c2bfc273cbd23d6 fixed some formatting commit c7920e1cf88ff46eb9294101344d9a567f22e2da Merge: 97eb28b 1da1c68 fix#864 fix using boolean commit 97eb28ba5dd49ddde8c8785f39b24d955e5de31c Fix #864 boolean value used to verify on new wallet commit 1da1c68bd3a9a373c70482b6e6e95251096149f1 fix #864 changed to boolean to prompt for verify commit 5bee96652434762d2c91ce31a1b1c9f169446ddc fix 864; made variable names easier for understanding branching. commit 45715960d30293f781b2ff9e5e647c2ec893f4a3 fix #864; allow password to be entered twice for new wallets for verification. fix #864 password entry verification; ammended boolean fix #864 ; default constructor for password_container should set verify=true
* / cmake: cleanup logic that sets flags per target/subdirredfish2016-07-281-0/+12
|/ | | | | | | | The previous logic that used a COMMON_*_FLAGS intermediate variable and then re-assigned CMAKE_*_FLAGS before including each subdirectory was confusing and ugly. This PR is the right way to do it. This commit is purely refactoring: built binaries unchanged.
* Merge pull request #937Riccardo Spagni2016-07-273-7/+11
|\ | | | | | | 0f990d0 cmake,common: flag for stack trace (redfish)
| * cmake,common: flag for stack traceredfish2016-07-273-7/+11
| | | | | | | | | | | | | | By default the flag is enabled whenever libunwind is found on the system, with the exception of static build on OSX (for which we can't install the throw hook #932 due to lack of support for --wrap in OSX ld64 linker).
* | Merge pull request #936Riccardo Spagni2016-07-272-15/+32
|\ \ | |/ |/| | | | | | | | | 4618873 tests: fix a bitflag test typo (moneromooo-monero) 89e68d7 unit_tests: check adding checkpoints succeeded (moneromooo-monero) 121165f db_lmdb: add some missing api call checks (moneromooo-monero) 22d8344 core_rpc_server: fix gray/white peer list mixup (moneromooo-monero)
| * db_lmdb: add some missing api call checksmoneromooo-monero2016-07-261-14/+31
| |
| * core_rpc_server: fix gray/white peer list mixupmoneromooo-monero2016-07-261-1/+1
| |
* | Merge pull request #928Riccardo Spagni2016-07-268-1/+364
|\ \ | | | | | | | | | ebf97d7 wallet: new {ex,im}port_key_images commands and RPC calls (moneromooo-monero)
| * | wallet: new {ex,im}port_key_images commands and RPC callsmoneromooo-monero2016-07-248-1/+364
| | | | | | | | | | | | | | | | | | They are used to export a signed set of key images from a wallet with a private spend key, so an auditor with the matching view key may see which of those are spent, and which are not.
* | | hardfork: fix off by one in rescaning fork state after restartmoneromooo-monero2016-07-251-3/+8
| |/ |/| | | | | This code should die anyway.
* | cmake: wallet: libunbound is not always staticredfish2016-07-231-22/+4
|/ | | | | | | | | | | | | It is not clear why libunbound was added to this in the first place, since it wasn't here before and #915 doesn't seem to introduce any new dependency on it. Tested build with STATIC=OFF (with and without libunbound-dev libunbound8 installed) and STATIC=ON, on Ubuntu Trusty, Debian Jessie, and Arch Linux. For static builds, beware of #926 and #907. If this hack was introduced to make it build on some other system (Windows? OS X?), then it will have to be dealt with, but not this way.
* Merge pull request #923Riccardo Spagni2016-07-231-0/+1
|\ | | | | | | 8312887 simplewallet: suggest removing cache when loading fails (moneromooo-monero)
| * simplewallet: suggest removing cache when loading failsmoneromooo-monero2016-07-221-0/+1
| |
* | Merge pull request #916Riccardo Spagni2016-07-235-53/+242
|\ \ | | | | | | | | | b89b963 wallet: add unconfirmed incoming txes from the txpool (moneromooo-monero)
| * | wallet: add unconfirmed incoming txes from the txpoolmoneromooo-monero2016-07-205-53/+242
| | | | | | | | | | | | | | | Shown in show_transfers simplewallet command, and get_transfers RPC command, if req.pool is true.
* | | Merge pull request #915Riccardo Spagni2016-07-235-30/+251
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d7597c5 refreshing wallet even if error happened (Ilya Kitaev) 6d32a3d wallet_api: async init, Wallet::connected status, log level (Ilya Kitaev) 193d251 libwallet_api cmake: conditionally creating libwallet_merged2 only for STATIC build (Ilya Kitaev) 10c06dd wallet_api: segfault on refresh fixed (Ilya Kitaev) 9d2cb4f WalletListener functionality (Ilya Kitaev) d27b883 hack to successfull linking for MSYS2 (Ilya Kitaev) 083380c Transaction fee multiplier aka priority integraged (Ilya Kitaev) 00ed12b Wallet::paymentIdValid (Ilya Kitaev)
| * | | refreshing wallet even if error happenedIlya Kitaev2016-07-182-6/+18
| | | |
| * | | wallet_api: async init, Wallet::connected status, log levelIlya Kitaev2016-07-184-18/+91
| | | |
| * | | libwallet_api cmake: conditionally creating libwallet_merged2 only forIlya Kitaev2016-07-182-9/+17
| | | | | | | | | | | | | | | | STATIC build