Commit Graph

24162 Commits

Author SHA1 Message Date
jl777
99c9922b07 Merge branch 'FSM' into jl777 2018-12-18 08:16:27 -11:00
blackjok3r
ce8f41325a this is fine 2018-12-19 00:53:05 +08:00
jl777
1cfd8030e3 Merge pull request #1112 from jl777/jl777
Jl777
2018-12-18 05:45:46 -11:00
jl777
5488101f95 Rename shutoff process 2018-12-18 05:22:38 -11:00
jl777
95f4ecf06e Serial mergetoaddress 2018-12-18 05:12:26 -11:00
blackjok3r
134ae5436f Merge branch 'FSM' of https://github.com/jl777/komodo
f
2018-12-18 23:45:37 +08:00
jl777
37c9636c39 Merge pull request #1111 from jl777/jl777
improve z_migrate with initial z_mergetoaddress
2018-12-18 04:41:47 -11:00
jl777
776e525083 \" 2018-12-18 04:38:02 -11:00
jl777
45df581240 Test 2018-12-18 04:36:36 -11:00
blackjok3r
6a2e2b414c Fix lockups with ram staker! 2018-12-18 23:36:00 +08:00
jl777
92fc71b753 [] 2018-12-18 04:35:49 -11:00
jl777
a7cd4c0d71 z_getnewaddress sprout 2018-12-18 04:33:24 -11:00
jl777
45d91c8f0d z_mergetoaddress loop at start of migrate 2018-12-18 04:30:25 -11:00
jl777
77b4cde5e8 Merge pull request #1110 from blackjok3rtt/FSM
Fix sync issue banning peers.
2018-12-17 22:56:44 -11:00
blackjok3r
8d2b0c3f31 Fix KMD check_deposit peer ban. 2018-12-18 17:09:37 +08:00
jl777
8a7b6901df Merge pull request #1109 from Mixa84/FSM
Channels fix (#5)
2018-12-17 10:15:01 -11:00
blackjok3r
0d67dbdbd4 Merge branch 'FSM' of https://github.com/blackjok3rtt/komodo into FSM 2018-12-18 02:27:35 +08:00
blackjok3r
7cbe71e5e0 Fix check_deposit banning peers on sync. 2018-12-18 02:27:29 +08:00
blackjok3rtt
9fc9804ced Merge pull request #1 from jl777/FSM
Fsm
2018-12-18 02:24:20 +08:00
Mihailo Milenkovic
56430117fe Channels fix (#5)
- Fix bug when destination invokes payment (wrong pubkeys in OP_RETURN - validation would fail)
- Added channelslist RPC
- Changed channelsinfo data to JSON format
2018-12-17 17:56:06 +01:00
blackjok3r
1656348767 Ram staker is fixed! 2018-12-18 00:26:35 +08:00
jl777
52ca62ec2b Merge pull request #1108 from jl777/jl777
Test any sprout
2018-12-17 04:19:54 -11:00
jl777
97fe83f4b3 Test any sprout 2018-12-17 04:12:47 -11:00
jl777
a7b1232316 Merge pull request #1107 from jl777/jl777
Jl777
2018-12-17 03:42:59 -11:00
jl777
89c6763a8f Mutually exclude merging sprout vs sapling 2018-12-17 03:25:44 -11:00
jl777
52a85f583e Test merge 2018-12-17 02:55:47 -11:00
jl777
dc8ce5b354 Merge pull request #1106 from blackjok3rtt/FSM
fir mining properly.
2018-12-17 01:58:00 -11:00
jl777
870c915ffd Merge branch 'FSM' into jl777 2018-12-17 00:42:35 -11:00
blackjok3r
993444ec3c fix 2018-12-17 19:19:43 +08:00
blackjok3r
e57b2a05fa print 2018-12-17 19:14:49 +08:00
blackjok3r
8402a8e954 fix 2018-12-17 18:28:45 +08:00
blackjok3r
90d1fee481 try 2018-12-17 17:46:20 +08:00
blackjok3r
867f785370 fix 2018-12-17 17:40:35 +08:00
blackjok3r
7a7ae42ab6 fix? 2018-12-17 17:36:30 +08:00
blackjok3r
1d1b1290e7 try this 2018-12-17 17:23:30 +08:00
blackjok3r
cacd2c7c02 fix prints and revert mempool error. 2018-12-17 16:24:29 +08:00
blackjok3r
02efca37ae revert this change it is wrong, they need to be OR here. 2018-12-17 13:04:04 +08:00
blackjok3r
ce7aed05cd Merge branch 'blackjok3rtt-FSM'
a
2018-12-17 12:41:07 +08:00
blackjok3r
7ff077b410 Merge branch 'FSM' of https://github.com/blackjok3rtt/komodo into blackjok3rtt-FSM
a
2018-12-17 12:40:45 +08:00
blackjok3r
a2d19feeba fir mining properly. Revert all proclimits to 1 or -1, as they are in zcash. also on shutdown, the pos64 was starting a new thread and then seg faulting, this stops that. 2018-12-17 12:25:53 +08:00
blackjok3rtt
ca2129e81d Merge pull request #63 from blackjok3rtt/FSM
Fsm
2018-12-17 11:49:40 +08:00
blackjok3rtt
4a2ea81f3c Merge branch 'master' into FSM 2018-12-17 11:49:30 +08:00
blackjok3r
2ebdae67e8 fix setgenerate better, bug on deamon stop it was starting another staking thread. 2018-12-17 11:41:26 +08:00
jl777
2a9543eef3 Merge pull request #1105 from jl777/jl777
Ignore cryptoconditions/compile
2018-12-16 12:01:19 -11:00
jl777
3c575f02de Ignore cryptoconditions/compile 2018-12-16 12:00:46 -11:00
jl777
c4e6e8b377 Merge pull request #1104 from jl777/beta
Beta
2018-12-16 11:05:03 -11:00
jl777
76324976dc Merge pull request #1101 from jl777/dev
Dev
2018-12-16 10:16:20 -11:00
jl777
365674f38d Merge pull request #1103 from jl777/FSM
FSM
2018-12-16 10:13:03 -11:00
jl777
5ef1e607d0 Merge pull request #1102 from jl777/jl777
Jl777
2018-12-16 10:10:56 -11:00
jl777
1f6f5c2975 Error check 2018-12-16 10:02:53 -11:00