Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,855 Commits 9 Branches 69 Tags 230 MiB
Commit Graph

6780 Commits

Author SHA1 Message Date
selsta 4baee200a7
build: prepare v0.16.0.0 release 2020-05-13 16:15:03 +02:00
moneromooo-monero 5d882f4f14
blockchain: fix theoretical race getting bulk timestamps 2020-05-13 13:42:41 +00:00
Dusan Klinec ab4429346d
trezor: add new firmware version support 2020-05-12 16:31:36 +02:00
sumogr 8656a8c9ff remove double includes 2020-05-11 13:53:17 +00:00
luigi1111 77a008f714
Merge pull request #6510 
70609d7 cryptonote_core: take out the time based upgrade warning (moneromooo-monero)
 2020-05-07 10:44:34 -05:00
luigi1111 4c2f78aeeb
Merge pull request #6506 
42e1484 wallet2: fix keys file deserialization exception handling (xiphon)
 2020-05-07 10:43:05 -05:00
SomaticFanatic 5ef0607da6 Update copyright year to 2020 
Update copyright year to 2020
 2020-05-06 22:36:54 -04:00
moneromooo-monero 70609d7681
cryptonote_core: take out the time based upgrade warning 
It doesn't really work anymore since we don't have a fork soon
 2020-05-06 18:27:23 +00:00
luigi1111 dbba6004f5
Merge pull request #6503 
f80ab3e cryptonote_protocol: do not request pruned borromean sig txes (moneromooo-monero)
 2020-05-06 12:22:28 -05:00
moneromooo-monero f80ab3edde
cryptonote_protocol: do not request pruned borromean sig txes 
We don't have a function to calculate their weight from a pruned
version (yet).
 2020-05-06 12:44:00 +00:00
luigi1111 f2c78f6a5b
Merge pull request #6486 
feee455 Fixes for ZMQ JSON-RPC endpoint names for raw tx (vtnerd)
 2020-05-06 00:34:30 -05:00
luigi1111 3de804f1e9
Merge pull request #6485 
7a8c1ee wallet2: fix subaddress expansion when receiving monero (moneromooo-monero)
 2020-05-06 00:31:51 -05:00
luigi1111 98e3802b26
Merge pull request #6484 
e7d0105 message_store: don't print an error when there is no mms file (moneromooo-monero)
 2020-05-06 00:30:39 -05:00
luigi1111 de025281dc
Merge pull request #6481 
119f706 rpc: fix 'use_bootstrap_daemon_if_necessary' return value (xiphon)
 2020-05-06 00:29:49 -05:00
luigi1111 9e3f72c375
Merge pull request #6480 
4f489fa wallet2: check_connection return false on get_version status != OK (xiphon)
 2020-05-06 00:28:18 -05:00
luigi1111 0f233c6ad8
Merge pull request #6478 
ee58362 Used legacy category to match insert_key_images behavior (vtnerd)
 2020-05-06 00:27:13 -05:00
luigi1111 483e5cab5c
Merge pull request #6472 
2efbd5f cryptonote: fix reuse of non default tx data when relaying (moneromooo-monero)
 2020-05-06 00:25:18 -05:00
luigi1111 8d0f1696df
Merge pull request #6471 
c6a1294 add another seed node (Gingeropolous/selsta)
9faf3d1 Add erciccione's seed node (erciccione/selsta)
 2020-05-06 00:23:59 -05:00
luigi1111 1f505a5eac
Merge pull request #6468 
a813c46 cryptonote_core: skip dns checkpoints on startup if not enforced (xiphon)
 2020-05-06 00:22:20 -05:00
luigi1111 6d1f3c9acd
Merge pull request #6467 
8b655de simplewallet: report timestamp based expected unlock time on balance (moneromooo-monero)
 2020-05-05 23:40:44 -05:00
luigi1111 b4023dcfc5
Merge pull request #6441 
613071f use memwipe on secret k/alpha values (moneromooo-monero)
 2020-05-05 23:39:32 -05:00
xiphon 42e14840fb wallet2: fix keys file deserialization exception handling 2020-05-05 16:34:50 +00:00
Lee Clagett e5214a2ca2 Adding ZMQ/Pub support for txpool_add and chain_main events 2020-05-04 02:06:35 +00:00
luigi1111 8185054db7
Merge pull request #6451 
4ed60b6 Bulletproofs: verification speedup (SarangNoether)
 2020-05-02 15:14:41 -05:00
luigi1111 ec90f9a54b
Merge pull request #6453 
d2d3a81 bootstrap_daemon: fix missing virtual destructor and lambda capture (clang warning) (xiphon)
 2020-05-01 15:47:47 -05:00
luigi1111 ac9f7c9bec
Merge pull request #6449 
27d551d simplewallet: add sweep_account command (moneromooo-monero)
 2020-05-01 15:36:19 -05:00
luigi1111 c9b800a787
Merge pull request #6446 
e509ede trezor: adapt to new passphrase mechanism (ph4r05)
 2020-05-01 15:32:52 -05:00
luigi1111 f020b24b02
Merge pull request #6444 
b367630 simplewallet : missing function block separator (sumogr)
 2020-05-01 15:24:33 -05:00
luigi1111 6e7b883212
Merge pull request #6443 
145be6d p2p: startup speedup, init seed nodes on first 'connect_to_seed()' (xiphon)
 2020-05-01 15:23:05 -05:00
luigi1111 6b7e88e16c
Merge pull request #6440 
7c4a400 simplewallet: fix strings (show_transfers & export_transfers) (sumogr)
 2020-05-01 15:21:57 -05:00
luigi1111 443f5c6bda
Merge pull request #6436 
688a3e8 Add timelock verification on device (cslashm)
 2020-05-01 15:20:05 -05:00
luigi1111 3e21e591b8
Merge pull request #6350 
da99157 Use byte_slice for sending zmq messages - removes data copy within zmq (vtnerd)
 2020-05-01 15:13:58 -05:00
Sumo Gr dd807b8410 txpool.cpp: rename var to fix for old g++ version (xenial default) 2020-04-29 10:03:51 +00:00
Lee Clagett feee455c9f Fixes for ZMQ JSON-RPC endpoint names for raw tx 2020-04-29 01:07:27 -04:00
moneromooo-monero 7a8c1eece9
wallet2: fix subaddress expansion when receiving monero 2020-04-27 16:48:19 +00:00
Dusan Klinec e509ede2aa
trezor: adapt to new passphrase mechanism 
- choice where to enter passphrase is now made on the host
- use wipeable string in the comm stack
- wipe passphrase memory
- protocol optimizations, prepare for new firmware version
- minor fixes and improvements
- tests fixes, HF12 support
 2020-04-27 18:17:56 +02:00
