Syksy/townforge
1
0
Fork 0
forked from townforge/townforge
Code Pull Requests Activity
16,121 Commits 13 Branches 181 Tags 599 MiB
cc
Commit Graph

649 Commits

Author SHA1 Message Date
Crypto City
bc83bea848 reserve builtin names too 2023-04-10 21:43:18 +00:00
Crypto City
8b3b8b0107 functional_tests: add some more test for messages 2023-04-06 18:55:04 +00:00
Crypto City
6128c8d908 functional_tests: fix p2p tx propagation test 2023-04-06 18:55:04 +00:00
Crypto City
2c378941dd players can now have a title 
chosen among a set of predefined components
 2023-04-05 07:54:00 +00:00
Crypto City
58d1aa544f functional_tests: check city tagline 2023-04-01 08:48:33 +00:00
Crypto City
71ffbea68a divide time into epochs, for flavour 2023-03-29 10:38:35 +00:00
Crypto City
a2dee19052 functional_tests: fix daemon_info fork test with extra forks set up 2023-03-26 20:44:49 +00:00
Crypto City
27845701db cities can now have a tagline 
because it's cool
 2023-03-26 20:44:48 +00:00
Crypto City
5827d5cd66 functional_tests: fix cold signing test 2023-03-26 20:44:48 +00:00
Crypto City
906c33d735 functional_tests: fix off by one in name place size limits 2023-03-20 14:14:02 +00:00
Crypto City
36c765ca14 Fluorine Fermi 
-----BEGIN PGP SIGNATURE-----
 
 iQFJBAABCAAzFiEEh3erj3eO6JSHovjn9KygGDZB4BAFAmMzenIVHGx1aWdpMTEx
 MXdAZ21haWwuY29tAAoJEPSsoBg2QeAQCi4IAJvKvE7nJ51/ZK30IY5+y2ELq1uI
 tYw9w6E8XujX4lxWewsV5BywJrYTmj22gfhlnuf54ppqciMNOZj8r1jp6bQMLY8d
 vNZwowbH/CRdGeo4k2EGOJIdB1wQ2m2i5hvlOcmlGFL7nujo2m9AHnrqxcfTw0ns
 xfWRjTU5Z3srfs22J9KNEurSg11i7DatwCO79zBL+JRETVLpD8GV6eeSXGSwNVc7
 6vUB/z0OoOtSV6UVDkqL1d5op2siw9NLEihYKLbTqAAdWxAG7o82Ne/cw6Vyo0uy
 mKwoSxGUf9zMNXlQfpQpxVmriXNgfjQ89akTVq7niIB9jG1OU/v9Pvg4BxE=
 =k/nU
 -----END PGP SIGNATURE-----

Merge tag 'v0.18.1.2' into cc

Fluorine Fermi
 2023-03-19 06:38:11 +00:00
Crypto City
170b9ea17f bump min named place size and add tests for place size 2023-03-18 16:07:43 +00:00
Crypto City
d90dd23fd5 functional_tests: fix unicode mixup in account name test 2023-03-18 13:28:03 +00:00
Crypto City
4de6c653a1 tests: restore mistakenly disabled functional tests 2023-03-18 13:28:03 +00:00
j-berman
65e13dbef1 wallet2: fix rescanning tx via scan_tx 
- Detach & re-process txs >= lowest scan height
- ensures that if a user calls scan_tx(tx1) after scanning tx2,
the wallet correctly processes tx1 and tx2
- if a user provides a tx with a height higher than the wallet's
last scanned height, the wallet will scan starting from that tx's
height
- scan_tx requires trusted daemon iff need to re-process existing
txs: in addition to querying a daemon for txids, if a user
provides a txid of a tx with height *lower* than any *already*
scanned txs in the wallet, then the wallet will also query the
daemon for all the *higher* txs as well. This is likely
unexpected behavior to a caller, and so to protect a caller from
revealing txid's to an untrusted daemon in an unexpected way,
require the daemon be trusted.
 2023-03-13 12:57:43 -07:00
