Commit Graph

27722 Commits

Author SHA1 Message Date
Jack Grigg
a581ac5e1b wallet: Skip transactions with no shielded data in CWallet::SetBestChain()
Co-authored-by: Daira Hopwood <daira@jacaranda.org>

Closes #3495.
2019-06-11 00:45:56 +08:00
blackjok3r
cab05f7f01 fix 2019-06-10 23:53:11 +08:00
blackjok3r
fd23e3a914 add -ac_ccactivateht=. Fix oracles timestamp activation, to stop loading block from disk for no reason. 2019-06-10 23:30:13 +08:00
blackjok3r
ce6acf0d00 Change ccEnable/Disable to macro 2019-06-10 20:51:52 +08:00
blackjok3rtt
5fdbf460d5 Merge pull request #101 from jl777/beta
Beta
2019-06-10 20:28:11 +08:00
jl777
1f523d4162 Merge pull request #1537 from jl777/dev
Dev
2019-06-10 00:56:23 -11:00
jl777
a7b9ee5150 Merge pull request #1536 from jl777/FSM
Merge branch 'dev' into FSM
2019-06-10 00:55:41 -11:00
jl777
5a44f04d8b Merge pull request #1535 from Alrighttt/FSM
Add oracles/faucet to KMDICE, add tokens to COQUI
2019-06-10 00:54:55 -11:00
Alrighttt
c9a943a86e add oracles, faucet to DICE; add tokens to COQUI 2019-06-10 10:50:23 +00:00
Alrighttt
cd189ae070 Merge pull request #2 from jl777/FSM
Fsm
2019-06-10 12:36:37 +02:00
jl777
94c7bec747 Merge branch 'dev' into FSM 2019-06-09 21:46:59 -11:00
jl777
c53064c938 Merge pull request #1534 from jl777/dev
Dev
2019-06-09 21:46:43 -11:00
jl777
929990301e Merge pull request #1533 from KomodoPlatform/dev
fix multi OS build
2019-06-09 21:46:14 -11:00
ca333
c0e915a27e Merge pull request #174 from jl777/dev
sync dev
2019-06-10 10:41:49 +02:00
jl777
e028fc8a6e Merge pull request #1532 from jl777/dev
Dev
2019-06-09 21:37:29 -11:00
jl777
350b8e85e0 Merge pull request #1531 from jl777/FSM
FSM
2019-06-09 21:35:30 -11:00
jl777
839f2b5959 Merge branch 'dev' into FSM 2019-06-09 21:34:47 -11:00
jl777
98b1189c4b Merge pull request #1530 from jl777/jl777
Jl777
2019-06-09 21:34:21 -11:00
jl777
507cb56c5d Tweak batches 2019-06-09 21:33:52 -11:00
jl777
dea44a0b20 Merge pull request #1529 from jl777/kolo-jl
dev
2019-06-09 21:33:18 -11:00
ca333
77ceea9b15 fix multi OS build 2019-06-10 00:32:19 +02:00
ca333
34192e2b22 add multi OS ifdef
added ifdef directives for conditional mutli OS build
2019-06-10 00:18:16 +02:00
ca333
1120925b60 Merge pull request #173 from jl777/dev
sync dev
2019-06-09 22:31:40 +02:00
Mihail Fedorov
2abffc800c dev 2019-06-09 19:48:21 +03:00
jl777
266cd487a3 Merge branch 'FSM' into jl777 2019-06-08 22:19:50 -11:00
jl777
c42116ba3b Refund processor 2019-06-08 22:19:33 -11:00
jl777
6d9ccdc858 Merge pull request #1528 from KomodoPlatform/FSM
add contribution guideline and security info
2019-06-08 22:19:06 -11:00
ca333
219e684a50 fix typo 2019-06-09 09:48:39 +02:00
ca333
6301a294ed Merge pull request #169 from jl777/FSM
sync FSM
2019-06-09 09:45:13 +02:00
ca333
3d313229d8 add dev docs 2019-06-09 09:43:52 +02:00
ca333
dd1e2e7576 add src 2019-06-09 09:36:00 +02:00
ca333
f0171a9bbc update code of conduct 2019-06-09 09:33:23 +02:00
ca333
6bb5f308fa add contribution guideline 2019-06-09 09:32:37 +02:00
jl777
3ca198ac20 Merge pull request #1527 from jl777/FSM
FSM
2019-06-07 22:55:25 -11:00
jl777
127d1485dc Merge pull request #1526 from jl777/jl777
Jl777
2019-06-07 22:54:57 -11:00
jl777
6432d0a24d Merge branch 'FSM' into jl777 2019-06-07 22:54:16 -11:00
jl777
65fd650782 Rescue stuff 2019-06-07 22:53:59 -11:00
jl777
733f4501a5 Merge branch 'dev' into FSM 2019-06-07 21:30:29 -11:00
jl777
e7777b405c Merge branch 'beta' into dev 2019-06-07 21:30:08 -11:00
jl777
81562f0459 Merge pull request #1525 from blackjok3rtt/beta
Disable ALL CCs on all CC activated chains.
2019-06-07 19:16:32 -11:00
blackjok3r
e73b3c5c9d Disable all CCs that are not used. Still needs list of ccs for KMDICE from Alright. 2019-06-08 12:50:10 +08:00
blackjok3rtt
215cd52809 Merge pull request #100 from jl777/beta
Beta
2019-06-08 11:32:21 +08:00
ca333
d206cc9c6c add security info 2019-06-08 01:22:28 +02:00
ca333
d256bddec4 Merge pull request #168 from jl777/FSM
sync FSM
2019-06-08 01:19:45 +02:00
jl777
439e7cb5d7 Fix getchaintips rpc crash. Thanks mike tout!! 2019-06-07 08:51:38 -11:00
jl777
b71ed3b95e Merge branch 'FSM' into jl777 2019-06-03 23:07:04 -11:00
jl777
c508dee766 Merge branch 'dev' into FSM 2019-06-03 23:06:37 -11:00
jl777
52661cc30a Merge branch 'beta' into dev 2019-06-03 23:05:24 -11:00
jl777
89e1414c6b Merge pull request #1524 from KMDLabs/master
merge changes for gcharang
2019-06-03 23:05:06 -11:00
blackjok3r
bc69675fc3 undo attempt at hs/s for staking chains 2019-06-04 17:55:34 +08:00