Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-27 13:29:25 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,906 Commits 9 Branches 69 Tags 295 MiB
ed22abb798
Commit Graph

5906 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Riccardo Spagni
ed22abb798
Merge pull request #3807 
a5c98609 version.cmake: fix configuring version.cpp without git (moneromooo-monero)
 2018-05-21 20:43:11 +02:00
Riccardo Spagni
81db197383
Merge pull request #3841 
ff31611a Revert "Merge pull request #3775" (Riccardo Spagni)
 2018-05-21 20:41:44 +02:00
Riccardo Spagni
ff31611a32 Revert "Merge pull request #3775" 
This reverts commit 20ef37bbca, reversing
changes made to 40070a661f.
 2018-05-21 20:30:31 +02:00
moneromooo-monero
a5c98609a1
version.cmake: fix configuring version.cpp without git 2018-05-15 18:40:16 +01:00
Riccardo Spagni
4b728d7dd4
Merge pull request #3794 
a58d9738 wallet2: consider 6 outputs or less to be unmixable from v7 (moneromooo-monero)
 2018-05-10 17:22:58 -07:00
moneromooo-monero
a58d9738c9
wallet2: consider 6 outputs or less to be unmixable from v7 2018-05-10 21:19:33 +01:00
Riccardo Spagni
52f6b33890
Merge pull request #3775 
6f859e43 cryptonote: make sure outPk setup always happens (moneromooo-monero)
 2018-05-08 09:59:28 +02:00
moneromooo-monero
6f859e4328
cryptonote: make sure outPk setup always happens 2018-05-07 19:21:52 +01:00
Riccardo Spagni
7ed94d3122
Merge pull request #3752 
5f193847 ringct: do not show verification errors with default settings (moneromooo-monero)
 2018-05-05 08:58:31 +02:00
moneromooo-monero
5f19384729
ringct: do not show verification errors with default settings 2018-05-04 08:27:55 +01:00
Riccardo Spagni
6b9d9f56a1
Merge pull request #3719 
3880bf39 cryptonote_protocol_handler.inl: remove span read just now that failed to pass some basic tests (stoffu)
da249fd5 cryptonote_protocol_handler.inl: fix return type mismatches (int vs bool) (stoffu)
 2018-04-29 21:38:22 +02:00
Riccardo Spagni
88c78d1683
Merge pull request #3729 
e3c68b90 README.md: mention building deps with -fPIC for static builds (moneromooo-monero)
 2018-04-29 21:38:12 +02:00
moneromooo-monero
e3c68b9018
README.md: mention building deps with -fPIC for static builds 2018-04-29 20:06:19 +01:00
Riccardo Spagni
07e55b0496
Merge pull request #3720 
c1886155 unit_tests: fix build after get_output_didstribution signature change (moneromooo-monero)
 2018-04-28 22:20:46 +02:00
moneromooo-monero
c1886155ed
unit_tests: fix build after get_output_didstribution signature change 2018-04-28 18:02:58 +01:00
Riccardo Spagni
cd22cb807a
Merge pull request #3709 
82b05d50 Adding required library (dependency of boost::this_thread::sleep_for) (Gene Peters)
 2018-04-28 17:02:22 +02:00
Riccardo Spagni
69b6f5b6a6
Merge pull request #3705 
f9d0827b Fix broken interactive daemon 'limit' commands plus RPC calls (rbrunner7)
 2018-04-28 17:02:08 +02:00
Riccardo Spagni
5bca8c6998
Merge pull request #3667 
53a1962d epee: Drop deprecated Boost.Thread header (Jan Beich)
 2018-04-28 17:01:32 +02:00
Riccardo Spagni
66e18cc92f
Merge pull request #3703 
18c2f6e2 mlog: fix setting no logs (moneromooo-monero)
 2018-04-28 16:59:29 +02:00
Riccardo Spagni
26cae8f4f1
Merge pull request #3695 
b1a9e97b slow-hash: fix memory leak for Windows /karbowanec#41 (aivve)
 2018-04-28 16:59:02 +02:00
Riccardo Spagni
8c27f127ec
Merge pull request #3692 
7346a59c Build: update miniupnp submodule (anonimal)
 2018-04-28 16:58:04 +02:00
Riccardo Spagni
2ab5b1a21f
Merge pull request #3683 
dad10775 Only log an error if fork version is higher AND is not known. (Thaer Khawaja)
 2018-04-28 16:57:36 +02:00
Riccardo Spagni
93e76e14a2
Merge pull request #3685 
ffeeefde speedup get_output_histogram for all amounts when min_count > 0 (moneromooo-monero)
2dae0f20 wallet2: add missing parameters to get_output_histogram (moneromooo-monero)
 2018-04-28 16:56:22 +02:00
Riccardo Spagni
35299644b2
Merge pull request #3650 
5bd7f760 import_multisig_info: fix sanity check crash in detach_blockchain (Mikhail Mitkevichl)
 2018-04-28 16:54:37 +02:00
stoffu
3880bf396a
cryptonote_protocol_handler.inl: remove span read just now that failed to pass some basic tests 2018-04-28 11:10:59 +09:00
stoffu
da249fd5ba
cryptonote_protocol_handler.inl: fix return type mismatches (int vs bool) 2018-04-28 11:07:51 +09:00
Gene Peters
82b05d5054 Adding required library (dependency of boost::this_thread::sleep_for) 2018-04-25 21:02:54 -07:00
moneromooo-monero
18c2f6e21d
mlog: fix setting no logs 2018-04-25 20:42:11 +01:00
rbrunner7
f9d0827bba Fix broken interactive daemon 'limit' commands plus RPC calls 2018-04-25 21:37:10 +02:00
aivve
b1a9e97b2d
slow-hash: fix memory leak for Windows /karbowanec#41 2018-04-24 20:47:29 +09:00
anonimal
7346a59c75
Build: update miniupnp submodule 
f21df05 was never supposed to be merged into the master branch.
fluffypony merged #3670 before #3668 was rebased and resolved.

Note: the cherry-picked commit hashes are now invalid because #3670
was merged before #3668 was rebased with the updated repo location.
 2018-04-23 22:27:54 +00:00
moneromooo-monero
ffeeefde60
speedup get_output_histogram for all amounts when min_count > 0 
This skips the vast majority of "dust" output amounts with just
one instance on the chain. Clocks in at 0.15% of the original
time on testnet.
 2018-04-23 10:54:28 +01:00
moneromooo-monero
2dae0f203a
wallet2: add missing parameters to get_output_histogram 2018-04-23 10:54:25 +01:00
Thaer Khawaja
dad1077577 Only log an error if fork version is higher AND is not known. 2018-04-22 17:26:44 -07:00
Mikhail Mitkevichl
5bd7f760e9 import_multisig_info: fix sanity check crash in detach_blockchain 2018-04-21 23:25:01 +03: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