Commit Graph

29 Commits

Author SHA1 Message Date
Crypto City
4e62bc9b3e custom items may now be consumable
they'll be consumed at a rate of one per game tick when assigned
to a flag
2024-10-16 13:53:55 +00:00
Crypto City
893331b189 overwrite game pkey when running with CC_USE_TEST_GAME_KEY=1
and back to default key otherwise
2024-09-26 21:26:14 +00:00
Crypto City
687a389fcb Fluorine Fermi
-----BEGIN PGP SIGNATURE-----
 
 iQFJBAABCAAzFiEEh3erj3eO6JSHovjn9KygGDZB4BAFAmXwr2oVHGx1aWdpMTEx
 MXdAZ21haWwuY29tAAoJEPSsoBg2QeAQjksIAJ9CSNK6LQU3b+8TdEv5knpMeyY/
 n6QXCA0Xl+rPJCseQZq5+FdwZjjdGm6ptm2+R/1nDjynw7jccChh2x/T0BH/3ewD
 h+30fOZ54Rm9m0hGUY7TQFf8+Nn2FK/OO+uexxMRPkj6yWmItvXTUDoEsnC0VCSn
 mA8GSy9w+ei6iTeviEH5FlSD37z/r8T5DPPy4Y44WVIWd/pR5klnnCNYFCVK2eXS
 nRuLRgY2r7hrfZfpH34JA2ITFVn7ijjZlmLN+/xNCoiIetkkvid4hZCnfl8haVC1
 G19S9cHUC0HtQxAjY8hbBrMj/7oi7SN+2+7+m/DfsyyrW0h9aX/GJySxSiA=
 =zXfB
 -----END PGP SIGNATURE-----

Merge tag 'v0.18.3.3' into cc

Fluorine Fermi
2024-08-15 07:48:13 +00:00
Crypto City
a745d7e476 hybrid PoW/PoS consensus
to protect against the first large monero miner to merge mine
being able to easily 51% the chain
2024-03-11 14:51:45 +00:00
Boog900
69de381526
add a test for the long term weight cache 2023-10-02 15:28:50 +01:00
Crypto City
bf53f14fd8 custom items can now have per role bonuses 2022-09-02 20:14:41 +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
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
1582492535 allow creating more items if that was setup on item definition 2022-08-02 06:19:03 +00:00
Crypto City
1bf09dfa66 tests: fix tests 2022-05-18 06:36:26 +00:00
mj-xmr
da9aa1f7f8
Copyright: Update to 2022 2022-03-04 06:59:20 +01:00
moneromooo-monero
bbe3b276b8
tx_pool: full tx revalidation on fork boundaries
avoids mining txes after a fork that are invalid by this fork's
rules, but were valid by the previous fork rules at the time
they were verified and added to the txpool.
2021-11-01 20:56:38 +00:00
Crypto City
6eeea7ed94 coins can now have a custom graphic design 2021-05-29 12:32:20 +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
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
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
b033e75db0 add more user data space to custom items 2020-10-17 23:28:43 +00:00
Crypto City
7a1ba041e8 tests: fix tests failures now that blockchain init queries cities 2020-09-02 23:07:03 +00:00
Crypto City
3335f8d14f create collectible coins for player count and city levels 2020-08-25 15:27:16 +00:00
Crypto City
61aa85ad3b add collectible coins 2020-08-21 18:33:02 +00:00
SomaticFanatic
5ef0607da6 Update copyright year to 2020
Update copyright year to 2020
2020-05-06 22:36:54 -04:00
Crypto City
b9ea0d835c foo! 2019-12-13 00:55:07 +00:00
stoffu
e9fac29a4b
unit_tests/long_term_block_weight: some tweaks that seem to make more sense 2019-04-09 20:21:45 +09:00
moneromooo-monero
7190798049
unit_tests: fix long term block weight test after cache change 2019-04-03 00:10:48 +00:00
moneromooo-monero
4b21d38dfd
blockchain: speed up getting N blocks weights/long term weights 2019-03-08 12:04:14 +00:00
moneromooo-monero
79b4e9f377
save some database calls when getting top block hash and height 2019-03-05 11:58:05 +00:00
moneromooo-monero
b044d03a51
Avoid repeated (de)serialization when syncing 2019-03-05 11:57:55 +00:00
moneromooo-monero
b8787f4302
ArticMine's new block weight algorithm
This curbs runaway growth while still allowing substantial
spikes in block weight

Original specification from ArticMine:

here is the scaling proposal
Define: LongTermBlockWeight
Before fork:
LongTermBlockWeight = BlockWeight
At or after fork:
LongTermBlockWeight = min(BlockWeight, 1.4*LongTermEffectiveMedianBlockWeight)
Note: To avoid possible consensus issues over rounding the LongTermBlockWeight for a given block should be calculated to the nearest byte, and stored as a integer in the block itself. The stored LongTermBlockWeight is then used for future calculations of the LongTermEffectiveMedianBlockWeight and not recalculated each time.
Define:   LongTermEffectiveMedianBlockWeight
LongTermEffectiveMedianBlockWeight = max(300000, MedianOverPrevious100000Blocks(LongTermBlockWeight))
Change Definition of EffectiveMedianBlockWeight
From (current definition)
EffectiveMedianBlockWeight  = max(300000, MedianOverPrevious100Blocks(BlockWeight))
To (proposed definition)
EffectiveMedianBlockWeight  = min(max(300000, MedianOverPrevious100Blocks(BlockWeight)), 50*LongTermEffectiveMedianBlockWeight)
Notes:
1) There are no other changes to the existing penalty formula, median calculation, fees etc.
2) There is the requirement to store the LongTermBlockWeight of a block unencrypted in the block itself. This  is to avoid possible consensus issues over rounding and also to prevent the calculations from becoming unwieldy as we move away from the fork.
3) When the  EffectiveMedianBlockWeight cap is reached it is still possible to mine blocks up to 2x the EffectiveMedianBlockWeight by paying the corresponding penalty.

Note: the long term block weight is stored in the database, but not in the actual block itself,
since it requires recalculating anyway for verification.
2019-03-04 09:33:58 +00:00