riceball/townforge
1
0
Fork 0
forked from townforge/townforge
Code Issues Pull Requests Projects Releases Wiki Activity
11,150 Commits 10 Branches 0 Tags 343 MiB
cc-mm
Commit Graph

1440 Commits

Author SHA1 Message Date
luigi1111
228af683a7
Merge pull request #6403 
5de2295 Correct key image check in tx_pool (vtnerd)
 2020-04-10 16:10:33 -05:00
Crypto City
3c2b07fd15 game: display actual badge counts in badge leaderboard 2020-04-10 01:51:27 +00:00
Crypto City
a0b6a6e8aa add a dice roll command, for use in story/roleplaying 2020-04-10 01:51:27 +00:00
Crypto City
9153c6f110 Add editable player profile 2020-04-08 11:04:01 +00:00
Crypto City
287fd9cfd1 Add player attributes for storytelling/role playing purposes 2020-04-08 00:15:51 +00:00
moneromooo-monero
7326b691d3
functional_tests: ensure signatures never reuse a timestamp 2020-04-06 16:11:36 +00:00
moneromooo-monero
082dd2c373
functional_tests: ensure signed timestamps are fresh 
This fixes a test failure now that timestamps are more constrained
 2020-04-06 14:06:36 +00:00
Crypto City
3891353d7e add a new command to destroy owned items 2020-04-04 23:41:15 +00: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
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
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
bf70696a85
Merge pull request #6346 
dbfa4f8 unit_tests: fix missing test names (xiphon)
 2020-04-04 12:50:17 -05:00
luigi1111
c4f75fe898
Merge pull request #6339 
c61abf8 remove empty statements (shopglobal)
 2020-04-04 12:47:31 -05:00
luigi1111
292e2d8f28
Merge pull request #6335 
0078ce7 wipeable_string: split - treat CR, LF and Tabs as separators (xiphon)
 2020-04-04 12:42:50 -05:00
luigi1111
0bd2c14bbb
Merge pull request #6309 
e69acff functional_tests: update cookie at 10 seconds interval (moneromooo-monero)
f5a11f0 functional_tests: speed up signature generation (moneromooo-monero)
 2020-04-04 12:35:02 -05:00
Crypto City
8f794a4a1e add temperature and building heating requirements 2020-04-03 15:43:36 +00:00
Crypto City
d7fa5676fe cc: special events now have a min duration 2020-04-03 15:43:35 +00:00
Crypto City
b3c3647cb9 add food consumption 2020-04-03 15:43:35 +00:00
Crypto City
91465c097b Rename default town/mayor names and expenses to game 2020-04-03 15:43:35 +00:00
Crypto City
beceb3ce79 cc: bump agricultural building min size requirements 2020-04-03 15:43:35 +00:00
Crypto City
a5d2eb2138 store badge award height 2020-04-03 15:43:35 +00: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
6d6af701ec cryptonote_basic: drop unused verification_context::m_not_rct field 2020-03-31 21:58:25 +00: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
Lee Clagett
f9441c5759 Fixed string_ref usage bug in epee::from_hex::vector 2020-03-30 16:53:34 +00:00
Lee Clagett
0c29e17581 Fix network unit tests after epee changes 2020-03-28 13:30:22 -04: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
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
f5a11f05fe
functional_tests: speed up signature generation 
Executing a new binary for each signature can get really slow
 2020-03-26 11:33:58 +00:00
moneromooo-monero
e69acffdc8
functional_tests: update cookie at 10 seconds interval 
Otherwise the daemon will start rejecting
 2020-03-26 11:33:55 +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
Crypto City
5c198dd7d6 allow resizing flags (when empty) 2020-03-21 16:21:35 +00:00
Aaron Hook
aa93e38862 p2p: remove old debug commands 2020-03-20 22:09:44 -07:00
Crypto City
39163c168a Event badges can now be awarded after creation 2020-03-20 19:27:51 +00:00
Crypto City
bdb53f11b6 blockchain_db: remove buggy and unused set_cc_account_name 2020-03-20 19:27:51 +00:00
Crypto City
2882f6bc80 badges 2020-03-20 19:27:51 +00:00
Crypto City
0d413cf164 merge cc_account data into a structure 2020-03-20 19:27:51 +00:00
Crypto City
8d3fbb1727 Add ignore machinery 2020-03-20 19:27:51 +00:00
Crypto City
a6b8da5f0e add player defined custom items 2020-03-20 19:27:51 +00:00
Lee Clagett
5de2295f3c Correct key image check in tx_pool 2020-03-14 19:17:15 +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
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
Lee Clagett
e719760253 Fix receive order leakage with tx fluffing 2020-03-10 22:30:07 -04:00
Lee Clagett
5fcc23ae0a Move hex->bin conversion to monero copyright files and with less includes 2020-03-09 05:23:59 +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
Alexander Blair
ff8a60b61c
Merge pull request #6061 
f1091c41 core_tests: remove some useless verbose logs (moneromooo-monero)
 2020-02-28 19:57:13 -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
