Commit Graph

7698 Commits

Author SHA1 Message Date
Crypto City
39bdccc437 game: add forest horizon 2020-02-04 14:55:58 +00:00
Crypto City
32ee9647ef game: default to clouds on 2020-02-04 14:55:43 +00:00
Crypto City
3e05b3e9d0 game: make some edit fields autofocus where appropriate 2020-02-04 01:12:16 +00:00
Crypto City
6020912e94 game: fix crash accessing null flag 2020-02-04 01:11:10 +00:00
Crypto City
fccb8c6f15 game: add header to buildings list in player info dialog 2020-02-04 00:41:37 +00:00
Crypto City
c05d737979 cc: increase patent itme, and add some more discoveries 2020-02-03 20:02:32 +00:00
Crypto City
c13a4642d7 game: flag tooltip tweaks 2020-02-03 16:36:17 +00:00
Crypto City
4020cff279 game: tweak widget enabled/disabled state based on wallet/account 2020-02-03 16:20:30 +00:00
Crypto City
5bd7572adb game: ensure non interactable list items don't claim a hit 2020-02-03 16:20:22 +00:00
Crypto City
67f4e4f956 game: do not pick any scene object when a TB widget is in the way 2020-02-03 16:20:22 +00:00
Crypto City
15b6cab28a cc: decrease threshold for new cities 2020-02-03 16:20:22 +00:00
Crypto City
09b4953f3c game: show tooltip with building info on hover 2020-02-03 16:20:22 +00:00
Crypto City
048282de81 game: player info dialog 2020-02-03 16:20:22 +00:00
Crypto City
302f81013d game: add current name as default in rename dialog 2020-02-01 11:59:12 +00:00
Crypto City
e19be588c6 game: smooth motion when the orbit camera avoids obstacles 2020-02-01 01:52:41 +00:00
Crypto City
ee2246d5d0 blockchain: disable block 1 for now 2020-01-31 23:28:38 +00:00
Crypto City
c0a680bbdc game: make orbit camera avoid obstacles 2020-01-31 20:47:22 +00:00
Crypto City
159cd822dd game: constrain walker camera pitch 2020-01-31 19:06:57 +00:00
Crypto City
d4efb19936 game: use planes rather than boxes for ground 2020-01-31 18:59:53 +00:00
Crypto City
f7f223967c game: make boundaries more visible 2020-01-31 15:30:16 +00:00
moneromooo-monero
b818522d29
p2p: fix spurious warning when we're connected to at last one seed 2020-01-31 15:11:22 +00:00
Crypto City
f2962eb131 game: add orbit camera
Useful when building
2020-01-31 15:05:17 +00:00
Crypto City
a4495fe653 game: add camera type selection, and default to walker 2020-01-31 14:29:04 +00:00
Crypto City
0217ad3035 walker-camera: fix unwanted roll 2020-01-31 13:41:32 +00:00
Crypto City
bc16deee19 game: rename "Actions" to "Commands" and add an exit button 2020-01-31 03:35:08 +00:00
Crypto City
aa0d1c7cbf game: move show flags to the options dialog 2020-01-31 03:21:02 +00:00
Crypto City
f4e0f98d6d cc: make military buildings' influence much larger
They don't get payouts, and their only use is bonuses for other
buildings, so they need to have a lot more to start being worth
the price.
2020-01-31 01:37:32 +00:00
Crypto City
46b97a477b game: make terrain actually infinite (for some small version of infinity) 2020-01-31 01:26:14 +00:00
Crypto City
7e277ba370 game: add missing files for found city dialog 2020-01-30 17:46:04 +00:00
Crypto City
7d09141bda game: add a "pick random coordinates" button to the found city dialog 2020-01-30 17:45:41 +00:00
Crypto City
122e383cd2 different building types now contribute differently to city growth 2020-01-30 17:26:02 +00:00
Crypto City
28615fe42d cc: modulate bonus buildings get from roads by role 2020-01-30 15:44:32 +00:00
Crypto City
90ecde3f3d db_lmdb: guard against cities founded after the genesis block 2020-01-30 15:44:32 +00:00
Crypto City
3cceab2f0b rpc: initialize new cities in cc_debug_allocate_new_city 2020-01-30 15:44:32 +00:00
Crypto City
31680e85f0 db_lmdb: don't delete a record we did no add in account keys 2020-01-30 15:44:32 +00:00
Crypto City
70f136440f daemon: print city name in cc_get_city 2020-01-30 15:44:32 +00:00
Crypto City
0da452c2d1 game: add largest buildings leaderboard 2020-01-30 15:44:32 +00:00
Crypto City
44176fbe43 game: add building activity leaderboard 2020-01-30 02:04:20 +00:00
Crypto City
eeb0d446b3 game: highlight "chat" button text when your nick is mentioned 2020-01-29 22:30:16 +00:00
Crypto City
d5b99cf343 game: don't re-focus the GUI when it's not focused 2020-01-29 20:49:05 +00:00
Crypto City
03dfa20a44 game: simplify and fix item selection in last update events dialog 2020-01-29 19:05:11 +00:00
Crypto City
870eefb108 cc: do not add "flag N" in events, they're redundant 2020-01-29 18:47:43 +00:00
Crypto City
a4ea6a7767 ensure generator production does not overflow 2020-01-29 18:44:17 +00:00
moneromooo-monero
4771a7aec1
p2p: remove obsolete local time in handshake
Also removes a potential fingerprinting vector
2020-01-29 14:39:58 +00:00
moneromooo-monero
2fbbc4a2d3
p2p: avoid sending the same peer list over and over
Nodes remember which connections have been sent which peer addresses
and won't send it again. This causes more addresses to be sent as
the connection lifetime grows, since there is no duplication anymore,
which increases the diffusion speed of peer addresses. The whole
white list is now considered for sending, not just the most recent
seen peers. This further hardens against topology discovery, though
it will more readily send peers that have been last seen earlier
than it otherwise would. While this does save a fair amount of net
bandwidth, it makes heavy use of std::set lookups, which does bring
network_address::less up the profile, though not too aggressively.
2020-01-29 14:39:56 +00:00
Crypto City
57526fd8f5 game: texturing improvements and new materials 2020-01-29 14:00:15 +00:00
Crypto City
49aa16bc51 wip - texturing 2020-01-29 01:21:45 +00:00
Crypto City
8554a4ed10 game: textures now extend over 8x8 tiles
Looks a lot better
2020-01-29 01:19:49 +00:00
Crypto City
cf37ca6393 game: add leaderboards dialog
And a leaderboard for discoveries
2020-01-28 21:08:20 +00:00
Crypto City
9fd1740594 game: fix crash in research dialog 2020-01-28 21:08:20 +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
53be0c04af game: fix typo in building settings message 2020-01-28 15:20:10 +00:00
Crypto City
8b6e8cca7b game: use std::vector<uint8_t> instead of std::vector<bool>
Turns out the load of operator== with a large selection kills performance
2020-01-28 15:05:21 +00:00
Crypto City
3c514cd9ba game: remove some unused code 2020-01-28 15:05:21 +00:00
Crypto City
329c20a2b2 game: don't warn when optional files are not found 2020-01-28 15:05:21 +00:00
Crypto City
2b55564405 blockchain: guard against large pre-start chain reorg 2020-01-28 15:05:21 +00:00
Crypto City
87d5be8ddb cc: move the town hall to the north side, in view of the start camera 2020-01-28 15:05:21 +00:00
Crypto City
24ccfe38ae cc: tweak road materials again 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
9ad2e1355d cc: make workforce proximity bonus/penalty starker 2020-01-28 15:05:21 +00:00
Crypto City
2282646a45 game: add flag size in the building settings dialog 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
Crypto City
28f8debbcf game: show road bonus for new buildings 2020-01-28 15:05:21 +00:00
Crypto City
53de630939 game: derive all windows from UITBWindow 2020-01-28 15:05:21 +00:00
Crypto City
d920561281 cc: bring first city earlier by 10 2020-01-28 15:05:21 +00:00
Crypto City
1c08f5d5a1 game: fix spurious "broken up" flag areas 2020-01-28 15:05:21 +00:00
moneromooo-monero
39a343d76e
p2p: remove backward compatible peer list 2020-01-26 18:37:33 +00:00
moneromooo-monero
606318026e
p2p: simplify last_seen serialization now we have optional stores 2020-01-26 18:37:32 +00:00
moneromooo-monero
9467b2e44c
cryptonote_protocol: omit top 64 bits of difficulty when 0 2020-01-26 18:37:31 +00:00
moneromooo-monero
5f98b46d58
p2p: remove obsolete local time from TIMED_SYNC 2020-01-26 18:37:26 +00:00
Alexander Blair
8eedc8a390
Merge pull request #6140
08635a08 blockchain: speedup fetching pruned contiguous tx blobs (moneromooo-monero)
2020-01-25 16:55:18 -08: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
623bc266ca tx_pool: fix tracking of city/flag trade commands 2020-01-25 23:17:44 +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
Crypto City
22b74d59d1 cc: ensure chat commands are not mined 2020-01-25 19:33:54 +00:00
xiphon
dab604e010 wallet2_api: implement estimateTransactionFee 2020-01-25 05:34:51 +00:00
Alexander Blair
59e7d5686b
Merge pull request #6093
2e58eb5c lmdb: Remove meaningless const qualifier on function type (Nathan Dorfman)
2020-01-24 20:24:44 -08:00
Alexander Blair
e8f94e7f1d
Merge pull request #6173
8231c7cd rpc: fix bootstrap RPC payment RPC being made in raw JSON, not JSON RPC (moneromooo-monero)
81c26589 rpc: don't auto fail RPC needing payment in bootstrap mode (moneromooo-monero)
2020-01-24 20:19:41 -08:00
Alexander Blair
93d49c1a54
Merge pull request #6172
d7cf8727 rpc: add received_timestamp for pool txes in gettransactions (moneromooo-monero)
2020-01-24 20:17:39 -08:00
Alexander Blair
e51ce477db
Merge pull request #6157
402dd207 db_lmdb: guard against non NUL terminated keys (moneromooo-monero)
2020-01-24 20:07:37 -08:00
Alexander Blair
159c78758a
Merge pull request #6154
3b419333 wallet: don't issue node rpc proxy requests in '--offline' mode (xiphon)
2020-01-24 20:07:01 -08:00
Alexander Blair
f20a962774
Merge pull request #6153
24adee4a p2p: don't request flags after closing connection (moneromooo-monero)
2020-01-24 20:06:46 -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
Alexander Blair
5558919e56
Merge pull request #6128
9fe8a76c perf_timer: fix pause/resume macros dereferencing too much (moneromooo-monero)
2020-01-24 20:06:12 -08:00
moneromooo-monero
2e9d1e6e1f
wallet2: fix store-tx-info loading
The backward compatibility code was always setting it to 1
in modern wallets since store_tx_keys was not present and thus
assumed to be 1 by default.

