Commit Graph

1704 Commits

Author SHA1 Message Date
Alexander Blair
609dbe6b92
Merge pull request #7154
cf7e1571d protocol: reject claimed block hashes that already are in the chain (moneromooo-monero)
af0a25544 protocol: drop peers we can't download anything from in sync mode (moneromooo-monero)
2020-12-26 13:40:36 -08:00
Lee Clagett
927141bcc4 Command max_bytes moved from dynamic map to static switch 2020-12-22 20:54:16 +00:00
moneromooo-monero
b652d598d1
add a max levin packet size by command type 2021-01-03 14:07:45 +00:00
Alexander Blair
16c780d568
Merge pull request #7250
61b6e4cc6 Add aggressive restrictions to pre-handshake p2p buffer limit (Lee Clagett)
2021-01-01 22:35:59 -08:00
moneromooo-monero
0aa541b361
protocol: more sanity checks in new chain block hashes 2020-12-31 23:33:18 +00:00
Lee Clagett
187b4d7521 Restrict duplicate keys in epee binary format 2020-12-20 03:47:32 +00:00
moneromooo-monero
cf7e1571d3
protocol: reject claimed block hashes that already are in the chain 2020-12-17 02:54:02 +00:00
Lee Clagett
61b6e4cc67 Add aggressive restrictions to pre-handshake p2p buffer limit 2020-12-17 00:36:10 +00:00
Lee Clagett
4978f69d7a Fix byte_stream::put_n 2020-12-14 14:45:24 -05:00
moneromooo-monero
0660db3e7a
fuzz_tests: add a test for utf8canonical 2020-12-14 19:40:24 +00:00
Alexander Blair
28e5e42986
Merge pull request #7110
d660f22ed protocol: drop origin IP if a block fails to verify in sync mode (moneromooo-monero)
2020-12-10 17:41:59 -08:00
Alexander Blair
1e9483a2d5
Merge pull request #7009
7414e2bac Change epee binary output from std::stringstream to byte_stream (Lee Clagett)
2020-12-10 17:34:50 -08:00
Alexander Blair
6bddd54f9d
Merge pull request #7003
08eb0949f Change to more efficient allocation strategy in byte_stream (Lee Clagett)
2020-12-10 17:33:50 -08:00
moneromooo-monero
d660f22ed1
protocol: drop origin IP if a block fails to verify in sync mode
It would otherwise be possible for a peer to send bad blocks,
then disconnect and reconnect again, escaping bans
2020-12-10 21:59:18 +00:00
Crypto City
f62f0b0c6c cc: remove military bonus for production buildings 2020-12-07 11:53:00 +00:00
moneromooo-monero
5ed604fe5b
crypto: fix non zero scalar being 0 after reducing 2020-12-04 01:00:03 +00:00
Crypto City
f13cbdfd16 cc: decrease military influence and penalty 2020-12-03 18:56:38 +00:00
Crypto City
8599ef7f67 sort items before patents and gemstones 2020-12-01 12:54:08 +00:00
Crypto City
e4d77f0996 fix tests after building size balance changes 2020-11-30 16:45:16 +00:00
Crypto City
4810da6cd1 add a few more city specializations 2020-11-30 16:45:16 +00:00
Crypto City
0446bde62c allow mayors to select who gets styling on runestone messages 2020-11-30 16:45:16 +00:00
Crypto City
1c1e2827e4 functional_tests: default to fast city test 2020-11-29 23:38:03 +00:00
Crypto City
c50b571fa9 allow the game account to enable/disable scripts 2020-11-29 23:38:03 +00:00
Crypto City
171858da4c cc: balance changes 2020-11-29 23:38:02 +00:00
luigi1111
36d31ba0be
Merge pull request #7018
a9cd5d9 cryptonote_core: dandelion - use local height or median height if syncing (xiphon)
2020-11-29 01:58:13 -06:00
luigi1111
c041550ffa
Merge pull request #6973
be84f67 Switch to Dandelion++ fluff mode if no out connections for stem mode (Lee Clagett)
2020-11-29 01:54:43 -06:00
luigi1111
7a0334742a
Merge pull request #6937
8a282f6 Add RELINK_TARGETS, monero_add_target_no_relink and use monero_add_executable/monero_add_library where possible (mj-xmr) Add monero_add_minimal_executable and use in tests (mj-xmr)
2020-11-29 01:49:39 -06:00
luigi1111
450f1325ab
Merge pull request #6856
db70af1 Unit Tests: Remove block reward upper bound size checks (TheCharlatan)
2020-11-28 22:35:07 -06:00
Crypto City
e21f521283 functional_tests: fix occasional failure due to firewood burning 2020-11-26 19:48:41 +00:00
Crypto City
1d4273c31e add prestige ranking and bonus from subsidy
also fix a couple bugs in coin collection scoring
2020-11-26 19:48:41 +00:00
xiphon
a9cd5d914e cryptonote_core: dandelion - use local height or median height if syncing 2020-11-25 01:27:42 +00:00
Crypto City
accda4481e functional_tests: add test for the total amount of gold 2020-11-22 23:25:50 +00:00
Crypto City
cf6a626937 auction creation and bidding, auction flags on mortgage default 2020-11-22 23:25:50 +00:00
Crypto City
dd434d46d4 functional_tests: only mine past the coin minting window if necessary 2020-11-22 23:25:50 +00:00
Crypto City
4ba0fe2080 functional_tests: fix occasional discovery test failure 2020-11-22 23:25:50 +00:00
Crypto City
203ecd44d6 functional_tests: expand script test 2020-11-22 23:25:50 +00:00
Crypto City
fc43e99043 db_tests: new tests to test low level LMDB blockchain calls 2020-11-22 23:25:49 +00:00
Crypto City
182863edc9 blob deduplication for scripts 2020-11-22 23:25:49 +00:00
Crypto City
7bad65991c cc: every script state can now have actions 2020-11-22 23:25:49 +00:00
Crypto City
f6498b3f05 db_lmdb: set last service height to current height on construction 2020-11-22 23:25:49 +00:00
Crypto City
0898e11996 use CC_NO_EXTERNAL_DEPS on all urho3d/boost dependencies 2020-11-22 23:25:49 +00:00
Crypto City
80195fb627 functional_tests: fix functional tests 2020-11-22 23:25:49 +00:00
Crypto City
7ef0b0a422 fix off by one between command dry run and block verification 2020-11-22 23:25:49 +00:00
Crypto City
dde3bf4c4a functional_tests: fix typo in item count retrieval 2020-11-22 15:27:07 +00:00
Crypto City
04f467def6 runestones
Currently only a player written message
2020-11-22 15:27:07 +00:00
Crypto City
722fabc6d3 Higher economic powers now depend on civil engineering discoveries 2020-11-22 15:27:07 +00:00
Crypto City
402d9ce769 land can now be given 2020-11-22 15:27:06 +00:00
Crypto City
cb40955cc6 new custom language for scripts 2020-11-22 15:27:06 +00:00
Crypto City
933046c95d simpler large game update test 2020-11-22 15:27:06 +00:00
Crypto City
7b290450f4 functional_tests: give the discoveries test a bit more money 2020-11-22 15:27:06 +00:00
Howard Chu
91fd634768
Better log message for unusable anon networks 2020-11-16 12:36:37 +00:00
Crypto City
8687b9773f remove remnants of obsolete resource availability 2020-11-10 18:17:43 +00:00
Crypto City
fb04ef804c temperature now drops with altitude 2020-11-10 18:17:43 +00:00
Lee Clagett
be84f678b9 Switch to Dandelion++ fluff mode if no out connections for stem mode 2020-11-03 13:58:14 -05:00
Crypto City
25c78c4f5e functional_tests: more leeway for discovery tests 2020-11-01 18:59:15 +00:00
Crypto City
98d4ae7c2b land cost now costs more near the city center and far away
also fix overflows in land/tax cost
2020-11-01 17:34:31 +00:00
Crypto City
fa9a377279 add player script variables 2020-11-01 17:33:55 +00:00
Crypto City
86639dcd7d functional_tests: fix discoveries test after cost increase 2020-11-01 16:47:20 +00:00
mj-xmr
8a282f64c9 Add RELINK_TARGETS, monero_add_target_no_relink and use monero_add_executable/monero_add_library where possible (mj-xmr)
Add monero_add_minimal_executable and use in tests

