Commit Graph

22010 Commits

Author SHA1 Message Date
jl777
c7b89e39b2 Merge pull request #1002 from jl777/dev
Dev
2018-11-28 21:55:47 -11:00
jl777
4e781776e2 Merge pull request #1001 from jl777/FSM
FSM
2018-11-28 21:55:08 -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
5d5da38a6f Merge pull request #996 from himu007/patch-8
Update assetchains.json
2018-11-27 08:45:17 -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
SHossain
7189ec418e Update assetchains.json 2018-11-27 18:58:49 +00:00
jl777
eb8f440b3d Merge pull request #995 from jl777/dev
Dev
2018-11-27 06:41:05 -11:00
jl777
4e44fe01a4 Merge pull request #994 from chainmakers/dev
EQL activate CC
2018-11-27 06:17:39 -11:00
Your Name
dd7eb14dcf modified: assetchains.json
modified:   assetchains.old
2018-11-27 13:13:56 -04:00
siulynot
baa3e42bc5 Merge pull request #1 from jl777/dev
Dev
2018-11-27 13:01:27 -04:00
jl777
e68ece5cd1 Merge pull request #993 from jl777/FSM
FSM
2018-11-27 05:30:57 -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
jl777
fe274bf254 Merge pull request #985 from Mixa84/FSM
Gateways withdraw update
2018-11-26 08:39:10 -11:00
Mihailo Milenkovic
16f5598f36 Gateways (#3)
- Changed gateways withdrawal flow
- Added txnotarizedconfirmed function to check if transaction is confirmed/notarized
- Fixed max number of inputs when adding in varuous CC functions
- Added TESTMODE to set CC confirmation tx to 2 blocks instead of 60
2018-11-26 20:32:57 +01:00
jl777
fbb3490bfb Merge pull request #984 from letolabs/FSM
Fsm
2018-11-26 06:18:12 -11:00
Jonathan "Duke" Leto
1617998925 Add ac_private test to suite 2018-11-26 18:15:37 +01:00
Jonathan "Duke" Leto
8c34aa1f7c Add back tokenconvert 2018-11-26 18:09:44 +01:00
jl777
632dac91e6 Revert 2018-11-25 07:55:17 -11:00