moneromooo-monero e7d01056f4
message_store: don't print an error when there is no mms file 
It confuses people
 2020-04-27 15:44:29 +00:00
xiphon 119f706921 rpc: fix 'use_bootstrap_daemon_if_necessary' return value 2020-04-27 10:32:33 +00:00
xiphon 4f489fa6a2 wallet2: check_connection return false on get_version status != OK 2020-04-26 13:08:17 +00:00
Lee Clagett ee58362b1f Used legacy category to match insert_key_images behavior 2020-04-24 20:19:37 -04:00
moneromooo-monero 2efbd5f0cc
cryptonote: fix reuse of non default tx data when relaying 
An automatic tx variable is initialized properly on the first
run through the loop, but not the second. Moving the variable
inside the loop ensures the ctor is called again to init it.
 2020-04-22 16:50:20 +00:00
Gingeropolous c6a1294b5e
add another seed node 
node is funded by random people and managed by me. currently functioning as public node at uwillrunanodesoon.moneroworld.com
 2020-04-22 15:43:22 +02:00
moneromooo-monero 8b655de8ed
simplewallet: report timestamp based expected unlock time on balance 2020-04-22 13:34:58 +00:00
erciccione 9faf3d1a72
Add erciccione's seed node 2020-04-22 10:24:40 +02:00
xiphon 145be6dbdb p2p: startup speedup, init seed nodes on first 'connect_to_seed()' 2020-04-21 23:40:04 +00:00
luigi1111 378cdeaeae
Merge pull request #6470 
79a1653 p2p: add seed node. (guywillett)
 2020-04-21 09:14:38 -05:00
luigi1111 c846c8650e
Merge pull request #6445 
5715460 Always reject duplicate key-images from second txid (vtnerd)
babf25d Allow unrestricted rpc calls to get full txpool info (vtnerd)
 2020-04-21 09:03:37 -05:00
luigi1111 cc91c0221d
Merge pull request #6415 
09abca7 wallet_api: checkUpdate - optional version and buildtag params (xiphon)
 2020-04-21 08:52:57 -05:00
luigi1111 cb8f4280bb
Merge pull request #6408 
5ef7138 daemon: fix print_net_stats RPC calls (moneromooo-monero)
 2020-04-21 08:46:39 -05:00
guy 79a1653a07 p2p: add seed node. 2020-04-21 15:35:30 +02:00
luigi1111 2d729fbdf7
Merge pull request #6332 
87d7558 Allow wallet2.h to run in WebAssembly (woodser)
 2020-04-21 08:26:54 -05:00
luigi1111 9c660e159e
Merge pull request #6278 
387fd66 Daemon: Print estimates for time until fully synced (rbrunner7)
 2020-04-21 08:19:02 -05:00
xiphon a813c46a1b cryptonote_core: skip dns checkpoints on startup if not enforced 2020-04-20 18:56:22 +00:00
xiphon d2d3a81d0e bootstrap_daemon: fix missing virtual destructor and lambda capture (clang warning) 2020-04-15 21:22:55 +00:00
woodser 87d75584e8 Allow wallet2.h to run in WebAssembly 
- Add abstract_http_client.h which http_client.h extends.
- Replace simple_http_client with abstract_http_client in wallet2,
message_store, message_transporter, and node_rpc_proxy.
- Import and export wallet data in wallet2.
- Use #if defined __EMSCRIPTEN__ directives to skip incompatible code.
 2020-04-15 13:22:46 -04:00
moneromooo-monero 613071f4fa
use memwipe on secret k/alpha values 
Reported by UkoeHB_ and sarang
 2020-04-15 01:16:31 +00:00
Sarang Noether 4ed60b626a Bulletproofs: verification speedup 2020-04-14 20:31:30 -04:00
moneromooo-monero 27d551d12f
simplewallet: add sweep_account command 
Expects an account number, then the usual sweep_all options

Useful to move monero that was accidentally sent to a subaddress
with a very large account index.
 2020-04-14 15:06:46 +00:00
Lee Clagett c26c93019a Add byte_stream for zero-copy serialization, and add support in ZMQ-JSON. 2020-04-11 04:12:11 +00:00
luigi1111 7c74e1919e
Merge pull request #6405 
8d23047 p2p: add another seed node (moneromooo-monero)
 2020-04-10 16:13:04 -05:00
luigi1111 228af683a7
Merge pull request #6403 
5de2295 Correct key image check in tx_pool (vtnerd)
 2020-04-10 16:10:33 -05:00
luigi1111 bce050ee78
Merge pull request #6394 
69b5992 simplewallet: new 'address one-off <major> <minor>' command (moneromooo-monero)
 2020-04-10 16:06:10 -05:00
luigi1111 7954f8cb18
Merge pull request #6358 
8958b4e blockchain_db: faster fetching of consecutive txes (moneromooo-monero)
 2020-04-10 16:01:37 -05:00
luigi1111 53800b3b63
Merge pull request #6341 
927fd47 simplewallet: fix smart mining not starting after first setup (moneromooo-monero)
 2020-04-10 15:59:14 -05:00
Sumo Gr b367630ee8
simplewallet : missing function block separator 2020-04-10 21:27:41 +03:00
sumogr 7c4a4003a3 simplewallet: fix strings (show_transfers & export_transfers) 2020-04-08 19:17:58 +03:00
cslashm 688a3e87e7 Add timelock verification on device 2020-04-08 11:12:32 +02:00
moneromooo-monero 69b5992296
simplewallet: new "address one-off <major> <minor>" command 2020-04-07 16:25:01 +00:00
luigi1111 bbceb31044
Merge pull request #6395 
ad13a4b Fixing static_asserts in ZMQ JSON (vtnerd)
 2020-04-04 13:17:54 -05:00
luigi1111 d102a72027
Merge pull request #6384 
ec01077 db_lmdb: fix race crash using a stale cursor (moneromooo-monero)
 2020-04-04 13:14:19 -05:00
luigi1111 d1f3d3376d
Merge pull request #6381 
e719760 Fix receive order leakage with tx fluffing (vtnerd)
 2020-04-04 13:12:31 -05:00
