Commit Graph

2994 Commits

Author SHA1 Message Date
miketout
af2e212d7a Remove spurios opret in tx builder, don't wait forever for blocks before mining, add delay to getblocktemplate 2018-10-11 21:35:09 -07:00
miketout
271326fafd Clean up stake rebroadcasting and mempool checking 2018-10-11 19:52:32 -07:00
miketout
1021455845 Fix negative height issues for pruning cheat lists 2018-10-11 14:23:14 -07:00
Michael Toutonghi
8fc4030c10 Reorganized cheatcatcher for build issues 2018-10-10 21:46:40 -07:00
Michael Toutonghi
df756d24ba Cheatcatcher 2018-10-10 19:02:09 -07:00
miketout
c754dbcfa6 Update to Zcash rc1 2018-10-08 23:47:20 -07:00
miketout
8682e17a7d Sapling support for z_shieldcoinbase and more 2018-10-08 16:17:24 -07:00
jl777
1449ae165f Fix bug in consensus code from miketout for small networks 2018-10-05 18:29:39 -11:00
miketout
ef9a13b557 Additional null check 2018-10-05 21:44:24 -07:00
miketout
a6ac51616c Add null check to deref 2018-10-05 21:37:49 -07:00
miketout
95c5c69bab Successful staking on Sapling wit Crypto Conditions 2018-10-05 21:09:09 -07:00
Simon
c94f4477e8 For #3546. Shielded tx with missing inputs are not treated as orphans. 2018-10-05 10:48:03 -07:00
miketout
8cb6777047 Change error to qualified error vs. no error at all 2018-10-04 13:22:28 -07:00
miketout
3764dea5d0 Change block before header from error to warning 2018-10-04 12:42:50 -07:00
miketout
2ed3bbec38 Debugging 2018-10-03 22:04:39 -07:00
Alrighttt
05f99c1b93 Merge pull request #20 from jl777/FSM
merge latest jl777-FSM
2018-10-03 11:38:09 -04:00
blackjok3r
220df8ac00 hard code number of notaries 2018-09-30 13:12:33 +08:00
blackjok3r
d5f8644985 change array to non static and remove init 2018-09-30 13:07:38 +08:00
blackjok3r
c6fb1e9117 try this instead 2018-09-30 13:00:09 +08:00
blackjok3r
f56c91238a change ac_private pubkeys to use STAKED notaries instead of elected 2018-09-30 12:49:40 +08:00
Alrighttt
78e10a3b60 merge lastest jl-dev branch 2018-09-29 15:59:47 +00:00
miketout
4b729ec577 Changes for most chain power rule 2018-09-28 01:38:14 -07:00
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