DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
17,074 Commits 6 Branches 7 Tags
bcb23c06e7a961485a1b9a1bfefd759d6832fc4c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
jl777 629ff5a287 Merge pull request #660 from jl777/jl777 
Jl777
 2018-05-09 10:05:25 +03:00
jl777 ccb805c993 Merge pull request #659 from jl777/jl777 
Jl777
 2018-05-08 21:05:15 +03:00
jl777 1448ebba2b Merge pull request #658 from himu007/patch-10 
delete vote2018
 2018-05-08 19:09:09 +03:00
jl777 30fd48c34c Merge pull request #657 from himu007/patch-9 
removed VOTE2018
 2018-05-08 19:08:52 +03:00
jl777 bed479837b Merge pull request #656 from himu007/patch-8 
removed VOTE2018
 2018-05-08 19:08:34 +03:00
jl777 864067ba3b Merge pull request #655 from himu007/patch-7 
removed VOTE2018
 2018-05-08 19:08:14 +03:00
jl777 2a1a6c5cb3 Merge pull request #653 from jl777/jl777 
Monthly cap
 2018-05-04 17:41:05 +03:00
jl777 08f17e01d3 Merge pull request #651 from jl777/jl777 
65 seconds to slow down diff
 2018-05-03 16:18:32 +03:00
jl777 e3a9e5fe72 Merge pull request #650 from jl777/jl777 
Jl777
 2018-05-03 14:21:28 +03:00
jl777 e27cff005b Merge pull request #649 from jl777/jl777 
Detect new block during wait
 2018-05-03 11:00:12 +03:00
jl777 3c8f919012 Merge pull request #648 from jl777/jl777 
Miner improvements, required for notaries
 2018-05-03 07:25:36 +03:00
jl777 a04c095fea Merge pull request #646 from jl777/jl777 
fixed rpc latency when notary mining
 2018-05-01 14:37:45 +03:00
jl777 7cde8fd1a4 Merge pull request #645 from jl777/jl777 
Jl777
 2018-04-30 11:49:36 +03:00
jl777 9c55049163 Merge pull request #643 from jl777/jl777 
Jl777
 2018-04-29 15:22:36 +03:00
jl777 626fb9481c Merge pull request #642 from jl777/jl777 
Restore LOCK cs_main in getinfo
 2018-04-29 10:06:15 +03:00
jl777 3205a566d4 Merge pull request #641 from jl777/jl777 
SCALE* exemption
 2018-04-28 14:27:26 +03:00
jl777 e19fa942ca Merge pull request #640 from jl777/jl777 
Assume notarized if TEST* chain
 2018-04-28 12:09:54 +03:00
jl777 c4dba35494 Merge pull request #638 from jl777/jl777 
fix bug that prevented MoM notarization
 2018-04-27 22:40:59 +03:00
jl777 4d34cafd41 Merge pull request #635 from jl777/jl777 
Jl777
 2018-04-27 15:21:30 +03:00
jl777 7f55226959 Merge pull request #633 from jl777/jl777 
Jl777
 2018-04-27 13:20:09 +03:00
jl777 ed33760086 Merge pull request #630 from jl777/jl777 
Wallet utility needs unsigned int MAX_BLOCK_SIGOPS = 20000;
 2018-04-26 23:43:58 +03:00
jl777 c9643980f8 Merge pull request #629 from jl777/jl777 
Update getinfo cached for asset chains
 2018-04-26 23:36:10 +03:00
jl777 8aeb8bef32 Merge pull request #628 from jl777/jl777 
Restore getinfo lock
 2018-04-26 21:59:49 +03:00
jl777 bd181e2fc4 Merge pull request #627 from jl777/jl777 
fast getinfo and other tweaks
 2018-04-26 21:13:00 +03:00
jl777 51dd1d3294 Merge pull request #626 from jl777/jl777 
Jl777
 2018-04-25 03:19:56 +03:00
jl777 808117f335 Merge pull request #624 from jl777/jl777 
Jl777
 2018-04-24 21:36:08 +03:00
jl777 64b4afd3ec Merge pull request #623 from jl777/jl777 
Jl777
 2018-04-24 18:39:31 +03:00
jl777 22123345a7 Merge pull request #622 from jl777/jl777 
Typo
 2018-04-24 17:16:25 +03:00
jl777 2c057f81a2 Merge pull request #621 from jl777/jl777 
+printout
 2018-04-24 17:05:13 +03:00
jl777 0cbf6cff4f Merge pull request #620 from jl777/jl777 
stuck node fix
 2018-04-24 16:31:32 +03:00
jl777 fcf451b0d8 Merge pull request #619 from himu007/patch-5 
Update README.md
 2018-04-24 15:11:26 +03:00
jl777 a8badd3229 Merge pull request #616 from himu007/patch-2 
Update README.md
 2018-04-24 14:55:31 +03:00
jl777 0c09e20087 Merge pull request #615 from jl777/jl777 
Jl777
 2018-04-24 00:01:29 +03:00
