Commit Graph

22126 Commits

Author SHA1 Message Date
jl777
771ea29dad Merge pull request #1031 from jl777/dev
Dev
2018-12-06 02:03:21 -11:00
jl777
c35d279b53 Merge pull request #1030 from jl777/FSM
FSM
2018-12-06 01:48:18 -11:00
jl777
1611558b46 Merge pull request #1028 from libscott/migrate_flip_import
Migrate flip import
2018-12-06 01:47:57 -11:00
jl777
ed83b2c1ea Merge pull request #1029 from blackjok3rtt/FSM
Fixes for MoMoM being out of order on target or missing!
2018-12-06 01:42:31 -11:00
blackjok3r
05908caa14 Prevent possible skip of notarisation on KMD 2018-12-06 20:26:41 +08:00
blackjok3rtt
0480ddbfba Merge pull request #19 from libscott/manymomoms
check many MoMoMs on tx import
2018-12-06 20:24:02 +08:00
blackjok3rtt
d8a94218c5 Merge pull request #18 from jl777/FSM
Fsm
2018-12-06 20:23:13 +08:00
jl777
fb67bac72f Squelch missing inputs 2018-12-06 00:09:13 -11:00
jl777
857f0d15cd Merge pull request #1026 from jl777/dev
Dev
2018-12-05 23:06:29 -11:00
jl777
3f262ab60d Merge pull request #1025 from jl777/FSM
FSM
2018-12-05 23:05:57 -11:00
jl777
3e1fcc781a Merge pull request #1024 from jl777/jl777
ac_staked miner fix
2018-12-05 23:05:19 -11:00
jl777
7c089f4865 Always generate scriptPubKey for create block 2018-12-05 22:00:46 -11:00
jl777
edc6aba6a5 -launchmap 2018-12-05 21:11:35 -11:00
jl777
4ee39bc49a -include 2018-12-05 21:10:20 -11:00
jl777
93a0ba6287 Makefile 2018-12-05 21:09:47 -11:00
jl777
73053ac9d5 Tweak build 2018-12-05 21:08:51 -11:00
jl777
fcce90b71b launchmap 2018-12-05 21:05:51 -11: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
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
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
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
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
jl777
36b8e1afdc Merge fixes 2018-12-04 01:47:06 -11:00
jl777
ae11e32574 Merge pull request #1018 from himu007/patch-12
Update README.md
2018-12-03 07:13:38 -11:00
SHossain
1ae28c0ea0 Update README.md 2018-12-03 18:05:45 +00:00
jl777
4b984eb540 Merge pull request #1016 from tonymorony/FSM
separated tests for different CCs to different files
2018-12-03 04:32:36 -11:00
Anton Lysakov
08e029bf40 separated tests for different CCs to different files 2018-12-03 21:26:33 +06:00
jl777
1755979283 Merge pull request #1015 from himu007/patch-10
added `-ac_sapling=5000000` for OOT
2018-12-02 06:49:02 -11:00
SHossain
6bd19b0835 added -ac_saplinig=5000000 for OOT
added `-ac_saplinig=5000000` for OOT
2018-12-02 17:47:13 +00:00
jl777
776108f5ab Merge pull request #1014 from himu007/patch-9
added `-ac_saplinig=5000000` for OOT
2018-12-02 06:45:12 -11:00
SHossain
d1e8c8c8fc Update assetchains.old 2018-12-02 17:44:05 +00:00
jl777
a6597a8f83 Merge pull request #1013 from jl777/dev
sync DEV -> FSM
2018-12-01 23:30:21 -11:00
jl777
5238bc4c9f Merge pull request #1012 from jl777/dev
Dev
2018-12-01 08:44:07 -11:00
jl777
b09f1c193a Merge pull request #1011 from jl777/FSM
FSM
2018-12-01 08:43:25 -11:00
jl777
181dcaa02c Merge pull request #1010 from jl777/jl777
dealer0 fixes to create entropytx reliably
2018-12-01 04:00:15 -11:00
jl777
b0b80e69e6 Entropy tx size 1.0 2018-12-01 03:59:11 -11:00