luigi1111 975825a1fd
Merge pull request #6375 
ebf3c10 Added logging for dropped local txes with no i2p/tor connections (vtnerd)
 2020-04-04 13:11:30 -05:00
luigi1111 97af9649c9
Merge pull request #6372 
7b9017f p2p: plug tor to clearnet association vector (Aaron Hook)
 2020-04-04 13:09:55 -05:00
luigi1111 59ab769210
Merge pull request #6364 
6e1cb5a device: Ledger - fix wide char hidapi error string conversion (xiphon)
 2020-04-04 13:02:18 -05:00
luigi1111 5757d99208
Merge pull request #6361 
68a6507 Fixed bug in ZMQ JSON-RPC method field (vtnerd)
 2020-04-04 13:01:15 -05:00
luigi1111 0150a480fd
Merge pull request #6357 
42a7a4d daemon: auto public nodes - cache and prioritize most stable nodes (xiphon)
 2020-04-04 12:59:23 -05:00
luigi1111 6a6eedd842
Merge pull request #6353 
6810150 daemon: if no banned IPs print something (sumogr)
 2020-04-04 12:56:36 -05:00
luigi1111 cfc0f4a7fa
Merge pull request #6351 
81c5943 Remove temporary std::string creation in some hex->bin calls (vtnerd)
5fcc23a Move hex->bin conversion to monero copyright files and with less includes (vtnerd)
3387f0e Reduce template bloat in hex->bin for ZMQ json (vtnerd)
 2020-04-04 12:55:02 -05:00
luigi1111 44547006bf
Merge pull request #6347 
fcb06f7 cryptonote_core: skip block notify on blockchain switching rollback (xiphon)
 2020-04-04 12:52:46 -05:00
luigi1111 ad5200e440
Merge pull request #6342 
82da832 rpc: Add check for too old timestamps in payment signatures. (glv2)
 2020-04-04 12:49:02 -05:00
luigi1111 c4f75fe898
Merge pull request #6339 
c61abf8 remove empty statements (shopglobal)
 2020-04-04 12:47:31 -05:00
luigi1111 081d49c59f
Merge pull request #6338 
80d5320 Hash domain separation (SarangNoether)
 2020-04-04 12:44:45 -05:00
luigi1111 6011064693
Merge pull request #6334 
cc18926 wallet2_api: wallet recovery - seed offset passphrase support (xiphon)
 2020-04-04 12:41:32 -05:00
luigi1111 0bb7191fd6
Merge pull request #6328 
9bde70e core: mention time being off in hash rate changes message (moneromooo-monero)
 2020-04-04 12:40:18 -05:00
luigi1111 85efaeb7bf
Merge pull request #6322 
29b7cd1 device_ledger: include status code name in error message (xiphon)
 2020-04-04 12:39:21 -05:00
luigi1111 ab802b4b80
Merge pull request #6321 
1a6e7bd wallet2: mention --daemon-ssl-allow-any-cert in --proxy error msg (xiphon)
 2020-04-04 12:37:26 -05:00
luigi1111 4398facb2e
Merge pull request #6286 
6d6af70 cryptonote_basic: drop unused verification_context::m_not_rct field (xiphon)
 2020-04-04 12:33:32 -05:00
Lee Clagett da99157462 Use byte_slice for sending zmq messages - removes data copy within zmq 2020-04-03 01:56:17 +00:00
xiphon 09abca76ae wallet_api: checkUpdate - optional version and buildtag params 2020-04-02 00:31:43 +00:00
Sarang Noether 80d5320fff Hash domain separation 2020-04-01 08:31:00 -04:00
xiphon 6d6af701ec cryptonote_basic: drop unused verification_context::m_not_rct field 2020-03-31 21:58:25 +00:00
moneromooo-monero 21fe6a289b
p2p: fix frequent weak_ptr exception on connection 
When a handshake fails, it can fail due to timeout or destroyed
connection, in which case the connection will be, or already is,
closed, and we don't want to do it twice.
Additionally, when closing a connection directly from the top
level code, ensure the connection is gone from the m_connects
list so it won't be used again.

AFAICT this is now clean in netstat, /proc/PID/fd and print_cn.

This fixes a noisy (but harmless) exception.
 2020-03-31 20:29:41 +00:00
luigi1111 6c7d928f19
Merge pull request #6336 
760ecf2 console_handler: do not let exception past the dor (moneromooo-monero)
09c8111 threadpool: lock mutex in create (moneromooo-monero)
e377977 tx_pool: catch theoretical error in get_block_reward (moneromooo-monero)
 2020-03-31 15:14:12 -05:00
luigi1111 94f44d4ee3
Merge pull request #6325 
3627e53 rpc: fix print_pool_sh not finding local txes (moneromooo-monero)
 2020-03-31 15:13:51 -05:00
luigi1111 f9de65b546
Merge pull request #6304 
2e9d1e6 wallet2: fix store-tx-info loading (moneromooo-monero)
 2020-03-31 15:13:19 -05:00
luigi1111 d0065f3063
Merge pull request #6302 
dab604e wallet2_api: implement estimateTransactionFee (xiphon)
 2020-03-31 15:12:48 -05:00
luigi1111 8a829e2cc4
Merge pull request #6301 
9989cb0 simplewallet: warn about correlations if print-ring-members is not set (moneromooo-monero)
 2020-03-31 13:37:19 -05:00
luigi1111 0253f86fde
Merge pull request #6298 
fe92fa1 [randomx] Add missing randomx_vm_set_cache() (cohcho)
 2020-03-31 13:36:21 -05:00
luigi1111 ccc3726d86
Merge pull request #6260 
320bc84 rpc: add --rpc-payment-allow-free-loopback (moneromooo-monero)
 2020-03-31 13:35:16 -05:00
luigi1111 096e2135dd
Merge pull request #6214 
054b4c7 protocol: request txpool contents when synced (moneromooo-monero)
 2020-03-31 13:32:55 -05:00
Lee Clagett 571546067f Always reject duplicate key-images from second txid 2020-03-30 17:52:42 +00:00
Lee Clagett babf25d2ec Allow unrestricted rpc calls to get full txpool info 2020-03-30 17:52:42 +00:00
moneromooo-monero 5ef7138d86
daemon: fix print_net_stats RPC calls 2020-03-29 13:45:58 +00:00
moneromooo-monero 9989cb087e
simplewallet: warn about correlations if print-ring-members is not set 
The warning about spending more than one output with similar creation
time was skipped if print-ring-members was not set, and it defaults to
false, which means most people probably aren't getting this warning if
they spend correlated outputs.