jl777 70240e5ec3 Merge pull request #613 from jl777/jl777 
Jl777
 2018-04-23 21:48:16 +03:00
jl777 d6793d1966 Merge pull request #612 from jl777/jl777 
remove half the redundant windows headers request fix
 2018-04-23 11:01:11 +03:00
jl777 d4f64c513e Merge pull request #611 from jl777/jl777 
similar to the prior fix, if the prevblock is in the limbo state of not being in the mapIndex or not having a pindex, it used to be a severe enough treatment to blacklist the peer. However this seems too strict as with fast block production and uneven block propagation times it seems not impossible that block N+1 arrives at a node before block N does.

In such a case, if the blockheaders for N and N+1 have not already been seen, these errors were triggered. The change reduces the reaction from a DoS error blacklist points to simply rejecting the block. If it indeed is a valid block, it will soon arrive and all will be well.
 2018-04-22 13:00:20 +03:00
jl777 38a3382327 Merge branch 'dev' into jl777 2018-04-22 12:57:26 +03:00
jl777 d762865ec9 Merge branch 'beta' into dev 2018-04-22 10:22:56 +03:00
jl777 642dd2f82f Merge pull request #609 from jl777/jl777 
Jl777
 2018-04-21 23:11:46 +03:00
jl777 710f1a33f1 Merge pull request #608 from ca333/patch-5 
update configure
 2018-04-21 19:45:28 +03:00
jl777 56b09b29ed Merge pull request #607 from jl777/jl777 
Jl777
 2018-04-21 19:18:03 +03:00
jl777 e77c5b8d07 Merge pull request #606 from KomodoPlatform/dev 
fix OSX/WIN port
 2018-04-21 17:26:06 +03:00
jl777 7d54b77e7d Merge pull request #605 from jl777/jl777 
Jl777
 2018-04-21 17:10:00 +03:00
jl777 d013a67e45 Merge pull request #604 from jl777/jl777 
Jl777
 2018-04-21 15:35:07 +03:00
jl777 8d7c97d9e8 Merge pull request #603 from jl777/jl777 
Jl777
 2018-04-21 10:45:47 +03:00
jl777 1fd382079b Merge pull request #602 from jl777/jl777 
Jl777
 2018-04-20 22:32:41 +03:00
jl777 476479af36 Merge pull request #601 from jl777/jl777 
Jl777
 2018-04-20 22:01:57 +03:00
jl777 425ca40a4e Merge pull request #600 from jl777/jl777 
Fix polarity of compare
 2018-04-20 17:43:44 +03:00
jl777 6383313e39 Merge pull request #599 from jl777/jl777 
Jl777
 2018-04-20 17:18:52 +03:00
jl777 97ecac6248 Merge pull request #598 from jl777/jl777 
Jl777
 2018-04-20 09:59:56 +03:00
jl777 a6f1662b4e Merge pull request #597 from ca333/patch-8 
fix windows support
 2018-04-20 09:32:05 +03:00
jl777 0a4ffaff30 Merge pull request #595 from ca333/patch-9 
fix OSX deps mk
 2018-04-19 10:05:43 +03:00
jl777 ddd8e4744f Merge branch 'beta' into dev 2018-04-17 23:58:53 +03:00
jl777 8664be3a58 Merge pull request #593 from jl777/jl777 
Jl777
 2018-04-17 23:48:51 +03:00
jl777 7213e636c1 Merge branch 'dev' into jl777 2018-04-17 23:28:32 +03:00
jl777 6f27d2ef09 Merge pull request #591 from letolabs/jl777 
Script to stop all asset chains
 2018-04-17 10:18:09 +03:00
jl777 c180f620ee Merge pull request #590 from DeckerSU/dev-bitcorefix 
fix vout values display in Insight KMD explorer
 2018-04-16 20:30:49 +03:00
jl777 d9649204f4 Merge pull request #587 from ca333/patch-6 
update Makefile
 2018-04-16 08:23:54 +03:00
jl777 2b9acc59fc Merge pull request #586 from ca333/patch-5 
fix Makefile
 2018-04-16 07:52:02 +03:00
jl777 b63b56277b Merge pull request #584 from scottgrayson/trunk-merge 
Fix merge conflicts for Bitcore PR
 2018-04-16 06:02:56 +03:00
jl777 bea77378f9 Merge pull request #585 from jl777/dev 
Dev
 2018-04-16 05:34:21 +03:00
jl777 d192d75538 Merge pull request #583 from jl777/dev 
Restore fixes
 2018-04-16 03:41:51 +03:00
jl777 a5f848c45a Merge branch 'testmaster' into beta 2018-04-16 03:29:05 +03:00
jl777 80d1414870 Merge pull request #581 from jl777/dev 
Delay PoW check until connect block
 2018-04-16 02:51:51 +03:00
jl777 396b851b03 Merge pull request #580 from jl777/dev 
Dev
 2018-04-15 23:57:23 +03:00
