DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
22,510 Commits 6 Branches 7 Tags
863cca8f3ea2d6cfd5a6925ec5b421aa2fb78a68
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
jl777 863cca8f3e Merge pull request #1154 from jl777/dev 
Dev
 2019-01-09 01:27:44 -11:00
jl777 5a50e61f58 Merge pull request #1153 from jl777/dev 
Dev
 2019-01-09 00:20:24 -11:00
jl777 2ec4150345 Merge pull request #1152 from jl777/FSM 
FSM
 2019-01-09 00:14:25 -11:00
jl777 784f699e0f Merge pull request #1151 from jl777/jl777 
Jl777
 2019-01-09 00:12:47 -11:00
jl777 49ae431efd Merge pull request #1150 from jl777/dev 
Dev
 2019-01-07 07:45:13 -11:00
jl777 cbb4633e21 Merge pull request #1149 from jl777/FSM 
Update version
 2019-01-07 07:44:41 -11:00
jl777 2b0a527b8b Merge pull request #1124 from jl777/dev 
Dev
 2019-01-07 07:32:34 -11:00
jl777 4d176938e0 Merge pull request #1148 from jl777/FSM 
tests
 2019-01-07 07:31:48 -11:00
jl777 afb7d5950f Merge pull request #1147 from jl777/FSM 
FSM
 2019-01-07 04:18:24 -11:00
jl777 3e5cfdc24b Merge pull request #1146 from jl777/jl777 
Jl777
 2019-01-07 04:14:57 -11:00
jl777 6dfaf5065f Merge pull request #1145 from ca333/patch-4 
fix libsodium url
 2019-01-07 04:10:07 -11:00
jl777 1f12585b33 Merge pull request #1144 from letolabs/z_listreceivedbyaddress 
Add confs+dpowconfs to z_listreceivedbyaddress
 2019-01-06 18:35:51 -11:00
jl777 5921eb2923 Merge pull request #1141 from blackjok3rtt/FSM 
Fix mempool lock.
 2019-01-06 02:28:43 -11:00
jl777 a5bcdac1db Merge pull request #1140 from letolabs/dpowconfs_fix 
Add dpowconfs to z_listunspent + listreceivedbyaddress and other small fixes
 2019-01-05 19:08:38 -11:00
jl777 76d120fa72 Merge pull request #1139 from Mixa84/FSM 
Oracles data and format check and decodeccopret
 2019-01-03 07:08:22 -11:00
jl777 b1dc77875a Merge pull request #1137 from Mixa84/FSM 
Fixing print of CC address in transaction
 2019-01-02 09:00:15 -11:00
jl777 8a606896dd Merge pull request #1136 from jl777/jl777 
Always makeburnoutput raw proof
 2019-01-02 04:52:55 -11:00
jl777 f7b88823c7 Merge pull request #1135 from jl777/jl777 
Fix oracles 'd' and 'D'
 2019-01-02 04:03:14 -11:00
jl777 7aceb88100 Merge pull request #1134 from jl777/jl777 
Jl777
 2019-01-02 02:17:52 -11:00
jl777 f511b6c9b4 Merge pull request #1133 from jl777/jl777 
Jl777
 2018-12-31 21:59:31 -11:00
jl777 3f63987a52 Merge pull request #1131 from Mixa84/FSM 
Fix daemon crashing when sending funds to oracles marker
 2018-12-30 23:52:40 -11:00
jl777 a22a92c842 Merge pull request #1130 from jl777/jl777 
Jl777
 2018-12-29 02:27:16 -11:00
jl777 fced71a178 Merge pull request #1129 from jl777/jl777 
Jl777
 2018-12-29 01:40:37 -11:00
jl777 256cfbb536 Merge pull request #1128 from jl777/jl777 
Jl777
 2018-12-29 01:31:01 -11:00
jl777 5e20cab06f Merge pull request #1127 from jl777/jl777 
int32_t komodo_nextheight();
 2018-12-29 01:28:06 -11:00
jl777 8defca90d3 Merge pull request #1126 from jl777/jl777 
Jl777
 2018-12-29 01:00:39 -11:00
jl777 a2ef21ed82 Merge pull request #1125 from blackjok3rtt/FSM 
This fixes the last of the sync issues.
 2018-12-27 21:45:56 -11:00