Reported by SeventhAlpaca
2020-01-24 16:34:07 +00:00
Crypto City
0a53ab2732 wallet2: don't process game balance changes for pool txes 2020-01-24 15:49:35 +00: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
712fed31fa cc: don't require a valid pubkey when not sending money 2020-01-24 15:49:34 +00:00
Crypto City
ae6ad7eb3a cc: fix reverting game update with defaulted land 2020-01-24 15:49:34 +00:00
Crypto City
8e2c9d5489 cc: make roads use granite, but less so 2020-01-24 15:49:34 +00:00
Crypto City
97da41ec66 game: fix selection disappearing as the mouse moves off an object 2020-01-24 15:49:34 +00:00
Crypto City
564b79bbc9 game: add edit commands which went missing during the tb switch 2020-01-24 15:49:34 +00:00
Crypto City
4ccc38366d game: fix influence/generator area markers 2020-01-24 15:49:34 +00:00
Crypto City
26c803adf6 game: factor out the area model builder, it'll be reused 2020-01-24 15:49:34 +00:00
Crypto City
0158e4bc71 game: add travel between cities 2020-01-24 15:49:34 +00:00
Crypto City
d68801f026 Allow trading cities 2020-01-24 15:49:34 +00:00
Crypto City
9d06dcf5b9 db_lmdb: don't place null pubkeys in the key-to-account table
all treasuries will have that key
2020-01-24 15:49:34 +00:00
Crypto City
7d6cb44866 db_lmdb: fix missing city name in for_all_cc_cities 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
Crypto City
b395e17a43 game: fix disappearing budget items 2020-01-20 00:58:01 +00:00
Crypto City
429cf3e9c0 game: disable assign items when appropriate
it was left enabled as a debug helper
2020-01-20 00:58:01 +00:00
Aaron Hook
d0641b42fe net: fix incorrect less operator for top/i2p addresses 2020-01-18 19:18:56 -08:00
Crypto City
3e25efaf45 game: display the max amount assignable in item select dialog 2020-01-18 13:02:00 +00:00
Crypto City
8ae7f04e93 game: some usability tweaks in trade ui 2020-01-18 12:14:27 +00:00
Crypto City
d6200512fd game: fix line taken out by mistkae in previous commit 2020-01-18 12:11:22 +00:00
Crypto City
d1b618ec43 game: wip - switch to turbo badger for ui 2020-01-18 01:21:51 +00:00
Crypto City
9c8fa71031 game: add missing node config dialog files 2020-01-17 23:24:08 +00:00
Crypto City
bc5bc0f085 game: make centered size conigurable 2020-01-17 23:21:37 +00:00
moneromooo-monero
484fc0c844 wallet2: remember daemon address overrides when loading a new wallet 2020-01-17 22:35:07 +00:00
Crypto City
bed5895ac3 game: node config dialog and disconnected notification 2020-01-17 21:13:02 +00:00
cohcho
fe92fa1391 [randomx] Add missing randomx_vm_set_cache() 2020-01-17 19:25:26 +00:00
Crypto City
4d4fbd7b41 game: wip - switch to turbo badger for ui 2020-01-17 16:59:43 +00:00
Crypto City
d0a35cbf6d game: more fuck you tb for this disappearing shade icon 2020-01-17 12:24:14 +00:00
Alexander Blair
beb815a81d
Merge pull request #6144
0e0351c4 wallet_rpc_server: add count parameter to create_address (Matt Smith)
2020-01-16 17:51:25 -08:00
Alexander Blair
c39ea485a0
Merge pull request #6141
b9b5c473 threadpool: use std::move when taking an element off the queue (moneromooo-monero)
2020-01-16 17:45:44 -08:00
Crypto City
1dc8488ca6 game: wip - switch to turbo badger for ui 2020-01-17 01:44:59 +00:00
Alexander Blair
2ce5529680
Merge pull request #6134
a7a40e28 Actually concatenate error strings. (Bert Peters)
2020-01-16 17:42:27 -08:00
Alexander Blair
f1ca98a7ef
Merge pull request #6133
b2ad757f Replace memset with memwipe. (Bert Peters)
2020-01-16 17:41:35 -08:00
Alexander Blair
e4e70b57ca
Merge pull request #6130
6dec0013 simplewallet: fix restore height warning (selsta)
2020-01-16 17:39:03 -08:00
Alexander Blair
c4abfbfbe7
Merge pull request #6124
21d4c216 blockchain: error out if the builtin hashes data size is wrong (moneromooo-monero)
2020-01-16 17:31:35 -08:00
Alexander Blair
c6f4113265
Merge pull request #6119
6f45cfa5 p2p: zero last seen timestamp when inserting a new peer (moneromooo-monero)
2020-01-16 17:29:27 -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
Crypto City
5d188770ab game: fix constant change events for main window 2020-01-16 22:50:33 +00:00
Crypto City
3903e10240 game: fix disappearing shade icon, fuck you tb 2020-01-16 21:58:55 +00:00
moneromooo-monero
50e59cfada
wallet2: reject zero keys in json input
Because the user might do this for reasons unknown.
Values beyond l-1 will be reduced, so are accepted.

Reported by who-biz.
2020-01-16 19:58:21 +00:00
Crypto City
a9b39c68aa game: wip - switch to turbo badger for ui 2020-01-16 13:36:02 +00:00
Crypto City
c896aeb2b3 game: fix random flag construction height when selling items 2020-01-16 13:32:56 +00:00
Crypto City
5376ff9fce game: fix inventory/budget selection 2020-01-15 21:53:27 +00:00
Crypto City
524f5f51f9 game: add flag info / last update events again 2020-01-15 21:10:44 +00:00
Crypto City
3cbf53cf13 game: make the main command window shadable 2020-01-15 21:03:33 +00:00
Crypto City
fbbd2e56d1 game: disable wallet widgets when no wallet is loaded 2020-01-15 19:31:53 +00:00
Crypto City
4688a3ba9e game: keep console the width of the screen 2020-01-15 19:31:35 +00:00
Crypto City
f438bd2866 game: fix flag display mode at startup 2020-01-15 18:35:06 +00:00
Crypto City
9c26e18e80 game: wip - switch to turbo badger for ui 2020-01-15 18:20:45 +00:00
Crypto City
af6405909b game: fix edit field context menu 2020-01-15 12:36:35 +00:00
Crypto City
ce43aecf41 game: move the commands window on resize if flush right or bottom 2020-01-15 11:36:07 +00:00
Crypto City
c6e3d0994f game: wip - switch to turbo badger for ui 2020-01-15 02:32:08 +00:00
Crypto City
a6d47c4c4a game: wip - switch to turbo badger for ui 2020-01-15 01:30:50 +00:00
xiphon
ffe7165ebf wallet: reroll fake outs selection on local tx_sanity_check failure 2020-01-14 22:56:23 +00:00
Crypto City
4a32053f66 game: wip - switch to turbo badger for ui 2020-01-13 21:55:23 +00:00
Crypto City
0465ed3b96 game: wip - switch to turbo badger for ui 2020-01-13 18:49:18 +00:00
Crypto City
06c92d3cec game: wip - switch to turbo badger for ui 2020-01-13 03:34:14 +00:00
Alexander Blair
e49a055e89
Merge pull request #6112
7c1d31b0 build: fix IOS, build blockchain_db and rpc, skip wallet_rpc_server (xiphon)
2020-01-11 18:10:44 -08:00
Alexander Blair
d024695772
Merge pull request #6105
0de8a0d3 wallet_rpc_server: new estimate_tx_size_and_weight RPC (moneromooo-monero)
2020-01-11 18:04:49 -08:00
Tadeas Moravec
096a9dbdf9
Wallet: Distingush amounts for a single subaddress
Adding a new `amounts` field ot the output of `get_transfers` RPC
method. This field specifies individual payments made to a single
subaddress in a single transaction, e.g., made by this command:

    transfer <addr1> <amount1> <addr1> <amount2>
2020-01-11 11:48:27 +01:00
Crypto City
88ea3cf8c6 game: player info window skeleton 2020-01-10 22:22:25 +00:00
Crypto City
6ce02621bc cc: make the labour cost function a bit less jaggy 2020-01-10 18:03:44 +00:00
Crypto City
14097fdc9f wallet: don't init the bitmessage socket before use
It saves having to create a SSL key that won't be used
2020-01-10 17:05:08 +00:00
Crypto City
b857530615 game: fancy clouds 2020-01-10 17:05:08 +00:00
rbrunner7
664720747f Daemon: Guard against reporting "synchronized" too early
The added condition "hshd.current_height >= target" guards against
reporting "synchronized" too early in the special situation that the
very first peer sending us data is synced to a lower height than
ourselves.
2020-01-10 15:49:49 +01:00
moneromooo-monero
0349347e6d
ringdb: use a different iv for key and data in rings table
This is technically a record encrypted in two pieces,
so the iv needs to be different.
Some backward compatibility is added to read data written
by existing code, but new data is written with the new code.
2020-01-09 17:32:21 +00:00
moneromooo-monero
7b88208722
simplewallet: reword mixin in user message in terms of ring size 2020-01-09 17:32:21 +00:00
moneromooo-monero
f507a43a23
wallet2: do not remove known rings when a tx fails
Even if it fails, the ring composition is known to a potential
adversary, and so we should reuse the same ring next time
2020-01-09 17:32:21 +00:00
UkoeHB
02224e714d Fix check_fee() discrepancy.
M100 = max{300kb, min{100block_median, m_long_term_effective_median_block_weight}}
not
M100 = max{300kb, m_long_term_effective_median_block_weight}

Fix base reward in get_dynamic_base_fee_estimate().

get_dynamic_base_fee_estimate() should match check_fee()

Fee is calculated based on block reward, and the reward penalty takes into account 0.5*max_block_weight (both before and after HF_VERSION_EFFECTIVE_SHORT_TERM_MEDIAN_IN_PENALTY).