jl777 ab3e2eecf5 Merge pull request #579 from jl777/dev 
Prevent autorewind if syncing. Not a critical update
 2018-04-15 23:27:01 +03:00
jl777 4627c1b4ec Merge pull request #578 from jl777/dev 
Change n0/n1 size to int32_t
 2018-04-15 22:32:35 +03:00
jl777 24f51d8dd3 Merge pull request #577 from jl777/dev 
Dev
 2018-04-15 22:15:38 +03:00
jl777 94d961cfa5 Merge pull request #576 from jl777/dev 
Dev
 2018-04-15 15:58:03 +03:00
jl777 dee1783a19 Merge pull request #575 from jl777/dev 
Dev
 2018-04-15 11:40:34 +03:00
jl777 afe2ca389f Merge pull request #574 from jl777/docker-curl-fix 
curl fix
 2018-04-15 11:39:51 +03:00
jl777 fffc1aa0aa Merge pull request #572 from jl777/dev 
Dev
 2018-04-14 15:34:51 +03:00
jl777 9fa5a41cf6 Merge pull request #570 from jl777/dev 
Dev
 2018-04-14 00:26:42 +03:00
jl777 8b29ea3797 Merge pull request #569 from jl777/dev 
New notaries, speedup and bugfixes
 2018-04-13 23:11:04 +03:00
jl777 b7fa26e3fb Merge branch 'beta' into dev 2018-04-13 23:10:36 +03:00
jl777 558f28c496 Merge pull request #568 from jl777/dev 
Dev
 2018-04-13 14:24:19 +03:00
jl777 40425d8514 Merge pull request #567 from letolabs/jl777 
Prevent core dumps from invalid maxpairs
 2018-04-13 10:22:06 +03:00
jl777 8e13b0fbf7 Merge pull request #566 from jl777/dev 
Dev
 2018-04-12 16:16:44 +03:00
jl777 11a1e38293 Merge pull request #565 from jl777/kolo-assets-new 
prlpay fix
 2018-04-12 16:14:36 +03:00
jl777 83079b8568 Merge pull request #564 from jl777/dev 
Dev
 2018-04-11 23:19:25 +03:00
jl777 3b71d4d22f Merge pull request #563 from jl777/jl777 
PoS bug fixes
 2018-04-11 16:10:06 +03:00
jl777 20ee2db462 Merge pull request #562 from jl777/jl777 
fix PoS
 2018-04-11 05:38:09 +03:00
jl777 94e005ffaf Merge pull request #561 from jl777/jl777 
tweak PoS
 2018-04-11 05:11:28 +03:00
jl777 29106d94a1 Merge pull request #560 from jl777/jl777 
Jl777
 2018-04-11 04:25:40 +03:00
jl777 4c015e6574 Merge pull request #559 from jl777/jl777 
-ac_perc and -ac_staking
 2018-04-11 03:40:16 +03:00
jl777 699634dd8b Merge pull request #557 from jl777/kolo-assets-new 
BNTN, CHAIN, PRLPAY chains
 2018-04-10 16:28:57 +03:00
jl777 58e477a75b Merge pull request #556 from letolabs/dev 
Dev
 2018-04-10 14:00:29 +03:00
jl777 83eae67b08 Merge pull request #555 from libscott/cryptoconditions 
Various cleanups
 2018-04-09 18:57:14 +03:00
jl777 53db65421e Merge pull request #538 from libscott/cryptoconditions 
Crypto-Conditions
 2018-04-08 13:18:26 +03:00
jl777 68e3066973 Merge pull request #554 from jl777/jl777 
Jl777
 2018-04-06 19:17:46 +03:00
jl777 c6c94006d9 Merge pull request #551 from KomodoPlatform/dev 
add BNTN
 2018-04-04 10:09:48 +03:00
jl777 b65fbf346c Merge pull request #548 from jl777/jl777 
Jl777
 2018-03-28 14:25:54 +03:00
jl777 c7fc8157f9 Merge pull request #547 from jl777/jl777 
a few fixes to build scripts
 2018-03-27 17:00:39 +03:00
jl777 1e0e14dea7 Merge pull request #546 from jl777/jl777 
add pindex pubkey33 cache
 2018-03-26 19:45:54 +03:00
jl777 6aecfddc35 Merge pull request #545 from jl777/jl777 
revert pindex caching
 2018-03-26 05:59:24 +03:00
jl777 65e1bee473 Merge pull request #544 from jl777/jl777 
some speedups
 2018-03-26 04:44:49 +03:00
jl777 7dc03c7d46 Merge pull request #543 from jl777/jl777 
fix sync
 2018-03-25 22:51:25 +03:00
jl777 d72bab960b Merge pull request #542 from jl777/jl777 
rebase to zcash 0.15
 2018-03-25 22:24:41 +03:00
jl777 eb9facd492 Merge branch 'dev' into jl777 2018-03-25 22:24:20 +03:00
jl777 ba5723c77d Merge pull request #541 from jl777/rebase2 
Rebase2 zcash 0.15
 2018-03-25 22:17:28 +03:00