Reported by SeventhAlpaca.
 2020-03-28 11:46:06 +00:00
moneromooo-monero 8d230473ef
p2p: add another seed node 
Node from syksy, administered by mooo
 2020-03-27 22:51:44 +00:00
Alexander Blair 72262b348a
Merge pull request #6299 
9c1f970b wallet2: remember daemon address overrides when loading a new wallet (moneromooo-monero)
 2020-03-27 12:33:15 -07:00
Alexander Blair 5780594202
Merge pull request #6296 
50e59cfa wallet2: reject zero keys in json input (moneromooo-monero)
 2020-03-27 12:31:59 -07:00
Alexander Blair 3ed5e7ce9f
Merge pull request #6295 
bcae95a2 p2p: do not add recently failed addresses to the peerlist (moneromooo-monero)
 2020-03-27 12:30:06 -07:00
Alexander Blair 8cb005b39c
Merge pull request #6289 
ffe7165e wallet: reroll fake outs selection on local tx_sanity_check failure (xiphon)
 2020-03-27 12:28:29 -07:00
Alexander Blair 5ba6eef272
Merge pull request #6288 
0349347e ringdb: use a different iv for key and data in rings table (moneromooo-monero)
7b882087 simplewallet: reword mixin in user message in terms of ring size (moneromooo-monero)
f507a43a wallet2: do not remove known rings when a tx fails (moneromooo-monero)
 2020-03-27 12:23:59 -07:00
Alexander Blair 7d4a93fab3
Merge pull request #6285 
d0641b42 net: fix incorrect less operator for top/i2p addresses (Aaron Hook)
 2020-03-27 12:23:00 -07:00
Alexander Blair aa982a51da
Merge pull request #6284 
02224e71 Fix check_fee() discrepancy. (UkoeHB)
 2020-03-27 12:21:26 -07:00
Alexander Blair e160e0b517
Merge pull request #6283 
a84131ce p2p: fix off by one adding fallback peers (moneromooo-monero)
 2020-03-27 12:19:55 -07:00
Alexander Blair a762084b15
Merge pull request #6282 
66472074 Daemon: Guard against reporting "synchronized" too early (rbrunner7)
 2020-03-27 12:19:07 -07:00
Alexander Blair c038cc8b79
Merge pull request #6280 
b818522d p2p: fix spurious warning when we're connected to at last one seed (moneromooo-monero)
 2020-03-27 12:17:54 -07:00
Alexander Blair 3baa68bbab
Merge pull request #6279 
36bdf402 p2p: fix adding wrong indices to the filtered peer list (moneromooo-monero)
 2020-03-27 12:17:07 -07:00
Alexander Blair a22cf5de1b
Merge pull request #6275 
aa93e388 p2p: remove old debug commands (Aaron Hook)
 2020-03-27 12:16:30 -07:00
Alexander Blair 338824add3
Merge pull request #6227 
f8d76f39 core: move the LockedTXN class out of txpool so it may be reused (moneromooo-monero)
 2020-03-27 12:15:37 -07:00
Lee Clagett 02d887c2e5 Adding Dandelion++ support to public networks: 
- New flag in NOTIFY_NEW_TRANSACTION to indicate stem mode
  - Stem loops detected in tx_pool.cpp
  - Embargo timeout for a blackhole attack during stem phase
 2020-03-26 15:01:30 +00:00
moneromooo-monero 054b4c7f41
protocol: request txpool contents when synced 
A newly synced Alice sends a (typically quite small) list of
txids in the local tpxool to a random peer Bob, who then uses
the existing tx relay system to send Alice any tx in his txpool
which is not in the list Alice sent
 2020-03-22 16:03:31 +00:00
rbrunner7 387fd668d1 Daemon: Print estimates for time until fully synced 2020-03-21 07:32:55 +01:00
Aaron Hook aa93e38862 p2p: remove old debug commands 2020-03-20 22:09:44 -07:00
moneromooo-monero bcae95a22e
p2p: do not add recently failed addresses to the peerlist 2020-03-20 15:45:26 +00:00
Lee Clagett ad13a4b2ac Fixing static_asserts in ZMQ JSON 2020-03-19 19:49:51 -04:00
Lee Clagett 5de2295f3c Correct key image check in tx_pool 2020-03-14 19:17:15 +00:00
xiphon c075aa7a6c workaround for GetObject windows.h macro and rapidjson conflict 2020-03-14 00:46:47 +00:00
moneromooo-monero f8d76f395b
core: move the LockedTXN class out of txpool so it may be reused 
for example, in the RPC server
 2020-03-12 11:30:05 +00:00
moneromooo-monero 320bc845b3
rpc: add --rpc-payment-allow-free-loopback 
This allows RPC coming from the loopback interface to not have
to pay for service. This makes it possible to run an externally
accessible RPC server for payment while also having a local RPC
server that can be run unrestricted and payment free.
 2020-03-12 11:27:34 +00:00
Alexander Blair 820ab9fdea
Merge pull request #6273 
0f78b06e Various improvements to the ZMQ JSON-RPC handling: (Lee Clagett)
 2020-03-12 01:13:49 -07:00
Alexander Blair d500bbe68f
Merge pull request #6268 
a6c24412 wallet: fix exceptions getting the hash of a pruned tx (moneromooo-monero)
 2020-03-12 01:02:31 -07:00
Alexander Blair 092a57df99
Merge pull request #6243 
4771a7ae p2p: remove obsolete local time in handshake (moneromooo-monero)
2fbbc4a2 p2p: avoid sending the same peer list over and over (moneromooo-monero)
3004835b epee: remove backward compatible endian specific address serialization (moneromooo-monero)
39a343d7 p2p: remove backward compatible peer list (moneromooo-monero)
60631802 p2p: simplify last_seen serialization now we have optional stores (moneromooo-monero)
9467b2e4 cryptonote_protocol: omit top 64 bits of difficulty when 0 (moneromooo-monero)
b595583f serialization: do not write optional fields with default value (moneromooo-monero)
5f98b46d p2p: remove obsolete local time from TIMED_SYNC (moneromooo-monero)
 2020-03-12 00:32:46 -07:00
