Commit Graph

21587 Commits

Author SHA1 Message Date
Alrighttt
caaca06a8f leave Heir CC activated on CCL 2019-06-14 14:41:04 +02:00
jl777
d2015647d0 undo constraint 2019-06-12 14:52:51 -11:00
Mihail Fedorov
2984a80f2e dev 2019-06-12 15:46:57 +03:00
jl777
ce787171b9 Merge branch 'FSM' into jl777 2019-06-11 18:32:35 -11:00
jl777
1dbac16cac Merge pull request #1552 from blackjok3rtt/beta
change blackjok3r_SH pubkeys
2019-06-11 18:31:18 -11:00
blackjok3r
1d4e09a5c4 change blackjok3r_SH pubkeys 2019-06-12 12:16:13 +08:00
jl777
99dfd5b3c9 Support CHIPS 2019-06-11 01:35:49 -11:00
jl777
679bbcf234 Support CHIPS in smartdust 2019-06-11 00:48:17 -11:00
jl777
25d6cd8edd Fix offset 2019-06-11 00:27:51 -11:00
jl777
c65c69fd13 Merge pull request #1547 from KomodoPlatform/dev
fix multi OS build
2019-06-10 20:14:32 -11:00
jl777
8906371a9b Merge pull request #1543 from jl777/kolo-jl
dev
2019-06-10 19:02:48 -11:00
Mihail Fedorov
086b9c7177 dev 2019-06-10 23:32:12 +03:00
ca333
87a8498961 fix WIN 2019-06-10 20:52:44 +02:00
ca333
962d885e31 fix win 2019-06-10 20:31:24 +02:00
ca333
150fc74430 chmod 2019-06-10 20:25:08 +02:00
ca333
e6a2ca7b6c fix WIN 2019-06-10 19:33:20 +02:00
ca333
1fa0949050 add customcc makefile 2019-06-10 19:31:51 +02:00
jl777
4a9a1d2b8e Merge branch 'FSM' into jl777 2019-06-10 05:51:30 -11:00
jl777
818072e5cb Merge pull request #1542 from blackjok3rtt/beta
wallet: Skip transactions with no shielded data in CWallet::SetBestCh…
2019-06-10 05:50:25 -11:00
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
jl777
2c098054de Merge branch 'FSM' into jl777 2019-06-10 05:33:09 -11:00
jl777
922bbf9dd1 Merge branch 'FSM' into jl777 2019-06-10 05:18:25 -11:00
ca333
1403eb6cf7 bump version
bump version for the hardfork
2019-06-10 18:18:09 +02: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
jl777
b47f7733df Merge branch 'FSM' into jl777 2019-06-10 00:56:38 -11:00
jl777
eb99b6f662 -print 2019-06-10 00:14:48 -11:00
jl777
5197c502e9 Fix ac 2019-06-10 00:13:50 -11:00
jl777
553f53f11f +prints 2019-06-10 00:11:59 -11:00
jl777
4993e1c477 +pritns 2019-06-10 00:06:04 -11:00
Alrighttt
c9a943a86e add oracles, faucet to DICE; add tokens to COQUI 2019-06-10 10:50:23 +00:00
jl777
9aba95eb1d Asset chains dust 2019-06-09 22:12:54 -11:00
ca333
c0e915a27e Merge pull request #174 from jl777/dev
sync dev
2019-06-10 10:41:49 +02: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
Mihail Fedorov
2abffc800c dev 2019-06-09 19:48:21 +03:00
jl777
c42116ba3b Refund processor 2019-06-08 22:19:33 -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
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
jl777
439e7cb5d7 Fix getchaintips rpc crash. Thanks mike tout!! 2019-06-07 08:51:38 -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
jl777
ee3aef5066 Define getacseason 2019-06-03 21:10:49 -11:00
jl777
37a2889b24 Merge branch 'FSM' into jl777 2019-06-03 19:23:28 -11:00
jl777
d1c16ee705 Merge branch 'dev' into FSM 2019-06-03 19:23:05 -11:00
blackjok3r
17dd062fee woops 2019-06-04 14:10:15 +08:00