Moved median calculation according to best practice of 'keep definitions close to where they are used'.
2020-01-09 09:11:09 -06:00
Crypto City
289d9c134b cc: fix "cleanup" with tiny amount of basic, no medium, and some high 2020-01-08 00:13:46 +00: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
moneromooo-monero
a84131cea3
p2p: fix off by one adding fallback peers
The code would ignore the first one to be added
2020-01-07 14:40:26 +00:00
Crypto City
9e0202913f game: fix race on new wallets 2020-01-07 13:41:23 +00:00
Crypto City
38c3352f6c game: simplify inventory code
Don't add 2048 list items, most of them hidden, get rid of
the index-to-item map, don't recreate the list unless changed
2020-01-06 21:42:55 +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
aef68e112c game: add stroke effect to the spector mode text
It makes the text readable when on bright daylight sky background
2020-01-06 12:44:11 +00:00
Crypto City
f258baa705 game: fix face orientations in new instanced quads render mode
They did not match the other modes
2020-01-06 12:44:11 +00:00
Crypto City
dbedf8df2d game: don't drop to per-cube rendering when a building isn't ours 2020-01-06 12:44:11 +00:00
Crypto City
6eee3091fb game: improve procsky (and enable it by default) and lighting
Procsky is now updated only when needed, removing the performance hit

