DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
24,172 Commits 5 Branches 7 Tags
042756499f8b99d3fd590de5ea1ffa043336fe33
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
jl777 b778dbef8e Merge pull request #1207 from jl777/jl777 
Jl777
 2019-01-25 17:16:59 -11:00
jl777 fc515c1f4a Merge pull request #1206 from DeckerSU/patch-gcc-8 
Patch gcc 8
 2019-01-25 16:37:17 -11:00
jl777 e4791f54e6 Merge branch 'FSM' into patch-gcc-8 2019-01-25 16:33:13 -11:00
jl777 3ea404eaf3 Merge pull request #1203 from jl777/jl777 
Jl777
 2019-01-25 01:28:50 -11:00
jl777 0097d0c870 Merge pull request #1200 from tonymorony/FSM 
initial heir tests
 2019-01-24 02:15:15 -11:00
jl777 d9e2156c3f Merge pull request #1199 from blackjok3rtt/jl777 
Auto purge of orphaned blocks from block DB and Index.
 2019-01-23 22:19:47 -11:00
jl777 af8f3f4938 Merge pull request #1198 from KomodoPlatform/cclib_dyn 
update cclib
 2019-01-23 07:11:27 -11:00
jl777 3cc3cb20da Merge pull request #1197 from dimxy/heir-fix-precision 
Heir fix precision
 2019-01-22 21:49:06 -11:00
jl777 dbdd6ea07e Merge pull request #1196 from dimxy/heir-fix-donations 
Heir fix donations
 2019-01-22 07:42:17 -11:00
jl777 7937644f3e Merge pull request #1195 from jl777/jl777 
Jl777
 2019-01-21 22:54:45 -11:00
jl777 b6753dc647 Merge pull request #1194 from tonymorony/FSM 
More tests for channels and tokens
 2019-01-21 22:54:33 -11:00
jl777 bd35ed03ba Merge pull request #1193 from jl777/jl777 
Jl777
 2019-01-21 01:53:25 -11:00
jl777 3ad4ad82e2 Merge pull request #1192 from Mixa84/FSM 
Channel close fix. Fix canceling partially filled orders by anyone.
 2019-01-21 01:52:40 -11:00
jl777 1fcf1343f4 Merge pull request #1191 from jl777/jl777 
Jl777
 2019-01-20 00:22:41 -11:00
jl777 8828df32a9 Merge pull request #1190 from jl777/cclib 
Cclib
 2019-01-19 22:57:57 -11:00
jl777 f37f308edb Merge pull request #1189 from KomodoPlatform/cclib 
[add] cclib to makefile
 2019-01-19 19:12:12 -11:00
jl777 37e7bc5721 Merge pull request #1188 from jl777/cclib 
Height and from_mempool in club
 2019-01-19 03:38:28 -11:00
jl777 b7fd17ac76 Merge pull request #1187 from jl777/cclib 
Cclib
 2019-01-19 02:44:39 -11:00
jl777 5ae5375a29 Merge pull request #1186 from jl777/cclib 
Cclib
 2019-01-19 01:07:18 -11:00
jl777 d13264a169 Merge pull request #1185 from tonymorony/FSM 
fixed existing token tests
 2019-01-18 00:02:41 -11:00
jl777 bfccd586f8 Merge pull request #1184 from Mixa84/FSM 
Fix ChannelsPayment when destpub issues payment,add check_signing_pubkey
 2019-01-17 23:21:48 -11:00
jl777 cd45dbdf25 Merge pull request #1182 from blackjok3rtt/FSM 
Corrupt tx in wallet fix.
 2019-01-17 22:10:22 -11:00
jl777 f5344fd3bd Merge pull request #1181 from dimxy/heir-tokens-cherpick4 
Heir tokens cherpick4
 2019-01-17 20:21:33 -11:00
jl777 4582a08461 Merge pull request #1180 from jl777/jl777 
Jl777
 2019-01-15 04:33:49 -11:00
jl777 10fede5b1a Merge pull request #1178 from jl777/jl777 
Jl777
 2019-01-13 08:55:15 -11:00
jl777 ca63bab5e6 Merge branch 'FSM' into jl777 2019-01-13 08:54:57 -11:00
jl777 6e92159a57 Merge pull request #1177 from tonymorony/FSM 
oracles autotests passing now
 2019-01-11 21:33:31 -11:00
jl777 07311c0fd3 Merge pull request #1174 from jl777/FSM 
FSM
 2019-01-11 04:30:43 -11:00
jl777 dac67400a4 Merge pull request #1173 from blackjok3rtt/FSM 
fix miner lock when run out of utxo
 2019-01-11 04:29:52 -11:00
jl777 9d96a434bb Merge pull request #1171 from jl777/FSM 
FSM
 2019-01-10 19:47:14 -11:00
jl777 c4634575fe Merge pull request #1169 from KomodoPlatform/dev 
update BIP44 cointype
 2019-01-10 18:07:22 -11:00
jl777 25f49bcb9b Merge pull request #1168 from blackjok3rtt/FSM 
Fix possible crash in PoW miner (OnDemand)
 2019-01-10 03:41:55 -11:00
jl777 c91a1d27ff Merge pull request #1166 from jl777/FSM 
FSM
 2019-01-09 04:33:27 -11:00
jl777 e755fa0e7b Merge pull request #1165 from jl777/jl777 
Jl777
 2019-01-09 04:32:35 -11:00
jl777 0a9b09b7df Merge pull request #1163 from jl777/FSM 
FSM
 2019-01-09 04:27:20 -11:00
jl777 cd10a5ab97 Merge pull request #1162 from jl777/jl777 
Workaround for -maxreorg
 2019-01-09 04:26:22 -11:00
jl777 74eb31b748 Merge pull request #1161 from jl777/FSM 
FSM
 2019-01-09 02:33:58 -11:00
jl777 e32ea6efa7 Merge pull request #1160 from jl777/jl777 
Jl777
 2019-01-09 02:33:24 -11:00
jl777 2b6edd7c99 Merge pull request #1156 from jl777/FSM 
FSM
 2019-01-09 01:49:11 -11:00
jl777 5f3bb5c06b Merge pull request #1155 from jl777/jl777 
Jl777
 2019-01-09 01:48:38 -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 cbb4633e21 Merge pull request #1149 from jl777/FSM 
Update version
 2019-01-07 07:44:41 -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 f68daa998d Merge pull request #1143 from wallnutkraken/master 
Fixed a 404'd libsodium link
 2019-01-07 03:28:53 -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 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 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 c4e6e8b377 Merge pull request #1104 from jl777/beta 
Beta
 2018-12-16 11:05:03 -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