944e8a4542
Merge pull request #6220 
a9bdc6e4 Improved performance for epee serialization: (Lee Clagett)
 2020-02-28 19:45:31 -08:00
Alexander Blair
e7997cd62a
Merge pull request #6202 
02b80513 unit_tests: remove invalid bulletproofs unit test (moneromooo-monero)
 2020-02-28 19:33:21 -08:00
Crypto City
10f48689f8 propagating fire special event 2020-02-28 19:37:11 +00:00
xiphon
42a7a4dd32 daemon: auto public nodes - cache and prioritize most stable nodes 2020-02-28 08:06:43 +00:00
Crypto City
6c5570b814 special events 2020-02-23 01:31:27 +00:00
Crypto City
e8e5e63996 repairing now uses materials too 2020-02-22 14:17:21 +00:00
Crypto City
30e260511f unit_tests: add a test for quadtree intersection 2020-02-22 14:17:21 +00:00
Crypto City
52da390658 add town levels (aesthetic only for now) and use weighted shares for subsidy 2020-02-22 14:17:21 +00:00
Crypto City
23c67f33c2 core_tests: fix overlapping land test 2020-02-22 14:17:21 +00:00
Crypto City
6d4f2a20bc cc: make additional cities scale on 2^n, not 10^n 2020-02-22 14:17:21 +00:00
Crypto City
be7b3bee4a cc: slash last resort price by 5 2020-02-22 14:17:21 +00:00
Crypto City
11c5ca898b We can now remove materials already on the blockchain 2020-02-22 14:17:21 +00:00
Crypto City
13040bf4f4 cc: bump min buy size a bit 2020-02-22 14:17:20 +00:00
xiphon
dbfa4f84ee unit_tests: fix missing test names 2020-02-18 23:56:21 +00:00
Interchained
c61abf87c0 remove empty statements 
Cleaning up a little around the code base.
 2020-02-17 11:55:15 -05:00
Crypto City
c9752a0b3d some s/monero/townforge/ where appropriate 2020-02-14 13:19:03 +00:00
xiphon
0078ce7fac wipeable_string: split - treat CR, LF and Tabs as separators 2020-02-12 21:16:07 +00:00
Crypto City
fb8b3af6fd game: merge faces into larger rectangles for performance 2020-02-11 18:17:16 +00:00
Crypto City
5be5fc483e functional_tests: add a bit more info to get_state 2020-02-09 15:41:07 +00:00
Crypto City
5f42d3641a automatic match commands 2020-02-09 15:41:07 +00: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
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
Crypto City
a4ea6a7767 ensure generator production does not overflow 2020-01-29 18:44:17 +00:00
Crypto City
aad82022a3 cc: give new towns only the town square 2020-01-28 21:08:20 +00:00
Crypto City
656d583919 cc: some more resources tweaks 2020-01-28 21:08:20 +00:00
Crypto City
456441f34f functional_tests: speed up signature generation 
Executing a new binary for each signature can get really slow
 2020-01-28 15:05:21 +00:00
Crypto City
73877dcb74 functional_tests: update cookie at 10 seconds interval 
Otherwise the daemon will start rejecting
 2020-01-28 15:05:21 +00:00
Crypto City
4183745da4 add price limit for accrual trades 2020-01-28 15:05:21 +00:00
Crypto City
7c1ea29fac cc: tweak workforce building 2020-01-28 15:05:21 +00:00
Crypto City
86448078f5 cc: basic residential does not need commercial influence anymore 
make it just a bonus
 2020-01-28 15:05:21 +00:00
moneromooo-monero
b595583f3d
serialization: do not write optional fields with default value 2020-01-26 18:37:30 +00: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
Crypto City
5a4d63f5f1 cc: new match command, matches trades without trading itself 
This will be useful for trade ussing accrual
 2020-01-25 22:18:04 +00:00
Alexander Blair
066c327f73
Merge pull request #6300 
6f330865 fix tests bug added in #6110 (Dusan Klinec)
 2020-01-24 20:23:24 -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
