Commit Graph
2872 Commits
Author SHA1 Message Date
jl777 9f59de78b2 Ramp down blockreward over 30 years 2018-09-24 07:22:32 -11:00
jl777 1f77927e62 Keep mining rewards indefinitely 2018-09-24 07:19:21 -11:00
jl777 a5a8968a32 Merge branch 'beta' into dev 2018-09-24 05:49:30 -11:00
jl777 49adb58081 Merge branch 'master' into beta 2018-09-24 05:09:14 -11:00
blackjok3r d75be221a0 fux stupid error 2018-09-24 19:55:23 +08:00
blackjok3r 44f2c39ada try and add eras, for notaries, with timestamp activation 2018-09-24 15:27:14 +08:00
jl777 f425c7eea5 Support for notarizing PRIVATE 2018-09-23 07:49:02 -11:00
jl777 a2e2291e26 Test 2018-09-23 05:53:54 -11:00
jl777 3a36ff1776 Test 2018-09-23 05:47:33 -11:00
jl777 ca865ad2d4 -prints 2018-09-23 00:40:14 -11:00
jl777 69d86d7782 Fix 2018-09-21 23:33:11 -11:00
jl777 0c2c564c24 ac_private to allow notary p2pk bouts 2018-09-21 23:29:00 -11:00
blackjok3r c2ec9c5468 syntax 2018-09-21 17:21:30 +08:00
blackjok3r 90f50a9ee7 add is_staked function 2018-09-21 17:15:21 +08:00
miketout 09dfacd0eb Don't reject based on erroneous version 2018-09-20 14:07:16 -07:00
miketout 644c7445ec Latest Zcash updates 2018-09-20 13:32:57 -07:00
blackjok3r 9e417e48d7 Change min protcol version so STAKED chains have their own value, so KMD
can still work.
2018-09-20 23:15:00 +08:00
miketout b8deecdc09 Sapling transaction testing 2018-09-20 03:08:36 -07:00
Homu 75c1dbc5eb Auto merge of #3452 - LarryRuane:3399-peer-ban-test, r=bitcartel
Test peer banning logic in both pre- and post-initial block download states

The DoS ban scores are different for each, and it's nice to test both.

Follow-on from #3410.
2018-09-19 10:25:23 -07:00
blackjok3r 876a6e0f9b Merge branch 'dev' of https://github.com/jl777/komodo into jl777-dev
fix merge conflict
2018-09-19 13:46:01 +08:00
miketout 9feb4b9e08 Major updates integration from all upstreams 2018-09-18 14:33:53 -07:00
jl777 c5164b3c7b Skip human help if longer chain is invalid due to notarization 2018-09-17 05:58:07 -11:00
jl777 12832b1d22 notarization check for asset chains 2018-09-17 01:04:34 -11:00
jl777 6b52965769 Stronger check for asset chain notarizations 2018-09-17 01:03:14 -11:00
jl777 119f1c1e0c Asset chain notarization check 2018-09-17 01:02:32 -11:00
jl777 8ccb74fb8e -p 2018-09-15 21:48:31 -11:00
jl777 f9d85c8f86 Check for notarized in disconnect tip 2018-09-15 21:46:46 -11:00
Michael Toutonghi 0c8fa56a02 All latest updates, smart contracts, including oracle from KMD/jl777 2018-09-13 13:00:13 -07:00
Larry Ruane 6206d86237 Test peer banning logic in both pre- and post-initial block download states 2018-09-12 13:30:01 -06:00
Jack Grigg c861137624 net: Check against the current epoch's version when disconnecting peers 2018-09-12 10:17:33 +01:00
Jack Grigg ebf4c0671e net: Check against the current epoch's version when rejecting nodes 2018-09-12 09:27:28 +01:00
Alrighttt 8254f50610 Merge pull request #6 from StakedChain/nntest
Nntest
2018-09-10 01:11:01 -04:00
jl777 1fcb0c4e4c Merge branch 'dev' into jl777 2018-09-05 20:36:25 -11:00
Scott Sadler 52ff32a564 put burntx opreturn at end of vout and fix crash with import tx 2018-09-06 04:18:44 -03:00
Scott Sadler 4d6cd59768 put burntx opreturn at end of vout and fix crash with import tx 2018-09-04 05:29:36 -03:00
jl777 bea5d28567 Merge 2018-08-31 22:08:25 -11:00
jl777 9a44d9ea32 Merge branch 'jl777' into FSM
# Conflicts:
#	src/cc/rewards.cpp
#	src/main.cpp
2018-08-31 22:07:10 -11:00
jl777 189117dc76 Disable dice status auto entropy 2018-08-28 03:07:56 -11:00
jl777 810f63668c Channelsopen 2018-08-28 02:18:04 -11:00
jl777 5139ffd321 +prints 2018-08-27 20:02:42 -11:00
miketout 1b7e60f7f6 Reenable checkpoints for IsInSync() 2018-08-27 18:26:22 -07:00
jl777 a5057f7e56 Revert most of test changes 2018-08-27 09:39:12 -11:00
jl777 2d44c20272 Mempool CC test 2018-08-27 09:31:56 -11:00
miketout 64d6048f4a Fixed checkpoint data that was put into codebase without proper check for blockchain, breaking other blockchains or asset chains 2018-08-27 12:11:33 -07:00
miketout 21337a4992 Add longest chain check 2018-08-26 14:15:06 -07:00
miketout 24dd56729b More work on initial sync 2018-08-26 11:58:14 -07:00
miketout bca01f86eb Ensure in sync differently 2018-08-25 21:47:10 -07:00
miketout 6d84700d44 Enable syncing of new test chains before checkpoints have started 2018-08-25 10:48:40 -07:00
jl777 19107e362e -print 2018-08-25 05:56:54 -11:00
jl777 62d82abc4c -print 2018-08-25 05:54:33 -11:00