Commit Graph

22427 Commits

Author SHA1 Message Date
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
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
3d013276fb COIN -> SATOSHIDEN 2018-12-16 05:52:01 -11:00
jl777
e9b100e50f COIN -> SATOSHIDEN 2018-12-16 05:51:21 -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
c1e694dd80 Update zmigrate 2018-12-16 04:59:04 -11: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
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
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
e3d72bf3b2 Merge pull request #1088 from jl777/dev
Dev
2018-12-15 07:46:31 -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
jl777
bbff028f0e Merge pull request #1086 from jl777/jl777
Jl777
2018-12-15 07:43:41 -11:00
jl777
ba0c0794eb Add three to migrate 2018-12-15 07:43:08 -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
Jonathan "Duke" Leto
7b30d56d3d Add makefile and readme for CC dapps 2018-12-15 10:29:00 -08:00
jl777
3eb0194063 Start at 5000 2018-12-15 05:57:34 -11:00
jl777
69b8e1028d Dont retry failed bigger amounts in migrate 2018-12-15 05:51:40 -11:00
jl777
919f2796de Merge pull request #1084 from jl777/dev
Dev
2018-12-15 05:09:12 -11:00
jl777
f17ff8ce37 Merge pull request #1083 from jl777/FSM
FSM
2018-12-15 05:07:07 -11:00