A nighttime camera light is now added, and interpolates with the
sun light at dawn and dusk
2020-01-06 12:44:11 +00:00
Crypto City
0e8efe7976 game: add some shadow bias to fix some nasty artifacts 2020-01-04 23:24:45 +00:00
Crypto City
1734a6219c game: keep settings in a config file 2020-01-04 20:21:23 +00:00
Crypto City
5822dfd221 game: update labour when processing build commands 2020-01-04 14:49:36 +00:00
Crypto City
39a3fbec66 game: fix missing polygons on large meshes in optimized mesh render mode 2020-01-04 14:27:40 +00:00
Crypto City
e9afc00504 core: add txes to the txpool in parentage order 2020-01-04 13:51:23 +00:00
Crypto City
0c732485be game: prevent loading a model on flag without a building we own 2020-01-04 13:51:23 +00:00
Crypto City
4b5e70d283 tx_pool: add some debug logs on ready checks 2020-01-04 13:51:23 +00:00
Crypto City
055457ec67 cc: fix one CHECK_AND_ASSERT_MES to CHECK_COMMAND_SET 2020-01-04 13:51:23 +00:00
Crypto City
f77ff2201f game: new render mode using StaticModelGroup and instancing 2020-01-04 13:51:23 +00:00
Crypto City
5f40893ef7 game: fix node leak when changing render mode 2020-01-03 22:17:12 +00:00
Crypto City
f8f8035a1d db_lmdb: store accounts flags in canonical sorted order 2020-01-03 20:30:51 +00:00
moneromooo-monero
36bdf40288
p2p: fix adding wrong indices to the filtered peer list 2020-01-03 17:56:54 +00:00
Crypto City
559c5f7b2e fix issues with game update event cache and tests 2020-01-03 16:27:51 +00:00
Crypto City
1d8d178f36 blockchain: constrain the large coinbase tx allowance conditions 2020-01-03 15:23:14 +00:00
Crypto City
0df1c4eb7e game: only display the side of the frame quad if large enough 2020-01-02 22:51:35 +00:00
Crypto City
17a9eac108 game: add options for shadows and procsky 2020-01-02 21:55:32 +00:00
Crypto City
765e4bd709 game: disable smiley/clear buttons in spectator mode 2020-01-02 19:32:33 +00:00
Crypto City
b6dbec2347 game: don't crash when failing to load a wallet 2020-01-02 19:01:14 +00:00
Crypto City
45a2130be1 game: disable console input in spectator mode 2020-01-02 18:56:53 +00:00
Crypto City
a2d2598dc6 game: make the "load a wallet" button in spectator mode look better 2020-01-02 16:44:07 +00:00
Crypto City
c156b4459a game: highlight the selected item in the trade ui 2020-01-02 16:29:52 +00:00
Crypto City
3ac2fbffc8 game: always select an item by default in the trade ui 2020-01-02 16:10:40 +00:00
Crypto City
bac1eb6f47 game: display flag boundary rather than full area 2020-01-02 15:21:56 +00:00
Crypto City
8404b02301 miner: mine in verification mode when on low difficulty 2020-01-02 10:24:31 +00:00
Crypto City
c8c048f300 game: add activation notification when setting a building settings 2020-01-02 10:18:23 +00:00
Crypto City
a4986e988f game: clear screen even earlier at startup 2020-01-02 09:54:24 +00:00
Crypto City
051bc8bc08 game: draw a single quad for the flag base 2020-01-02 09:51:56 +00:00
Crypto City
d41a7a753c game: move the custom mesh creation to a separate routine
It will be reused
2020-01-02 09:51:52 +00:00
Crypto City
e75a4803d3 game: splashscreen instead of whatever was in video RAM at the time 2020-01-02 00:05:14 +00:00
Crypto City
f2086cc7a1 game: initialize UI earlier 2020-01-01 21:33:46 +00:00
Crypto City
f7fc704b5c game: add a "spectator mode" text and load button when in spectator mode 2020-01-01 21:28:18 +00:00
Crypto City
87085a9538 game: add spectator mode
A player without an account can now look around the game,
just not alter it
2020-01-01 20:42:14 +00:00
Crypto City
36fe5f9cc5 cc: fix FlagState leak 2020-01-01 18:04:34 +00:00
Crypto City
4f1d3acc70 cc: add a game update cache 2020-01-01 16:53:02 +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
debcea9769 cc: fix building name being lost on game update revert 2020-01-01 15:12:48 +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
7566d1d274 wallet: fix exceptions getting the hash of a pruned tx 2019-12-31 10:21:07 +00:00
Crypto City
eb494c526b cc: fix cumulative influence using the wrong flag's side for rounding 2019-12-31 10:19:13 +00:00
Crypto City
93743aa560 game: fix adding/removing blocks in a selection that spans flags 2019-12-31 10:19:13 +00:00
moneromooo-monero
d64e5aa719
wallet: allow message sign/verify for subaddresses 2019-12-31 08:44:36 +00:00
Crypto City
ab653343d6 game: fix leaking/duplicate flag quads 2019-12-30 22:38:18 +00:00
Crypto City
48082c41e9 game: select currently selected flag in trade ui, if any 2019-12-30 22:38:18 +00:00
Crypto City
868b8e3e2f game: add flags to trade ui 2019-12-30 22:38:18 +00:00
Crypto City
4a8aa3db2f game: pre-fill price/amount when clicking on an order 2019-12-30 22:38:18 +00:00
Crypto City
a1734a9935 game: bump trade ui price column widget width 2019-12-30 22:38:17 +00:00
Crypto City
b98aa4aaad game: better market selection 2019-12-30 22:38:17 +00:00
Crypto City
6818ef511f game: display potential as "-" when it doesn't apply 2019-12-30 22:38:17 +00:00
Crypto City
217166bcab game: add a resizing widget to the chat 2019-12-30 22:38:17 +00:00
Crypto City
c3e0f43f72 cc: make patent time per discovery 2019-12-30 22:38:17 +00:00
moneromooo-monero
a6c24412e5
wallet: fix exceptions getting the hash of a pruned tx 2019-12-30 15:14:57 +00:00
Crypto City
a31eaa1e55 simplewallet: don't print spent/received game money when locked 2019-12-29 18:47:18 +00:00
Crypto City
fe31868d7f game: fix horizontal scrollbar in chat 2019-12-29 18:41:18 +00:00
Crypto City
290067e908 game: don't print influence or potential when they don't apply 2019-12-29 17:51:02 +00:00
Crypto City
44ff248f19 game: add existing building name in building settings dialog 2019-12-29 17:50:40 +00:00
Crypto City
51469f08a8 cc: change research influence
Due to the way the research command works, we can't easily
determine "shares" for a research building, so instead we
make the research building influence others
2019-12-29 17:50:26 +00:00
Crypto City
883096ea25 cc: fix research bonus not taking height/EP into account
and grows in power of 1.5 to encourage large buildings (campuses)
2019-12-28 17:09:35 +00:00
Crypto City
cc2d565657 cc: fix research money not going back to treasury 2019-12-28 17:09:14 +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
87122879af tx_pool: always send receive time for chat game txes 2019-12-27 19:23:33 +00:00
Crypto City
d740c0900a game: remove budget activation threshold when unused 2019-12-27 19:02:45 +00:00
Crypto City
fdac2c3917 game: announce discoveries in chat 2019-12-27 18:58:30 +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
24a9685e57 game: hide locked and discovered discoveries by default 2019-12-27 03:08:55 +00:00
Crypto City
c4d88a0996 cc: add a couple more discoveries 2019-12-27 02:24:49 +00:00
Crypto City
94c605528c cc: do not count existing budget for chance to discover
turns out this is the best in practice
2019-12-27 01:52:36 +00:00
Crypto City
bc78dfe75c cc: fix bug hashing research outcome 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
d1f8d2c717 game: improve research UI
Prediction of chance of discovery from amount paid, colouring,
hide widgets if a discovery is not currently researchable
2019-12-26 18:03:59 +00:00
Crypto City
241a60c1ee game: swap buy and sell widgets around, it feels more natural 2019-12-26 16:49:13 +00:00
Crypto City
f81c8203aa game: add in chat game notifications
So far, only used for new buildings
2019-12-26 16:26:55 +00:00
Crypto City
22a59fb069 cc: add a few more discoveries 2019-12-26 16:26:55 +00:00
Crypto City
2f33a4a4f4 game: add research UI 2019-12-26 16:23:16 +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
4fc5db3f78 small research fixes and factor some code 2019-12-25 23:19:02 +00:00
Crypto City
1076fe952b cc: add research buildings 2019-12-25 22:29:52 +00:00
Crypto City
ccb71779c6 game: fix buying from the last resort seller from the trade ui 2019-12-25 22:29:36 +00:00
Crypto City
86a1517139 Discoveries and research 2019-12-25 20:36:51 +00:00
Crypto City
33d04dff63 cc: fix defaulting on buildings not clearing flags from accounts 2019-12-24 19:16:25 +00:00
Crypto City
73af7e4905 game: add matching and expiration to the trade UI 2019-12-24 18:42:13 +00:00
Crypto City
1cc85512c3 game: fix type mismatch 2019-12-24 18:11:08 +00:00
Crypto City
fd7ad43a88 game: trade UI (no matching yet) 2019-12-24 13:42:41 +00:00
Crypto City
d3981da708 cc: fix item balance check not setting the detail flag 2019-12-24 13:42:31 +00:00
Crypto City
3ce82a8424 game: update blur sizes on window resize 2019-12-23 21:50:29 +00:00
Crypto City
2069249b41 game: speed up default rendering case
Disable glow effect when it's used for anything
2019-12-23 21:32:22 +00:00
Crypto City
20ce5ae867 game: fix new/glow effect missing 2019-12-23 21:29:56 +00:00
Crypto City
3dba400994 cc: cleanup tiny block amounts in requirements 2019-12-23 19:14:52 +00:00
Crypto City
6f5e74503f cc: more tweaks and payout fixes 2019-12-23 18:12:06 +00:00
Crypto City
90d31182b4 more road and influence tweaks 2019-12-23 13:32:49 +00:00
Crypto City
0b870194dc cc: make land cost proportional to tiles (with some skew penalty) 2019-12-23 01:49:10 +00:00
Crypto City
d3b1cb3334 cc: slash all costs by 10 2019-12-23 00:57:12 +00:00
Crypto City
85485b6ebc cc: tweak RES requirements 2019-12-23 00:38:25 +00:00
Crypto City
4a63f50420 only consider active buildings for road bonus/shares calc 2019-12-23 00:05:54 +00:00
Crypto City
94dd8fb8d3 cc: fix shares and activation in game update 2019-12-22 20:11:42 +00:00
Crypto City
5fc8c98a20 tweak road bonus for residential flags based on north/south 2019-12-22 15:51:03 +00:00
Crypto City
40801f4f33 custom repair print function
to avoid relying on floats
2019-12-22 14:06:29 +00:00
Crypto City
9475f232ba cc: some more tweaking 2019-12-21 23:42:08 +00:00
Crypto City
dedcfa08e5 cc: make the agricultural min size smaller 2019-12-21 17:56:58 +00:00
Crypto City
ab39221a5e Add minimum sizes for certain roles/economic power combinations 2019-12-21 17:56:58 +00:00
Crypto City
1c3e744cb3 game: fix tile changing before all build txes are emitted 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
b98b8bf5b2 some more road tweaking 2019-12-21 17:56:58 +00:00
Crypto City
28d92dacfa cc: fix removing update events from the wrong height on revert 2019-12-21 17:56:58 +00:00
Crypto City
4417e82007 game: fix loop back to end on previous button in update events dialog 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
56e71876a1 cc: take into account amount of road space leading to a 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
a6b50d309c road tweaks 2019-12-21 17:56:58 +00:00
Crypto City
22285d7b70 Roads 2019-12-21 17:56:58 +00:00
moneromooo-monero
6933693179
rpc: fill miner_tx_hash again
It was removed to save duplicated generation time, but it can
be copied from another instance instead
2019-12-20 14:16:31 +00:00
Crypto City
976dec8ded game: print building role if unnamed in events dialog 2019-12-19 00:58:29 +00:00
Crypto City
ed7e28d13d game: fix off by one 2019-12-18 21:24:59 +00:00
Crypto City
d46b622f65 game: allow empty role in building settings for empty building
also select the current role by default
2019-12-18 21:22:06 +00:00
Crypto City
f48ea3fefd game: fix buffer overflow 2019-12-18 21:15:39 +00:00
Crypto City
a585369ab1 game: make shares 64 bits in a place where they were still 32 bits 2019-12-18 01:04:27 +00:00
moneromooo-monero
21c3d42eb9
p2p: drop the peerlist dump to TRACE
It's spammy
2019-12-17 20:27:04 +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
89b1c6c0d8 cc: tweak workforce generator a bit and fix its money sink 2019-12-17 13:56:15 +00:00
Crypto City
8a41742521 cc, game: disable some items and roles
They'll be game upgrades
2019-12-17 13:56:15 +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
6fafc90925 game: add building names to the last events dialog 2019-12-17 01:40:31 +00:00
Crypto City
099ddec05f game: move Map to GameState 2019-12-17 01:40:31 +00:00
moneromooo-monero
5f71de2803 wallet2: guard against race with multiple decrypt_keys users
If more than one thread wants to make sure of the spend secret key,
then we decrypt on the first caller and reencrypt on the last caller,
otherwise we could use an invalid secret key.
2019-12-17 01:40:29 +00:00
moneromooo-monero
f717d5936c
wallet2: guard against race with multiple decrypt_keys users
If more than one thread wants to make sure of the spend secret key,
then we decrypt on the first caller and reencrypt on the last caller,
otherwise we could use an invalid secret key.
2019-12-17 01:38:29 +00:00
moneromooo-monero
716012ca3a
rpc: drop the obsolete and wrong "unpruned size" log
Since we now get pruned data in the first place, the "unpruned" data
size will in fact be the pruned data size, leading to confusion
2019-12-16 14:50:07 +00:00
stoffu
ae84ec90c8
wallet-cli/rpc: allow sweep_all to use outputs in all subaddresses within an account 2019-12-16 21:10:11 +09:00
Crypto City
c76b4a210a game: fix free camera not keeping from rolling 2019-12-14 19:26:24 +00:00
Crypto City
56920d6130 game: fix crash removing last block 2019-12-14 19:01:43 +00:00
palomato
bc6d8aa343
Corrected message typo
Message was "peer claims higher version that we think"
Requested change "peer claims higher version than we think"
2019-12-14 13:06:09 -05:00
Crypto City
bbebe773f8 db_lmdb: fix bugs allocating new flags after some were deleted 2019-12-14 16:40:46 +00:00
Crypto City
2fa0400d72 Fixups after monero rebase, and fix tests after other recent changes 2019-12-14 16:40:46 +00:00
moneromooo-monero
5cbb17b946
wallet2: fix hang in wallet refresh
If the hashes received would move the current blockchain past the
stop point, the short history would not be updated, since we do
not expect another loop, but the daemon might return earlier hashes,
causing the end index to not be enough to reach the threshold and
this require another loop, which will download the same hashes and
cause an infinite loop.
2019-12-14 16:24:04 +00:00
moneromooo-monero
8a276451b2
blockchain: fix flushing txes from the txpool 2019-12-14 02:13:39 +00:00
Crypto City
41e339eff1 cc: decrease the one off fee to buy land 2019-12-13 01:33:07 +00:00
Crypto City
cbb7cb02ac game: add a basic "walker" camera
moves at ground level, can climb over one block
2019-12-13 01:33:07 +00:00
Crypto City
6577c31175 game: move camera code in a separate class with a base class 2019-12-13 01:33:07 +00:00
Crypto City
68b220edb7 game: speedup removing nodes 2019-12-13 01:33:07 +00:00
Crypto City
54646f0aeb game: optimized mesh generation 2019-12-13 01:33:07 +00:00
Crypto City
0223c854f8 game: F12 to draw debug geometry 2019-12-13 01:33:07 +00:00
Crypto City
ed8adb98ff game: fix crash switching material before the game is loaded 2019-12-13 01:33:07 +00:00
Crypto City
be772d75ba game: fix world tile streaming 2019-12-13 01:33:07 +00:00
Crypto City
a449e9aa33 game: add setting to ignore influence to get a cost/profit estimate 2019-12-13 01:33:07 +00:00
Crypto City
66293b2a88 cc: some more tweaking 2019-12-13 01:33:07 +00:00
Crypto City
a2389a9953 game: fix wood material after addition of more stone 2019-12-13 01:33:06 +00:00
Crypto City
a3ea3dd222 game: fix cursor/block z fighting 2019-12-13 01:33:06 +00:00
Crypto City
87b2d3e165 we can now build below existing blocks 2019-12-13 01:33:06 +00:00
Crypto City
cefe06e359 game: fix block addition to the wrong place 2019-12-13 01:33:06 +00:00
Crypto City
d2cfa670e0 game: fix error when removing a block where none exists 2019-12-13 01:33:06 +00:00
Crypto City
818d564719 game: better picking, and highlight selected tile too 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
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
b52d1cd974 game: fix theoretical loop bug 2019-12-13 01:32:49 +00:00
Crypto City
17b0ead854 game: estimate payouts for the first building of its type 2019-12-13 01:32:49 +00:00
Crypto City
019625c127 cc: some more tweaking 2019-12-13 01:32:49 +00:00
Crypto City
52deff213b game: add a scale field to the user guide prices 2019-12-13 01:32:49 +00:00
Crypto City
56a6b57d4b game: fix missing balance at start before a new block 2019-12-13 01:32:49 +00:00
Crypto City
2e105eef4b simplewallet: in-game balance change message wording and typo 2019-12-13 01:32:49 +00:00
Crypto City
18ca20333a game: add flag size in building settings dialog 2019-12-13 01:32:49 +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
003f4b85ae cc: some more tweaking 2019-12-13 01:32:49 +00:00
Crypto City
fef8f8fee6 game: add user selectable prices for profit/loss estimation 2019-12-13 01:32:49 +00:00
Crypto City
e48aae2fb3 tmp - log spam 2019-12-13 01:32:49 +00:00
Crypto City
18333fe5dc game: allow building sideways 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
238e7b2fff game: add estimated cost/price/profit/loss for generators
in building settings dialog
2019-12-13 01:32:49 +00:00
Crypto City
4a2ce9af1e ensure shares for non-earning buildings are 0 2019-12-13 01:32:49 +00:00
Crypto City
e8578103fa cc: some more tweaking 2019-12-13 01:32:49 +00:00
Crypto City
7e02bf3023 cc: double influence 2019-12-13 01:32:49 +00:00
Crypto City
4289fb6549 cc: add a comment about staff cost accounting where it's confusing 2019-12-13 01:32:49 +00:00
Crypto City
9c92a14a4d wallet: add chat RPC 2019-12-13 01:32:49 +00:00
Crypto City
d54f907d43 add game subsidy 2019-12-13 01:32:49 +00:00
Crypto City
893dc067a6 blockchain_db: fix built tiles counting 2019-12-13 01:31:56 +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
b80c323d42 remove some obsolete code 2019-12-13 01:31:25 +00:00
Crypto City
d0e49f833e game: chat display tweaks 2019-12-13 01:31:25 +00:00
Crypto City
c9c705f74e fix time drift causing missing chat lines 2019-12-13 01:31:25 +00:00
Crypto City
ed69abc73d game: don't try to send chat lines if there's no wallet 2019-12-13 01:31:25 +00:00
Crypto City
d49840000b game: make the console easier to snap to the end 2019-12-13 01:31:25 +00:00
moneromooo-monero
4fa9fc1070 rpc: add received_timestamp for pool txes in gettransactions 2019-12-13 01:31:25 +00:00
Crypto City
108234ea0d game: remember chat color in wallet attributes 2019-12-13 01:31:25 +00:00
Crypto City
c529d0e1dd game: display exception message when failing to load wallet 2019-12-13 01:31:25 +00:00
Crypto City
1c43243154 game: add chat button 2019-12-13 01:31:25 +00:00
Crypto City
0ab0f8d687 game: chat improvements: smileys, colors 2019-12-13 01:31:25 +00:00
Crypto City
d13a6ef700 game: add C hotkey for chat 2019-12-13 01:31:25 +00:00
Crypto City
6eecbf3f74 game: make the prefix style configurable 2019-12-13 01:31:25 +00:00
Crypto City
c1d07b7c42 p2p: fix connection to single seed network 2019-12-13 01:31:25 +00:00
Crypto City
dc612482eb cc: don't error when getting potential for a role with no potential
This will happen a lot since all flag types get potential,
it'll just be 0
2019-12-13 01:31:25 +00:00
Crypto City
80d2269217 player names are now unique and format restricted 2019-12-13 01:31:25 +00:00
Crypto City
6a4b803920 game: improve chat UI
Display /me lines in italic, and display timestamps in smaller font
2019-12-13 01:31:25 +00:00
Crypto City
ff42976c39 wallet_rpc_server: add cc_repair wallet RPC 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
ecc038155a wallet_rpc_server: add new name field to building_settings 2019-12-13 01:31:25 +00:00
Crypto City
06401c86be game: save wallet cache on exit 2019-12-13 01:31:25 +00:00
Crypto City
da8a630d7f game: fix logic to get a new snapshot based on received blocks 2019-12-13 01:31:25 +00:00
Crypto City
d0915ab55e wallet2: add on_reorg callback 2019-12-13 01:31:25 +00:00
Crypto City
9de3148dd9 Add in-game chat through non-mineable txpool transactions 2019-12-13 01:31:25 +00:00
Crypto City
bcfa9ac956 cryptonote: fix prunable hash calculation 2019-12-13 01:31:25 +00:00
Crypto City
84d87d51a2 wallet2: fix cc_nonce not being serialized in pending_tx 2019-12-13 01:31:25 +00:00
Crypto City
629fcd44da game: add a console
Not the builtin one, since it's has builtin behaviour I don't want
and I'll need to extend this one
2019-12-13 01:31:25 +00:00
Crypto City
a762173511 game: add model export to Magical voxel format 2019-12-13 01:31:25 +00:00
Crypto City
87a2ab33de game: add save api (not used yet) 2019-12-13 01:31:25 +00:00
Crypto City
a0b6135cc9 game: don't display a dialog when trying to remove a block already on chain
It is aggravating
2019-12-13 01:31:25 +00:00
Crypto City
998730ef6e game: disable buy button when there is no selection 2019-12-13 01:31:25 +00:00
Crypto City
585b7c806d cc: tax empty land the same as a min level building 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
f0d7b3a8c4 game: use a 5x5 section setup from a 3x3 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
6b6ce844a3 game: don't display uninitialized timestamps in events window 2019-12-13 01:31:25 +00:00
Crypto City
5127173182 game: the events viewer can now explore history 2019-12-13 01:31:25 +00:00
Crypto City
5922cdad67 better player name lookup in game
Automatic lookup, and snapshots include the current set
2019-12-13 01:31:25 +00:00
Crypto City
cf0aca6c9b game: display owner name in flag window 2019-12-13 01:31:25 +00:00
Crypto City
d781e35365 game: display flags with the same colour if they have the same owner 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
fd45f4bce9 game: note when building settings costs are over player inventory 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
8261e1f03c game: disable building settings OK button on invalid configuration 2019-12-13 01:30:29 +00:00
Crypto City
d5f371143c game: pass resource flags upstream and include them in command 2019-12-13 01:30:29 +00:00
Crypto City
79b4718b07 game: show extra labour in building settings dialog 2019-12-13 01:30:29 +00:00
Crypto City
6f24dc5dc7 game: fix estimated land tax in building settings window 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
f6e2faeeb7 wallet_rpc_server: add parent to build command 2019-12-13 01:30:28 +00:00
Crypto City
9853c226ef wallet_rpc_server: add resource_flags to building_settings request 2019-12-13 01:30:28 +00:00
Crypto City
3543d06137 rpc: return influence in cc_get_flag response 2019-12-13 01:30:28 +00:00
Crypto City
b2ce755525 cc: fix get_distance, and add unit tests 2019-12-13 01:30:28 +00:00
Crypto City
1d765e5689 cc: remove leftover debug trace 2019-12-13 01:30:28 +00:00
Crypto City
a3f97c26ec wallet_rpc_server: return command nonce in build command 2019-12-13 01:30:28 +00:00
Crypto City
1570a58471 db_lmdb: set economic power to 0 for new land (before any building) 2019-12-13 01:30:28 +00:00
Crypto City
ddb878c0b0 rpc: serialize missing field in cc_get_flag response 2019-12-13 01:30:28 +00:00
Crypto City
ed4ccaa3cf wallet: remove unused budget field in building_settings response 2019-12-13 01:30:28 +00:00
Crypto City
1caeafccb6 cc: fix game update revert reverting wrong items 2019-12-13 01:30:28 +00:00
Crypto City
cd10f8d974 p2p: add seed node 2019-12-13 01:28:54 +00:00
Crypto City
ac22b43e79 blockchain: fix get_output_distribution assuming monero forks 2019-12-13 01:28:54 +00:00
Crypto City
67946e117e cc: clear last events when reverting a game update command 2019-12-13 01:28:54 +00:00
Crypto City
95a9010a3a game: enable/disable buttons depending on current state 2019-12-13 01:28:54 +00:00
Crypto City
bedf6e19b1 simplewallet: replace cow with cubes on lock screen 2019-12-13 01:28:54 +00:00
Crypto City
d1d5226922 game: display a "loading wallet" notification when starting loading 2019-12-13 01:28:54 +00:00
Crypto City
dc5df6bba9 game: keep budget unchanged if there is not enough to build 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
1bc506271e blockchain: fix crash in init 2019-12-13 01:28:54 +00:00
Crypto City
25cb8145fe game: fix inconsistent escape behaviour 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
79348ffb50 cc: don't add 0 land tax events 2019-12-13 01:28:21 +00:00
Crypto City
dfd37c7bf5 game: add mouse/key based building
z to place a block where the mouse points
x to remove a block where the mouse points
tab to cycle through block types
2019-12-13 01:28:21 +00:00
Crypto City
f2f92e924e game: auto select next item type when adding a row in item select dialog 2019-12-13 01:28:21 +00:00
Crypto City
de89dfa53b game: fix double counting of blocks when building 2019-12-13 01:28:21 +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
63b26444bb wallet: add assign_items RPC command 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
8fae545324 simplewallet: fix prospective balance reporting for create_account 2019-12-13 01:26:54 +00:00
Crypto City
5ed672eff3 rpc: fix pop_blocks not returning an error on error 2019-12-13 01:26:54 +00:00
Crypto City
302bcbef8f cc: add paranoid static assert about MIN_BUY_SIDE_SIZE 2019-12-13 01:26:54 +00:00
Crypto City
3b479592a8 db_lmdb: fix flag tile deletion 2019-12-13 01:26:54 +00:00
Crypto City
fd3b33d1d9 cc: fix stray db writes 2019-12-13 01:26:54 +00:00
Crypto City
94d28268f8 rpc: add optional cc_fee in get_transactions response 2019-12-13 01:26:54 +00:00
Crypto City
4d2bfe56f6 db_lmdb: don't move leftover balance to treasury on account deletion
It breaks reorgs
2019-12-13 01:26:05 +00:00
Crypto City
cfa02b4775 cc: fix stonecutter producing wood, not stone 2019-12-13 01:26:05 +00:00
Crypto City
21924d6aa9 cc: include bonus/penalty in game events 2019-12-13 01:26:05 +00:00
Crypto City
0aa4a74cd7 cc: tone down inactivity decay boost a bit 2019-12-13 01:26:05 +00:00
Crypto City
62263ec477 game: mention clicking on inventory when starting building 2019-12-13 01:26:05 +00:00
Crypto City
93de644e29 game: fix material selection for blocks only 2019-12-13 01:26:05 +00:00
Crypto City
3c1a2fcf39 game: some last update events dialog cosmetics 2019-12-13 01:26:05 +00:00
Crypto City
6b89692a82 game: make item buy dialog more forgiving
Merge duplicates and ignore empty fields
2019-12-13 01:26:05 +00:00
Crypto City
97cc397371 game: fix activation budget using the remaining budget 2019-12-13 01:26:05 +00:00
Crypto City
424143aa6d cc: fix item delta decoding 2019-12-13 01:26:05 +00:00
Crypto City
94737a7cff game: add notification when selecting materials 2019-12-13 01:26:05 +00:00
Crypto City
4a8c0cd031 game: add "activation budget use" to the flag window 2019-12-13 01:26:05 +00:00
Crypto City
897624f12a game: "pin" flag window when there is a selection 2019-12-13 01:26:05 +00:00
Crypto City
199fb76c3c game: UI for last update events 2019-12-13 01:26:05 +00:00
Crypto City
f26920e64e fix shares not being serialized in game update 2019-12-13 01:26:05 +00:00
Crypto City
4d5c6530be cc: fix game handler check mixing balance and items 2019-12-13 01:26:05 +00:00
Crypto City
71b1cd6fc8 game: remove leftover debug print 2019-12-13 01:26:05 +00:00
Crypto City
cf72522e86 make game update actions retrievable as text 2019-12-13 01:26:05 +00:00
Crypto City
32d7a3523d game: make window resizeable 2019-12-13 01:21:44 +00:00
Crypto City
02607cbc32 blockchain: verify game update command in miner tx 2019-12-13 01:21:44 +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
c1c246b389 cc: make some log a bit more verbose 2019-12-13 01:21:44 +00:00
Crypto City
329ae07c49 blockchain: fix core tests for pre-v12 blocks 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
e8f0a0c6c6 land tax is now proportional to economic power 2019-12-13 01:21:44 +00:00
Crypto City
4269143cd9 blockchain: allow large blocks, if they're due to the coinbase tx
Game update txes might get large
2019-12-13 01:21:44 +00:00
Crypto City
0b799a2a45 game: fix potential init bug 2019-12-13 01:21:44 +00:00
Crypto City
1824fec36a rework potential maps and add potential for generators 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
fd7eea2f4d repair level below 70% affects shares 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
136a6f5838 game: fix build materials coming from player rather than budget 2019-12-13 01:21:44 +00:00
Crypto City
c3e5087803 game: add motion speed modifiers, and increase far clip plane/fog 2019-12-13 01:21:44 +00:00
Crypto City
d10437e1ce fix typo 2019-12-13 01:21:44 +00:00
Crypto City
4809c5ed3a game: some ui width tweaks 2019-12-13 01:21:44 +00:00
Crypto City
aac978baa7 more work on influence 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
81daa4733d improve snapshot handling 2019-12-13 01:21:44 +00:00
Crypto City
2fc645626a enable procsky and increase far plane 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
4e0158c476 fix prev cc_shares record fetching 2019-12-13 01:21:44 +00:00
Crypto City
9ec1540fee game: display treasury balance 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
a2ff11aee3 rpc: CC locking fix 2019-12-13 01:21:44 +00:00
Crypto City
cd0c10342d game: fix estimate payout in empty world 2019-12-13 01:21:04 +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
3a9ce612ff game: display influence radius
also display those overlays with alpha
2019-12-13 01:21:04 +00:00
Crypto City
346f3e9791 game update 2019-12-13 01:21:04 +00:00
Crypto City
818aa814c3 game: get a new snapshot when we get a game update command
These will be complex to get right, so might as well get a new
snapshot. This can change if it proves slow as the world grows.
2019-12-13 01:20:38 +00:00
Crypto City
058e08e025 tweak influence rules 2019-12-13 01:20:38 +00:00
Crypto City
a7fcb2cce8 payouts 2019-12-13 01:20:38 +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
937621b98b add get_cc_agricultural_potential for an area 2019-12-13 01:20:38 +00:00
Crypto City
bfa21bfd15 cc: pass role, not stability, to influence calc 2019-12-13 01:20:37 +00:00
Crypto City
1795477cdd replace monetary cost by labour cost in building 2019-12-13 01:20:37 +00:00
Crypto City
f6dfd72be6 game: rename "Load" button "Import model" 2019-12-13 01:20:37 +00:00
Crypto City
043d41aaa3 game: maintain flag budget when approving/abandoning building 2019-12-13 01:20:37 +00:00
Crypto City
abe4da3167 fixes for labour as item 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
0a2797fea5 blockchain: remove some obsolete code 2019-12-13 01:20:37 +00:00
Crypto City
f9804e9cd7 game: better building settings UI 2019-12-13 01:20:37 +00:00
Crypto City
3b4bc714b4 game: don't ask for a snapshot multiple times when syncing 2019-12-13 01:20:37 +00:00
Crypto City
ef859fd01b game: enable/disable some buttons based on game state 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
958e11370a cc: decrease town center stability potential map size 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
9cd6f6fc5c game: add a flag window, with basic flag info 2019-12-13 01:20:37 +00:00
Crypto City
d5b68cd957 game: don't allow buying more than 256x256
It'd end up buying a size modulo 256
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
50dfea93af game: make the quadtree is a bit more generic 2019-12-13 01:19:10 +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
39cfbb1c2d tx_pool: remove obsolete code 2019-12-13 01:19:10 +00:00
Crypto City
d422c248cf cc_command_defs: fix account size, it should be 32 bit 2019-12-13 01:19:10 +00:00
Crypto City
fc3bcb1533 tx_pool: flush txes with unknown parent 2019-12-13 01:19:10 +00:00
Crypto City
ca666fd6ff change display mode to "show/hide flags"
blocks are now always shown
2019-12-13 01:19:10 +00:00
Crypto City
f663f2d2b4 fix build wrt SDL 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
fe42578f44 removing blocks now obeys the fine grained selection 2019-12-13 01:19:10 +00:00
Crypto City
35d1b47607 Fix block caching when popping 2019-12-13 01:19:10 +00:00
Crypto City
8ca411330f game: copy Data/CoreData as game build post step 2019-12-13 01:19:10 +00:00
Crypto City
665d71b1f6 game: flatten all terrain for now 2019-12-13 01:19:10 +00:00
Crypto City
a502fca9b1 include for join 2019-12-13 01:19:10 +00:00
Crypto City
737db2a7e3 add missing file 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
1979fa16ee more work on trade command 2019-12-13 01:19:10 +00:00
Crypto City
9ab9d4439b 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
0fab3d28a4 wallet_rpc_server: handle unencoded blocks 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
257c6279fc make create_account not a cc_command_base_t subclass 2019-12-13 01:18:57 +00:00
Crypto City
db46103ddf daemon: print_bc parameter to list only blocks with txes 2019-12-13 01:18:57 +00:00
Crypto City
33b25649ee fix deposit always sending 0 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
c37f2bdb10 fix account unset in rpc transfer 2019-12-13 01:18:57 +00:00
Crypto City
b36dba06b3 more work on trade commands 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
32b856036e display repair in UI
also remove obsolete buy command in Map
2019-12-13 01:12:39 +00:00
Crypto City
efdeddfaaa add edge selection 2019-12-13 01:12:39 +00:00
Crypto City
408fb7b456 preliminary code to allow game commands in coinbase txes 2019-12-13 01:12:39 +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
21bc5cf724 display relative, not absolute, coordinates 2019-12-13 01:12:39 +00:00
Crypto City
49b9a267fc grow/shrink selection 2019-12-13 01:12:39 +00:00
Crypto City
fd30df3d66 remove console 2019-12-13 01:12:39 +00:00
Crypto City
103eb5407c elliptical selection mode 2019-12-13 01:12:39 +00:00
Crypto City
fa695cd790 new effect fixes 2019-12-13 01:12:39 +00:00
Crypto City
5b72dd7c5e don't add invisible nodes for type 0 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
d2f70a2fd4 faster 2019-12-13 01:12:39 +00:00
Crypto City
65549199c6 display fixes 2019-12-13 01:12:39 +00:00
Crypto City
97a9c7fad8 Load Magica voxel models in game - current material only 2019-12-13 01:12:39 +00:00
Crypto City
88e62ebe0c faster 2019-12-13 01:12:39 +00:00
Crypto City
b6757ebfc4 fix hidden block bug - they could be hidden by invisible ones 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
94fd5505bc magica voxel model loader 2019-12-13 01:12:39 +00:00
Crypto City
26b36eb282 union/difference selection 2019-12-13 01:12:39 +00:00
Crypto City
8f8e41b7f4 First steps towards complex selection 2019-12-13 01:12:39 +00:00
Crypto City
ad61f42304 add procsky (disabled)
It looks nice, but is very slow, might be usable as an option
2019-12-13 01:12:39 +00:00
Crypto City
9a635be6f6 fix Z fighting over selection and flag areas 2019-12-13 01:12:39 +00:00
Crypto City
61f04e93ea fix selection material bug 2019-12-13 01:12:39 +00:00
Crypto City
9f8b9044a2 make deposit/withdraw dialog modal 2019-12-13 01:12:39 +00:00
Crypto City
ffa4ed2c33 selection/glow fixes 2019-12-13 01:12:39 +00:00
Crypto City
1baa9f16b4 glowing newly built blocks
Draws attention to changes on the map
2019-12-13 01:12:39 +00:00
Crypto City
e14fc34be3 fix incremental build 2019-12-13 01:12:39 +00:00
Crypto City
5e30ce1933 optimize build tx size 2019-12-13 01:12:39 +00:00
Crypto City
ad21d6deb0 make not-yet-committed blocks look ghosted 2019-12-13 01:12:39 +00:00
Crypto City
0ebee4f3e8 undo/redo 2019-12-13 01:12:39 +00:00
Crypto City
f5e54984bb fix bad wallet balance on startup 2019-12-13 01:12:39 +00:00
Crypto City
822d3796a1 buying blocks in game 2019-12-13 01:12:39 +00:00
Crypto City
43ce9e2471 fix build after argv constness change 2019-12-13 01:12:39 +00:00
Crypto City
16d1860d9b fix focus issues 2019-12-13 01:12:39 +00:00
Crypto City
25f58d70b6 display in player window when the wallet is disconnected 2019-12-13 01:12:39 +00:00
Crypto City
c80e02df62 don't spam error messages forever 2019-12-13 01:12:39 +00:00
Crypto City
0a4ceb808a tx_pool: don't leave some txes in the pool without ever rechecking them 2019-12-13 01:12:39 +00:00
Crypto City
492e3dff41 snapshots 2019-12-13 01:12:39 +00:00
Crypto City
c20e3c52a7 build with debug info for now 2019-12-13 01:12:39 +00:00
Crypto City
df605398b6 new cc_get_state.bin daemon RPC 2019-12-13 01:12:39 +00:00
Crypto City
6e2d8e7de2 pass around block when refreshing 2019-12-13 01:11:39 +00:00
Crypto City
a812517700 some ui niggles 2019-12-13 01:11:39 +00:00
Crypto City
478c2b9db5 fixes 2019-12-13 01:11:39 +00:00
Crypto City
bf83c766de add notification ui for not-an-error info messages 2019-12-13 01:11:39 +00:00
Crypto City
a2a40bae65 bounds check 2019-12-13 01:11:39 +00:00
Crypto City
530b557349 don't take focus away from scene when clicking on commands 2019-12-13 01:11:39 +00:00
Crypto City
bbf2d892bf remove some obsolete defines, and make others saner 2019-12-13 01:11:39 +00:00
Crypto City
b239e62fae don't send nop txes 2019-12-13 01:11:39 +00:00
Crypto City
3ae27245b7 add nonce/parent in rpc 2019-12-13 01:11:39 +00:00
Crypto City
e6c1424213 remove block fix 2019-12-13 01:11:39 +00:00
Crypto City
f99059ef47 better selection niggles fix 2019-12-13 01:11:39 +00:00
Crypto City
678ade5df3 cast 2019-12-13 01:11:39 +00:00
Crypto City
6d4bd7fefe fix selection niggles 2019-12-13 01:11:39 +00:00
Crypto City
d27f797be4 incremental build 2019-12-13 01:11:39 +00:00
Crypto City
ed94d6159b in-game building support with build-and-commit 2019-12-13 01:11:39 +00:00
Crypto City
0ec9932a1f parent wip 2019-12-13 01:11:39 +00:00
Crypto City
525d31deab fixes 2019-12-13 01:10:17 +00:00
Crypto City
9fe310463e remove obsolete land cost calculation code and format land cost 2019-12-13 01:10:17 +00:00
Crypto City
3735a16468 in-game deposit/withdraw 2019-12-13 01:10:17 +00:00
Crypto City
6af529ac1c one can now buy land from the game UI 2019-12-13 01:10:16 +00:00
Crypto City
c76692e532 more fixes 2019-12-13 01:10:16 +00:00
Crypto City
3a52320010 more fixes 2019-12-13 01:10:16 +00:00
Crypto City
d73ab99e95 more fixes, and per flag city mesh modifications 2019-12-13 01:10:16 +00:00
Crypto City
03276185c8 fixes 2019-12-13 01:10:16 +00:00
Crypto City
5e9c11a642 quadtree fixes and unit tests 2019-12-13 01:10:16 +00:00
Crypto City
31f1ccade8 skeleton code for processing cc commands 2019-12-13 01:10:16 +00:00
Crypto City
ee9cffc0a7 in game load wallet function 2019-12-13 01:10:16 +00:00
Crypto City
28c4b17382 display wallet balance as well 2019-12-13 01:10:16 +00:00
Crypto City
d134c0599b adjust core tests after taking owned blocks into account when building 2019-12-13 01:10:16 +00:00
Crypto City
10cf0fbd8c plug city coordinates into the renderer too 2019-12-13 01:10:16 +00:00
Crypto City
cb118473ee remove some obsolete game code 2019-12-13 01:10:16 +00:00
Crypto City
ae6ddc6b8e account for blocks when building 2019-12-13 01:10:16 +00:00
Crypto City
65fd81f0fe plug wallet into renderer (and add missing files) 2019-12-13 01:10:16 +00:00
Crypto City
bc55e16880 wallet2: guard against no callback set when asking for password 2019-12-13 01:10:16 +00:00
Crypto City
f514d80daf game: fix a few warnings 2019-12-13 01:10:16 +00:00
Crypto City
d1036eb863 fix using namespace in header
It was conflicitng with ssl
2019-12-13 01:10:16 +00:00
Crypto City
da0fee4abc import PoC 3D renderer 2019-12-13 01:10:16 +00:00
Crypto City
bb9c5b97bf cc_status wallet command 2019-12-13 01:10:16 +00:00
Crypto City
2369d280dd buy_blocks command 2019-12-13 01:10:16 +00:00
Crypto City
c1f82eaec7 crypto: faster hashing for tests 2019-12-13 01:10:16 +00:00
Crypto City
a9c688a385 improve build core test, fix min height 2019-12-13 01:10:16 +00:00
Crypto City
392e0fc84b some more build tests, and adjust build cost curve 2019-12-13 01:10:16 +00:00
Crypto City
a2f66c6eb4 more build tests 2019-12-13 01:10:16 +00:00
Crypto City
ef20919721 basic build core tests 2019-12-13 01:10:16 +00:00
Crypto City
917dcd5485 build command 2019-12-13 01:10:16 +00:00
Crypto City
63eee871f5 buy_land wallet rpc 2019-12-13 01:09:15 +00:00
Crypto City
7b6648b77c buy_land core tests 2019-12-13 01:09:15 +00:00
Crypto City
81ef8e6104 add buy_land wallet command 2019-12-13 01:09:15 +00:00
Crypto City
639b02a407 make create_cc_transactions more generic 2019-12-13 01:08:07 +00:00
Crypto City
69616dfc00 syntax error after rebase 2019-12-13 01:08:07 +00:00
Crypto City
c129b656b1 remove address book payment id stuff left after rebase 2019-12-13 01:08:07 +00:00
Crypto City
252114a0b2 fixup some fork stuff left after rebase 2019-12-13 01:08:07 +00:00
Crypto City
647734e59b remove address book payment_id left after rebase 2019-12-13 01:08:07 +00:00
Crypto City
21d6960ed1 remove cc_command.h left after rebase 2019-12-13 01:08:07 +00:00
Crypto City
367bb6bafa remove get_account_integrated_address_as_str left after rebase 2019-12-13 01:08:07 +00:00
Crypto City
24f9900670 cleaner code to handle command specific code
also add the start of a cc consensus rules class
2019-12-13 01:08:07 +00:00
Crypto City
26519b0820 add cc_transfer wallet RPC 2019-12-13 01:08:07 +00:00
Crypto City
9ba3a6e427 more unit tests 2019-12-13 01:07:45 +00:00
Crypto City
1b6a6c878a forbid unlock_time in bare txes 2019-12-13 01:07:45 +00:00
Crypto City
aaf0f5098a remove now obsolete view public key, abortive subaddress support, etc 2019-12-13 01:07:45 +00:00
Crypto City
0a36d2a12b unit tests 2019-12-13 01:07:03 +00:00
Crypto City
a57e103b31 rework cc_command 2019-12-13 01:07:03 +00:00
Crypto City
a4bb280922 reject txes that, when combined, spend more than an account's balance 2019-12-13 01:05:09 +00:00
Crypto City
dc153a504e bare txes 2019-12-13 01:05:08 +00:00
Crypto City
b8b2eb22a7 cc tx fix 2019-12-13 01:03:21 +00:00
Crypto City
456a856231 new cc_deposit/cc_withdraw wallet commands 2019-12-13 01:02:27 +00:00
Crypto City
be3369cd6b test popping blocks reverts balance changes 2019-12-13 01:01:05 +00:00
Crypto City
4ffec4dc82 prune in signature 2019-12-13 01:01:05 +00:00
Crypto City
9e359d7dc8 fixup 2019-12-13 01:01:05 +00:00
Crypto City
aca2c2d52e blockchain: propagate error when popping blocks 2019-12-13 01:01:05 +00:00
Crypto City
aed6360776 withdraw test 2019-12-13 01:01:05 +00:00
Crypto City
2f135eedbd basic account system and tests 2019-12-13 01:01:05 +00:00
Crypto City
479b71b6e0 Fix coinbase not being able to include fees larger than subsidy 2019-12-13 01:00:34 +00:00
Crypto City
b17da7dd40 transactions can now involved cc accounts (wip) 2019-12-13 01:00:34 +00:00
Crypto City
1a070ceb7c New DB tables and debug commands 2019-12-13 00:59:22 +00:00
Crypto City
b9ea0d835c foo! 2019-12-13 00:55:07 +00:00
luigi1111
b4e1dc83d2
Merge pull request #6057
3b8dcc2 wallet2: make keys unlocker reentrant (moneromooo-monero)
2019-12-12 13:49:58 -06:00
luigi1111
e5cc6d39a9
Merge pull request #6055
886ed25 blockchain: fix comment wrongly refering to SHA-3 rather than Keccak (moneromooo-monero)
2019-12-12 13:47:04 -06:00
luigi1111
ccde60838b
Merge pull request #6054
017f816 daemon: handle printing higher hash rates (moneromooo-monero)
2019-12-12 13:45:50 -06:00
luigi1111
fb64463c4c
Merge pull request #6052
c96b7ee tx_pool: fix error message assuming incorrectly (moneromooo-monero)
2019-12-12 13:44:50 -06:00
luigi1111
e629db18f4
Merge pull request #6049
45fd72b Updated paper references (SarangNoether)
277003f Minor prover simplification (SarangNoether)
2019-12-12 13:43:57 -06:00
luigi1111
a61db51aae
Merge pull request #6027
9768e96 simplewallet: remove remaining payment id dead code (moneromooo-monero)
2019-12-12 13:38:00 -06:00
luigi1111
dad4cf121e
Merge pull request #6018
dce6f05 rpc: Only show version string if it matches expected pattern (ndorf)
3293780 daemon: Use rpc for 'version' command (ndorf)
2019-12-12 13:36:05 -06:00
moneromooo-monero
987c3139dc
print_coinbase_tx_sum now supports 128 bits sums
The tail emission will bring the total above 64 bits
2019-12-12 01:56:59 +00:00
Howard Chu
c361303184
Silence miner debugmsg spam
Don't try to allocate the dataset repeatedly if it has already failed.
2019-12-09 15:59:52 +00:00
moneromooo-monero
d93e1dffa9
simplewallet: warn on refresh if refresh-from-block-height seems off 2019-12-09 14:09:39 +00:00
moneromooo-monero
a6a2ad6cac
simplewallet: set manual refresh mode in rescan_bc
This ensures we get asked for the password if needed
2019-12-07 13:57:26 +00:00
Jason Rhinelander
72ca7e3b0f Fix time comparison math
Dividing `dt` here by 1e6 converts it to seconds, but that is clearly
wrong since `REQUEST_NEXT_SCHEDULED_SPAN_THRESHOLD_STANDBY` is measured
in microseconds.  As a result, this if statement was effectively never
used.
2019-12-05 21:02:18 -04:00
naughtyfox
a2578892c0 --disable-ban-rpc option to prevent RPC users from banning 2019-12-04 17:45:27 +03:00
moneromooo-monero
94266eeb89
simplewallet: fix output age display with duplicate heights
The highlight check was based on height, so would highlight
any output at that height, resulting in several matches if
a fake out was picked at the same height as the real spend
2019-12-03 18:50:28 +00:00
moneromooo-monero
f1d379d27d
simplewallet: fix "outputs in same tx" detector
It was comparing source txids, but txids were empty,
so all checks triggered
2019-12-03 18:50:22 +00:00
moneromooo-monero
5985c5afe8
rpc: add bad-blocks to flush_cache RPC
Flushes m_invalid_blocks in Blockchain.
2019-12-02 18:53:30 +00:00
woodser
ef95a76d0d remove unused variable 'ptx' from on_describe_transfer() 2019-12-01 13:07:26 -05:00
moneromooo-monero
5f2a32c15a
daemon: run with -rpc-payment-address and --rpc-restricted-bind-port 2019-11-29 20:07:01 +00:00
moneromooo-monero
f8127831c7
simplewallet: fix encrypted payment id note triggering on dummy ones 2019-11-29 20:02:46 +00:00
moneromooo-monero
316ab7b56e
wallet2: better error when restoring a wallet with the wrong keys 2019-11-28 18:22:29 +00:00
moneromooo-monero
b90c4bc39e
rpc: error out from get_info if the proxied call errors out
Coverity 205410
2019-11-27 19:52:39 +00:00
moneromooo-monero
054b2621b1
node_rpc_proxy: init some new rpc payment fields in invalidate
The cache time would take care of these, but it's cleaner that way

