monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-18 00:37:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5871 commits 9 branches 69 tags 308 MiB
Commit graph

5871 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thaer Khawaja
dad1077577 Only log an error if fork version is higher AND is not known. 2018-04-22 17:26:44 -07:00
Riccardo Spagni
8fdf645397
Merge pull request #3670 
19e01378 Build: remove UPnP definition from snap (anonimal)
6b853980 Build: update CMake and p2p for in-tree miniupnp (anonimal)
859db52f CMake: update new location of in-tree miniupnpc (anonimal)
f21df05c Build: add miniupnp submodule (anonimal)
10685648 Build: remove in-tree miniupnpc (anonimal)
 2018-04-21 22:01:54 +02:00
Riccardo Spagni
a429f06b18
Merge pull request #3579 
0b88fff3 simplewallet: fix help message of sign_transfer (stoffu)
 2018-04-21 21:58:52 +02:00
Riccardo Spagni
a3a617f35f
Merge pull request #3576 
f82c10dc WalletManagerImpl: reuse existing connection to daemon instead of reconnectivng every time (stoffu)
 2018-04-21 21:58:10 +02:00
Riccardo Spagni
6189a775b0
Merge pull request #3636 
998c1461 daemon: read config file before reading any other args (stoffu)
 2018-04-21 21:57:31 +02:00
Riccardo Spagni
bcb71797c8
Merge pull request #3633 
f914df84 device: add a one off override keyword where appropriate (moneromooo-monero)
 2018-04-21 21:55:44 +02:00
Riccardo Spagni
7e98e9d7ce
Merge pull request #3630 
51b511be simplewallet: add version command (moneromooo-monero)
35d1269f daemon: add a version command (moneromooo-monero)
 2018-04-21 21:55:28 +02:00
Riccardo Spagni
e6cf9c06fc
Merge pull request #3624 
d8584fc8 util: log stack trace on crash (moneromooo-monero)
 2018-04-21 21:55:02 +02:00
Riccardo Spagni
03ff3be10e
Merge pull request #3672 
875c1cab wallet2: increase rpc timeout for get_output_distribution (moneromooo-monero)
70f23217 add top height to get_output_distribution, and cache it for rct (moneromooo-monero)
8c7363fb rpc: add missing perf timer for get_output_distribution (moneromooo-monero)
 2018-04-21 21:54:08 +02:00
anonimal
19e0137805
Build: remove UPnP definition from snap 
(cherry picked from commit 5ef6dcb1c4b08497533a20d0addcf1b09db51166)
 2018-04-21 09:43:23 +00:00
anonimal
6b85398031
Build: update CMake and p2p for in-tree miniupnp 
(cherry picked from commit a7366b5feeffaeb65b217b2d6f138e0ab1c90192)
 2018-04-21 09:43:23 +00:00
moneromooo-monero
875c1cabb9
wallet2: increase rpc timeout for get_output_distribution 2018-04-19 16:06:26 +01:00
moneromooo-monero
70f2321763
add top height to get_output_distribution, and cache it for rct 
This should cache the vast majority of calls for long running wallets
 2018-04-19 16:06:22 +01:00
moneromooo-monero
8c7363fbef
rpc: add missing perf timer for get_output_distribution 2018-04-19 16:06:20 +01:00
anonimal
859db52fda
CMake: update new location of in-tree miniupnpc 
(cherry picked from commit b16a282f97d8f6c967e8a0b1ecfd75110f095182)
 2018-04-19 10:56:09 +00:00
anonimal
f21df05c77
Build: add miniupnp submodule 
Though we only need miniupnpc, rebasing and maintaining a miniupnpc-only
repo is unrealistic.

(cherry picked from commit 3c40eb768c292a4dec79d7dffd6685fd37940a2a)
 2018-04-19 10:55:56 +00:00
anonimal
1068564867
Build: remove in-tree miniupnpc 
Will be replaced by a submodule.

(cherry picked from commit e962216678)
 2018-04-19 10:55:29 +00:00
stoffu
998c1461c3
daemon: read config file before reading any other args 2018-04-14 22:05:24 +09:00
moneromooo-monero
f914df8494
device: add a one off override keyword where appropriate 2018-04-14 10:59:38 +01:00
moneromooo-monero
51b511be4c
simplewallet: add version command 2018-04-13 18:47:33 +01:00
moneromooo-monero
35d1269fac
daemon: add a version command 2018-04-13 18:47:30 +01:00
moneromooo-monero
d8584fc8d7
util: log stack trace on crash 2018-04-12 20:36:16 +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
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
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
moneromooo-monero
24acb66eac
wallet2: fix misc issues when the ringdb can't be initialized 2018-04-12 11:07:07 +01: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