Commit Graph

26378 Commits

Author SHA1 Message Date
blackjok3r
bc874c93c5 fix 2018-12-06 13:25:27 +08:00
blackjok3r
18c8e33c42 more prints 2018-12-06 13:20:59 +08:00
blackjok3r
52f7a22072 a 2018-12-06 13:13:21 +08:00
blackjok3r
665d5446d1 debug prints 2018-12-06 12:54:01 +08:00
blackjok3r
f2363105b7 Merge branch 'master' of https://github.com/StakedChain/komodo
a
2018-12-06 12:19:44 +08:00
blackjok3r
6a7df87213 add print 2018-12-06 12:19:21 +08:00
jl777
759737ce7d Merge pull request #1023 from letolabs/FSM
Fix z_importkey
2018-12-05 08:53:11 -11:00
Jonathan "Duke" Leto
d3d5fb9142 Fix z_importkey for sapling addresses 2018-12-05 20:46:41 +01:00
ca333
a429f2797f Merge pull request #84 from jl777/dev
update dev
2018-12-05 19:09:54 +01:00
ca333
e99d70c062 Merge pull request #82 from jl777/master
update master
2018-12-05 19:08:35 +01:00
blackjok3rtt
d72bc11da2 Merge pull request #57 from StakedChain/periodic_founders
Periodic founders and fix getnotarysendmany
2018-12-06 00:31:36 +08:00
blackjok3r
1e8e9c621b fix 2018-12-06 00:26:33 +08:00
blackjok3r
6731ee159f fix 2018-12-06 00:22:23 +08:00
blackjok3r
51b4c9a346 missed save 2018-12-06 00:21:36 +08:00
blackjok3r
311aa931cc add ac_period and try to fix sendmany 2018-12-06 00:19:31 +08:00
jl777
7cda0ed96b Merge pull request #1019 from jl777/beta
Sapling Release Candidate
2018-12-05 05:04:09 -11: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
89680802e4 Merge pull request #1021 from jl777/FSM
zcash 2.0.2 fixes
2018-12-05 04:59:29 -11:00
jl777
83d4ca0697 Merge pull request #1020 from tonymorony/FSM
added tests for oracles data publishing
2018-12-05 04:46:18 -11:00
Anton Lysakov
3a4366bef4 added tests for oracles data publishing 2018-12-05 21:42:02 +06:00
blackjok3r
d5e2a1f96b oops 2018-12-05 23:32:49 +08:00
blackjok3r
5fa97bf208 fix asgin 2018-12-05 23:31:02 +08:00
blackjok3r
11a9543ba3 fix 2018-12-05 23:29:44 +08:00
blackjok3r
d361307ffa ;# 2018-12-05 23:28:24 +08:00
blackjok3r
d7a2e9ff2c fix splling 2018-12-05 23:26:31 +08:00
blackjok3r
d29eed22d5 try periodic founders payment first time 2018-12-05 23:14:50 +08:00
jl777
6d10847814 Merge branch 'FSM' into jl777 2018-12-05 03:13:56 -11:00
jl777
8e93a31bf3 Enable coin migration CC 2018-12-05 02:30:36 -11:00
blackjok3r
0ae2e97a1d FIX COMMENTED OUT COIN IMPORT 2018-12-05 20:57:21 +08:00
jl777
b739548812 Declare flag 2018-12-05 01:54:15 -11:00
jl777
9641503a27 CBlockIndex 2018-12-05 01:52:56 -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
78d607d361 Default experimental mode 2018-12-05 01:36:52 -11:00
jl777
5245f600cd GetHeight() 2018-12-05 01:16:00 -11:00
jl777
e34bb5163a Non-test code from: https://github.com/zcash/zcash/pull/3619 2018-12-05 01:14:05 -11:00
blackjok3rtt
9b8bd2c605 Merge pull request #56 from StakedChain/noStreamer
No streamer
2018-12-05 20:13:56 +08:00
blackjok3rtt
6b8d3d392a Delete rpcmisc.cpp 2018-12-05 20:13:30 +08:00
blackjok3r
3dd1038988 what 2018-12-05 20:09:57 +08:00
blackjok3r
e9719a96b0 disavle DNS seeds 2018-12-05 20:08:01 +08:00
jl777
8c939c1af5 https://github.com/zcash/zcash/pull/3605/files 2018-12-05 00:01:01 -11:00
jl777
9a59f56135 https://github.com/zcash/zcash/pull/3670/files 2018-12-04 23:56:04 -11:00
jl777
a5be135052 https://github.com/zcash/zcash/pull/3684/files 2018-12-04 23:51:14 -11:00
blackjok3rtt
dbada96ce0 Merge pull request #55 from StakedChain/noStreamer
Merge sapling into master
2018-12-05 18:47:18 +08:00
blackjok3r
d84aad9651 remove sleep does nothign 2018-12-05 18:41:28 +08:00
blackjok3r
1602f04ac8 fix miner try to stop staker pegging a core 2018-12-05 16:59:28 +08:00
blackjok3r
3a705a843e fix 2018-12-05 01:39:27 +08:00
blackjok3r
f27f8c2821 fix 2018-12-05 01:38:19 +08:00
blackjok3r
0545cb9ba6 prints 2018-12-05 01:28:29 +08:00