 jl777
|
58b5db44c1
|
Merge pull request #1072 from blackjok3rtt/ac_period
Ac period
|
2018-12-14 00:23:57 -11:00 |
|
|
jl777
|
765c44a86c
|
Merge pull request #1071 from tonymorony/FSM
Initial gateways test (gateway creation)
|
2018-12-13 06:27:12 -11:00 |
|
|
jl777
|
a7a88928fa
|
Merge pull request #1070 from jl777/jl777
Jl777
|
2018-12-13 03:33:46 -11:00 |
|
|
jl777
|
0eaea97eeb
|
Merge pull request #1068 from tonymorony/FSM
initial tests for ChannelsCC
|
2018-12-13 02:09:46 -11:00 |
|
|
jl777
|
d541817752
|
Merge pull request #1067 from webworker01/dev
Set sapling for zilla in far future, fix oot sapling param
|
2018-12-12 23:23:34 -11:00 |
|
|
jl777
|
d661fc87df
|
Merge pull request #1065 from jl777/FSM
FSM
|
2018-12-12 11:35:26 -11:00 |
|
|
jl777
|
e719e66630
|
Merge pull request #1064 from jl777/jl777
zMigrate cap at 1000
|
2018-12-12 11:33:54 -11:00 |
|
|
jl777
|
5720fcd4b5
|
Merge pull request #1063 from jl777/jl777
Jl777
|
2018-12-12 09:29:27 -11:00 |
|
|
jl777
|
5723284fdd
|
Merge pull request #1062 from jl777/jl777
fix CC mempool processing
|
2018-12-12 06:40:02 -11:00 |
|
|
jl777
|
162e04c56d
|
Merge pull request #1058 from jl777/FSM
FSM
|
2018-12-10 11:55:51 -11:00 |
|
|
jl777
|
2c75acc021
|
Merge pull request #1057 from jl777/jl777
fix missing rewards txid
|
2018-12-10 11:55:18 -11:00 |
|
|
jl777
|
b10a04973e
|
Merge pull request #1055 from jl777/FSM
Revert txfee changes
|
2018-12-10 06:40:28 -11:00 |
|
|
jl777
|
1c83c86b29
|
Merge pull request #1054 from DeckerSU/generate-fix
genproclimit fix
|
2018-12-09 09:27:47 -11:00 |
|
|
jl777
|
9f0c084b50
|
Merge pull request #1052 from jl777/FSM
FSM
|
2018-12-09 08:46:00 -11:00 |
|
|
jl777
|
239d9d33d4
|
Merge pull request #1051 from jl777/jl777
Jl777
|
2018-12-09 08:43:56 -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
|
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
|
03815c8450
|
Merge pull request #1043 from Mixa84/FSM
Fix hanging of oracles
|
2018-12-07 01:46:31 -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
|
0647cc2bfd
|
Merge pull request #1039 from Mixa84/FSM
Fix reorder of vins in FinalizeCCTx
|
2018-12-06 08:39:54 -11: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
|
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
|
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 |
|
|
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
|
759737ce7d
|
Merge pull request #1023 from letolabs/FSM
Fix z_importkey
|
2018-12-05 08:53:11 -11:00 |
|
|
jl777
|
ee3490e235
|
Merge pull request #1022 from jl777/dev
Dev
|
2018-12-05 05:03:48 -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 |
|
|
jl777
|
ae11e32574
|
Merge pull request #1018 from himu007/patch-12
Update README.md
|
2018-12-03 07:13:38 -11: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 |
|
|
jl777
|
1755979283
|
Merge pull request #1015 from himu007/patch-10
added `-ac_sapling=5000000` for OOT
|
2018-12-02 06:49:02 -11: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 |
|
|
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
|
706208ecf9
|
Merge pull request #1009 from jl777/jl777
fix staking edge case
|
2018-11-30 23:38:28 -11:00 |
|
|
jl777
|
bf5705da1e
|
Merge pull request #1008 from blackjok3rtt/FSM
fix getblocktemplate
|
2018-11-30 21:51:28 -11:00 |
|
|
jl777
|
35a0d86d64
|
Merge pull request #1007 from jl777/jl777
Jl777
|
2018-11-30 13:59:36 -11:00 |
|
|
jl777
|
e0ee681019
|
Merge pull request #1006 from jl777/jl777
Jl777
|
2018-11-30 12:23:20 -11:00 |
|
|
jl777
|
6b5dbcf41c
|
Merge pull request #1005 from dimxy/dimxy-val
Dimxy val (asset validation and tx creation check against bad tx's in the ancestors)
|
2018-11-30 12:15:25 -11:00 |
|
|
jl777
|
7cbd6557c3
|
Merge pull request #1004 from blackjok3rtt/fix_cli
Fix cli includes
|
2018-11-29 06:58:25 -11:00 |
|
|
jl777
|
cc77288f5a
|
Merge pull request #1003 from jl777/jl777
Jl777
|
2018-11-29 03:03:38 -11:00 |
|
|
jl777
|
c7b89e39b2
|
Merge pull request #1002 from jl777/dev
Dev
|
2018-11-28 21:55:47 -11:00 |
|
|
jl777
|
4e781776e2
|
Merge pull request #1001 from jl777/FSM
FSM
|
2018-11-28 21:55:08 -11:00 |
|
|
jl777
|
256c0b799c
|
Merge pull request #1000 from jl777/jl777
Mempool fixes in the CC path
|
2018-11-28 21:53:58 -11:00 |
|
|
jl777
|
2e1f49dfa6
|
Merge pull request #999 from jl777/jl777
Jl777
|
2018-11-28 04:07:23 -11:00 |
|
|
jl777
|
b1c4e5eaae
|
Merge pull request #998 from jl777/jl777
Prevent sapling activation until ac_sapling set
|
2018-11-28 00:35:56 -11:00 |
|
|
jl777
|
03383b18b6
|
Merge pull request #997 from jl777/jl777
Jl777
|
2018-11-27 23:03:50 -11:00 |
|
|
jl777
|
5d5da38a6f
|
Merge pull request #996 from himu007/patch-8
Update assetchains.json
|
2018-11-27 08:45:17 -11:00 |
|
|
jl777
|
eb8f440b3d
|
Merge pull request #995 from jl777/dev
Dev
|
2018-11-27 06:41:05 -11:00 |
|
|
jl777
|
4e44fe01a4
|
Merge pull request #994 from chainmakers/dev
EQL activate CC
|
2018-11-27 06:17:39 -11:00 |
|
|
jl777
|
e68ece5cd1
|
Merge pull request #993 from jl777/FSM
FSM
|
2018-11-27 05:30:57 -11:00 |
|
|
jl777
|
98fc53819a
|
Merge pull request #992 from jl777/jl777
Jl777
|
2018-11-27 05:05:33 -11:00 |
|
|
jl777
|
4d7df9f590
|
Merge pull request #991 from miketout/dev-komodo
Updated db calls in CBlockTree::Snapshot
|
2018-11-26 22:04:32 -11:00 |
|
|
jl777
|
ffa22dc5c0
|
Merge pull request #990 from Mixa84/FSM
Fix tx_notarizedconfirmed
|
2018-11-26 10:23:50 -11:00 |
|
|
jl777
|
19930a5f65
|
Merge pull request #989 from jl777/jl777
MIN_NON_NOTARIZED_CONFIRMS -> 101
|
2018-11-26 09:18:33 -11:00 |
|
|
jl777
|
b001c75108
|
Merge pull request #988 from jl777/jl777
init notarized
|
2018-11-26 09:02:21 -11:00 |
|
|
jl777
|
ab109df2b7
|
Merge pull request #987 from jl777/jl777
Fix case
|
2018-11-26 08:59:14 -11:00 |
|
|
jl777
|
cb718dce12
|
Merge pull request #986 from jl777/jl777
Jl777
|
2018-11-26 08:52:12 -11:00 |
|
|
jl777
|
fe274bf254
|
Merge pull request #985 from Mixa84/FSM
Gateways withdraw update
|
2018-11-26 08:39:10 -11:00 |
|
|
jl777
|
fbb3490bfb
|
Merge pull request #984 from letolabs/FSM
Fsm
|
2018-11-26 06:18:12 -11:00 |
|
|
jl777
|
0ca564da8c
|
Merge pull request #983 from jl777/jl777
Delay
|
2018-11-25 06:32:55 -11:00 |
|
|
jl777
|
a6ec35d8cb
|
Merge pull request #982 from jl777/jl777
Jl777
|
2018-11-25 06:28:46 -11:00 |
|
|
jl777
|
4709d72570
|
Merge pull request #981 from jl777/jl777
+debug
|
2018-11-25 06:25:00 -11:00 |
|
|
jl777
|
8f47dce303
|
Merge pull request #980 from jl777/jl777
Slow down migrate
|
2018-11-25 06:17:37 -11:00 |
|
|
jl777
|
50fbc59590
|
Merge pull request #979 from jl777/jl777
Test
|
2018-11-25 06:03:36 -11:00 |
|
|
jl777
|
ed9147a5f1
|
Merge pull request #978 from jl777/jl777
Jl777
|
2018-11-25 06:02:09 -11:00 |
|
|
jl777
|
9dfb4184f0
|
Merge pull request #977 from ca333/patch-2
fix makeRelease.sh
|
2018-11-25 05:10:25 -11:00 |
|
|
jl777
|
5fc3f58e76
|
Merge pull request #976 from ca333/patch-1
update gitlab CI conf
|
2018-11-25 05:10:00 -11:00 |
|
|
jl777
|
d80ef46e94
|
Merge pull request #974 from jl777/jl777
sapling release candidate
|
2018-11-25 04:25:08 -11:00 |
|
|
jl777
|
6d695ad92d
|
Merge pull request #975 from jl777/dev
Dev
|
2018-11-25 04:23:19 -11:00 |
|
|
jl777
|
8b05586dc5
|
Merge pull request #973 from jl777/FSM
FSM
|
2018-11-25 04:19:55 -11:00 |
|
|
jl777
|
1276d4b72d
|
Merge pull request #972 from jl777/jl777
maxinputs+1
|
2018-11-25 04:13:49 -11:00 |
|
|
jl777
|
db8e9dde5c
|
Merge pull request #971 from letolabs/ac_private_tests
Tests for ac_private=1
|
2018-11-23 20:22:37 -11:00 |
|
|
jl777
|
e4d6a53cd0
|
Merge pull request #970 from letolabs/verushash
Tests for -ac_algo=verushash
|
2018-11-23 10:51:59 -11:00 |
|
|
jl777
|
4458e675a2
|
Merge pull request #969 from tonymorony/FSM
CC auto-tests changes
|
2018-11-22 23:01:56 -11:00 |
|
|
jl777
|
9b80571a2d
|
Merge pull request #967 from miketout/dev-komodo
Fix index db iterators
|
2018-11-21 21:22:41 -11:00 |
|
|
jl777
|
ab3ae964e1
|
Merge pull request #966 from letolabs/ccerrors
Add various error checking to gateway + oracle RPCs
|
2018-11-20 21:48:24 -11:00 |
|
|
jl777
|
f5c0b2039e
|
Merge pull request #965 from letolabs/fsm-fix
Get dice CC compiling again
|
2018-11-20 21:40:42 -11:00 |
|
|
jl777
|
7dfae3293b
|
Merge pull request #964 from miketout/dev-komodo
Fix bug in oracles for KMDICE and others
|
2018-11-18 22:31:18 -11:00 |
|
|
jl777
|
065756bdc2
|
Merge pull request #963 from miketout/dev-komodo
Latest fixes from testing
|
2018-11-18 21:13:28 -11:00 |
|
|
jl777
|
a187da04b3
|
Merge pull request #962 from miketout/dev-komodo
Fix for chains with coinbase_maturity under 100
|
2018-11-18 05:43:20 -11:00 |
|
|
jl777
|
2a5fc9cd81
|
Merge pull request #958 from miketout/dev-komodo
Support for all Verus parameters, VerusHash, Coinbase Timelocks, Sapling, and 50/50 VerusPoS/PoW, not VerusPoP
|
2018-11-17 22:01:47 -11:00 |
|
|
jl777
|
7c0672e33f
|
Merge pull request #961 from jl777/dev
pre-sapling
|
2018-11-17 22:00:42 -11:00 |
|
|
jl777
|
13165b0d10
|
Merge pull request #960 from jl777/jl777
pre-sapling
|
2018-11-17 22:00:01 -11:00 |
|
|
jl777
|
8173c75652
|
Merge pull request #959 from jl777/FSM
FSM
|
2018-11-17 21:59:12 -11:00 |
|
|
jl777
|
2cf4977c25
|
Merge pull request #957 from jl777/dev
Extra satoshi for KMDICE
|
2018-11-15 00:13:14 -11:00 |
|
|
jl777
|
c41f80392b
|
Merge pull request #956 from jl777/jl777
Extra satoshi for KMDICE
|
2018-11-15 00:12:36 -11:00 |
|