moneromooo-monero ec01077720
db_lmdb: fix race crash using a stale cursor 
If a db resize happened, the txpool meta cursor might be stale,
and was not being renewed when necessary.
It would cause this SEGSEGV:

in mdb_cursor_set ()
in mdb_cursor_get ()
in cryptonote::BlockchainLMDB::get_txpool_tx_blob(crypto::hash const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&, cryptonote::relay_category) const ()
in cryptonote::tx_memory_pool::get_transaction(crypto::hash const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&, cryptonote::relay_category) const ()
in cryptonote::t_cryptonote_protocol_handler<cryptonote::core>::handle_notify_new_fluffy_block(int, epee::misc_utils::struct_init<cryptonote::NOTIFY_NEW_FLUFFY_BLOCK::request_t>&, cryptonote::cryptonote_connection_context&) ()
 2020-03-12 00:57:32 +00:00
Lee Clagett e719760253 Fix receive order leakage with tx fluffing 2020-03-10 22:30:07 -04:00
Lee Clagett 3387f0e327 Reduce template bloat in hex->bin for ZMQ json 2020-03-09 17:55:55 +00:00
Lee Clagett 5fcc23ae0a Move hex->bin conversion to monero copyright files and with less includes 2020-03-09 05:23:59 +00:00
Aaron Hook 7b9017f671
p2p: plug tor to clearnet association vector 
During the handshake for an incoming connection, the peer id is checked against the local node's peer id only for the specific zone of the incoming peer, in order to avoid linking public addresses to tor addresses:
5d7ae2d279/src/p2p/net_node.inl (L2343)

However, on handshakes for outgoing connections, all zones are checked:
5d7ae2d279/src/p2p/net_node.inl (L1064)

If an attacker wanted to link a specific tor node to a public node, they could potentially connect to as many public nodes as possible, get themselves added to the peer whitelist, maybe stuff some more attacker-owned addresses into the greylist, then disconnect, and for any future incoming connections, respond with the tor node's id in an attempt to link the public/tor addresses.
 2020-03-07 18:12:59 +00:00
moneromooo-monero 9c1f970b82
wallet2: remember daemon address overrides when loading a new wallet 2020-03-07 18:09:31 +00:00
Lee Clagett ebf3c10fcb Added logging for dropped local txes with no i2p/tor connections 2020-03-07 00:03:17 +00:00
Lee Clagett 0f78b06e8c Various improvements to the ZMQ JSON-RPC handling: 
- Finding handling function in ZMQ JSON-RPC now uses binary search
  - Temporary `std::vector`s in JSON output now use `epee::span` to
    prevent allocations.
  - Binary -> hex in JSON output no longer allocates temporary buffer
  - C++ structs -> JSON skips intermediate DOM creation, and instead
    write directly to an output stream.
 2020-03-05 14:20:56 +00:00
xiphon 6e1cb5a4d0 device: Ledger - fix wide char hidapi error string conversion 2020-03-01 11:42:48 +00:00
Alexander Blair 4764d18eeb
Merge pull request #6248 
21c3d42e p2p: drop the peerlist dump to TRACE (moneromooo-monero)
 2020-02-28 20:21:27 -08:00
Alexander Blair da617ac1b0
Merge pull request #6238 
f717d593 wallet2: guard against race with multiple decrypt_keys users (moneromooo-monero)
 2020-02-28 20:21:06 -08:00
Alexander Blair ea6396ea66
Merge pull request #6222 
a6a2ad6c simplewallet: set manual refresh mode in rescan_bc (moneromooo-monero)
 2020-02-28 19:59:43 -08:00
Alexander Blair 8c2939a7cb
Merge pull request #6058 
88b82bef simplewallet: point to "set help" in the lock screen message (moneromooo-monero)
f19c9f23 util: allow newlines in string to be split (moneromooo-monero)
 2020-02-28 19:54:37 -08:00
Alexander Blair f3fddd935f
Merge pull request #6259 
69336931 rpc: fill miner_tx_hash again (moneromooo-monero)
 2020-02-28 19:51:15 -08:00
Alexander Blair 9ea7df3b31
Merge pull request #6242 
716012ca rpc: drop the obsolete and wrong "unpruned size" log (moneromooo-monero)
 2020-02-28 19:50:02 -08:00
Alexander Blair 5bd496e8ef
Merge pull request #6241 
ae84ec90 wallet-cli/rpc: allow sweep_all to use outputs in all subaddresses within an account (stoffu)
 2020-02-28 19:49:41 -08:00
Alexander Blair 19ce033299
Merge pull request #6236 
bc6d8aa3 Corrected message typo (palomato)
 2020-02-28 19:49:07 -08:00
Alexander Blair a6cf4b09e7
Merge pull request #6235 
5cbb17b9 wallet2: fix hang in wallet refresh (moneromooo-monero)
 2020-02-28 19:48:41 -08:00
Alexander Blair 4371ac4265
Merge pull request #6225 
987c3139 print_coinbase_tx_sum now supports 128 bits sums (moneromooo-monero)
 2020-02-28 19:48:11 -08:00
Alexander Blair 2deb02f81d
Merge pull request #6224 
d93e1dff simplewallet: warn on refresh if refresh-from-block-height seems off (moneromooo-monero)
 2020-02-28 19:46:33 -08:00
Alexander Blair 6742c4acb7
Merge pull request #6223 
c3613031 Silence miner debugmsg spam (Howard Chu)
 2020-02-28 19:45:55 -08:00
Alexander Blair afff9e7041
Merge pull request #6219 
72ca7e3b Fix time comparison math (Jason Rhinelander)
 2020-02-28 19:43:44 -08:00
Alexander Blair e22655a187
Merge pull request #6215 
a2578892 --disable-ban-rpc option to prevent RPC users from banning (naughtyfox)
 2020-02-28 19:43:06 -08:00
Alexander Blair 5e492c4cbc
Merge pull request #6213 
94266eeb simplewallet: fix output age display with duplicate heights (moneromooo-monero)
f1d379d2 simplewallet: fix "outputs in same tx" detector (moneromooo-monero)
 2020-02-28 19:36:41 -08:00
Alexander Blair 4da37daf67
Merge pull request #6211 
5985c5af rpc: add bad-blocks to flush_cache RPC (moneromooo-monero)
 2020-02-28 19:36:16 -08:00
Alexander Blair 8606b1a14a
Merge pull request #6203 
ef95a76d remove unused variable 'ptx' from on_describe_transfer() (woodser)
 2020-02-28 19:34:41 -08:00
