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
2020-08-27 03:01:28 -07:00
Alexander Blair
bad5d8d6f0
Merge pull request #6690
...
7175dcb10
2020-08-27 02:54:30 -07:00
Alexander Blair
3f392341e7
Merge pull request #6660
...
839e1f4ba
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
2020-08-16 12:53:50 -07:00
Alexander Blair
01b512f3a9
Merge pull request #6716
...
76c16822d
2020-08-16 12:52:21 -07:00
Alexander Blair
a08df6eb1b
Merge pull request #6603
...
4e2377995
2020-08-16 12:43:38 -07:00
Alexander Blair
009ca6fcd3
Merge pull request #6601
...
98c151ecb60627c9f2fe96e66eb
2020-08-16 12:43:11 -07:00
Alexander Blair
9eebe01c58
Merge pull request #6593
...
6f5411d30c6dc2850c
2020-08-16 12:41:10 -07:00
Alexander Blair
6d29ee6c52
Merge pull request #6493
...
921dd8dde
2020-08-16 12:39:59 -07:00
Alexander Blair
e2e09d00c2
Merge pull request #6337
...
a11ec4ac1
2020-08-16 12:38:44 -07:00
Alexander Blair
13549d590e
Merge pull request #6329
...
6bfcd3101
2020-08-16 12:37:43 -07:00
Crypto City
be0b26ef25
add item groups
2020-08-15 15:12:35 +00:00
Crypto City
26b298e947
performance_tests: add magica voxel load/save test
2020-08-15 15:12:35 +00:00
Crypto City
20427ca382
functional_tests: add new city test
2020-08-15 15:12:35 +00:00
Crypto City
18da33a330
funtional_tests: guard against special events destroying buildings
2020-08-15 15:12:35 +00:00
Lee Clagett
4e2377995d
Change ZMQ-JSON txextra to hex and remove unnecessary base fields
2020-08-14 23:01:00 +00:00
Lee Clagett
fe96e66ebe
Fix pruned tx for ZMQ's GetBlocksFast
2020-08-14 19:46:33 +00:00
Sarang Noether
921dd8dde5
Use domain-separated ChaCha20 for in-memory key encryption
2020-08-09 19:11:54 -04:00
Sarang Noether
6bfcd31015
Updates InProofV1, OutProofV1, and ReserveProofV1 to new V2 variants that include all public proof parameters in Schnorr challenges, along with hash function domain separators. Includes new randomized unit tests.
2020-08-09 18:42:15 -04:00
Alexander Blair
c108c5e2f0
Merge pull request #6354
...
67ade8005
2020-08-09 06:42:49 -07:00
Crypto City
1e9af40f21
functional_tests: add some more farming tests
2020-08-07 00:41:08 +00:00
Crypto City
1508512920
tests: remove int sqrt test
...
It's slow, and we don't rely on it
2020-08-06 14:15:48 +00:00
Crypto City
0f364a96d7
cc: prevent building too close to the edges of the world
2020-08-05 14:09:06 +00:00
Crypto City
105c45df20
functional_tests: run with CC_FASTER_POW
2020-08-05 14:09:06 +00:00
Crypto City
3b23655a5f
functional_tests: fix game update messing up checks
2020-08-05 14:09:06 +00:00
Crypto City
fb5dd77afa
Farming
2020-08-05 14:09:06 +00:00
Crypto City
db93803916
functional_tests: ensure the resized flag has no building
2020-08-01 17:05:19 +00:00
Crypto City
2a1c79920d
speedup terrain generation
2020-08-01 17:05:19 +00:00
Crypto City
031d32d08e
cc: make cities grow in cost more slowly
2020-07-26 10:31:37 +00:00
Crypto City
34856d0808
keep track of the item supply
2020-07-25 22:43:58 +00:00
Crypto City
b268c5b8c7
add elevation bonus
2020-07-25 22:43:58 +00:00
Crypto City
c598cfec0a
remove building within range of resource generators constraint
2020-07-25 22:43:58 +00:00
Crypto City
664d56f520
Height map
2020-07-25 22:43:53 +00:00
Crypto City
6918004419
cc: fix temperature to heating function
2020-07-24 15:36:50 +00:00
Crypto City
ac171bf477
cc: rewrite potential system and add more potentials
2020-07-24 15:36:50 +00:00
Crypto City
0f71803126
tests: enable unbound tests
2020-07-24 15:36:50 +00:00
koe
85efc88c1e
Fix overflow issue in epee:misc_utils::rolling_median_t and median(), with unit test
2020-07-23 03:36:05 -05:00
xiphon
76c16822d0
wallet2_api: implement runtime proxy configuration
2020-07-20 13:45:12 +00:00
Alexander Blair
3ba6c7fd30
Merge pull request #6516
...
8656a8c9f
2020-07-19 03:34:28 -07:00
Alexander Blair
a0d179e528
Merge pull request #6512
...
5ef0607da
2020-07-19 03:32:59 -07:00
Alexander Blair
65938d26f6
Merge pull request #6497
...
db8563cb
2020-07-19 03:27:55 -07:00
luigi1111
3057f52f89
Merge pull request #6599
...
6e4a55b9b86e14
2020-07-08 17:20:29 -05:00
luigi1111
35e2520115
Merge pull request #6559
...
15538f7
2020-07-08 17:07:50 -05:00
Crypto City
63a3230fdb
add ignore tests
2020-06-30 11:06:08 +00:00
Crypto City
dc140ff2fc
functional_tests: add some more data in get_state
2020-06-29 22:16:08 +00:00
Crypto City
fffeb1bdae
cc: allow hunting with a population less than actual
2020-06-29 22:16:08 +00:00
Crypto City
8c249305f7
unit_tests: don't link to urho3d
2020-06-24 01:06:54 +00:00
Crypto City
09c272a064
tests: add test for building with palette change
2020-06-22 22:15:13 +00:00
Crypto City
6f4fc81b1d
functional_tests: add chat tests
2020-06-22 22:15:13 +00:00
Crypto City
5d30d10b68
functional_tests: add some more invitations tests
2020-06-22 22:15:13 +00:00
Crypto City
3e05ee54fe
tx_pool: do not allow more than one (non kept by block) hunt command at once
2020-06-21 01:18:30 +00:00
Crypto City
ef2c7bcca8
functional_tests: use fast pow
2020-06-21 01:18:29 +00:00
Crypto City
f112b180e3
cc: fix unlocking discoveries bug
2020-06-21 01:18:29 +00:00
Crypto City
206b30cb8f
functional_tests: add reorg test
2020-06-21 01:18:29 +00:00
moneromooo-monero
2743357518
functional_tests: add p2p functional tests
...
Tests tx/block propagation and reorgs
2020-06-21 01:18:29 +00:00
Crypto City
b945e80261
functional_tests: add randomx tests
2020-06-21 01:18:29 +00:00
Crypto City
75516e6e34
core: fix mining from a block that's not the current top
2020-06-21 01:18:29 +00:00
luigi1111
93257997bd
Merge pull request #6656
...
bde7f1cc4b7420c4df8b138ca1bb
2020-06-19 10:17:51 -05:00
Crypto City
23c813cf45
add city specializations
2020-06-14 23:43:30 +00:00
moneromooo-monero
bde7f1c5cc
fuzz_tests: fix init check in oss-fuzz mode
2020-06-14 16:10:49 +00:00
moneromooo-monero
c4df8b1390
fix leaks in fuzz tests
2020-06-14 12:54:13 +00:00
moneromooo-monero
38ca1bb389
fuzz_tests: add a tx extra fuzz test
2020-06-14 12:54:10 +00:00
selsta
58e1c8b031
repo: update donation fund address
2020-06-09 12:19:39 +02:00
luigi1111
967285a9fa
Merge pull request #6522
...
29e563b
2020-06-08 14:05:05 -05:00
Lee Clagett
7aeb503547
Fix boost <1.60 compilation and fix boost 1.73+ warnings
2020-05-31 21:18:11 -04:00
Crypto City
2a90a3df6b
fixes after merge
2020-05-31 00:41:03 +00:00
Crypto City
396157b032
Merge remote-tracking branch 'origin/master' into cc
2020-05-30 18:55:11 +00:00
Crypto City
eb6be814ef
functional_tests: processes can now run in a new terminal (off by default)
2020-05-29 23:20:51 +00:00
Crypto City
3af586f748
unit_tests: fix missing roles in influence test
2020-05-29 23:20:51 +00:00
Crypto City
c22e54b850
unlock_time is now valid only for coinbase txes
2020-05-29 23:20:50 +00:00
Crypto City
4d819324dc
tests: fix missing error on missing python entry point
2020-05-29 23:20:50 +00:00
Crypto City
e98aa10308
cc: don't give an attribute point before levelling up
2020-05-29 23:20:50 +00:00
Crypto City
828bb1ba41
allow destroying a flag
2020-05-29 23:20:50 +00:00
Crypto City
0cc8c0c675
game balance updates after all the recent changes
2020-05-29 23:20:50 +00:00
Crypto City
d2949eb3ff
Change the address prefix from CC to TF
2020-05-29 23:20:49 +00:00
Crypto City
ce07516176
mine only one tx per account per block
2020-05-29 23:20:49 +00:00
Crypto City
cfcae9094d
claim cost in firefighting, flag resizing and city founding
2020-05-29 23:20:49 +00:00
Crypto City
2f77fc4051
invitations
2020-05-29 23:20:49 +00:00
Crypto City
f661248740
functional_tests: add hunt test
2020-05-29 23:20:49 +00:00
Crypto City
e21b669517
functional_tests: fix discovery tests after new discovery additions
2020-05-29 23:20:49 +00:00
Crypto City
a76e62f22c
core: sign create_aaccount commands too
...
with the new pubkey, to prove we know it
2020-05-29 23:20:49 +00:00
Crypto City
98ad361d8a
firefighting
2020-05-29 23:20:45 +00:00
moneromooo-monero
9b86e14c5a
functional_tests: add simple relay_tx test
2020-05-28 12:49:17 +00:00
luigi1111
d6d4a03b85
Merge pull request #6535
...
81773f5cb4edc1
2020-05-27 18:27:06 -05:00
moneromooo-monero
6f5411d305
tests: fix missing error on missing python entry point
2020-05-27 13:11:01 +00:00
Crypto City
6a18101b1a
add invitation system
2020-05-26 16:22:42 +00:00
Crypto City
b333b92415
move cc_badge.h away from blockchain_db.h
2020-05-26 16:22:42 +00:00
Doyle
15538f7e3f
ByteSlice: Fix persisting ptr to std::moved SSO buffer
...
The Bug:
1. Construct `byte_slice.portion_` with `epee::span(buffer)` which copies a pointer to the SSO buffer to `byte_slice.portion_`
2. It constructs `byte_slice.storage_` with `std::move(buffer)` (normally this swap pointers, but SSO means a memcpy and clear on the original SSO buffer)
3. `slice.data()` returns a pointer from `slice.portion_` that points to the original SSO cleared buffer, `slice.storage_` has the actual string.
2020-05-20 10:13:58 +10:00
Lee Clagett
a11ec4ac1d
Support for supercop ASM in wallet, and benchmark for supercop
2020-05-16 10:25:17 +00:00
moneromooo-monero
81773f55a4
fuzz_tests: refactor and add OSS-Fuzz compatibility
2020-05-15 17:18:27 +00:00
Lee Clagett
67ade80055
Add randomized delay when forwarding txes from i2p/tor -> ipv4/6
2020-05-15 07:57:35 +00:00
selsta
f35ced6d7f
build: fix boost 1.73 compatibility
2020-05-14 22:57:53 +02:00
Lee Clagett
29e563bb1e
Fixed bugs for take_slice and byte_stream->byte_slice
2020-05-12 01:26:37 -04:00
sumogr
8656a8c9ff
remove double includes
2020-05-11 13:53:17 +00:00
SomaticFanatic
5ef0607da6
Update copyright year to 2020
...
Update copyright year to 2020
2020-05-06 22:36:54 -04:00
luigi1111
9f3e8e3ff0
Merge pull request #6477
...
afe5a55babf25d5715460
2020-05-06 00:26:16 -05:00
Lee Clagett
e5214a2ca2
Adding ZMQ/Pub support for txpool_add and chain_main events
2020-05-04 02:06:35 +00:00
moneromooo-monero
db8563cb46
performance_tests: some windows fixes
...
Too many iterations cause std::bad_alloc for the timings vector,
and the micro prefix displays as some other character, so use u.
Reported by iDunk
2020-05-03 14:11:45 +00:00
Crypto City
06472348cf
WIP - palettes
2020-04-28 15:43:03 +00:00
Lee Clagett
afe5a55e96
Revert functional test changes in babf25d2e and 571546067
2020-04-24 18:30:23 -04:00
Crypto City
4863f4684e
unit_tests: fix building settings unit test
2020-04-23 13:16:35 +00:00
Crypto City
6ad068d938
make city levels somewhat easier to achieve
2020-04-22 15:14:48 +00:00
Crypto City
3a0571d578
give some slight share/production edge with building age
...
This should make it somewhat more appealing to build an existing building
rather then buy your own land and build a new building on it, given there
is no land scarcity.
2020-04-21 17:41:07 +00:00
luigi1111
c846c8650e
Merge pull request #6445
...
5715460babf25d
2020-04-21 09:03:37 -05:00
luigi1111
4540afc51b
Merge pull request #6433
...
7326b69082dd2c
2020-04-21 08:54:44 -05:00
luigi1111
06c81b6527
Merge pull request #6359
...
f9441c5
2020-04-21 08:38:21 -05:00
luigi1111
2d729fbdf7
Merge pull request #6332
...
87d7558
2020-04-21 08:26:54 -05:00
Crypto City
326f4bc3f2
allow repairing many flags in one command
2020-04-15 17:51:31 +00:00
woodser
87d75584e8
Allow wallet2.h to run in WebAssembly
...
- Add abstract_http_client.h which http_client.h extends.
- Replace simple_http_client with abstract_http_client in wallet2,
message_store, message_transporter, and node_rpc_proxy.
- Import and export wallet data in wallet2.
- Use #if defined __EMSCRIPTEN__ directives to skip incompatible code.
2020-04-15 13:22:46 -04:00
Crypto City
3b87070a5d
add hunt system
2020-04-13 17:23:54 +00:00
Crypto City
c7c3944fb0
unit_tests: fix badge score unit tests
2020-04-11 19:11:47 +00:00
Crypto City
bf738e7524
cc: extend the db to store all game events, not just game update ones
2020-04-11 19:02:00 +00:00
Lee Clagett
c26c93019a
Add byte_stream for zero-copy serialization, and add support in ZMQ-JSON.
2020-04-11 04:12:11 +00:00
luigi1111
8185054db7
Merge pull request #6451
...
4ed60b6
2020-05-02 15:14:41 -05:00
luigi1111
a5cc613a68
Merge pull request #6460
...
f8b1480
2020-05-01 15:50:19 -05:00
luigi1111
c9b800a787
Merge pull request #6446
...
e509ede
2020-05-01 15:32:52 -05:00
Dusan Klinec
e509ede2aa
trezor: adapt to new passphrase mechanism
...
- choice where to enter passphrase is now made on the host
- use wipeable string in the comm stack
- wipe passphrase memory
- protocol optimizations, prepare for new firmware version
- minor fixes and improvements
- tests fixes, HF12 support
2020-04-27 18:17:56 +02:00
Sumo Gr
f8b1480f95
unit_tests: fix gcc+ warning
2020-04-18 18:04:20 +03:00
Sarang Noether
4ed60b626a
Bulletproofs: verification speedup
2020-04-14 20:31:30 -04:00
luigi1111
228af683a7
Merge pull request #6403
...
5de2295
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
2020-04-04 13:12:31 -05:00
luigi1111
5757d99208
Merge pull request #6361
...
68a6507
2020-04-04 13:01:15 -05:00
luigi1111
0150a480fd
Merge pull request #6357
...
42a7a4d
2020-04-04 12:59:23 -05:00
luigi1111
cfc0f4a7fa
Merge pull request #6351
...
81c59435fcc23a3387f0e
2020-04-04 12:55:02 -05:00
luigi1111
bf70696a85
Merge pull request #6346
...
dbfa4f8
2020-04-04 12:50:17 -05:00
luigi1111
c4f75fe898
Merge pull request #6339
...
c61abf8
2020-04-04 12:47:31 -05:00
luigi1111
292e2d8f28
Merge pull request #6335
...
0078ce7
2020-04-04 12:42:50 -05:00
luigi1111
0bd2c14bbb
Merge pull request #6309
...
e69acfff5a11f0
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
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
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
2020-03-12 01:13:49 -07:00
Alexander Blair
092a57df99
Merge pull request #6243
...
4771a7ae2fbbc4a23004835b39a343d7606318029467b2e4b595583f5f98b46d
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
2020-02-28 19:57:13 -08:00
Alexander Blair
4371ac4265
Merge pull request #6225
...
987c3139
2020-02-28 19:48:11 -08:00
Alexander Blair
944e8a4542
Merge pull request #6220
...
a9bdc6e4
2020-02-28 19:45:31 -08:00
Alexander Blair
e7997cd62a
Merge pull request #6202
...
02b80513
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
2020-02-06 00:29:32 -08:00
Alexander Blair
25c1bd4714
Merge pull request #6035
...
b90c4bc3fa16df99054b2621d0faae2ad56a483a3c849188
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
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#6110 (Dusan Klinec)
2020-01-24 20:23:24 -08:00
Alexander Blair
d1b08c00cf
Merge pull request #6146
...
70c9cd3c
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
2020-01-16 17:27:15 -08:00
Alexander Blair
50c2fda496
Merge pull request #6110
...
da6c807f
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
Crypto City
075119b46b
unit_tests: fix overread in influence calculation
2019-12-13 01:28:54 +00:00
Crypto City
c9c91ccb08
cc: add staff (extra payments per building count)
...
to incentivize richer people towards larger buildings rather
than many small ones
2019-12-13 01:28:54 +00:00
Crypto City
341ed8ed53
rejig repair a bit
...
Repair is now 0 before anything is built, and goes to 100% when
building. This makes it easier when building anew after a building
got destroyed due to decay
2019-12-13 01:28:54 +00:00
Crypto City
836b362159
fix reverting buy_land after trading flags
2019-12-13 01:28:21 +00:00
Crypto City
70b4a8f594
Fixes after rebasing onto latest monero
2019-12-13 01:27:46 +00:00
Crypto City
f4c2a09499
functional_tests: add command revert tests
2019-12-13 01:26:54 +00:00
Crypto City
210882c66f
remove tile data and set repair to 0 for derelict buildings
2019-12-13 01:26:54 +00:00
Crypto City
475ff2dcdb
unit_tests: fix cc unit tests build
2019-12-13 01:26:54 +00:00
Crypto City
f92bc5e779
building activation requires a thresold of the budget to be used
2019-12-13 01:21:44 +00:00
Crypto City
e8d072cb8f
functional_tests: fix cc functional tests
2019-12-13 01:21:44 +00:00
Crypto City
84106cbcbe
allow 50-1000 economic level (in steps of 50)
2019-12-13 01:21:44 +00:00
Crypto City
7c2f33c660
game: display "buildable" zone around generators
2019-12-13 01:21:44 +00:00
Crypto City
e484e3eda8
unit_tests: fix tests
2019-12-13 01:21:44 +00:00
Crypto City
d9176ad644
add repair command and UI
2019-12-13 01:21:44 +00:00
Crypto City
1d0ec34f78
setting up buildings needs to have relevant generators nearby
2019-12-13 01:21:44 +00:00
Crypto City
e6b2da4bb9
generators basics
2019-12-13 01:21:44 +00:00
Crypto City
3fb509b796
more work in influence
2019-12-13 01:21:44 +00:00
Crypto City
455c859823
new command to assign items to a flag
2019-12-13 01:21:44 +00:00
Crypto City
5ff843a7a5
functional tests: fix cc tests (adding building settings as a side effect)
2019-12-13 01:21:44 +00:00
Crypto City
445d59c650
city support in game update command
2019-12-13 01:21:04 +00:00
Crypto City
7b26b94e56
make shares 64 bit
2019-12-13 01:21:04 +00:00
Crypto City
346f3e9791
game update
2019-12-13 01:21:04 +00:00
Crypto City
96bbe1857c
keep land if a building decays to 0
2019-12-13 01:20:38 +00:00
Crypto City
6e8c42868d
more work on influence
2019-12-13 01:20:38 +00:00
Crypto City
13f61e7e16
some work on potential
2019-12-13 01:20:38 +00:00
Crypto City
1795477cdd
replace monetary cost by labour cost in building
2019-12-13 01:20:37 +00:00
Crypto City
9b9aed1c56
make blocks and labour items
2019-12-13 01:20:37 +00:00
Crypto City
29a7b2f954
more work on building settings
2019-12-13 01:20:37 +00:00
Crypto City
fb318fbf16
building settings
2019-12-13 01:20:37 +00:00
Crypto City
2bdb7be38c
add role flag field
2019-12-13 01:20:37 +00:00
Crypto City
4e1b8e14b9
add cc influence building blocks
2019-12-13 01:20:37 +00:00
Crypto City
70179de428
potential maps
2019-12-13 01:20:37 +00:00
Crypto City
8a9b3f0e66
more work on game update
2019-12-13 01:20:37 +00:00
Crypto City
2dbab85c58
quadtree: move to cc, and use std::shared_ptr instead of Urho3D's
2019-12-13 01:20:37 +00:00
Crypto City
3b318b5bf4
more work on trade command
2019-12-13 01:20:37 +00:00
Crypto City
1248fc2dc7
more work on trade command
2019-12-13 01:20:37 +00:00
Crypto City
4d351a682a
more work on trade command
2019-12-13 01:20:37 +00:00
Crypto City
5face5e4c6
more work on trade command - accept only one trade for the same flag
2019-12-13 01:19:10 +00:00
Crypto City
96cb892a74
more work on trade command
2019-12-13 01:19:10 +00:00
Crypto City
af51d16944
more work on trade command
2019-12-13 01:19:10 +00:00
Crypto City
35a15567fe
more work on trade command
2019-12-13 01:19:10 +00:00
Crypto City
303267a975
more work on trade command
2019-12-13 01:19:10 +00:00
Crypto City
2c88df3028
more work on trade command
2019-12-13 01:19:10 +00:00
Crypto City
ed0defe38e
more work on trade command
2019-12-13 01:19:10 +00:00
Crypto City
331bfa7a75
more work on trade command
2019-12-13 01:19:10 +00:00
Crypto City
1979fa16ee
more work on trade command
2019-12-13 01:19:10 +00:00
Crypto City
2c4d9aa8ab
more work on trade command
2019-12-13 01:19:10 +00:00
Crypto City
8777c1c354
functional_tests: more build tests
2019-12-13 01:19:10 +00:00
Crypto City
32f6fe1f8e
don't use the wallet keys for CC, but a derived key, for privacy
2019-12-13 01:19:10 +00:00
Crypto City
33c36e8d8b
fix up tests after recent changes
2019-12-13 01:18:57 +00:00
Crypto City
257c6279fc
make create_account not a cc_command_base_t subclass
2019-12-13 01:18:57 +00:00
Crypto City
bcd323c987
restore tests
2019-12-13 01:18:57 +00:00
Crypto City
fad8355a7e
add functional tests, a few fixes, and a cc_get_info wallet rpc
2019-12-13 01:18:57 +00:00
Crypto City
b791566140
trade command, and command overhaul it required
2019-12-13 01:18:19 +00:00
Crypto City
b188f4636d
more work on game update command
2019-12-13 01:14:17 +00:00
Crypto City
634e477278
"game" command, for consensus driven changes
2019-12-13 01:12:39 +00:00
Crypto City
98533616d3
add a repair field to flag
2019-12-13 01:12:39 +00:00
Crypto City
9dbb2c2f02
save support for magica models
2019-12-13 01:12:39 +00:00
Crypto City
5d74ba6159
don't accept "short" build commands
...
It'll increase tx size a bit, but is safer
2019-12-13 01:12:39 +00:00
Crypto City
26b36eb282
union/difference selection
2019-12-13 01:12:39 +00:00
