Commit Graph

22362 Commits

Author SHA1 Message Date
jl777
e2a1f44c6d Merge branch 'FSM' into jl777 2018-12-28 01:37:23 -11:00
jl777
722964362a Fix -ac_import 2018-12-27 08:28:37 -11:00
jl777
141560e39a Fix define 2018-12-27 01:14:33 -11:00
jl777
33f99eb34a Allow any ac_pubkey import for testing 2018-12-27 01:12:37 -11:00
jl777
75ecbdebb4 selfimports 2018-12-27 01:11:03 -11:00
jl777
ac96ea5178 std 2018-12-27 01:09:24 -11:00
jl777
2d5537af00 Stubs for -ac_import 2018-12-27 00:59:35 -11:00
jl777
2472cdb7e9 Merge pull request #1123 from Mixa84/FSM
Channels fix (#6)
2018-12-25 06:45:25 -11:00
jl777
569d960832 Merge pull request #1122 from tonymorony/FSM
Made CC tests pass
2018-12-25 05:14:51 -11:00
Mihailo Milenkovic
478a31f463 Channels fix (#6)
- Fix bug for not able to issue last payment in channel
- Add more info in channelsinfo
2018-12-25 17:13:54 +01:00
Anton Lysakov
07555bf237 temporary disabled gateways tests 2018-12-25 20:05:24 +06:00
Anton Lysakov
2e9bcdc6b8 adjusted channels tests for new RPC call 2018-12-25 20:00:29 +06:00
jl777
45f444efbe Merge branch 'FSM' into jl777 2018-12-20 03:49:09 -11:00
jl777
733720b3a3 Merge branch 'FSM' into jl777 2018-12-20 03:46:48 -11:00
jl777
8ee384869f Merge pull request #1119 from blackjok3rtt/FSM
Fix mempool and staker
2018-12-20 03:46:09 -11:00
blackjok3r
5bcdcf0a75 fix build 2018-12-20 21:23:56 +08:00
blackjok3r
d2a7d55272 test git diff 2018-12-20 21:13:32 +08:00
blackjok3rtt
fe8f79cd50 Merge pull request #2 from jl777/FSM
Fsm
2018-12-20 20:13:34 +08:00
jl777
e89d25e4ac Merge pull request #1115 from jl777/jl777
Jl777
2018-12-19 09:33:26 -11:00
jl777
2d9c9864d7 Skip unspendables in zmigrate 2018-12-19 09:26:37 -11:00
jl777
4fc0f19775 Fix warnings 2018-12-18 10:13:04 -11:00
jl777
99c9922b07 Merge branch 'FSM' into jl777 2018-12-18 08:16:27 -11: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
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
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
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
02efca37ae revert this change it is wrong, they need to be OR here. 2018-12-17 13:04:04 +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
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
5ef1e607d0 Merge pull request #1102 from jl777/jl777
Jl777
2018-12-16 10:10:56 -11:00