This is done in order not to have to relink targets, when just an .so changed, but not its interface.
2020-10-28 20:08:26 +01:00
Crypto City
e349e5694e give higher level woods more heating power 2020-10-26 13:09:35 +00:00
Crypto City
08433773e1 cc: make bonuses/penalties size dependent on role 2020-10-26 13:09:35 +00:00
Crypto City
e40212a683 cc: make marble easier to get 2020-10-26 13:09:35 +00:00
Crypto City
f2808a6a39 more tile size optimization
Tiles are now stored as a single packed byte stream,
including in the game, and unpacked/repacked as necessary
2020-10-25 18:47:26 +00:00
selsta
e79c88e610
functional_tests: inrease mining timeout 2020-10-22 04:17:11 +02:00
Crypto City
34a4d2b618 fixes after monero merge 2020-10-19 12:17:51 +00:00
Crypto City
43b8112c1e Merge branch 'master' into cc 2020-10-18 00:33:51 +00:00
Crypto City
cb353a875d daemon: include nonce to txid map in print_pool 2020-10-17 23:30:31 +00:00
Crypto City
110e1d227e functional_tests: add an item count consistency check 2020-10-17 23:30:31 +00:00
Crypto City
da5d2a429a fix a few niggles with broken assert_exception in functional tests 2020-10-17 23:30:31 +00:00
Crypto City
c6fc32a423 functional_tests: fix typo testing balances and remove dead code 2020-10-17 23:30:30 +00:00
Crypto City
29fa6c7222 wood can now be chopped into firewood 2020-10-17 23:30:30 +00:00
Crypto City
7b51ad56bc WIP - mortgages 2020-10-17 23:29:26 +00:00
Crypto City
9b291c45b3 WIP - mortgages 2020-10-17 23:29:26 +00:00
Crypto City
f7bd04fc12 remove custom item amount field, it is now redundant
since we track supply for all items
2020-10-17 23:29:26 +00:00
Crypto City
9586a32958 WIP - mortgages 2020-10-17 23:29:26 +00:00
Crypto City
b033e75db0 add more user data space to custom items 2020-10-17 23:28:43 +00:00
Crypto City
5710bb74dd WIP - scripts 2020-10-17 23:28:43 +00:00
Lee Clagett
08eb0949f3 Change to more efficient allocation strategy in byte_stream 2020-10-13 15:10:54 +00:00
Lee Clagett
249eae5f4a Allow byte_stream->byte_slice conversion to shrink unused buffer space 2020-10-13 15:09:18 +00:00
xiphon
a12a8174e0 Dandelion++: skip desynced peers in stem phase 2020-10-12 13:44:06 +00:00
Lee Clagett
7414e2bac1 Change epee binary output from std::stringstream to byte_stream 2020-10-10 15:28:40 +00:00
Crypto City
cd61a1024b functional_tests: fix game update tests going out of labour 2020-10-07 00:54:17 +00:00
TheCharlatan
db70af1bbc
Unit Tests: Remove block reward upper bound size checks
Tests running after being compiled with `make debug-test` failed with
```
[  FAILED  ] block_reward_and_current_block_weight.fails_on_huge_median_size
[  FAILED  ] block_reward_and_current_block_weight.fails_on_huge_block_weight
```