Crypto City
dbf58ec851 add odin's bounty - gold bonus based on randomly chosen named place 2023-02-16 19:21:19 +00:00
Crypto City
1af5d7b313 functional_tests: fix rare spurious failure from lack of wood 2023-02-16 14:18:40 +00:00
Crypto City
c4a776f182 include service efficiency in cc_get_flag RPC when applicable 2023-02-16 14:18:40 +00:00
Crypto City
0737d151f2 functional_tests: fix attempt to use more money than available 2023-02-16 14:18:40 +00:00
Crypto City
f71b6df441 craft buildings can now runestones from regular stones 2023-02-16 14:18:40 +00:00
Crypto City
cb4b2c71a6 functional_tests: check all cc_* RPC entry points are tested 2023-02-16 14:18:40 +00:00
Crypto City
1a68d7e1ad functional_tests: add cc_allow_styling tests 2023-02-16 14:18:40 +00:00
Crypto City
f96628d988 functional_tests: add cc_change_palette tests 2023-02-16 14:18:40 +00:00
Crypto City
c09c6fed54 functional_tests: add cc_get_rare_fish_data tests 2023-02-16 14:18:39 +00:00
Crypto City
e22accf518 functional_tests: add cc_replace_script_blob tests 2023-02-16 14:18:39 +00:00
Crypto City
2d63fde471 functional_tests: add cc_get_badge_scores tests 2023-02-16 14:18:39 +00:00
Crypto City
fc6fc1d498 functional_tests: add cc_get_production tests 2023-02-16 14:18:39 +00:00
Crypto City
7bd8d1a99a functional_tests: add cc_get_crop_yield tests 2023-02-16 14:18:39 +00:00
Crypto City
06554b555d functional_tests: add cc_get_terrain tests 2023-02-16 14:18:39 +00:00
Crypto City
bbcb70f62a functional_tests: add cc_get_stats tests 2023-02-16 14:18:39 +00:00
Crypto City
0c7c0109df functional_tests: add cc_get_blobs/cc_get_blob_info tests 2023-02-16 14:18:39 +00:00
Crypto City
69e5252303 functional_tests: add cc_get_foreclosures tests 2023-02-16 14:18:39 +00:00
Crypto City
7e07b242d8 functional_tests: add cc_get_used_nonces tests 2023-02-16 14:18:39 +00:00
Crypto City
349ebe8b3c functional_tests: add cc_get_temperature tests 2023-02-16 14:18:39 +00:00
Crypto City
0e00348dd1 functional_tests: add cc_are_discoveries_enabled tests 2023-02-16 14:18:39 +00:00
Crypto City
f762e0898d functional_tests: add cc_get_service_fee tests 2023-02-16 14:18:39 +00:00
Crypto City
26b4b4489d functional_tests: add cc_get_bonuses tests 2023-02-16 14:18:39 +00:00
Crypto City
bf4339a8ad functional_tests: add cc_get_badge_totals tests 2023-02-16 14:18:39 +00:00
Crypto City
0126e0dd43 functional_tests: add cc_get_accounts tests 2023-02-16 14:18:39 +00:00
Crypto City
28ac9ef30e functional_tests: add cc_get_special_events tests 2023-02-16 14:18:39 +00:00
Crypto City
698fe07fe9 functional_tests: add cc_get_last_update_events tests 2023-02-16 14:18:39 +00:00
Crypto City
37ac59f737 functional_tests: add cc_get_nonces_mined tests 2023-02-16 14:18:39 +00:00
Crypto City
b90e5c3859 functional_tests: add cc_find_flag tests 2023-02-16 14:18:39 +00:00
Crypto City
04537a0a0b functional_tests: add cc_lookup_account tests 2023-02-16 14:18:39 +00:00
Crypto City
2d34ccf168 destroy assigned items on involuntary building destruction 
eg, fire, derelict buildings...
 2023-02-16 14:18:39 +00:00
Crypto City
8932eac499 add placeholder chat type to chat command 
there might be more than one chat at some point
 2023-02-16 14:18:39 +00:00
Crypto City
890af738d6 fix transfer functional tests with transfer to self 2023-02-06 14:10:15 +00:00
Crypto City
12ade5e935 add an extra fee to create items with prestige and/or role bonuses 
to prevent abuse
 2023-02-06 14:10:15 +00:00
Crypto City
46d4dc442a fix naming an empty flag before building on it 2023-01-29 08:44:11 +00:00
Crypto City
d6170c130d items can now be retrieved from flags 
except labour and construction materials
 2023-01-29 08:10:02 +00:00
Crypto City
90989c35ef functional_tests: ensure scripts are finished after testing scripts 2023-01-28 17:03:26 +00:00
Crypto City
406eef2d68 compress player profile previous/new strings in command 2023-01-28 17:03:01 +00:00
Crypto City
f789d40e7c creating user textures now needs a cultural building 
since user texture space is at a premium, this will discourage
spamming and DoS
 2023-01-28 17:03:01 +00:00
