Commit Graph

21572 Commits

Author SHA1 Message Date
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
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
jl777
bfd191585b Merge branch 'FSM' into jl777 2019-06-03 18:53:26 -11:00
jl777
dc28597e30 Merge branch 'dev' into FSM 2019-06-03 18:52:57 -11:00
blackjok3r
86926e33f0 fix uint 2019-06-04 13:34:50 +08:00
blackjok3r
b29c95a26d fix PIRATE forced rescan. 2019-06-04 11:53:38 +08:00
Mihail Fedorov
c62ddda360 Notaries 2019 2019-06-03 17:36:28 +03:00
Mihail Fedorov
f5d4ff421e Notaries 2019 2019-06-03 02:04:54 +03:00
jl777
2a3dffbb5d Merge pull request #1516 from MyHush/zdupes2
Allow duplicate receivers in z_sendmany
2019-05-30 22:13:23 -11:00
Jonathan "Duke" Leto
01fb676782 Allow duplicate receivers in z_sendmany 2019-05-31 10:54:16 +02:00
ca333
5e6d7bad4b fix OSX
this fixes the faulty OSX patch
2019-05-31 03:11:54 +02:00
blackjok3r
8c9fc38a92 fix 2019-05-30 21:19:15 +08:00
DeckerSU
4f989b26eb fix notarisationTx type 2019-05-30 00:23:38 +03:00
DeckerSU
33a0059a18 gcc-8: fix komodo_connectblock reaches end of non-void function error 2019-05-30 00:11:50 +03:00
DeckerSU
9a5de83ebc sort64 / revsort64s has void return-type 2019-05-29 23:14:15 +03:00
Mihailo Milenkovic
01f597a2c8 Oracles pubkey spoofing in register tx fix
- Fix activation on July 15th 2019 00:00
- Added oraclesfund tx to fund Oracles CC address of pubkey that will register, and spend it in register tx
- oraclessamples gets baton address as input instead of txid to show all data from publisher
2019-05-28 15:40:43 +02:00
Jonathan "Duke" Leto
0f24aec587 Give correct CLI asset name and RPC ports in rpc examples 2019-05-27 21:36:25 -07:00