With the introduction of the patch in
be82c40703 (diff-1a57d4e6013984c420da98d1adde0eafL113)
the assertions checking the weight of the median and current block
against a size limit were removed. Since the limit is now enforced by a
long divisor and a uint64_t type, checking in a separate test makes
little sense, so they are removed here.
2020-10-03 02:32:17 +02:00
Crypto City
bd20a169ec functional_tests: more city and game update tests 2020-09-29 12:14:10 +00:00
Crypto City
7d495bc49c core_test: fix core tests (not enough labour) 2020-09-28 21:09:07 +00:00
Crypto City
2ed24f1918 functional_tests: fix repairing from the wrong account in farming test 2020-09-28 21:09:07 +00:00
Crypto City
81ac18db00 rewrite city cost function 2020-09-28 21:09:07 +00:00
Crypto City
31e74fba63 tests: fix a few tests after recent changes 2020-09-28 21:09:07 +00:00
Alexander Blair
2e83628d02
Merge pull request #6840
6ee9f1260 fuzz_tests: fix build error in signature fuzz test (moneromooo-monero)
2020-09-27 16:16:54 -07:00
Crypto City
1aba8c4743 functional_tests: fix cc_repair arguments 2020-09-24 19:29:55 +00:00
Crypto City
029375c6dc unit_tests: fix influence tests from military after related changes 2020-09-24 19:29:55 +00:00
Crypto City
045c9a7c94 core_tests: fix nonce reuse core test 2020-09-24 19:29:55 +00:00
Crypto City
b7c431c15e remove cost from buy_land command 2020-09-24 19:29:55 +00:00
iamamyth
163f83720f
functional_tests: rewrite mining code, clearer timeout info 2020-09-24 20:04:05 +02:00
moneromooo-monero
6ee9f12607
fuzz_tests: fix build error in signature fuzz test 2020-09-24 15:17:57 +00:00
Crypto City
967ec1957a unit_tests: add another better test for harvest overflow 2020-09-17 02:30:44 +00:00
Crypto City
d8a3c29b67 cc: increase heating requirements a fair bit 2020-09-17 02:30:44 +00:00
Crypto City
21e095ab90 fix tests after price changes 2020-09-17 02:30:44 +00:00
Crypto City
a389011f3c add new plant breeding discoveries 2020-09-17 02:30:44 +00:00
Crypto City
fdd27879f1 add merge mining with monero 2020-09-17 02:30:43 +00:00
moneromooo-monero
f11531d046 add_aux_pow now adds aux hashes at fixed slots in the aux merkle tree
To protect against mining multiple blocks of a chain with only one PoW
2020-09-16 22:55:06 +00:00
moneromooo-monero
8cf2bb107e New add_aux_pow RPC to support merge mining 2020-09-13 22:16:07 +00:00
Crypto City
a3ce8f4290 cc: double last resort prices 2020-09-13 22:16:07 +00:00
luigi1111
fd657c7706
Merge pull request #6798
4e44306 enable CLSAG support for Trezor client (ph4r05)
2020-09-07 14:30:41 -05:00
Riccardo Spagni
aefa7740c3
Merge pull request #6111
d20ff4f64 functional_tests: add a large (many randomx epochs) p2p reorg test (moneromooo-monero)
6a0b3b1f8 functional_tests: add randomx tests (moneromooo-monero)
9d42649d5 core: fix mining from a block that's not the current top (moneromooo-monero)
2020-09-06 15:49:37 +02:00
Dusan Klinec
4e4430603f
enable CLSAG support for Trezor client 2020-09-04 01:24:58 +02:00
luigi1111
ee0b02d0db
Merge pull request #6757
6a37da8 threadpool: guard against exceptions in jobs, and armour plating (moneromooo-monero)
2020-09-03 12:25:59 -05:00
Crypto City
9c61486243 unit_tests: fix failure due to reading uninitialized city data 2020-09-02 23:07:03 +00:00
Crypto City
b648ed500a new resilient soil city specialization, fix nutrients recovery, add tests 2020-09-02 23:07:03 +00:00
Crypto City
c29d308510 cc: protect against integer overflow in intermediate calculations 2020-09-02 23:07:03 +00:00
Crypto City
3714a4e5b0 fix unbound unit tests link error 2020-09-02 23:07:03 +00:00
Crypto City
7a1ba041e8 tests: fix tests failures now that blockchain init queries cities 2020-09-02 23:07:03 +00:00
moneromooo-monero
6a37da837e
threadpool: guard against exceptions in jobs, and armour plating
Those would, if uncaught, exit run and leave the waiter to wait
indefinitely for the number of active jobs to reach 0
2020-09-01 14:33:33 +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
40d58c0c9d add dependencies where appropriate to make -jN work 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
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
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
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
Sarang Noether
5aa1575e91 CLSAG verification performance test 2020-08-27 12:44:04 +00:00
Sarang Noether
641b08c920 CLSAG optimizations 2020-08-27 12:44:04 +00:00
moneromooo-monero
82ee01699c
Integrate CLSAGs into monero
They are allowed from v12, and MLSAGs are rejected from v13.
2020-08-27 12:44:04 +00:00
moneromooo-monero
8cd1d6df8f
unit_tests: add ge_triple_scalarmult_base_vartime test 2020-08-27 12:44:01 +00:00
Sarang Noether
4b328c6616 CLSAG signatures 2020-08-27 12:43:29 +00:00
Alexander Blair
b04da25e4d
Merge pull request #6760
844fb4e94 enforce claiming maximum coinbase amount (moneromooo-monero)
2020-08-27 03:01:28 -07:00
Alexander Blair
bad5d8d6f0
Merge pull request #6690
7175dcb10 replace most boost serialization with existing monero serialization (moneromooo-monero)
2020-08-27 02:54:30 -07:00
Alexander Blair
3f392341e7
Merge pull request #6660
839e1f4ba functional_tests: add p2p functional tests (moneromooo-monero)
2020-08-27 02:53:41 -07:00
moneromooo-monero
839e1f4bab
functional_tests: add p2p functional tests
Tests tx/block propagation and reorgs
2020-08-26 23:00:27 +00:00
Crypto City
964612aed7 game: mac build fixes 2020-08-25 23:02:41 +00:00
Crypto City
16c084838f add yearly coins auto creation 2020-08-25 15:27:16 +00:00
Crypto City
3335f8d14f create collectible coins for player count and city levels 2020-08-25 15:27:16 +00:00
Crypto City
7aea6cbf93 add a daemon RPC to get new unused nonces 2020-08-25 13:20:15 +00:00
Crypto City
5b693a15b1 some material variants are now locked till a player level 2020-08-25 13:20:15 +00:00
Crypto City
61844a1f62 start the year a bit earlier so that we can farm right away 2020-08-25 13:20:15 +00:00
Crypto City
bb9bd2ce50 store command nonce in game events log
and store a nonce in all commands (except none) now
2020-08-25 13:20:14 +00:00
Crypto City
c688079acb commands can now be cancelled
if they're not mined yet, or only partially matched trades
2020-08-25 13:20:14 +00:00
Crypto City
dc2cc4b6d5 item groups can now optionally be public 2020-08-25 13:20:14 +00:00
Crypto City
61aa85ad3b add collectible coins 2020-08-21 18:33:02 +00:00
moneromooo-monero
844fb4e940
enforce claiming maximum coinbase amount
Claiming a slightly lesser amount does not yield the size gains
that were seen pre rct, so this closes a fingerprinting vector
2020-08-21 12:36:53 +00:00
Lee Clagett
b641e0a2c0 Add clear method to byte_stream 2020-08-17 21:30:34 -04:00
luigi1111
765db1ae7a
Revert "Use domain-separated ChaCha20 for in-memory key encryption"
This reverts commit 921dd8dde5.
2020-08-17 14:08:59 -05:00
moneromooo-monero
7175dcb107
replace most boost serialization with existing monero serialization
This reduces the attack surface for data that can come from
malicious sources (exported output and key images, multisig
transactions...) since the monero serialization is already
exposed to the outside, and the boost lib we were using had
a few known crashers.

For interoperability, a new load-deprecated-formats wallet
setting is added (off by default). This allows loading boost
format data if there is no alternative. It will likely go
at some point, along with the ability to load those.

Notably, the peer lists file still uses the boost serialization
code, as the data it stores is define in epee, while the new
serialization code is in monero, and migrating it was fairly
hairy. Since this file is local and not obtained from anyone
else, the marginal risk is minimal, but it could be migrated
later if needed.

Some tests and tools also do, this will stay as is for now.
2020-08-17 16:23:58 +00:00
Alexander Blair
10ad0d7eb2
Merge pull request #6718
85efc88c1 Fix overflow issue in epee:misc_utils::rolling_median_t and median(), with unit test (koe)
2020-08-16 12:53:50 -07:00
Alexander Blair
01b512f3a9
Merge pull request #6716
76c16822d wallet2_api: implement runtime proxy configuration (xiphon)
2020-08-16 12:52:21 -07:00