Commit Graph

21980 Commits

Author SHA1 Message Date
jl777
e23cb3e0d2 Partial revert of heir address to build 2018-11-30 12:22:02 -11:00
jl777
ee123647f8 Merge branch 'FSM' into jl777 2018-11-30 12:17:06 -11:00
jl777
6b5dbcf41c Merge pull request #1005 from dimxy/dimxy-val
Dimxy val (asset validation and tx creation check against bad tx's in the ancestors)
2018-11-30 12:15:25 -11:00
jl777
800396d746 Allow duplicated destination for sendmany 2018-11-30 12:13:03 -11:00
dim71
a25af8d781 removed unused commented function 2018-12-01 03:28:07 +05:00
dim71
933e1b4220 added check for bad tx (sending from normal vins to cc vouts) to asset validation and tx creation code 2018-12-01 03:08:24 +05:00
jl777
c9e9081c8a Rebase 2018-11-29 07:00:04 -11:00
jl777
147eddc818 Merge branch 'FSM' into jl777 2018-11-29 06:59:57 -11:00
jl777
7cbd6557c3 Merge pull request #1004 from blackjok3rtt/fix_cli
Fix cli includes
2018-11-29 06:58:25 -11:00
blackjok3r
d89fe8b560 fix bitcoin-cli.cpp includes 2018-11-30 01:52:39 +08:00
jl777
cc77288f5a Merge pull request #1003 from jl777/jl777
Jl777
2018-11-29 03:03:38 -11:00
jl777
9ad8bfa16e Prevent spurious reindexing 2018-11-29 03:02:27 -11:00
jl777
05d0f6c0b3 +comments 2018-11-29 01:58:48 -11:00
blackjok3rtt
e11cef924b Merge pull request #14 from jl777/FSM
Fsm
2018-11-29 18:30:15 +08:00
jl777
a50fa5a6b9 Merge branch 'FSM' into jl777 2018-11-28 21:54:25 -11:00
jl777
256c0b799c Merge pull request #1000 from jl777/jl777
Mempool fixes in the CC path
2018-11-28 21:53:58 -11:00
jl777
30eae48849 Mempool fixes in the CC path 2018-11-28 21:53:27 -11:00
jl777
2e1f49dfa6 Merge pull request #999 from jl777/jl777
Jl777
2018-11-28 04:07:23 -11:00
jl777
b0abf90f69 Fix null ptr in dice status 2018-11-28 04:06:49 -11:00
jl777
ea5b152c58 Move print 2018-11-28 00:40:11 -11:00
jl777
b1c4e5eaae Merge pull request #998 from jl777/jl777
Prevent sapling activation until ac_sapling set
2018-11-28 00:35:56 -11:00
jl777
a23af09cda Prevent sapling activation until ac_sapling set 2018-11-28 00:35:31 -11:00
jl777
03383b18b6 Merge pull request #997 from jl777/jl777
Jl777
2018-11-27 23:03:50 -11:00
jl777
a3911bbf3d int32_t komodo_nextheight(); 2018-11-27 23:02:57 -11:00
jl777
a0e51c46b1 Sapling CC tx support 2018-11-27 23:00:15 -11:00
jl777
561a4a15eb CBlockIndex *pindex; 2018-11-27 08:37:10 -11:00
jl777
7d69cacf37 Ht 2018-11-27 08:36:05 -11:00
jl777
7eaff5d90a Possible fix for sapling CC 2018-11-27 08:31:51 -11:00
jl777
98fc53819a Merge pull request #992 from jl777/jl777
Jl777
2018-11-27 05:05:33 -11:00
jl777
377e885bd4 Fixes 2018-11-27 05:04:14 -11:00
jl777
3be59de4ab Add K 2018-11-27 05:02:21 -11:00
jl777
3065bbdcc4 Prevent timeout by non-owner 2018-11-27 05:01:27 -11:00
jl777
87dc1c7336 Merge branch 'FSM' into jl777 2018-11-26 22:05:34 -11:00
jl777
0a68a9a71c Reenable -ac_sapling option 2018-11-26 22:05:31 -11:00
jl777
7879ba266e Merge branch 'FSM' into jl777 2018-11-26 22:04:43 -11:00
jl777
4d7df9f590 Merge pull request #991 from miketout/dev-komodo
Updated db calls in CBlockTree::Snapshot
2018-11-26 22:04:32 -11:00
miketout
e48af4a18a Updated db calls in CBlockTree::Snapshot 2018-11-26 18:21:30 -08:00
jl777
ffa22dc5c0 Merge pull request #990 from Mixa84/FSM
Fix tx_notarizedconfirmed
2018-11-26 10:23:50 -11:00
Mihailo Milenkovic
09ba3bfc9d Fix tx_notarizedconfirmed 2018-11-26 22:19:15 +01:00
jl777
19930a5f65 Merge pull request #989 from jl777/jl777
MIN_NON_NOTARIZED_CONFIRMS -> 101
2018-11-26 09:18:33 -11:00
jl777
488c443890 MIN_NON_NOTARIZED_CONFIRMS -> 101 2018-11-26 09:17:49 -11:00
jl777
b001c75108 Merge pull request #988 from jl777/jl777
init notarized
2018-11-26 09:02:21 -11:00
jl777
0820a58565 init notarized 2018-11-26 09:00:55 -11:00
jl777
ab109df2b7 Merge pull request #987 from jl777/jl777
Fix case
2018-11-26 08:59:14 -11:00
jl777
760ed567cd Fix case 2018-11-26 08:58:41 -11:00
jl777
cb718dce12 Merge pull request #986 from jl777/jl777
Jl777
2018-11-26 08:52:12 -11:00
jl777
0b71e4822a Fix komodo_txnotarizedconfirmed 2018-11-26 08:50:44 -11:00
jl777
d9537e3a3b Merge branch 'FSM' into jl777 2018-11-26 08:41:47 -11:00
jl777
593e81ac69 Increase std amount to 10k 2018-11-26 08:41:02 -11:00
jl777
576d01e46c Merge branch 'FSM' into jl777 2018-11-26 08:40:15 -11:00