Commit Graph

22154 Commits

Author SHA1 Message Date
jl777
a2ea9de06f Revert txfee changes 2018-12-10 05:45:59 -11:00
jl777
239d9d33d4 Merge pull request #1051 from jl777/jl777
Jl777
2018-12-09 08:43:56 -11:00
jl777
5ea3f23ac9 Update three 2018-12-09 08:41:08 -11:00
jl777
07921af3fd Merge branch 'FSM' into jl777 2018-12-08 01:37:27 -11:00
jl777
e831503936 Merge branch 'dev' into FSM 2018-12-08 01:35:25 -11:00
jl777
0b1a452eac Merge branch 'beta' into dev 2018-12-08 01:34:10 -11:00
jl777
54431fd74a Prevent height -> nLockTime 2018-12-08 01:33:23 -11:00
jl777
e1e0ae1357 Merge pull request #1048 from jl777/dev
Dev
2018-12-08 00:58:47 -11:00
jl777
3c414c466f Merge pull request #1047 from jl777/FSM
Synchronize version number with agama 0.3.0
2018-12-08 00:58:11 -11:00
jl777
ba6f37bb65 Synchronize version number with agama 0.3.0 2018-12-08 00:57:32 -11:00
jl777
b12b0c5339 Merge pull request #1045 from jl777/dev
Dev
2018-12-07 01:47:59 -11:00
jl777
57976990e8 Merge pull request #1044 from jl777/FSM
FSM
2018-12-07 01:47:32 -11:00
jl777
f0cc5e2d8d Merge branch 'FSM' into jl777 2018-12-07 01:46:52 -11:00
jl777
03815c8450 Merge pull request #1043 from Mixa84/FSM
Fix hanging of oracles
2018-12-07 01:46:31 -11:00
Mihailo Milenkovic
2ad557a4ca Fix hanging of oracles 2018-12-07 13:41:45 +01:00
jl777
26c0ecc417 Merge pull request #1041 from jl777/dev
Dev
2018-12-06 08:54:28 -11:00
jl777
1f2552f68c Merge pull request #1040 from jl777/FSM
FSM
2018-12-06 08:53:52 -11:00
jl777
9b0ee5fb94 Merge branch 'FSM' into jl777 2018-12-06 08:52:52 -11:00
jl777
0647cc2bfd Merge pull request #1039 from Mixa84/FSM
Fix reorder of vins in FinalizeCCTx
2018-12-06 08:39:54 -11:00
Mihailo Milenkovic
b4a5d1531a Fix reorder of vins in FinalizeCCTx 2018-12-06 18:07:25 +01:00
jl777
3ee50e0caa Merge pull request #1038 from jl777/FSM
FSM
2018-12-06 04:54:50 -11:00
jl777
eeaa224a52 Merge pull request #1037 from jl777/jl777
Fix inconsistent CC data
2018-12-06 04:53:42 -11:00
jl777
a9935f7657 Fix inconsistent CC data 2018-12-06 04:53:01 -11:00
jl777
6f776df5b4 Merge pull request #1035 from jl777/dev
Dev
2018-12-06 02:13:05 -11:00
jl777
a08fa6d107 Merge pull request #1034 from jl777/FSM
FSM
2018-12-06 02:12:34 -11:00
jl777
a1e2dffa62 Merge pull request #1033 from jl777/jl777
GetHeight()
2018-12-06 02:12:02 -11:00
jl777
d8282c5739 GetHeight() 2018-12-06 02:08:39 -11:00
jl777
d4f269a90f Merge branch 'FSM' into jl777 2018-12-06 02:04:24 -11:00
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