Commit Graph

483 Commits

Author SHA1 Message Date
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
Crypto City
85319d34a8 functional_tests: improve reorg test 2021-08-21 16:11:28 +00:00
Crypto City
19b9af508f functional_tests: some more trader order book tests 2021-08-21 14:44:33 +00:00
Crypto City
83ebf8aad4 improve third party matching 2021-08-18 22:38:51 +00:00
Crypto City
9079a293d0 functional_tests: fix fire test sometimes breaking 2021-08-16 10:36:46 +00:00
Crypto City
5206ea2ec3 fix hunts conflicting with each other 2021-08-12 11:01:35 +00:00
Crypto City
b5f7cd94af functional_tests: fix firefighting test 2021-08-12 11:01:35 +00:00
Crypto City
ca01aa2221 functional_tests: add basic tests for firefighting 2021-07-23 09:10:52 +00:00
Crypto City
42f430cf08 functional_tests: test derelict buildings 2021-07-20 19:41:53 +00:00
Crypto City
21676e11be functional_tests: add tests for cc_is_invitation_used 2021-07-07 19:58:22 +00:00
Crypto City
5c29d4356c fix hunting allowing an empty building as condition 2021-07-06 20:50:44 +00:00
Crypto City
da83f01ff4 make dividend command more flexible
it can optionally distribute to unowned items only, as well as
pay per item rather than split
2021-07-06 12:52:33 +00:00
Crypto City
ea37a84d86 functional_tests: fix city spec tests failing due to too high level 2021-07-05 16:33:54 +00:00
Crypto City
bf5e9909d2 fix inventory bug with mortgages that mature while being auctioned 2021-06-24 08:50:19 +00:00
Crypto City
1928507a29 functional_tests: fix auction bid fee 2021-06-24 08:49:53 +00:00
Crypto City
7ffaf6d3ae double spendable age to 20 2021-06-03 07:40:21 +00:00
Crypto City
449ec733d3 event badges can now have a custom design 2021-05-29 12:32:20 +00:00
Crypto City
135742961f add logging/quarrying/maintenance discoveries 2021-05-14 17:22:13 +00:00
Crypto City
8249a86017 add badge for number of cities built in 2021-04-27 18:15:30 +00:00
Crypto City
0e3a6ba8c8 functional_tests: fix python3 compatibility 2021-04-27 18:15:30 +00:00
Crypto City
907636077e functional_tests: more generous timeout for the large sync 2021-04-27 18:15:30 +00:00
Crypto City
514bec111b store better info (counterparties, all flags/items, fee) in game events
also make balance signed so we can distinguish income and expenditures,
add missing/incorrect event data
2021-04-27 18:15:30 +00:00
mj-xmr
6799e212cc
Tests: Mining test uses a parametric path for finding the calculation app
MINING_SILENT and MINING_NO_MEASUREMENT env vars
2021-04-27 06:21:02 +02:00
Crypto City
931773c40e Merge remote-tracking branch 'origin/master' into cc 2021-04-24 13:46:11 +00:00
Crypto City
e8f35a87c8 halve block time for user friendliness in gameplay 2021-04-22 23:18:32 +00:00
mj-xmr
dc81e23e60 Split epee/string_tools.h and encapsulate boost::lexical_cast 2021-04-16 20:54:20 +02:00
Crypto City
56155d4154 functional_tests: add more tests 2021-04-16 11:15:51 +00:00
Crypto City
618388ccab items can now be auctioned 2021-04-15 11:12:21 +00:00
Crypto City
7eafb335b1 do not reuse flags, it only leads to mistakes in history 2021-04-12 13:48:34 +00:00
Crypto City
f2cf26638d invitations can now be tied to a particular recipient address 2021-04-11 10:22:59 +00:00
Crypto City
2392c7d372 functional_tests: add item ownership checks 2021-04-10 00:06:37 +00:00
Crypto City
cf9246ab08 functional_tests: fix random failure in discoveries test 2021-04-10 00:06:37 +00:00
Crypto City
f1fd56f172 functional_tests: give a bit more leeway in wood stocks 2021-04-10 00:06:37 +00:00
Crypto City
2eec2f6371 fix farming not being bothered by not having enough heating material
also fix demolishing a farm while a crop is being grown
2021-04-06 10:46:37 +00:00
Crypto City
dccf609e29 functional_tests: a mortgaged flag can't be demolished, given, traded 2021-04-04 19:42:38 +00:00
Crypto City
b5277a67ef functional_tests: more runestone tests: demolish, remove blocks 2021-04-02 22:54:56 +00:00
Crypto City
1a8055684e rpc: remove obsolete width/height in cc_demolish 2021-04-02 22:54:56 +00:00
Crypto City
6d5b0222cf add runestone carving tests 2021-04-02 22:54:56 +00:00
Crypto City
c663b3b6b6 armour plate various commands' verification code 2021-04-02 15:17:28 +00:00
mj-xmr
45f01f577c [CI] Adaptive mining timeout, depending on available CPU power
Printing also available RAM. Add comprehensive description.
2021-03-30 05:48:55 +02:00
Crypto City
e3b256215f functional_tests: add test for fractional amount of gold in item 2021-03-26 20:37:15 +00:00
Crypto City
6261344b9a remove mime_type from custom items, and add gold content 2021-03-25 14:37:56 +00:00
Crypto City
5b2e27b2ad functional_tests: fix accounting error 2021-03-25 13:54:24 +00:00
Crypto City
8354848ec8 custom item secondary descriptions can now be updated 2021-03-23 23:36:38 +00:00
Crypto City
20b806a964 rpc: add cc_is_custom_item_data RPC 2021-03-23 23:36:38 +00:00
mj-xmr
c836dc11c9 [CI] Use Python3 for funcional tests, instead of Python2 2021-03-20 10:30:57 +01:00
Crypto City
59da6694be rpc: add a cc_get_predefined_item_info RPC 2021-03-13 19:50:44 +00:00
Crypto City
6be4416f10 functional_tests: fix occasional failure from tx misordering 2021-03-13 10:45:46 +00:00
Crypto City
afc4f6f913 new cc_get_item_ownership RPC and daemon command 2021-03-13 10:45:46 +00:00
Crypto City
b8d4836f2a add optional hash and MIME type to custom items, and add cc_item_info command 2021-03-13 10:45:46 +00:00
Crypto City
3ffe13df7d extra land tax for lots left empty for more than 10 days 2021-03-13 10:45:46 +00:00
moneromooo-monero
b5209a09d2
functional_tests: hide check_missing_rpc_methods behind requests check 2021-02-23 20:10:03 +00:00
luigi1111
1614be4a41
Merge pull request #7371
1aecdcf Increase timeout for the mining test 4 times (to 240s) (mj-xmr)
2021-02-18 14:11:55 -05:00
mj-xmr
1aecdcf536 Increase timeout for the mining test 4 times (to 240s) 2021-02-11 13:42:43 +01:00
Kevin Barbour
85db1734e7
Remove unused variables in monero codebase
There are quite a few variables in the code that are no longer
(or perhaps never were) in use. These were discovered by enabling
compiler warnings for unused variables and cleaning them up.

In most cases where the unused variables were the result
of a function call the call was left but the variable
assignment removed, unless it was obvious that it was
a simple getter with no side effects.
2021-02-09 08:05:05 +01:00
Crypto City
49faf95c40 fix flag destruction not keeping full state 2021-02-03 16:26:08 +00:00
Crypto City
56d5455d9b functional_tests: fix some python2/python3 differences 2021-02-03 16:26:08 +00:00
Crypto City
d9e81d0c5b cc: remove obsolete transportation discoveries 2021-02-03 16:26:08 +00:00
Crypto City
4956a6aa5e Merge remote-tracking branch 'origin/master' into cc 2021-01-18 01:33:53 +00:00
Crypto City
a4f6efb6db add unlock levels for chat colours 2021-01-16 20:44:45 +00:00
Crypto City
e760d4b2ed cc: remove pig farming discoveries 2021-01-16 20:44:45 +00:00
Crypto City
7e87bcc711 fix functional tests 2021-01-16 20:44:45 +00:00
Crypto City
8c3d9ff405 functional_tests: fix trade tests after matchable fix 2021-01-16 20:44:45 +00:00
Crypto City
8599ef7f67 sort items before patents and gemstones 2020-12-01 12:54:08 +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