Crypto City
fb9e5297e8 auto updating trade prices 
A trade order can be set to update its price every game update,
allowing auctions of sorts
 2020-01-24 15:49:34 +00:00
Crypto City
df17dcdcda name binaries and relevant files townforge* 2020-01-24 15:49:34 +00:00
Crypto City
f8fddabe81 add a give (items) command 2020-01-24 15:49:34 +00:00
Crypto City
c82864acfc New cities can now be created, price goes down with world size 2020-01-24 15:49:34 +00:00
Dusan Klinec
6f330865e5
fix tests bug added in #6110 
- e.g., fixes gen_block_big_major_version test, error: generation failed: what=events not set, cannot compute valid RandomX PoW
- ask for events only if difficulty > 1 (when it really matters)
- throwing an exception changed to logging, so it is easy to spot a problem if tests start to fail.
 2020-01-19 17:21:04 +01:00
Aaron Hook
d0641b42fe net: fix incorrect less operator for top/i2p addresses 2020-01-18 19:18:56 -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
Alexander Blair
50c2fda496
Merge pull request #6110 
da6c807f tests: fix HF12 chaingen - construct bc object from events (Dusan Klinec)
 2020-01-11 18:08:20 -08:00
Crypto City
302aade6cb cc: tweak requirements/cost/production 
Scale all requirements up by 8 times, so small flags have enough
blocks to build something. Larger ones will have too many, but
we don't care since they don't have to use a minimum anymore.
Tweak sawmill/stonecutter so they still get some profit with
those new numbers
 2020-01-08 00:07:02 +00:00
Crypto City
feb843c742 rpc: change items from uint32_t[NUM_ITEMS] to std::vector<{uint32_t, uint32_t}> 2020-01-06 21:40:39 +00:00
Crypto City
9fa1ee81ef functional_tests: add a name to some building settings commands 2020-01-04 13:51:23 +00:00
Crypto City
9e77f9e526 functional_tests: more complex revert tests 2020-01-03 20:33:02 +00:00
Crypto City
559c5f7b2e fix issues with game update event cache and tests 2020-01-03 16:27:51 +00:00
Crypto City
c13754532c Remove the unused "commit" version of game update creation 2020-01-01 16:33:15 +00:00
Crypto City
7e4fe631d5 allow large game update commands 2020-01-01 15:14:16 +00:00
Crypto City
18696fe6a1 include construction height in flag trade commands 
This prevents someone from demolishing their building and selling
the now empty land to a waiting buyer
 2019-12-31 11:16:38 +00:00
moneromooo-monero
d64e5aa719
wallet: allow message sign/verify for subaddresses 2019-12-31 08:44:36 +00:00
Crypto City
2e136c18c4 replace more arrays of NUM_ITEMS by a std::map 2019-12-28 16:33:17 +00:00
Crypto City
bdbc367c8e keep track of building age 2019-12-28 16:33:17 +00:00
Crypto City
c5583c224f more research tweaking 2019-12-27 17:37:46 +00:00
Crypto City
0d0ac253b9 make budget count against research difficulty decrease instead 2019-12-27 13:52:38 +00:00
Crypto City
eca8f78ea2 tests fix 2019-12-27 01:51:08 +00:00
Crypto City
dbfac813e3 add some research/discoveries tests 2019-12-27 01:51:08 +00:00
Crypto City
bcb5f8e885 unit_tests: fix buy_land test after land cost change 2019-12-26 18:43:19 +00:00
Crypto City
54c462ed22 change item balances from uint32_t[NUM_ITEMS] to std::map<uint32, uint32> 
We have a lot more item space now, and a lot of it is sparse
 2019-12-26 16:23:16 +00:00
Crypto City
3fba4e24a1 unit_tests: fix tests after production changes 
also a bug in the test code
 2019-12-26 01:59:56 +00:00
Crypto City
4fc5db3f78 small research fixes and factor some code 2019-12-25 23:19:02 +00:00
Crypto City
86a1517139 Discoveries and research 2019-12-25 20:36:51 +00:00
Crypto City
513b4564b8 tests: fix after recent changes 2019-12-21 17:57:20 +00:00
Crypto City
ab39221a5e Add minimum sizes for certain roles/economic power combinations 2019-12-21 17:56:58 +00:00
Crypto City
46ff4e2d31 cc: fix min/max trade expiration to match block target change 2019-12-21 17:56:58 +00:00
Crypto City
51d6704a08 cc: connection_squares now also returns direction 
of the first building compared to the second building
 2019-12-21 17:56:58 +00:00