xiphon 42a7a4dd32 daemon: auto public nodes - cache and prioritize most stable nodes 2020-02-28 08:06:43 +00:00
moneromooo-monero 8958b4e7aa
blockchain_db: faster fetching of consecutive txes 
Useful for wallet refresh or node sync
 2020-02-27 15:05:34 +00:00
sumogr 6810150d46 daemon: if no banned IPs print something 2020-02-24 20:52:55 +00:00
luigi1111 39e1890276
Merge pull request #6198 
5f2a32c daemon: run with -rpc-payment-address and --rpc-restricted-bind-port (moneromooo-monero)
 2020-02-19 22:25:44 -05:00
luigi1111 04187e5968
Merge pull request #6197 
f812783 simplewallet: fix encrypted payment id note triggering on dummy ones (moneromooo-monero)
 2020-02-19 22:24:44 -05:00
luigi1111 2de1137e60
Merge pull request #6194 
316ab7b wallet2: better error when restoring a wallet with the wrong keys (moneromooo-monero)
 2020-02-19 22:23:46 -05:00
luigi1111 22a0367398
Merge pull request #6190 
096a9db Wallet: Distingush amounts for a single subaddress (tmoravec)
 2020-02-19 22:22:36 -05:00
xiphon fcb06f7a82 cryptonote_core: skip block notify on blockchain switching rollback 2020-02-19 16:19:29 +00:00
Interchained c61abf87c0 remove empty statements 
Cleaning up a little around the code base.
 2020-02-17 11:55:15 -05:00
Guillaume Le Vaillant 82da832368 rpc: Add check for too old timestamps in payment signatures. 2020-02-17 15:10:19 +01:00
moneromooo-monero 927fd47934
simplewallet: fix smart mining not starting after first setup 
Also avoid rewriting the wallet if the setting is already was we need
 2020-02-17 13:16:09 +00:00
moneromooo-monero e3779775d7
tx_pool: catch theoretical error in get_block_reward 
Coverity 196626
 2020-02-12 21:05:28 +00:00
moneromooo-monero 09c8111c53
threadpool: lock mutex in create 
In some contrived case, it might theoretically be the case that
destroy is called from another thread, which would modify the
threads array from two threads.

Coverity 208372
 2020-02-12 21:05:28 +00:00
xiphon cc18926eba wallet2_api: wallet recovery - seed offset passphrase support 2020-02-11 23:36:50 +00:00
moneromooo-monero 9bde70e567
core: mention time being off in hash rate changes message 2020-02-10 16:56:10 +00:00
moneromooo-monero 3627e53aab
rpc: fix print_pool_sh not finding local txes 2020-02-08 12:56:00 +00:00
xiphon 29b7cd1351 device_ledger: include status code name in error message 2020-02-08 01:46:39 +00:00
xiphon 1a6e7bd40f wallet2: mention --daemon-ssl-allow-any-cert in --proxy error msg 2020-02-07 10:02:27 +00:00
moneromooo-monero c2095fc27b
miner: use verification mode for low diff one block nonce searches 
This avoids lengthy init times when testing
 2020-02-06 14:27:10 +00:00
Alexander Blair bd4acbf44c
Merge pull request #6183 
3813a992 download: catch exceptions checking for size (moneromooo-monero)
 2020-02-06 00:34:58 -08:00
Alexander Blair af27276452
Merge pull request #6178 
7ac7d5d3 updates: fix source code URL on _WIN32 (selsta)
 2020-02-06 00:33:49 -08:00
Alexander Blair e552ba14b2
Merge pull request #6127 
67b4a19e simplewallet: noob-friendly help menu (wowario)
 2020-02-06 00:33:31 -08:00
Alexander Blair 995f34b538
Merge pull request #6103 
4b384003 wallet2: don't try to lock an empty filename (moneromooo-monero)
 2020-02-06 00:33:18 -08:00
Alexander Blair 756f06cd83
Merge pull request #6102 
b328de6b wallet_rpc_server: add tx weight in transfer commands responses (moneromooo-monero)
 2020-02-06 00:32:47 -08:00
Alexander Blair 8136bf37e2
Merge pull request #6096 
a633f85d daemon: allow printing N blocks from the end of the chain (moneromooo-monero)
 2020-02-06 00:31:50 -08:00
Alexander Blair b8e5c769c7
Merge pull request #6095 
7ba31191 daemon: add +meta print_tx parameter (moneromooo-monero)
 2020-02-06 00:31:17 -08:00
Alexander Blair 78d4d5ab79
Merge pull request #6094 
236d2a88 blockchain_stats: make it work on pruned blockchains (moneromooo-monero)
 2020-02-06 00:30:48 -08:00
Alexander Blair 2532567091
Merge pull request #6078 
b9fc2066 Add a --keep-fakechain option to keep fakechain databases (JamesWrigley)
 2020-02-06 00:30:15 -08:00
Alexander Blair cd1610bc37
Merge pull request #6076 
22d30866 simplewallet: add missing inactivity-lock-timeout to set help blurb (moneromooo-monero)
9f57f0df simplewallet: do not mention inactivity if a lock was manual (moneromooo-monero)
 2020-02-06 00:29:52 -08:00
Alexander Blair 3b224bb99d
Merge pull request #6069 
d64e5aa7 wallet: allow message sign/verify for subaddresses (moneromooo-monero)
 2020-02-06 00:29:32 -08:00
Alexander Blair 34d7ea62f6
Merge pull request #6053 
deb350b7 always print peer IDs in the same format (moneromooo-monero)
 2020-02-06 00:28:47 -08:00
Alexander Blair 9a08ac98c0
Merge pull request #6050 
65301c40 core: point out when we hit the block rate visibility limit (moneromooo-monero)
 2020-02-06 00:28:18 -08:00
Alexander Blair 9658f5d7fc
Merge pull request #6040 
2f8f3a94 rpc: base flush_cache request/response on the new base structs (moneromooo-monero)
 2020-02-06 00:26:34 -08:00
Alexander Blair 25c1bd4714
Merge pull request #6035 
b90c4bc3 rpc: error out from get_info if the proxied call errors out (moneromooo-monero)
fa16df99 make_test_signature: exit nicely on top level exception (moneromooo-monero)
054b2621 node_rpc_proxy: init some new rpc payment fields in invalidate (moneromooo-monero)
d0faae2a rpc: init a few missing client_info members (moneromooo-monero)
d56a483a rpc: do not propagate exceptions out of a dtor (moneromooo-monero)
3c849188 rpc: always set the update field in update on sucess (moneromooo-monero)
 2020-02-06 00:26:13 -08:00
