Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,995 Commits 9 Branches 69 Tags 295 MiB
96405bcaa0
Commit Graph

5995 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
moneromooo-monero
bc4d53bece
rpc: add missing perf timer for get_output_distribution 2018-04-12 18:06:22 +01:00
Riccardo Spagni
6f6521ad7a
Merge pull request #3606 
b5d6c723 wallet2: store subaddress lookahead settings (stoffu)
 2018-04-12 15:27:49 +02:00
stoffu
b5d6c723e9
wallet2: store subaddress lookahead settings 2018-04-12 22:23:53 +09:00
Riccardo Spagni
41a66bf05b
Merge pull request #3619 
3edef51d blockchain_blackball: fix build with CLANG 5 (moneromooo-monero)
 2018-04-12 15:11:02 +02:00
Riccardo Spagni
1f96755ddc
Merge pull request #3618 
3367ed86 blockchain_blackball: fix build with CLANG 5 (moneromooo-monero)
 2018-04-12 15:10:21 +02:00
moneromooo-monero
3edef51d70
blockchain_blackball: fix build with CLANG 5 
It doesn't like the explicit NULL dereference (which is fine, honest)
 2018-04-12 14:04:31 +01:00
moneromooo-monero
3367ed863c
blockchain_blackball: fix build with CLANG 5 
It doesn't like the explicit NULL dereference (which is fine, honest)
 2018-04-12 13:51:26 +01:00
Riccardo Spagni
079dd5dfef
Merge pull request #3616 
94b899db Use 'boost' mutex instead of 'std' mutex (cslashm)
2c274e05 Fix sub-address tx scan. (cslashm)
 2018-04-12 14:41:51 +02:00
cslashm
94b899db26 Use 'boost' mutex instead of 'std' mutex 2018-04-12 13:58:57 +02:00
cslashm
2c274e05fe Fix sub-address tx scan. 
When additional keys was needed, the TX scan failed because the
derivation data was always recomputed with the main tx_key and not
the corresponding additional one.

Moreover this patch avoid perf decreasing when not using HW device.
 2018-04-12 13:58:57 +02:00
Riccardo Spagni
5e08fd89ea
Merge pull request #3549 
73951cbd wallet2: request transactions in slices when scanning for known rings (moneromooo-monero)
25fe67e4 rpc: allow getting pruned blocks from gettransactions (moneromooo-monero)
 2018-04-12 13:49:33 +02:00
Riccardo Spagni
a95461e76d
Merge pull request #3609 
08343aba tx_pool: fix loading with colliding key images (moneromooo-monero)
 2018-04-12 13:48:44 +02:00
Riccardo Spagni
1e9cc3e43e
Merge pull request #3602 
a9cc88ee common: make this build with unbound 1.4.20 (moneromooo-monero)
 2018-04-12 13:48:12 +02:00
Riccardo Spagni
14c870ee5f
Merge pull request #3615 
24acb66e wallet2: fix misc issues when the ringdb can't be initialized (moneromooo-monero)
 2018-04-12 13:47:54 +02:00
Riccardo Spagni
3b8704b0fa
Merge pull request #3555 
0b26c4d5 wallet2: move segregation height to v7 (moneromooo-monero)
 2018-04-12 13:47:39 +02:00
Riccardo Spagni
5d8439e310
Merge pull request #3534 
eecfb57d wallet: warn if not using the default ring size (moneromooo-monero)
 2018-04-12 13:47:20 +02:00
Riccardo Spagni
f6094bb225
Merge pull request #3532 
aa5c2e01 simplewallet: warn about key reuse on startup (moneromooo-monero)
 2018-04-12 13:46:50 +02:00
Riccardo Spagni
226de8e928
Merge pull request #3530 
eb59f7c5 cryptonote_tx_util: make destinations properly shuffled (stoffu)
 2018-04-12 13:46:34 +02:00
Riccardo Spagni
8703f1d80e
Merge pull request #3516 
1e0958c0 wallet: fix default mixin (4 -> 6) (sneurlax)
 2018-04-12 13:46:18 +02:00
Riccardo Spagni
4a9794e033
Merge pull request #3550 
58f66073 wallet2: request transactions in slices when scanning for known rings (moneromooo-monero)
2897c269 rpc: allow getting pruned blocks from gettransactions (moneromooo-monero)
 2018-04-12 13:44:55 +02:00
Riccardo Spagni
a9e2993258
Merge pull request #3607 
5eeeec39 wallet2: store subaddress lookahead settings (stoffu)
 2018-04-12 13:31:51 +02:00
Riccardo Spagni
5b8afd43ac
Merge pull request #3610 
178c11f4 tx_pool: fix loading with colliding key images (moneromooo-monero)
 2018-04-12 13:27:46 +02:00
Riccardo Spagni
9ae9f6ada6
Merge pull request #3601 
91a61fea common: make this build with unbound 1.4.20 (moneromooo-monero)
 2018-04-12 13:26:48 +02:00
Riccardo Spagni
a4feeb4238
Merge pull request #3574 
cdf9ecfd wallet2: fix misc issues when the ringdb can't be initialized (moneromooo-monero)
 2018-04-12 13:24:28 +02:00
Riccardo Spagni
e89f33634d
Merge pull request #3556 
d400b4d3 wallet2: move segregation height to v7 (moneromooo-monero)
 2018-04-12 13:24:07 +02:00
