Commit Graph

26570 Commits

Author SHA1 Message Date
jl777
0b1a452eac Merge branch 'beta' into dev 2018-12-08 01:34:10 -11:00
jl777
bb48971246 Merge pull request #1050 from jl777/beta
Prevent height -> nLockTime
2018-12-08 01:33:55 -11:00
jl777
54431fd74a Prevent height -> nLockTime 2018-12-08 01:33:23 -11:00
jl777
f2befab32d Merge pull request #1049 from jl777/beta
Beta
2018-12-08 00:59:24 -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
ca333
9889d268b4 Merge pull request #89 from jl777/master
update master
2018-12-07 14:04:50 +01:00
jl777
69a1eb9add Merge pull request #1046 from jl777/beta
Beta
2018-12-07 01:48:31 -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
ca333
b892c9a1f9 Merge pull request #88 from jl777/master
update master
2018-12-06 21:38:47 +01:00
jl777
a802c40d24 Merge pull request #1042 from jl777/beta
Beta
2018-12-06 08:55:01 -11: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
blackjok3r
25406293e5 add ac_period to 2018-12-07 01:34:15 +08:00
Mihailo Milenkovic
b4a5d1531a Fix reorder of vins in FinalizeCCTx 2018-12-06 18:07:25 +01:00
blackjok3r
dd6b254fd4 fix 2018-12-07 00:52:38 +08:00
blackjok3r
b76ca3dc43 Try wallet fix here 2018-12-07 00:38:13 +08: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
ca333
41e4f1e534 Merge pull request #87 from jl777/master
update master
2018-12-06 15:13:54 +01:00
blackjok3rtt
5f3a589dff Merge pull request #20 from jl777/FSM
Fsm
2018-12-06 22:00:39 +08:00
jl777
9001b75c34 Merge pull request #1036 from jl777/beta
Beta
2018-12-06 02:13:34 -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
b5c97c33c9 Merge pull request #1032 from jl777/beta
Beta
2018-12-06 02:03:58 -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
blackjok3r
04285b4b25 finally works? 2018-12-06 19:54:08 +08:00
blackjok3r
b1d5f3efc7 fix 2018-12-06 19:52:23 +08:00
blackjok3r
c144c7d68b wtf 2018-12-06 19:50:54 +08:00
blackjok3r
c9b2ab288a fix 2018-12-06 19:31:29 +08:00
blackjok3r
135ad0456c try 2018-12-06 19:30:47 +08:00
blackjok3r
a02f7be253 fix 2018-12-06 19:29:06 +08:00
blackjok3r
04c758ba8b fix 2018-12-06 19:23:48 +08:00