Crypto City
b9146035de cc: add adjecent squares calc 
I'm sure it'll come handy soon
 2019-12-21 17:56:58 +00:00
Crypto City
269328d4f1 core_tests: set CC_FAST_POW by default 2019-12-17 13:56:16 +00:00
Crypto City
2cc1144b19 cc: slowly increase land tax with distance from the town center 2019-12-17 13:56:16 +00:00
Crypto City
7eeaa75acd cc: disable BUILD_RATIO_ACTIVE_THRESHOLD_PERCENT 
It seemed like a good idea to push people to build, but it
might instead push people to build anything quick even if
they don't have a nice idea yet
 2019-12-17 13:56:15 +00:00
Crypto City
2fa0400d72 Fixups after monero rebase, and fix tests after other recent changes 2019-12-14 16:40:46 +00:00
Crypto City
87b2d3e165 we can now build below existing blocks 2019-12-13 01:33:06 +00:00
Crypto City
5cc149c89f tests: fix tests after recent emission changes 2019-12-13 01:33:06 +00:00
Crypto City
20d7fdb5a3 unit_tests: fix tests after recent emission changes 2019-12-13 01:33:06 +00:00
Crypto City
11cf7f532b new demolish command 
Recovers 20% of the flag budget, and the flag may now be reused
for another building role
 2019-12-13 01:33:06 +00:00
Crypto City
349ddcb8b2 change emission parameters 
1 minute target
raise tail emission
decrease the number of decimals to 8
4 game updates per day
 2019-12-13 01:32:49 +00:00
Crypto City
b185d9127a cc: some more tweaking 2019-12-13 01:32:49 +00:00
Crypto City
d54f907d43 add game subsidy 2019-12-13 01:32:49 +00:00
Crypto City
2041f2e4f0 rework production/requirements some 
Will need more
 2019-12-13 01:31:56 +00:00
moneromooo-monero
618338363a 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
 2019-12-13 01:31:56 +00:00
Crypto City
80d2269217 player names are now unique and format restricted 2019-12-13 01:31:25 +00:00
Crypto City
84f16018d8 wallet_rpc_server: add cc_rename_flag wallet RPC 2019-12-13 01:31:25 +00:00
Crypto City
9770001686 Cities can now have a name 2019-12-13 01:31:25 +00:00
Crypto City
d7063d99d8 flags (with a building) can now be named and renamed 2019-12-13 01:31:25 +00:00
Crypto City
761d212b53 cc: save events to the db 
This makes them retrievable from a snapshot, after a restart,
and after a reorg that crosses a game update
 2019-12-13 01:31:25 +00:00
Crypto City
b89e696a80 flag 0 is now invalid 
makes it possible to have a "no flag applies" semantic
 2019-12-13 01:31:25 +00:00
Crypto City
8f613351ec daemon: print cc command type in print_pool_sh 2019-12-13 01:31:25 +00:00
Crypto City
3e41959825 players can now select a name when creating an account 2019-12-13 01:31:25 +00:00
moneromooo-monero
fe48fe2790 core_tests: reset thread pool between tests 
Avoids a DB error (leading to an assert) where a thread uses
a read txn previously created with an environment that was
since closed and reopened. While this usually works since
BlockchainLMDB renews txns if it detects the environment has
changed, this will not work if objects end up being allocated
at the same address as the previous instance, leading to stale
data usage.

Thanks hyc for the LMDB debugging.
 2019-12-13 01:31:04 +00:00
Crypto City
be0ebbe148 fix fresh clone build 2019-12-13 01:31:04 +00:00
Crypto City
6b7bb1493b cc: repair command now takes a delta repair 
rather than a from/to pair, which avoids it getting invalid if
a game update occurs before it gets mined
 2019-12-13 01:31:04 +00:00
Crypto City
c9616f7f83 better error reporting when submitting invalid commands 2019-12-13 01:31:04 +00:00
Crypto City
6d1c0dfcf8 unit_tests: test get_cc_influence does not overflow 2019-12-13 01:30:29 +00:00
Crypto City
b2a77a2b39 cc: building settings costs more labour with distance to generators 2019-12-13 01:30:29 +00:00
Crypto City
b2ce755525 cc: fix get_distance, and add unit tests 2019-12-13 01:30:28 +00:00
Crypto City
c42899adc9 unit_tests: fix missing parameter in flag_t ctor 2019-12-13 01:30:28 +00:00
Crypto City
6386184aa6 functional_tests: check popping all blocks restores initial state 2019-12-13 01:28:54 +00:00