jl777 2472cdb7e9 Merge pull request #1123 from Mixa84/FSM 
Channels fix (#6)
 2018-12-25 06:45:25 -11:00
jl777 569d960832 Merge pull request #1122 from tonymorony/FSM 
Made CC tests pass
 2018-12-25 05:14:51 -11:00
jl777 8421131673 Merge pull request #1121 from himu007/patch-13 
Update assetchains.old
 2018-12-21 04:15:36 -11:00
jl777 d722a5522e Merge pull request #1120 from jl777/kolo 
KSB
 2018-12-20 12:05:54 -11:00
jl777 8ee384869f Merge pull request #1119 from blackjok3rtt/FSM 
Fix mempool and staker
 2018-12-20 03:46:09 -11:00
jl777 e3e8f8d09a Merge pull request #1117 from jl777/dev 
Dev
 2018-12-19 09:34:54 -11:00
jl777 b9cbd35954 Merge pull request #1116 from jl777/FSM 
FSM
 2018-12-19 09:34:07 -11:00
jl777 e89d25e4ac Merge pull request #1115 from jl777/jl777 
Jl777
 2018-12-19 09:33:26 -11:00
jl777 d56d6f4ebd Merge pull request #1114 from jl777/dev 
Dev
 2018-12-18 08:47:33 -11:00
jl777 6d0086ba8a Merge pull request #1113 from jl777/FSM 
FSM
 2018-12-18 08:46:54 -11:00
jl777 1cfd8030e3 Merge pull request #1112 from jl777/jl777 
Jl777
 2018-12-18 05:45:46 -11:00
jl777 37c9636c39 Merge pull request #1111 from jl777/jl777 
improve z_migrate with initial z_mergetoaddress
 2018-12-18 04:41:47 -11:00
jl777 77b4cde5e8 Merge pull request #1110 from blackjok3rtt/FSM 
Fix sync issue banning peers.
 2018-12-17 22:56:44 -11:00
jl777 8a7b6901df Merge pull request #1109 from Mixa84/FSM 
Channels fix (#5)
 2018-12-17 10:15:01 -11:00
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 76324976dc Merge pull request #1101 from jl777/dev 
Dev
 2018-12-16 10:16:20 -11:00
jl777 365674f38d Merge pull request #1103 from jl777/FSM 
FSM
 2018-12-16 10:13:03 -11:00
jl777 5ef1e607d0 Merge pull request #1102 from jl777/jl777 
Jl777
 2018-12-16 10:10:56 -11:00
jl777 4a3720060c Merge pull request #1100 from jl777/FSM 
FSM
 2018-12-16 07:42:04 -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 9df94d325c Merge pull request #1098 from jl777/dev 
Dev
 2018-12-16 05:53:53 -11:00
jl777 5cea6d0265 Merge pull request #1097 from jl777/FSM 
FSM
 2018-12-16 05:53:16 -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 e41bcc2769 Merge pull request #1093 from jl777/dev 
Dev
 2018-12-16 03:34:52 -11:00
jl777 07acc1b896 Merge pull request #1092 from jl777/FSM 
FSM
 2018-12-16 03:33:47 -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 e3d72bf3b2 Merge pull request #1088 from jl777/dev 
Dev
 2018-12-15 07:46:31 -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 919f2796de Merge pull request #1084 from jl777/dev 
Dev
 2018-12-15 05:09:12 -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 4f70c65bbb Merge pull request #1075 from jl777/dev 
Dev
 2018-12-14 04:27:31 -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 718c0522e1 Merge pull request #1069 from jl777/dev 
Dev
 2018-12-13 02:37:04 -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 a09a563c86 Merge pull request #1066 from jl777/dev 
Dev
 2018-12-12 11:36:14 -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 89e68a88da Merge pull request #1060 from jl777/dev 
0.3.1
 2018-12-10 12:19:48 -11:00
jl777 8722a14a16 Merge pull request #1059 from jl777/dev 
Dev
 2018-12-10 11:56:29 -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 43cb92bdba Merge pull request #1056 from jl777/dev 
Dev
 2018-12-10 06:40:59 -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 f9cbbf91c3 Merge pull request #1053 from jl777/dev 
Merge branch 'beta' into dev
 2018-12-09 08:46:23 -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