DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
22,328 Commits 5 Branches 7 Tags
8d2b0c3f31ecdd4dfe31ea785c637efe2df4443d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
jl777 52ca62ec2b Merge pull request #1108 from jl777/jl777 
Test any sprout
 2018-12-17 04:19:54 -11:00
jl777 a7b1232316 Merge pull request #1107 from jl777/jl777 
Jl777
 2018-12-17 03:42:59 -11:00
jl777 dc8ce5b354 Merge pull request #1106 from blackjok3rtt/FSM 
fir mining properly.
 2018-12-17 01:58:00 -11:00
jl777 2a9543eef3 Merge pull request #1105 from jl777/jl777 
Ignore cryptoconditions/compile
 2018-12-16 12:01:19 -11:00
jl777 5ef1e607d0 Merge pull request #1102 from jl777/jl777 
Jl777
 2018-12-16 10:10:56 -11:00
jl777 1d4194841d Fix stuck sync for nodes that are doing full sync 
The sapling height is calculated near the sapling activation timestamp.
Until it is set, the node doesn’t know when sapling should be active.

Depending on the speed at which you get blocks from the future, it was
possible that you could see a sapling active block before the sapling
height was set. This would happen only if syncing from a node that
didn’t know the sapling height and a full resync with the most peers
and most variety of incoming block sources was most likely hit by this.

The net effect was that the blocks after sapling activation were marked
as invalid, so by the time the node synced up to the sapling height, it
couldn’t advance.
 2018-12-16 07:41:17 -11:00
jl777 0a07654961 Merge pull request #1095 from blackjok3rtt/FSM 
Fix setgenerate and proclimit.
 2018-12-16 06:02:05 -11:00
jl777 76df1cd6e4 Merge pull request #1096 from jl777/jl777 
Jl777
 2018-12-16 05:52:42 -11:00
jl777 2d21aed45b Merge pull request #1094 from blackjok3rtt/FSM 
fix spam of print when txs are being added out of order.
 2018-12-16 03:59:51 -11:00
jl777 8116522c48 Merge pull request #1091 from jl777/jl777 
Jl777
 2018-12-16 03:32:06 -11:00
jl777 72fea6a95e Merge pull request #1090 from blackjok3rtt/FSM 
Fixed mempool fix
 2018-12-16 02:37:07 -11:00
jl777 ecc931622b Merge pull request #1087 from jl777/FSM 
FSM
 2018-12-15 07:44:54 -11:00
jl777 bbff028f0e Merge pull request #1086 from jl777/jl777 
Jl777
 2018-12-15 07:43:41 -11:00
jl777 3a62013d0f Merge pull request #1085 from letolabs/dev 
Add makefile and readme for CC dapps
 2018-12-15 07:36:39 -11:00
jl777 f17ff8ce37 Merge pull request #1083 from jl777/FSM 
FSM
 2018-12-15 05:07:07 -11:00
jl777 b3851c2e20 Merge pull request #1082 from jl777/jl777 
reduce too strict error checking during sync that could case valid peers to be banned
 2018-12-15 05:05:40 -11:00
jl777 4a765d7d61 Merge pull request #1081 from jl777/jl777 
Try 500
 2018-12-15 01:43:38 -11:00
jl777 0808eea19a Merge pull request #1080 from jl777/jl777 
reduce zmigrate size
 2018-12-15 01:36:05 -11:00
jl777 610ff2eec1 Merge pull request #1079 from jl777/jl777 
Jl777
 2018-12-14 14:13:37 -11:00
jl777 655ef3c8ae Merge pull request #1078 from tonymorony/FSM 
CC tests refactor
 2018-12-14 10:31:20 -11:00
jl777 a1fbf3361d Merge pull request #1077 from tonymorony/FSM 
Separated cryptoconditions tests execution by cc-test.sh
 2018-12-14 07:09:19 -11:00
jl777 76097d75ab Merge pull request #1076 from blackjok3rtt/FSM 
Fix Mempool fix
 2018-12-14 06:35:00 -11:00
jl777 187d75b73c Merge pull request #1074 from jl777/FSM 
FSM
 2018-12-14 04:26:55 -11:00
jl777 ab700947d1 Merge pull request #1073 from jl777/jl777 
small fixes
 2018-12-14 04:26:15 -11:00
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