Crypto City
a0497a35d9 cc: constrain dividend note length 2023-01-28 17:03:01 +00:00
Crypto City
4613cdb321 add a tiny fee by dividend recipient 
for abuse prevention
 2023-01-28 17:03:01 +00:00
Crypto City
14d8120aa9 shares for cities which restrict settlers count for half for subsidy 
for abuse prevention
 2023-01-28 17:03:01 +00:00
Crypto City
0cd2e67d06 research buildings now offer a bonus and can be used as a service 2023-01-28 17:03:00 +00:00
Crypto City
c38b346452 functional_tests: ensure fishery does not deactivate while testing 2023-01-28 17:03:00 +00:00
Crypto City
60b22f6ccc functional_tests: fix rare failure due to lack of money 2023-01-28 17:03:00 +00:00
Crypto City
309da5001c rpc: add cc_get_building_cost RPC 2023-01-28 17:03:00 +00:00
Crypto City
b36454b79b game: allow vertical colour gradients in chat messages 2023-01-28 17:02:59 +00:00
Crypto City
487e941453 functional_tests: fix comment 2023-01-28 17:02:59 +00:00
Crypto City
095104f6d0 constrain tax break zones within 25k tiles of center or other ones 2023-01-28 17:02:59 +00:00
Crypto City
1985a1d5a7 food salting, as an agricultural building service 2023-01-28 17:02:59 +00:00
Crypto City
413ba7369f pearl diving, as a fishery service 2023-01-28 17:02:59 +00:00
Crypto City
aa7bcbf6c9 there can now be more than once special event in a city at once 2023-01-28 17:02:58 +00:00
Crypto City
a31f37334b account for gold in items assigned to flags 2023-01-28 17:02:58 +00:00
Crypto City
118f1ac9ca functional_tests: fix demolish tests 2023-01-28 17:02:58 +00:00
j-berman
864a78ee5f wallet2: check wallet compatibility with daemon's hard fork version 2022-09-12 21:23:08 -06:00
moneromooo-monero
1d3657afb5
wallet2: better test on whether to allow output import 
Being offline is not a good enough heuristic, so we keep track
of whether the wallet ever refreshed from a daemon, which is a
lot better, and probably the best we can do without manual user
designation (which would break existing cold wallet setups till
the user designates those wallets)
 2022-09-07 06:22:31 +00:00
moneromooo-monero
0cbf5571d3
allow exporting outputs in chunks 
this will make it easier huge wallets to do so without hitting
random limits (eg, max string size in node).
 2022-09-07 06:22:07 +00:00
j-berman
b03d7091f7
wallet2: fixes for export/import output flow 
- only allow offline wallets to import outputs
- don't import empty outputs
- export subaddress indexes when exporting outputs
 2022-09-06 17:20:23 -06:00
Crypto City
bf53f14fd8 custom items can now have per role bonuses 2022-09-02 20:14:41 +00:00
Crypto City
1f636fbf8e change tax break zone mechanics 
There can be multiple tax break zones, unlocked at increasing
city levels, but they are fixed once set.
This will prevent mayorial bait and switch abuse.
 2022-08-31 11:48:49 +00:00
Crypto City
02e6ba170f functional_tests: add message tests 2022-08-23 05:20:29 +00:00
Crypto City
e5b17616fd blockchain: fix invalid memory read getting fee on empty chain 2022-08-23 05:20:29 +00:00
Crypto City
7c70d0ef6e invisible P2P messages 2022-08-23 05:20:28 +00:00
Crypto City
088538c160 Merge remote-tracking branch 'origin/master' into HEAD 
b6a029f222

Multisig functional test broken
 2022-08-08 17:44:32 +00:00
Crypto City
eec63d353a store city level in db, avoid max_level crutch 2022-08-08 14:38:47 +00:00
Crypto City
f9790980b4 new special event: merchant ship, selling items on the market 2022-08-04 15:57:39 +00:00
Crypto City
070a4d46da remove the --debug-allow-gm-commands-from-account option 
allow usage of an alternate game account key pair for tests instead
 2022-08-04 15:57:39 +00:00
Crypto City
3e42cf32ca functional_tests: fix daemon hard fork test 2022-08-04 08:36:32 +00:00
Crypto City
4252824ad0 functional_tests: piggy back on first building to prevent random events 
since they can break tests which do not expect them
 2022-08-04 08:36:32 +00:00
