Commit Graph

12267 Commits

Author SHA1 Message Date
luigi1111
94b056c06e
Merge pull request #6786
975ae22 Fix send scalar z in plaintext (grydz)
333ae55 Update minimal Ledger Monero app version (grydz)
0a3c5a6 Update protocol version with Ledger's HW (grydz)
2020-08-31 16:54:51 -05:00
luigi1111
54d5f098f2
Merge pull request #6783
30c1cf8 repo: update 'sponsor' link (selsta)
2020-08-31 16:52:53 -05:00
luigi1111
a70374d3e6
Merge pull request #6782
c3f9913 supercop: update submodule (selsta)
2020-08-31 16:51:44 -05:00
luigi1111
a51ccc036f
Merge pull request #6770
bdc6b10 Fix ZMQ pruned bulletproof transactions (vtnerd)
2020-08-31 16:50:18 -05:00
luigi1111
61dd04b681
Merge pull request #6600
fa06c39 Bind signature to full address and signing mode (SarangNoether)
743608e wallet: allow signing a message with spend or view key (moneromooo-monero)
2020-08-31 16:49:03 -05:00
Crypto City
d36c71da7b game: give details for controls configuration conflicts 2020-08-30 18:13:56 +00:00
Crypto City
a8d494074b coins can now be different gold content based on type 2020-08-30 18:13:56 +00:00
Crypto City
5324b5c838 wallet: add missing user_data parameter for custom items 2020-08-30 18:13:56 +00:00
Crypto City
ed0f32118c cc: create coins for new cities too 2020-08-30 18:13:56 +00:00
Crypto City
3ab0474475 bump version to 0.21.1.1 2020-08-30 18:13:56 +00:00
Crypto City
3326cbb327 game: fix crash when the config file does not exist 2020-08-30 18:13:56 +00:00
Crypto City
74a1baee9d bump version to 0.21.1.0 2020-08-30 17:31:54 +00:00
Crypto City
ddcd87d30c game: fix config file overwrite on startup 2020-08-30 16:21:48 +00:00
Crypto City
5538c8bfc8 game: fix issues with missing and/or duplicated markers 2020-08-30 16:21:48 +00:00
Crypto City
e80e869925 game: do not draw markers beyond visible terrain
This avoids looking weird and querying terrain heights on further
away tiles, leading to terrain tile cache thrashing
2020-08-30 16:21:48 +00:00
Crypto City
ce99289b4c game: fix crash on resizing the windows 2020-08-30 16:21:48 +00:00
Crypto City
19e8569570 game: switch mouse to wrap mode in "B" build mode 2020-08-30 16:21:48 +00:00
Crypto City
9191cfe566 tx_pool: fix dupes in the "sorted by fee" container 2020-08-30 16:21:48 +00:00
Crypto City
3573c2dd98 tx_pool: fix "double draw" causing txes being rejected 2020-08-30 16:21:48 +00:00
Crypto City
30e3940435 cc: catch allocation errors in terrain generation 2020-08-30 16:21:48 +00:00
xiphon
bdcf587c79 net: fix get_tcp_endpoint, boost address_v4 ip in host byte order 2020-08-29 18:07:46 +00:00
Matt Smith
12a78e5e74
cmake: Use job pool feature to limit concurrent jobs
Add two new options, MONERO_PARALLEL_COMPILE_JOBS and
MONERO_PARALLEL_LINK_JOBS to try and prevent running out of memory when
building everything.

Requires >= cmake 3.0.0, and the use of the Ninja generator.

Useful links:

