Commit Graph

1148 Commits

Author SHA1 Message Date
jl777
31e466f6c7 Triggers -> Marmara stubs 2019-01-02 19:10:10 -11:00
blackjok3r
e93fd95815 Merge branch 'FSM' of https://github.com/jl777/komodo into ac_import 2019-01-02 23:29:52 +08:00
jl777
0ea9ae3c05 Update copyright to 2019 2018-12-31 21:41:05 -11:00
blackjok3r
b94c9770fe Merge branch 'dev' of https://github.com/jl777/komodo into dev
merge
2018-12-28 10:14:28 +08:00
blackjok3r
66bac37186 fixed 2018-12-21 00:00:11 +08:00
blackjok3r
2a60644323 fix 2018-12-20 23:58:26 +08:00
blackjok3r
5a09ff96c5 fix 2018-12-20 23:56:33 +08:00
blackjok3r
227a0cec3c Merge branch 'FSM' of https://github.com/jl777/komodo
fix
2018-12-20 23:23:24 +08:00
blackjok3r
d2a7d55272 test git diff 2018-12-20 21:13:32 +08:00
jl777
97658a0c03 z_mergetoaddress fix 2018-12-19 09:03:54 -11:00
blackjok3r
134ae5436f Merge branch 'FSM' of https://github.com/jl777/komodo
f
2018-12-18 23:45:37 +08:00
jl777
8a7b6901df Merge pull request #1109 from Mixa84/FSM
Channels fix (#5)
2018-12-17 10:15:01 -11: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
97fe83f4b3 Test any sprout 2018-12-17 04:12:47 -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
blackjok3r
7ff077b410 Merge branch 'FSM' of https://github.com/blackjok3rtt/komodo into blackjok3rtt-FSM
a
2018-12-17 12:40:45 +08:00
blackjok3r
45bbd04fb2 cleanwallettransactions 2018-12-17 12:34:40 +08:00
jl777
1f6f5c2975 Error check 2018-12-16 10:02:53 -11:00
blackjok3r
3028d884e5 Major rebase and fix staking. 2018-12-16 23:04:45 +08:00
blackjok3r
3e7c05f2f0 fix 2018-12-13 13:18:06 +08:00
blackjok3r
345260d1b5 oops 2018-12-13 13:13:57 +08:00
blackjok3r
7349a49641 Merge branch 'FSM' of https://github.com/jl777/komodo
fix
2018-12-13 12:40:53 +08:00
jl777
3958b39ead Fix rewards claim txid not appearing in list transactions 2018-12-10 11:53:34 -11:00
jl777
9742bb74db -prints 2018-12-10 11:48:48 -11:00
jl777
5f162b1a9d +print 2018-12-10 11:39:51 -11:00
jl777
0615c21df0 +print 2018-12-10 11:38:07 -11:00
jl777
181d6b33f3 +prints 2018-12-10 11:35:11 -11:00
jl777
2b66bcf247 Move prints 2018-12-10 10:37:13 -11:00
jl777
80198244d4 New prints 2018-12-10 10:18:42 -11:00
jl777
fcb709c5e8 +print 2018-12-10 09:56:26 -11:00
blackjok3r
dd6b254fd4 fix 2018-12-07 00:52:38 +08:00
blackjok3r
665d5446d1 debug prints 2018-12-06 12:54:01 +08:00
blackjok3r
6a7df87213 add print 2018-12-06 12:19:21 +08:00
jl777
ee3490e235 Merge pull request #1022 from jl777/dev
Dev
2018-12-05 05:03:48 -11:00
jl777
2817aa9a1a Merge remote-tracking branch 'origin/beta' into beta 2018-12-05 05:02:23 -11:00
jl777
b739548812 Declare flag 2018-12-05 01:54:15 -11:00
jl777
ab2c621e63 Set tiptime 2018-12-05 01:51:38 -11:00
jl777
db99467890 Enable z_mergetoaddress 2018-12-05 01:48:36 -11:00
jl777
e34bb5163a Non-test code from: https://github.com/zcash/zcash/pull/3619 2018-12-05 01:14:05 -11:00
blackjok3r
0545cb9ba6 prints 2018-12-05 01:28:29 +08:00
blackjok3r
6595ab0201 try fix wallet get corrupt, add prints 2018-12-05 01:21:12 +08:00
jl777
36b8e1afdc Merge fixes 2018-12-04 01:47:06 -11:00
blackjok3r
df4732ac23 Merge branch 'FSM' of https://github.com/jl777/komodo into noStreamer
a
2018-12-03 13:14:23 +08:00
jl777
d17cc35cc6 -print 2018-11-30 23:36:57 -11:00
jl777
3777611fbc Test 2018-11-30 23:34:51 -11:00
jl777
552294da4a Max to min 2018-11-30 23:13:07 -11:00
jl777
26b1402931 Test 2018-11-30 23:07:15 -11:00
jl777
257e996fff Test 2018-11-30 22:59:10 -11:00