luigi1111 d7aeb5a9f8
Merge pull request #6233 
8a27645 blockchain: fix flushing txes from the txpool (moneromooo-monero)
 2020-02-04 14:38:35 -05:00
moneromooo-monero b818522d29
p2p: fix spurious warning when we're connected to at last one seed 2020-01-31 15:11:22 +00:00
moneromooo-monero 4771a7aec1
p2p: remove obsolete local time in handshake 
Also removes a potential fingerprinting vector
 2020-01-29 14:39:58 +00:00
moneromooo-monero 2fbbc4a2d3
p2p: avoid sending the same peer list over and over 
Nodes remember which connections have been sent which peer addresses
and won't send it again. This causes more addresses to be sent as
the connection lifetime grows, since there is no duplication anymore,
which increases the diffusion speed of peer addresses. The whole
white list is now considered for sending, not just the most recent
seen peers. This further hardens against topology discovery, though
it will more readily send peers that have been last seen earlier
than it otherwise would. While this does save a fair amount of net
bandwidth, it makes heavy use of std::set lookups, which does bring
network_address::less up the profile, though not too aggressively.
 2020-01-29 14:39:56 +00:00
moneromooo-monero 39a343d76e
p2p: remove backward compatible peer list 2020-01-26 18:37:33 +00:00
moneromooo-monero 606318026e
p2p: simplify last_seen serialization now we have optional stores 2020-01-26 18:37:32 +00:00
moneromooo-monero 9467b2e44c
cryptonote_protocol: omit top 64 bits of difficulty when 0 2020-01-26 18:37:31 +00:00
moneromooo-monero 5f98b46d58
p2p: remove obsolete local time from TIMED_SYNC 2020-01-26 18:37:26 +00:00
Alexander Blair 8eedc8a390
Merge pull request #6140 
08635a08 blockchain: speedup fetching pruned contiguous tx blobs (moneromooo-monero)
 2020-01-25 16:55:18 -08:00
Alexander Blair 40f82b35ae
Merge pull request #6170 
56a4469e network: log traffic and add a simple traffic analysis script (moneromooo-monero)
 2020-01-25 16:54:24 -08:00
moneromooo-monero 56a4469ef3
network: log traffic and add a simple traffic analysis script 2020-01-26 00:33:41 +00:00
moneromooo-monero dd8c6b1703
wallet: do not split integrated addresses in address book api 2020-01-26 00:03:53 +00:00
xiphon dab604e010 wallet2_api: implement estimateTransactionFee 2020-01-25 05:34:51 +00:00
Alexander Blair 59e7d5686b
Merge pull request #6093 
2e58eb5c lmdb: Remove meaningless const qualifier on function type (Nathan Dorfman)
 2020-01-24 20:24:44 -08:00
Alexander Blair e8f94e7f1d
Merge pull request #6173 
8231c7cd rpc: fix bootstrap RPC payment RPC being made in raw JSON, not JSON RPC (moneromooo-monero)
81c26589 rpc: don't auto fail RPC needing payment in bootstrap mode (moneromooo-monero)
 2020-01-24 20:19:41 -08:00
Alexander Blair 93d49c1a54
Merge pull request #6172 
d7cf8727 rpc: add received_timestamp for pool txes in gettransactions (moneromooo-monero)
 2020-01-24 20:17:39 -08:00
Alexander Blair e51ce477db
Merge pull request #6157 
402dd207 db_lmdb: guard against non NUL terminated keys (moneromooo-monero)
 2020-01-24 20:07:37 -08:00
Alexander Blair 159c78758a
Merge pull request #6154 
3b419333 wallet: don't issue node rpc proxy requests in '--offline' mode (xiphon)
 2020-01-24 20:07:01 -08:00
Alexander Blair f20a962774
Merge pull request #6153 
24adee4a p2p: don't request flags after closing connection (moneromooo-monero)
 2020-01-24 20:06:46 -08:00
Alexander Blair d1b08c00cf
Merge pull request #6146 
70c9cd3c Change to Tx diffusion (Dandelion++ fluff) instead of flooding (Lee Clagett)
 2020-01-24 20:06:34 -08:00
Alexander Blair 5558919e56
Merge pull request #6128 
9fe8a76c perf_timer: fix pause/resume macros dereferencing too much (moneromooo-monero)
 2020-01-24 20:06:12 -08:00
moneromooo-monero 2e9d1e6e1f
wallet2: fix store-tx-info loading 
The backward compatibility code was always setting it to 1
in modern wallets since store_tx_keys was not present and thus
assumed to be 1 by default.

Reported by SeventhAlpaca
 2020-01-24 16:34:07 +00:00
Aaron Hook d0641b42fe net: fix incorrect less operator for top/i2p addresses 2020-01-18 19:18:56 -08:00
cohcho fe92fa1391 [randomx] Add missing randomx_vm_set_cache() 2020-01-17 19:25:26 +00:00
Alexander Blair beb815a81d
Merge pull request #6144 
0e0351c4 wallet_rpc_server: add count parameter to create_address (Matt Smith)
 2020-01-16 17:51:25 -08:00
Alexander Blair c39ea485a0
Merge pull request #6141 
b9b5c473 threadpool: use std::move when taking an element off the queue (moneromooo-monero)
 2020-01-16 17:45:44 -08:00
Alexander Blair 2ce5529680
Merge pull request #6134 
a7a40e28 Actually concatenate error strings. (Bert Peters)
 2020-01-16 17:42:27 -08:00
Alexander Blair f1ca98a7ef
Merge pull request #6133 
b2ad757f Replace memset with memwipe. (Bert Peters)
 2020-01-16 17:41:35 -08:00
Alexander Blair e4e70b57ca
Merge pull request #6130 
6dec0013 simplewallet: fix restore height warning (selsta)
 2020-01-16 17:39:03 -08:00
Alexander Blair c4abfbfbe7
Merge pull request #6124 
21d4c216 blockchain: error out if the builtin hashes data size is wrong (moneromooo-monero)
 2020-01-16 17:31:35 -08:00
Alexander Blair c6f4113265
Merge pull request #6119 
6f45cfa5 p2p: zero last seen timestamp when inserting a new peer (moneromooo-monero)
 2020-01-16 17:29:27 -08:00