* https://cmake.org/cmake/help/latest/prop_gbl/JOB_POOLS.html
* https://reviews.llvm.org/D6304
2020-08-29 16:34:42 +01:00
Crypto City
bf25565942 Revert "game: do not print success message even when a tx failed"
This reverts commit f435f7d481.
2020-08-29 14:02:13 +00:00
Crypto City
b3e2dbd1b5 remove -H left in by mistake 2020-08-29 13:22:22 +00:00
Crypto City
f435f7d481 game: do not print success message even when a tx failed 2020-08-29 12:17:11 +00:00
Crypto City
d3cbb7d6cc game: fix terrain rendering mode switch 2020-08-29 12:17:11 +00:00
Crypto City
40d58c0c9d add dependencies where appropriate to make -jN work 2020-08-29 12:17:11 +00:00
Crypto City
3266ffdb3e cmake: fix first build breaking on zlib 2020-08-29 12:17:11 +00:00
Crypto City
9126e89754 manual: update unlock level for military and affluent residential 2020-08-29 12:17:11 +00:00
Sarang Noether
fa06c39d97 Bind signature to full address and signing mode 2020-08-28 19:38:00 -04:00
moneromooo-monero
743608ec16 wallet: allow signing a message with spend or view key 2020-08-28 19:25:17 -04:00
luigi1111
5946002105
Merge pull request #6787
e6c81c5 ringct: fix CLSAG serialization after boost/epee changes (moneromooo-monero)
2020-08-28 18:08:03 -05:00
luigi1111
51bf6b5842
Merge pull request #6785
4a9bd8f core_tests: remove hardcoded hf version (monermooo-monero)
1dc427d core_tests: fix failures after v13 (moneromooo-monero)
2020-08-28 18:06:23 -05:00
Crypto City
933c4f2db1 tb: link against the freetype bundled with urho3d 2020-08-28 21:16:57 +00:00
cryptographicfool
5245ba132b
Made spelling, grammar, and punctuation changes. Squashed commits into one as requested.
Made some corrections as suggested.
2020-08-28 18:23:54 +00:00
moneromooo-monero
e6c81c5ea7
ringct: fix CLSAG serialization after boost/epee changes
also fix a an assert message refering t MLSAG
2020-08-28 11:52:54 +00:00
François Colas
975ae22211
Fix send scalar z in plaintext
The scalar z has not been generated on the HW thus it can't be sent
encrypted. The value is derived from the exported private view key.
2020-08-28 12:01:57 +02:00
François Colas
333ae55fef
Update minimal Ledger Monero app version 2020-08-28 12:00:25 +02:00
François Colas
0a3c5a605b
Update protocol version with Ledger's HW 2020-08-28 11:59:02 +02:00
moneromooo-monero
1dc427def9
core_tests: fix failures after v13
v13 enforces claiming the full block reward, so we need to keep
track of tx fees to add them to the coinbase
2020-08-28 00:18:39 +00:00
moneromooo-monero
4a9bd8f70f
core_tests: remove hardcoded hf version 2020-08-28 00:14:04 +00:00
Alexander Blair
44cd8a13ec
Merge pull request #6769
b641e0a2c Add clear method to byte_stream (Lee Clagett)
2020-08-27 12:05:16 -07:00
Alexander Blair
39a087406d
Merge pull request #6739
1660fe8a2 draft support of clsag (cslashm)
703944c4d CLSAG device support (Sarang Noether)
aff87b5f6 Added balance check to MLSAG/CLSAG performance tests (Sarang Noether)
f964a92c5 Updated MLSAG and CLSAG tests for consistency (Sarang Noether)
5aa1575e9 CLSAG verification performance test (Sarang Noether)
641b08c92 CLSAG optimizations (Sarang Noether)
82ee01699 Integrate CLSAGs into monero (moneromooo-monero)
8cd1d6df8 unit_tests: add ge_triple_scalarmult_base_vartime test (moneromooo-monero)
4b328c661 CLSAG signatures (Sarang Noether)
2020-08-27 12:03:24 -07:00
moneromooo-monero
d20ff4f648
functional_tests: add a large (many randomx epochs) p2p reorg test 2020-08-27 15:13:04 +00:00
moneromooo-monero
6a0b3b1f8a
functional_tests: add randomx tests 2020-08-27 15:13:03 +00:00
moneromooo-monero
9d42649d58
core: fix mining from a block that's not the current top 2020-08-27 15:13:00 +00:00
cslashm
1660fe8a25
draft support of clsag 2020-08-27 12:44:18 +00:00
Sarang Noether
703944c4d4 CLSAG device support 2020-08-27 12:44:04 +00:00
Sarang Noether
aff87b5f6a Added balance check to MLSAG/CLSAG performance tests 2020-08-27 12:44:04 +00:00
Sarang Noether
f964a92c57 Updated MLSAG and CLSAG tests for consistency 2020-08-27 12:44:04 +00:00