Coverity 205412
2019-11-27 19:52:37 +00:00
moneromooo-monero
d0faae2a92
rpc: init a few missing client_info members
Coverity 205414
2019-11-27 19:52:37 +00:00
moneromooo-monero
d56a483abe
rpc: do not propagate exceptions out of a dtor
Coverity 205415
2019-11-27 19:52:36 +00:00
moneromooo-monero
3c849188ab
rpc: always set the update field in update on sucess
Coverity 205416
2019-11-27 19:52:33 +00:00
moneromooo-monero
3813a992e4
download: catch exceptions checking for size
Happens on at least one windows box
2019-11-26 18:42:00 +00:00
moneromooo-monero
8231c7cd04
rpc: fix bootstrap RPC payment RPC being made in raw JSON, not JSON RPC 2019-11-25 19:28:43 +00:00
moneromooo-monero
88b82befc7
simplewallet: point to "set help" in the lock screen message 2019-11-25 13:17:21 +00:00
moneromooo-monero
f19c9f2307
util: allow newlines in string to be split 2019-11-25 13:17:18 +00:00
selsta
7ac7d5d32f
updates: fix source code URL on _WIN32 2019-11-25 00:37:54 +01:00
moneromooo-monero
81c2658989
rpc: don't auto fail RPC needing payment in bootstrap mode 2019-11-22 18:12:29 +00:00
moneromooo-monero
d7cf872767
rpc: add received_timestamp for pool txes in gettransactions 2019-11-22 15:53:40 +00:00
Matt Smith
0e0351c456 wallet_rpc_server: add count parameter to create_address 2019-11-22 12:00:01 +00:00
moneromooo-monero
402dd2078c
db_lmdb: guard against non NUL terminated keys 2019-11-19 11:12:49 +00:00
Jethro Grassie
d8fc8d8868
make d2h et al. constant-time 2019-11-19 04:21:02 -05:00
xiphon
3b41933335 wallet: don't issue node rpc proxy requests in '--offline' mode 2019-11-19 03:26:42 +00:00
moneromooo-monero
24adee4a08
p2p: don't request flags after closing connection 2019-11-19 02:03:39 +00:00
Lee Clagett
68a6507c3f Fixed bug in ZMQ JSON-RPC method field 2019-11-18 12:59:41 +00:00
Howard Chu
47d094c0c4
Fix #6147 DB corruption from child process overwrite
Don't leave stdout/stderr dangling on a fork.
2019-11-17 14:04:22 +00:00
luigi1111
df9843212a
Merge pull request #6135
09f59ec wallet: set non-empty error string on connection failure (xiphon)
2019-11-16 11:00:33 -06:00
moneromooo-monero
b9b5c473d1
threadpool: use std::move when taking an element off the queue
It has a std::function, which can have a capture context, and
the function runtime might be small
2019-11-15 13:24:34 +00:00
moneromooo-monero
08635a0875
blockchain: speedup fetching pruned contiguous tx blobs
About twice as fast, very roughly
2019-11-15 13:23:30 +00:00
xiphon
09f59eccad wallet: set non-empty error string on connection failure 2019-11-14 19:49:57 +00:00
Bert Peters
a7a40e285c Actually concatenate error strings. 2019-11-14 10:36:49 +01:00
selsta
6dec001359
simplewallet: fix restore height warning 2019-11-14 03:00:20 +01:00
Bert Peters
b2ad757f48 Replace memset with memwipe. 2019-11-13 18:00:50 +01:00
moneromooo-monero
9fe8a76c59
perf_timer: fix pause/resume macros dereferencing too much 2019-11-13 12:08:40 +00:00
wowario
67b4a19edf
simplewallet: noob-friendly help menu 2019-11-13 10:24:10 +03:00
Nathan Dorfman
dce6f055f9 rpc: Only show version string if it matches expected pattern 2019-11-12 18:19:24 -07:00
Nathan Dorfman
3293780992 daemon: Use rpc for "version" command 2019-11-12 17:57:36 -07:00
moneromooo-monero
21d4c21619
blockchain: error out if the builtin hashes data size is wrong 2019-11-12 12:43:08 +00:00
moneromooo-monero
6f45cfa5c5
p2p: zero last seen timestamp when inserting a new peer 2019-11-11 12:44:35 +00:00
moneromooo-monero
27522aaa12
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-11-10 12:58:49 +00:00
xiphon
7c1d31b0a1 build: fix IOS, build blockchain_db and rpc, skip wallet_rpc_server 2019-11-09 14:21:22 +00:00
moneromooo-monero
0de8a0d37d
wallet_rpc_server: new estimate_tx_size_and_weight RPC 2019-11-06 15:18:21 +00:00
moneromooo-monero
4b38400336
wallet2: don't try to lock an empty filename 2019-11-05 15:33:01 +00:00
moneromooo-monero
b328de6b7a
wallet_rpc_server: add tx weight in transfer commands responses 2019-11-05 14:25:06 +00:00
moneromooo-monero
27457a2268
wallet2: fix pool txes not being flushed when mined 2019-11-04 19:32:48 +00:00
moneromooo-monero
a633f85da9
daemon: allow printing N blocks from the end of the chain
It's a very common usage (for my anyway) and avoids the need to
get the current height, paste, subtract one, etc
2019-11-04 17:38:14 +00:00
moneromooo-monero
7ba31191f3
daemon: add +meta print_tx parameter
prints size, weight and (if mined) height
2019-11-04 15:57:56 +00:00
moneromooo-monero
236d2a88e2
blockchain_stats: make it work on pruned blockchains
It reports the actual size as pruned, however
2019-11-04 15:10:01 +00:00
Nathan Dorfman
2e58eb5cdb lmdb: Remove meaningless const qualifier on function type 2019-11-04 02:28:45 -07:00
Lee Clagett
70c9cd3c9c Change to Tx diffusion (Dandelion++ fluff) instead of flooding 2019-11-04 09:23:20 +00:00
Riccardo Spagni
06b0441762
Merge pull request #6074
38f691048 simplewallet: plug a timing leak (moneromooo-monero)
dcff02e4c epee: allow a random component in once_a_time timeouts (moneromooo-monero)
e10833024 wallet: reuse cached height when set after refresh (moneromooo-monero)
5956beaa1 wallet2: fix is_synced checking target height, not height (moneromooo-monero)
fd35e2304 wallet: fix another facet of "did I get some monero" information leak (moneromooo-monero)
d5472bd87 wallet2: do not send an unnecessary last getblocks.bin call on refresh (moneromooo-monero)
97ae7bb5c wallet2: do not repeatedly ask for pool txes sent to us (moneromooo-monero)
2019-11-03 14:52:16 -08:00
Lee Clagett
5d7ae2d279 Adding support for hidden (anonymity) txpool 2019-11-02 20:36:03 +00:00
Riccardo Spagni
eaadbbdab0
Merge pull request #6079
e4d1674e8 0.15.0.0 release engineering (Riccardo Spagni)
2019-11-02 17:31:22 +02:00
Riccardo Spagni
da31077bed
Merge pull request #6047
ebc6ce44f cryptonote: untangle dependency from miner to blockchain (moneromooo-monero)
2019-11-02 17:30:09 +02:00
Riccardo Spagni
e4d1674e8c
0.15.0.0 release engineering 2019-11-02 17:21:52 +02:00
moneromooo-monero
38f6910481
simplewallet: plug a timing leak
As reported by Tramèr et al, timing of refresh requests can be used
to see whether a password was requested (and thus at least one output
received) since this will induce a delay in subsequent calls.
To avoid this, we schedule calls at a given time instead of sleeping
for a set time (which would make delays additive).
To further avoid a scheduled call being during the time in which a
password is prompted, the actual scheduled time is now randomized.
2019-11-02 11:41:41 +00:00
JamesWrigley
b9fc206660 Add a --keep-fakechain option to keep fakechain databases
This is handy when doing tests that generate a lot of transactions, since that
takes time it's preferable to re-use the database for future runs.
2019-11-01 23:56:08 +01:00
moneromooo-monero
e108330248
wallet: reuse cached height when set after refresh
Refreshing sets cached height, which is otherwise got by calling
get_info. Since get_info is called upon needing to display a prompt
after a command has finished, it can be used to determine how much
time a given command took to run if the cache timeout lapses while
the command runs. Refreshing caches the height as a side effect, so
get_info will never be called as a result of displaying a prompt
after refreshing (and potentially leaking how much time it took to
process a set of transactions, therefore leaking whether we got
some monero in them).
2019-11-01 18:59:41 +00:00
moneromooo-monero
5956beaa15
wallet2: fix is_synced checking target height, not height
Target height would be appropriate for the daemon, which syncs
off other daemons, but the wallet syncs off the daemon it's
connected to, and its target is the daemon's current height.
2019-11-01 18:59:39 +00:00
moneromooo-monero
fd35e2304a
wallet: fix another facet of "did I get some monero" information leak
We get new pool txes before processing any tx, pool or not.
This ensures that if we're asked for a password, this does not
cause a measurable delay in the txpool query after the last
block query.
2019-11-01 18:59:38 +00:00
moneromooo-monero
d5472bd87b
wallet2: do not send an unnecessary last getblocks.bin call on refresh
The "everything refreshed" state was detected when a refresh call did
not return any new blocks. This can be detected without that extra
"empty" call by comparing the claimed node height to the height of
the last block retrieved. Doing this avoids that last call, saves
some bandwidth, and makes the common refresh case use only one call
rather than two.

