Commit Graph

9084 Commits

Author SHA1 Message Date
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
luigi1111 996fa78196
Merge pull request #6231
8e338e5 depends: update libsodium to 1.0.18 (TheCharlatan)
2020-01-08 18:46:02 -05:00
Riccardo Spagni 3c01bffd0c
Merge pull request #6253
f9b48b91c GPGKey: Add Snipa (Alexander Blair)
2020-01-06 21:36:42 +02:00
luigi1111 907292dfb4
Merge pull request #6232
aa9ba30 add binaryFate's PGP key (binaryFate)
2020-01-03 08:21:36 -05:00
Alexander Blair f9b48b91c6
GPGKey: Add Snipa
Adds GPG key for Alexander Blair (Snipa)
2019-12-18 22:06:49 -08:00
binaryFate aa9ba3064e add binaryFate's PGP key 2019-12-13 21:03:56 +01:00
TheCharlatan 8e338e555c
depends: update libsodium to 1.0.18 2019-12-12 23:39:37 +01:00
luigi1111 b4e1dc83d2
Merge pull request #6057
3b8dcc2 wallet2: make keys unlocker reentrant (moneromooo-monero)
2019-12-12 13:49:58 -06:00
luigi1111 9d0d4f1d08
Merge pull request #6056
5a44893 python-rpc: add missing strict_balances parameter for get_accounts (moneromooo-monero)
2019-12-12 13:48:15 -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 a6fa7d493e
Merge pull request #6041
261abf7 functional_tests: ensure mining stops on error in mining test (moneromooo-monero)
2019-12-12 13:41:05 -06:00
luigi1111 425da2381d
Merge pull request #6037
f49a8ca easylogging++: add screen.xterm-256color to the 'allow colour' TERM list (moneromooo-monero)
2019-12-12 13:40:09 -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
luigi1111 3531cc5fd2
Merge pull request #5965
5d7ae2d Adding support for hidden (anonymity) txpool (vtnerd)
2019-12-12 13:32:35 -06:00
luigi1111 411f1b0ee3
Merge pull request #6174
9cb8d92 ANONYMITY_NETWORKS.md : fix unintentional wrapping (jonathancross)
2019-11-25 12:40:05 -06:00
Jonathan Cross 9cb8d92202
ANONYMITY_NETWORKS.md : fix unintentional wrapping 2019-11-23 17:06:57 +01:00
luigi1111 3e3db92303
Merge pull request #6117
0f7c9f4 Gitian Readme: adding android signing & fix v0.15 checksum. (jonathancross)
2019-11-20 09:23:19 -06:00
luigi1111 f971068363
Merge pull request #6155
d8fc8d8 make d2h et al. constant-time (jtgrassie)
2019-11-19 10:00:09 -06:00
Jethro Grassie d8fc8d8868
make d2h et al. constant-time 2019-11-19 04:21:02 -05:00
luigi1111 81da5246e4
Merge pull request #6148
47d094c Fix #6147 DB corruption from child process overwrite (hyc)
2019-11-18 13:24:42 -06:00
luigi1111 ac0e6f7ecd
Merge pull request #6118
gitian: add FreeBSD support (75c5a04, 607c01a, cca6e5c, 35b5e91, 024a1c7, b14d9ab, 5eea312, 9cbba5a, 2e435df, abeed9a) (hyc)
2019-11-18 13:21:08 -06:00
Howard Chu abeed9a767
"Fix" non-determinism in native_cctools build
By omitting the otool binary which is built non-deterministically.
We don't use it anyway.
2019-11-18 09:18:00 +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
Howard Chu 2e435dfe76
Fixup compiled python in OSX 2019-11-17 13:44:18 +00:00
Howard Chu 9cbba5a8ec
Fix unwind library ordering
Sort objects being archived
2019-11-17 13:44:18 +00:00
Howard Chu 5eea312f6d
Fixup sodium darwin
get rid of sodium-darwin.mk special case, unify back with sodium.mk
2019-11-17 13:44:18 +00:00
Howard Chu b14d9abca9
Use standard time for depends caches
streamline, remove obsolete wrappers
2019-11-17 13:44:18 +00:00
Howard Chu 024a1c7ddf
Add ARFLAGS
Needed to invoke deterministic mode on some archivers
2019-11-17 13:44:07 +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
luigi1111 97bdaae7d3
Merge pull request #6107
3d649d5 epee: close connection when the peer has done so (moneromooo-monero)
2019-11-16 10:59:32 -06:00
xiphon 09f59eccad wallet: set non-empty error string on connection failure 2019-11-14 19:49:57 +00:00
Howard Chu 35b5e917aa
gitian: add FreeBSD 2019-11-14 07:03:04 +00:00
Howard Chu cca6e5c645
depends: Add FreeBSD support 2019-11-14 07:03:04 +00:00
Howard Chu 607c01aa56
gitian: Parametrize target platforms 2019-11-14 07:03:04 +00: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
luigi1111 fe3f6a3e6b
Merge pull request #6097
27457a2 wallet2: fix pool txes not being flushed when mined (moneromooo-monero)
2019-11-11 15:45:26 -06:00
moneromooo-monero 3d649d528a
epee: close connection when the peer has done so
This fixes rapid reconnections failing as the peer hasn't yet
worked out the other side is gone, and will reject "duplicate"
connections until a timeout.
2019-11-11 20:05:24 +00:00
Howard Chu 75c5a04ca5
gitian: Update to latest gitian-builder 2019-11-11 08:35:53 +00:00
Jonathan Cross 0f7c9f4f31
Gitian Readme: adding android signing & fix v0.15 checksum. 2019-11-11 00:41:59 +01:00
moneromooo-monero 27457a2268
wallet2: fix pool txes not being flushed when mined 2019-11-04 19:32:48 +00:00
Riccardo Spagni a48ef0a65a
Merge pull request #6088
e8c5ab515 gitian: fix out dir location (iDunk5400)
2019-11-04 06:14:05 -08:00
Riccardo Spagni b20d8a94fc
Merge pull request #6091
5b78c27c5 Copy LICENSE to all archives (Howard Chu)
2019-11-04 06:13:55 -08:00
iDunk5400 e8c5ab5155
gitian: fix out dir location 2019-11-04 10:25:54 +01:00
Howard Chu 5b78c27c50
Copy LICENSE to all archives 2019-11-04 05:05:38 +00:00
Riccardo Spagni ff94771b47
Merge pull request #6087
2bfd41b29 depends: fix typo in packages (selsta)
2019-11-03 15:13:52 -08:00