Riccardo Spagni
dd527d9369
Merge pull request #3535 
4c6ff21c wallet: warn if not using the default ring size (moneromooo-monero)
 2018-04-12 13:22:09 +02:00
Riccardo Spagni
1e792c3e26
Merge pull request #3533 
2012cbe9 simplewallet: warn about key reuse on startup (moneromooo-monero)
 2018-04-12 13:21:51 +02:00
Riccardo Spagni
3c7d7bc324
Merge pull request #3531 
eb59f7c5 cryptonote_tx_util: make destinations properly shuffled (stoffu)
 2018-04-12 13:21:15 +02:00
Riccardo Spagni
51a4cc0fad
Merge pull request #3515 
89250054 wallet: fix default mixin (4 -> 6) (sneurlax)
 2018-04-12 13:06:56 +02:00
moneromooo-monero
24acb66eac
wallet2: fix misc issues when the ringdb can't be initialized 2018-04-12 11:07:07 +01:00
Riccardo Spagni
7bd9b62db6
Merge pull request #3591 
8daba22f Use 'boost' mutex instead of 'std' mutex (cslashm)
d481410b Fix sub-address tx scan. (cslashm)
 2018-04-12 11:29:56 +02:00
Riccardo Spagni
3a9290ba6f
Merge pull request #3511 
0beb94f3 device: fix endianess dependence on subaddress secret key generation (moneromooo-monero)
 2018-04-12 11:15:27 +02:00
Riccardo Spagni
5053f8f40b
Merge pull request #3502 
11c933e1 fix lambda compile error on openbsd (moneromooo-monero)
 2018-04-12 11:14:43 +02:00
Riccardo Spagni
96b2fee721
Merge pull request #3536 
c77d2bfa Add the possibility to export private view key for fast scan. (cslashm)
100b7bc1 Change mutex lock model to avoid dead lock and ensure locks are always released. (cslashm)
641dfc99 Automatic height setup when creating/restoring hw device. (cslashm)
 2018-04-12 11:12:33 +02:00
Riccardo Spagni
60b18cdd1f
Merge pull request #3492 
dac3895a update block hashes for checkpoints.dat (Riccardo Spagni)
 2018-04-12 11:07:16 +02:00
Riccardo Spagni
93047ce762
Merge pull request #3485 
1834127c rpc: make get_output_distribution a non-restricted RPC (moneromooo-monero)
 2018-04-12 11:06:26 +02:00
Riccardo Spagni
1b4dc46129
Merge pull request #3473 
eaa8bfe7 wallet2: set from_height of GET_OUTPUT_DISTRIBUTION correctly The previous expression (stoffu)
0a619f78 wallet2: enable the mitigation only after the fork height (stoffu)
 2018-04-12 11:05:31 +02:00
Riccardo Spagni
3d6636e79c
Merge pull request #3471 
5f664793 p2p: correct port number for seed nodes (stoffu)
 2018-04-12 11:02:46 +02:00
Riccardo Spagni
ebb55f797b
Merge pull request #3468 
0098ed33 wallet2: fix for loading settings of key reuse mitigation (stoffu)
 2018-04-12 11:00:47 +02:00
Riccardo Spagni
8902ddb91a
Merge pull request #3466 
1d79c14d Revert bb19386b (Howard Chu)
522be96f Fix generating version.cpp (Howard Chu)
 2018-04-12 11:00:14 +02:00
Riccardo Spagni
628946c1f8
Merge pull request #3464 
e520cc06 change wording in hard fork description section (Gingeropolous)
 2018-04-12 10:59:44 +02:00
Riccardo Spagni
959f6ed9a5
Merge pull request #3461 
57300491 wallet: catch exceptions dealing with ringdb and warn (moneromooo-monero)
 2018-04-12 10:57:50 +02:00
moneromooo-monero
178c11f4a4
tx_pool: fix loading with colliding key images 
A key image may be present more than once if all but one of the
txes spending that key image are coming from blocks. When loading
a txpool from storage, we must load the one that's not from a
block first to avoid rejection
 2018-04-11 15:29:35 +01:00
moneromooo-monero
08343abaf4
tx_pool: fix loading with colliding key images 
A key image may be present more than once if all but one of the
txes spending that key image are coming from blocks. When loading
a txpool from storage, we must load the one that's not from a
block first to avoid rejection
 2018-04-11 15:27:56 +01:00
stoffu
5eeeec39f6
wallet2: store subaddress lookahead settings 2018-04-11 15:38:55 +09:00
moneromooo-monero
a9cc88ee76
common: make this build with unbound 1.4.20 
Common on currently used distros
 2018-04-10 23:46:18 +01:00
moneromooo-monero
91a61fea55
common: make this build with unbound 1.4.20 
Common on currently used distros
 2018-04-10 23:43:24 +01:00
cslashm
8daba22f92 Use 'boost' mutex instead of 'std' mutex 2018-04-10 08:43:06 +02:00
cslashm
d481410bff Fix sub-address tx scan. 
When additional keys was needed, the TX scan failed because the
derivation data was always recomputed with the main tx_key and not
the corresponding additional one.

Moreover this patch avoid perf decreasing when not using HW device.
 2018-04-09 16:53:13 +02:00
stoffu
0b88fff3a5
simplewallet: fix help message of sign_transfer 2018-04-07 22:51:03 +09:00