As a side effect, it prevents an information leak reported by
Tramèr et al: if the wallet retrieves a set of blocks which includes
an output sent to the refreshing wallet, the wallet will prompt the
user for the password to decode the amount and calculate the key
image for the new output, and this will delay subsequent calls to
getblocks.bin, allowing a passive adversary to note the delay and
deduce when the wallet receives at least one output.

This can still happen if the wallet downloads more than 1000 blocks,
since this will be split in several calls, but then the most the
adversary can tell is which 1000 block section the user received
some monero (the adversary can estimate the heights of the blocks
by calculating how many "large" transfers are done, which will be
sections of blocks, the last of which will usually be below 1000,
but the size of the data should allow the actual number of blocks
sent to be determined fairly accurately).

This timing trick still be used via the subsequent scan for incoming
txes in the txpool, which will be fixed later.
2019-11-01 18:59:37 +00:00
moneromooo-monero
22d30866ca
simplewallet: add missing inactivity-lock-timeout to set help blurb 2019-11-01 15:37:55 +00:00
moneromooo-monero
9f57f0df92
simplewallet: do not mention inactivity if a lock was manual 2019-11-01 14:36:57 +00:00
moneromooo-monero
97ae7bb5cb
wallet2: do not repeatedly ask for pool txes sent to us
This lets a passive attacker with access to the network link
between node and wallet perform traffic analysis to deduce
when an idle wallet receives a transaction.

