doy-lee
913b3a40b5
Merge commit '2287fb9' into CherryPickUnboundWindowsBuildFix
2018-10-22 15:43:00 +11:00
Riccardo Spagni
5c418c0522
Merge pull request #4522
...
a39c0358
2018-10-20 20:40:16 +02:00
moneromooo-monero
cf75ee722a
blockchain: move two new verification errors to the verify category
...
Lest we get people get scared again
2018-10-19 21:11:12 +00:00
doy-lee
b9fabc269f
Merge branch 'dev' into LokiMergeUpstreamUntil_20181010_77e1ebf
2018-10-11 13:21:23 +11:00
doy-lee
e2c8660d22
Merge dev changes
2018-10-10 17:51:16 +11:00
Maxim Shishmarev
207c1fa89a
Making service nodes list and quorum cop thread-safe ( #285 )
...
* Remove dependency on service node list in quorum cop
* making service node list therad-safe
* improve thread-safety of quorum cop
2018-10-10 16:24:01 +11:00
doy-lee
339f96b0cc
Merge commit 'c23b6f8' into LokiMergeUpstreamUntil_20181010_77e1ebf
2018-10-10 15:07:16 +11:00
doy-lee
7c3d7c49d3
Add missing outputs specifier to wallet
2018-10-10 14:39:16 +11:00
doy-lee
c73da116ae
Merge commit '4a652d6' into LokiMergeUpstreamUntil_20180911_e6d36c1
2018-10-10 13:48:01 +11:00
Maxim Shishmarev
1157d90345
use vector for hard fork versions in test options
2018-10-10 13:02:45 +11:00
doy-lee
2d3adf003b
Merge commit '7addabc' into LokiMergeUpstreamUntil_20180911_e6d36c1
2018-10-10 10:30:31 +11:00
doy-lee
1e0c4bf4f1
Fix remaining bulletproofs failing core tests
2018-10-09 19:59:21 +11:00
doy-lee
c1da4f690d
Merge commit '5ffb2ff' into LokiMergeUpstreamUntil_20180911_e6d36c1
2018-10-09 12:31:08 +11:00
Riccardo Spagni
ac5674524a
Revert "Merge pull request #4472 "
...
This reverts commit 79d46c4d55c9fc61dbb5
2018-10-08 21:39:54 +02:00
moneromooo-monero
a39c035846
blockchain: add check test options are given for fakechain mode
...
Coverity 188616
2018-10-08 11:37:58 +00:00
doy-lee
5805b72778
Merge commit '2a8fcb421bc41eb254f95379dd73238915dd509d' into LokiMergeUpstreamUntil_20180911_e6d36c1
...
Begin fixing broken bulletproof tests in Loki
2018-10-08 13:34:36 +11:00
doy-lee
ffcee98d37
Merge commit '126196b' into LokiMergeUpstreamUntil_20180911_e6d36c1
2018-10-04 15:00:37 +10:00
doy-lee
e2ef377b4a
Merge commit '9ce9f8caf6e290088711ce4d5d90c1507a837bf2' into LokiMergeUpstreamUntil_20180911_e6d36c1
2018-10-04 14:59:49 +10:00
xiphon
02d3ef7bda
blocks: use auto-generated .c files instead of 'LD -r -b binary'
2018-10-04 00:01:09 +00:00
Riccardo Spagni
e2da7c7817
Merge pull request #4467
...
fa942ef6
2018-10-02 22:36:57 +02:00
Riccardo Spagni
83d8f03c23
Merge pull request #4333
...
73403004 add --block-notify to monerod and --tx-notify to monero-wallet-{cli,rpc} (moneromooo-monero)
2018-09-29 22:20:44 +02:00
iDunk5400
fa942ef610
daemon: silence daemon update warnings on testnet
2018-09-29 14:42:10 +02:00
Riccardo Spagni
8bf5a00564
Merge pull request #4423
...
357441a2d9f666d76b1b4e836f153533
2018-09-25 13:33:52 +02:00
doy-lee
6c6e2a1c01
Merge commit '510dbf3' into LokiMergeUpstream20180821
2018-09-25 18:00:51 +10:00
doy-lee
3f85a1b716
Merge commit '89645ec' into LokiMergeUpstream20180821
2018-09-25 17:50:49 +10:00
moneromooo-monero
50981c40ce
blockchain: add stagenet v8 and v9, two weeks before mainnet
2018-09-24 20:43:39 +00:00
Riccardo Spagni
d9f666d78c
update checkpoints.dat
2018-09-23 09:51:15 +02:00
Riccardo Spagni
d6893aedf6
Merge pull request #4369
...
b2bb9312befdcbf4
2018-09-21 20:31:21 +02:00
moneromooo-monero
360f07774e
core: cache block template where possible
...
This avoids constant rechecking of the same things each time
a miner asks for the block template. The tx pool maintains
a cookie to allow users to detect when the pool state changed,
which means the block template needs rebuilding.
2018-09-21 15:54:01 +10:00
doy-lee
879181d9b0
Merge commit 'b780cf4' into LokiMergeUpstream20180821
2018-09-20 20:01:13 +10:00
doy-lee
0012fe9568
Merge batch upstream changes from monero
2018-09-19 19:21:56 +10:00
doy-lee
319a2c3299
Upstream merge necessary changes to work with Loki
2018-09-19 19:15:03 +10:00
doy-lee
ad8cdc1d1f
Merge commit '702a410' into LokiMergeUpstream20180821
2018-09-19 14:18:52 +10:00
doy-lee
bfa4f75e5c
Merge commit '21afa71' into LokiMergeUpstream20180821
2018-09-19 14:05:10 +10:00
doy-lee
5b9091d119
Merge commit '025187e' into LokiMergeUpstream20180821
2018-09-19 14:05:07 +10:00
doy-lee
13d524ee02
Merge branch 'dev' into LokiMergeUpstream20180821
2018-09-19 13:23:56 +10:00
moneromooo-monero
46a5b51427
blockchain: avoid exception if asked for a block we do not have
...
This can happen if a peer tries to obtain the next span from other
peers if that span is needed for not downloaded yet. Also if the
peer maliciously requests a non existent block hash.
2018-09-19 11:50:13 +10:00
Riccardo Spagni
22a6591a70
Merge pull request #4325
...
4e1e9a60
2018-09-18 17:39:16 +02:00
jcktm
f9804db357
updated checkpoints to remove early hardfork chainsplit
2018-09-17 06:47:31 +10:00
moneromooo-monero
be001326d1
remove obsolete daemon selection of fake outs and old tx construction
2018-09-14 10:51:45 +00:00
doy-lee
0c85ff45e3
Merge commit '2329d2f' into LokiMergeUpstream20180821
2018-09-14 16:14:44 +10:00
doy-lee
ed9d21bb9f
Merge commit '0cf80ba' into LokiMergeUpstream20180821
2018-09-14 15:51:22 +10:00
doy-lee
f8d12478c2
Merge commit '2771a18' into LokiMergeUpstream20180821
2018-09-14 15:40:55 +10:00
Maxim Shishmarev
d8944cb5ca
core_tests: more tests and some refactoring ( #205 )
...
* core_tests: test that deregister tx make it into full blocks
* correct derivation of the service nodes winner in core tests
* core_tests: check deregistrations with non-zero fee declined
* core_tests: linear chain generator refactoring
* core_tests: test deregister safety buffer
* fix build error with const elements
* remote unnecessary const from return type
2018-09-14 14:35:29 +10:00
doy-lee
13589fad38
Merge commit 'ef2cb6328788e14e8d593593ea9b2b716d72d6bd' into LokiMergeUpstream20180821
2018-09-13 19:07:10 +10:00
doy-lee
ae4d7e4465
Merge commit 'a830db25775f7b708210e736154caf147ddf0ef3' into LokiMergeUpstream20180821
2018-09-13 18:42:56 +10:00
doy-lee
ca464be3bd
Merge commit 'ed2c81e' into LokiMergeUpstream20180821
2018-09-13 18:42:49 +10:00
moneromooo-monero
8d769392d9
replace std::list with std::vector on some hot paths
...
also use reserve where appropriate
2018-09-13 18:31:35 +10:00
doy-lee
5138bf10a2
Merge commit '50af357' into LokiMergeUpstream20180821
2018-09-13 17:53:10 +10:00
doy-lee
0b166ffaa3
Merge branch 'dev' into LokiMergeUpstream20180821
2018-09-13 17:46:15 +10:00
