Commit Graph
22471 Commits
Author SHA1 Message Date
blackjok3r 02efca37ae revert this change it is wrong, they need to be OR here. 2018-12-17 13:04:04 +08:00
blackjok3r a2d19feeba fir mining properly. Revert all proclimits to 1 or -1, as they are in zcash. also on shutdown, the pos64 was starting a new thread and then seg faulting, this stops that. 2018-12-17 12:25:53 +08:00
jl777 2a9543eef3 Merge pull request #1105 from jl777/jl777
Ignore cryptoconditions/compile
2018-12-16 12:01:19 -11:00
jl777 3c575f02de Ignore cryptoconditions/compile 2018-12-16 12:00:46 -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 1f6f5c2975 Error check 2018-12-16 10:02:53 -11:00
jl777 78a4e17981 -compile script 2018-12-16 07:47:00 -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 b60630d5e3 Syntax 2018-12-16 06:51:27 -11:00
jl777 dd3e21e79d Test 2018-12-16 06:50:26 -11:00
jl777 fe4eb7bb92 Syntax 2018-12-16 06:49:27 -11:00
jl777 58cecce562 GetHeight() 2018-12-16 06:46:53 -11:00
jl777 4c19213416 Test clean sync 2018-12-16 06:43:39 -11:00
jl777 0a07654961 Merge pull request #1095 from blackjok3rtt/FSM
Fix setgenerate and proclimit.
2018-12-16 06:02:05 -11:00
blackjok3r f9260ac43f fix 2018-12-17 00:57:23 +08: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 3d013276fb COIN -> SATOSHIDEN 2018-12-16 05:52:01 -11:00
blackjok3rtt c17728c00c fix format 2018-12-17 00:26:10 +08:00
blackjok3r 92c9ee71c1 fix 2018-12-17 00:22:14 +08:00
blackjok3r 2d725d91fc Fix setgenerate and genproclimit 2018-12-17 00:18:15 +08:00
jl777 6b6452e1b7 Merge branch 'FSM' into jl777 2018-12-16 04:00:58 -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
blackjok3r 1da3ef7280 fix spam of print when txs are being added out of order. 2018-12-16 22:55:20 +08:00
jl777 07acc1b896 Merge pull request #1092 from jl777/FSM
FSM
2018-12-16 03:33:47 -11:00
jl777 cf60b9ee10 Merge branch 'dev' into FSM 2018-12-16 03:33:14 -11:00
jl777 8116522c48 Merge pull request #1091 from jl777/jl777
Jl777
2018-12-16 03:32:06 -11:00
jl777 6955ce6de7 Prevent fractional migrate 2018-12-16 03:31:35 -11:00
jl777 c773c0e988 Merge branch 'FSM' into jl777 2018-12-16 02:38:03 -11:00
jl777 72fea6a95e Merge pull request #1090 from blackjok3rtt/FSM
Fixed mempool fix
2018-12-16 02:37:07 -11:00
blackjok3r 7fe18c8196 fix other test for ztx 2018-12-16 21:33:23 +08:00
blackjok3r cd42ca7d93 put mempool print back in now 2018-12-16 21:08:33 +08:00
blackjok3r 94c37803df Final fix for mempool 2018-12-16 21:06:17 +08:00
blackjok3r f4b2975279 Updated change to mempool fix. Will skip all sapling and sprout txs at each stage. 2018-12-16 19:14:33 +08:00
blackjok3r a528f1bd77 Don't add z-tx to the mempool on block validation. Causes needless slowdowns and error messages. 2018-12-16 15:52:32 +08:00
jl777 3491227494 Sprout funds 2018-12-15 15:03:24 -11:00
jl777 77528e4ebb Track sprout funds in coin supply 2018-12-15 15:00:22 -11:00
jl777 bf06420946 Test 2018-12-15 08:53:55 -11:00
jl777 0d4c230f49 Test 2018-12-15 08:51:26 -11:00
jl777 ec6c22d86d Test 2018-12-15 08:36:27 -11:00
jl777 d8657dcd17 Reconsider before sapling activation 2018-12-15 08:27:57 -11:00
jl777 4bb4b49593 Params().GetConsensus().vUpgrades 2018-12-15 08:20:35 -11:00
jl777 d8e9a8a51c Use GetHeight() 2018-12-15 08:19:03 -11:00
jl777 2c8363bb86 Revalidate sapling activation height 2018-12-15 08:18:10 -11:00
jl777 ca55a34710 zmigrate COIN sapling 2018-12-15 07:48:23 -11:00
jl777 5ab99b6a4a Merge branch 'FSM' into jl777 2018-12-15 07:45:51 -11:00
jl777 3ab4cd8651 Merge branch 'dev' into FSM 2018-12-15 07:45:12 -11:00
jl777 ecc931622b Merge pull request #1087 from jl777/FSM
FSM
2018-12-15 07:44:54 -11:00