Reported by Tramèr et al.
2019-11-01 10:42:01 +00:00
moneromooo-monero
ebc6ce44f4
cryptonote: untangle dependency from miner to blockchain
It causes link errors at least on mac
2019-10-31 01:06:42 +00:00
moneromooo-monero
3b8dcc290d
wallet2: make keys unlocker reentrant
protects against having your keys mangled
2019-10-29 13:53:57 +00:00
moneromooo-monero
886ed25055
blockchain: fix comment wrongly refering to SHA-3 rather than Keccak 2019-10-29 11:37:08 +00:00
moneromooo-monero
017f816897
daemon: handle printing higher hash rates 2019-10-29 11:33:15 +00:00
moneromooo-monero
deb350b783
always print peer IDs in the same format 2019-10-29 11:30:20 +00:00
moneromooo-monero
c96b7ee619
tx_pool: fix error message assuming incorrectly 2019-10-29 10:43:59 +00:00
xiphon
2e2bf8a207 daemon: always use bootstrap daemon (if set) in '--no-sync' mode 2019-10-28 21:52:19 +00:00
Sarang Noether
45fd72b0d7 Updated paper references 2019-10-28 12:34:44 -04:00
moneromooo-monero
65301c406e
core: point out when we hit the block rate visibility limit 2019-10-28 16:06:15 +00:00
Sarang Noether
277003f145 Minor prover simplification 2019-10-28 09:34:49 -04:00