Crypto City
aaf24f1338 allow seting more than one global variable at once, for atomicity 2022-08-04 08:36:32 +00:00
Crypto City
6bfc447544 custom items may now have a prestige bonus 
only the game account can add prestige bonuses
 2022-08-04 08:36:31 +00:00
Crypto City
6c4a31509a new "tax break zone" city specialization 2022-08-04 08:36:31 +00:00
Crypto City
c004280dc7 user textures can now tile independently horizontally and vertically 2022-08-02 06:19:05 +00:00
Crypto City
4552e18249 somewhat better looking terrain 2022-08-02 06:19:04 +00:00
Crypto City
1b5c033f6e cc: fix consuming items with gold in scripts 2022-08-02 06:19:04 +00:00
Crypto City
09251d7be6 include script owner in start_script_command 
so we know when the game should requets a snapshot
 2022-08-02 06:19:04 +00:00
Crypto City
98c62f0645 functional_tests: add user texture tests 2022-08-02 06:19:03 +00:00
Crypto City
8d7e78a7fa functional_tests: check event balances for game, foreclosure and treasuries 2022-08-02 06:19:03 +00:00
Crypto City
1ded69f8b1 scripts can now create items if set up this way at definition time 2022-08-02 06:19:03 +00:00
Crypto City
1582492535 allow creating more items if that was setup on item definition 2022-08-02 06:19:03 +00:00
Crypto City
ffbc1d3ae1 compress script blobs with zstd 
- we don't really care if they're slow to compress
- we care about compression for blockchain usage (and max tx size)
 2022-07-23 15:46:20 +00:00
Crypto City
aa48b3cdfb functional_tests: fix fire test being upset by a fire in another city 2022-07-23 15:46:20 +00:00
Crypto City
74c2683f62 functional_tests: a bit more leeway when checking for derelict buildings 2022-07-23 15:46:19 +00:00
Crypto City
588ce075b4 functional_tests: fix nonce search bug 2022-07-23 15:46:19 +00:00
Crypto City
403c31c31e functional_tests: test fishing in another city's fishing grounds 2022-07-23 15:46:19 +00:00
Crypto City
aae749b0eb tune down fishing grounds recovery 2022-07-23 15:46:19 +00:00
Crypto City
b6d94f9fbf more generic special event overrides for tests 2022-07-23 15:46:19 +00:00
Crypto City
774f8430ce drop runestone price to one quarter gold 2022-07-23 15:46:18 +00:00
Crypto City
0ddeaa3992 add RPC and functional tests for edit_player_profile 2022-07-23 15:46:18 +00:00
Crypto City
f36b5f77db functional_tests: add tests for naming places 2022-07-23 15:46:18 +00:00
Crypto City
ea035a18be functional_tests: fire can last longer now 2022-07-23 15:46:18 +00:00
Crypto City
32314a1dc4 scripts can now award event badges 2022-07-23 15:46:18 +00:00
j-berman
8cc3c9af4d Publish submitted txs via zmq 2022-07-21 11:53:31 -07:00
Crypto City
e141fbf27d functional_tests: more info when a bug in ownership is detected 2022-07-04 21:15:34 +00:00
Crypto City
1a48b87d14 functional_tests: add whisper tests 2022-07-04 21:15:34 +00:00
Crypto City
d48966a82c improved fishing mechanics 2022-07-04 21:15:34 +00:00
Crypto City
6e0044f5e6 functional_tests: make fire test more stable 2022-07-04 21:15:34 +00:00
Crypto City
9c09582b7f cc: forbid giving to oneself 2022-07-04 21:15:33 +00:00
Crypto City
734f2cc524 only active buildings can fish, sow and harvest 2022-07-04 21:15:33 +00:00
Crypto City
ffc4e2198f buildings' econonic power can now be upgraded 
for 150% of the incremental cost
 2022-07-04 21:15:33 +00:00
Crypto City
636d8b7a84 more intricate shoreline 2022-07-04 21:15:33 +00:00
Crypto City
ce6016306d add fish, fishing and fisheries 2022-07-04 21:15:33 +00:00
Crypto City
fb48c2e73e add procedures to scripts 2022-06-28 16:49:49 +00:00
Crypto City
73824c40f1 fix */+- precedence in scripts 2022-06-28 16:49:49 +00:00
Crypto City
9ffb213012 background scripts, tied to the game account 2022-06-28 16:49:49 +00:00
Crypto City
5474600c6a make if in scripts more generic, and allow an else branch too 2022-06-28 16:49:49 +00:00
Crypto City
867e9b359f remove restricted items hack 2022-06-28 16:49:49 +00:00
Crypto City
ca27a104bd add per choice script reserves 
This will allow script options to scale with player balances
 2022-06-28 16:49:49 +00:00