Alexander Blair 3acb22b889
Merge pull request #6115 
27522aaa core_tests: reset thread pool between tests (moneromooo-monero)
 2020-01-16 17:27:15 -08:00
moneromooo-monero 50e59cfada
wallet2: reject zero keys in json input 
Because the user might do this for reasons unknown.
Values beyond l-1 will be reduced, so are accepted.

Reported by who-biz.
 2020-01-16 19:58:21 +00:00
xiphon ffe7165ebf wallet: reroll fake outs selection on local tx_sanity_check failure 2020-01-14 22:56:23 +00:00
Alexander Blair e49a055e89
Merge pull request #6112 
7c1d31b0 build: fix IOS, build blockchain_db and rpc, skip wallet_rpc_server (xiphon)
 2020-01-11 18:10:44 -08:00
Alexander Blair d024695772
Merge pull request #6105 
0de8a0d3 wallet_rpc_server: new estimate_tx_size_and_weight RPC (moneromooo-monero)
 2020-01-11 18:04:49 -08:00
Tadeas Moravec 096a9dbdf9
Wallet: Distingush amounts for a single subaddress 
Adding a new `amounts` field ot the output of `get_transfers` RPC
method. This field specifies individual payments made to a single
subaddress in a single transaction, e.g., made by this command:

    transfer <addr1> <amount1> <addr1> <amount2>
 2020-01-11 11:48:27 +01:00
rbrunner7 664720747f Daemon: Guard against reporting "synchronized" too early 
The added condition "hshd.current_height >= target" guards against
reporting "synchronized" too early in the special situation that the
very first peer sending us data is synced to a lower height than
ourselves.
 2020-01-10 15:49:49 +01:00
moneromooo-monero 0349347e6d
ringdb: use a different iv for key and data in rings table 
This is technically a record encrypted in two pieces,
so the iv needs to be different.
Some backward compatibility is added to read data written
by existing code, but new data is written with the new code.
 2020-01-09 17:32:21 +00:00
moneromooo-monero 7b88208722
simplewallet: reword mixin in user message in terms of ring size 2020-01-09 17:32:21 +00:00
moneromooo-monero f507a43a23
wallet2: do not remove known rings when a tx fails 
Even if it fails, the ring composition is known to a potential
adversary, and so we should reuse the same ring next time
 2020-01-09 17:32:21 +00:00
UkoeHB 02224e714d Fix check_fee() discrepancy. 
M100 = max{300kb, min{100block_median, m_long_term_effective_median_block_weight}}
not
M100 = max{300kb, m_long_term_effective_median_block_weight}

Fix base reward in get_dynamic_base_fee_estimate().

get_dynamic_base_fee_estimate() should match check_fee()

Fee is calculated based on block reward, and the reward penalty takes into account 0.5*max_block_weight (both before and after HF_VERSION_EFFECTIVE_SHORT_TERM_MEDIAN_IN_PENALTY).

Moved median calculation according to best practice of 'keep definitions close to where they are used'.
 2020-01-09 09:11:09 -06:00
moneromooo-monero a84131cea3
p2p: fix off by one adding fallback peers 
The code would ignore the first one to be added
 2020-01-07 14:40:26 +00:00
moneromooo-monero 36bdf40288
p2p: fix adding wrong indices to the filtered peer list 2020-01-03 17:56:54 +00:00
moneromooo-monero d64e5aa719
wallet: allow message sign/verify for subaddresses 2019-12-31 08:44:36 +00:00
moneromooo-monero a6c24412e5
wallet: fix exceptions getting the hash of a pruned tx 2019-12-30 15:14:57 +00:00
moneromooo-monero 6933693179
rpc: fill miner_tx_hash again 
It was removed to save duplicated generation time, but it can
be copied from another instance instead
 2019-12-20 14:16:31 +00:00
moneromooo-monero 21c3d42eb9
p2p: drop the peerlist dump to TRACE 
It's spammy
 2019-12-17 20:27:04 +00:00
moneromooo-monero f717d5936c
wallet2: guard against race with multiple decrypt_keys users 
If more than one thread wants to make sure of the spend secret key,
then we decrypt on the first caller and reencrypt on the last caller,
otherwise we could use an invalid secret key.
 2019-12-17 01:38:29 +00:00
moneromooo-monero 716012ca3a
rpc: drop the obsolete and wrong "unpruned size" log 
Since we now get pruned data in the first place, the "unpruned" data
size will in fact be the pruned data size, leading to confusion
 2019-12-16 14:50:07 +00:00
stoffu ae84ec90c8
wallet-cli/rpc: allow sweep_all to use outputs in all subaddresses within an account 2019-12-16 21:10:11 +09:00
palomato bc6d8aa343
Corrected message typo 
Message was "peer claims higher version that we think"
Requested change "peer claims higher version than we think"
 2019-12-14 13:06:09 -05:00
moneromooo-monero 5cbb17b946
wallet2: fix hang in wallet refresh 
If the hashes received would move the current blockchain past the
stop point, the short history would not be updated, since we do
not expect another loop, but the daemon might return earlier hashes,
causing the end index to not be enough to reach the threshold and
this require another loop, which will download the same hashes and
cause an infinite loop.
 2019-12-14 16:24:04 +00:00
moneromooo-monero 8a276451b2
blockchain: fix flushing txes from the txpool 2019-12-14 02:13:39 +00:00
luigi1111 b4e1dc83d2
Merge pull request #6057 
3b8dcc2 wallet2: make keys unlocker reentrant (moneromooo-monero)
 2019-12-12 13:49:58 -06:00
luigi1111 e5cc6d39a9
Merge pull request #6055 
886ed25 blockchain: fix comment wrongly refering to SHA-3 rather than Keccak (moneromooo-monero)
 2019-12-12 13:47:04 -06:00
luigi1111 ccde60838b
Merge pull request #6054 
017f816 daemon: handle printing higher hash rates (moneromooo-monero)
 2019-12-12 13:45:50 -06:00
luigi1111 fb64463c4c
Merge pull request #6052 
c96b7ee tx_pool: fix error message assuming incorrectly (moneromooo-monero)
 2019-12-12 13:44:50 -06:00
luigi1111 e629db18f4
Merge pull request #6049 
45fd72b Updated paper references (SarangNoether)
277003f Minor prover simplification (SarangNoether)
 2019-12-12 13:43:57 -06:00