Crypto City
d85d5012eb newbie coins - each new player gets a random one 
collecting all the set gives a prestige boost
 2022-06-28 16:49:48 +00:00
moneromooo-monero
2979474221
disable multisig by default 
There are vulnerabilities in multisig protocol if the parties do not
trust each other, and while there is a patch for it, it has not been
throroughly reviewed yet, so it is felt safer to disable multisig by
default for now.
If all parties in a multisig setup trust each other, then it is safe
to enable multisig.
 2022-05-17 19:52:03 +00:00
luigi1111
c1625a8928
Merge pull request #8220 
0d6ecb1 multisig: add post-kex verification round to check that all participants have completed the multisig address (koe)
 2022-05-10 16:41:02 -05:00
koe
0d6ecb1136 multisig: add post-kex verification round to check that all participants have completed the multisig address 2022-04-29 14:04:59 -05:00
j-berman
5d388eb74d Bump ring size to 16 for v15 & remove set default in wallet cli 2022-04-18 14:36:28 -07:00
moneromooo-monero
b030f20751
Fee changes from ArticMine 
https://github.com/ArticMine/Monero-Documents/blob/master/MoneroScaling2021-02.pdf

with a change to use 1.7 instead of 2.0 for the max long term increase rate
 2022-04-10 18:13:34 +00:00
reemuru
6abe3fee19
tests: integrated_address: remove missing payment id assertion 
The integrated address functional test fails in the workflows due
to an assertion for missing payment id that is no longer needed.
Remove the assertion and update the assertion count.

Fixes 7dcfccb: ("wallet_rpc_server: fix make_integrated_address with no payment id")
 2022-04-06 06:49:01 -05:00
luigi1111
0eb1b570b6
Merge pull request #8197 
da9aa1f Copyright: Update to 2022 (mj-xmr)
 2022-04-06 00:08:53 -04:00
luigi1111
d9e6baac42
Merge pull request #8158 
e5000a9 Balance includes unconfirmed transfers to self (woodser)
 2022-03-18 16:28:16 -05:00
mj-xmr
da9aa1f7f8
Copyright: Update to 2022 2022-03-04 06:59:20 +01:00
luigi1111
5eaa4434e8
Merge pull request #7877 
e08abaa multisig key exchange update and refactor (koe)
 2022-03-02 18:51:54 -05:00
Crypto City
850b8766d6 functional_tests: fix invalid names tests, "\xff\xff" is now valid 2022-03-01 18:21:19 +00:00
koe
e08abaa43f multisig key exchange update and refactor 2022-02-22 16:37:42 -06:00
woodser
e5000a9f0c Balance includes unconfirmed transfers to self 2022-01-31 07:52:38 -05:00
selsta
e9156d78a3
functional_tests: update uri test with external pid 2021-12-14 23:35:48 +01:00
Crypto City
307e97f9e9 v16 with recent consensus changes - with hacks for now 2021-11-25 17:27:14 +00:00
Crypto City
29c47dcfe9 tune city level progression 2021-11-24 07:08:51 +00:00
Crypto City
bb203fe647 add new moose disease special event 2021-11-23 16:22:29 +00:00
Crypto City
a8ad4091fa add restricted item group, may not be sold/given/auctioned etc 2021-11-15 17:04:16 +00:00
Crypto City
ae4d520621 add a testnet v15 fork at block 60000 2021-10-15 13:29:47 +00:00
Crypto City
0d20478bd2 mayors may now control who can buy/build in their city 2021-10-14 10:47:26 +00:00
Crypto City
c263cba732 cc: allow embedding smaller quantities of gold in items 2021-10-14 10:44:47 +00:00
Crypto City
25cc1bf99a game: plug palette editor in import flow 2021-09-21 12:18:18 +00:00
Crypto City
18ab361e8b give spread to match command matcher 2021-09-14 19:59:41 +00:00
Crypto City
489a261db0 Merge remote-tracking branch 'origin/master' into cc 
8fde011dbe
 2021-09-01 15:50:02 +00:00
Crypto City
996253e3b0 revert test v15 fork 2021-09-01 15:12:14 +00:00
Crypto City
6794309459 functional_tests: ensure number of blocks to mine is integer 2021-09-01 15:12:13 +00:00
Crypto City
f309f1422c fix sync failure when popping a game update block, but only it 2021-08-21 16:11:28 +00:00