jl777
a7b1232316
Merge pull request #1107 from jl777/jl777
...
Jl777
2018-12-17 03:42:59 -11:00
jl777
89c6763a8f
Mutually exclude merging sprout vs sapling
2018-12-17 03:25:44 -11:00
jl777
52a85f583e
Test merge
2018-12-17 02:55:47 -11:00
blackjok3r
993444ec3c
fix
2018-12-17 19:19:43 +08:00
blackjok3r
e57b2a05fa
print
2018-12-17 19:14:49 +08:00
blackjok3r
8402a8e954
fix
2018-12-17 18:28:45 +08:00
blackjok3r
90d1fee481
try
2018-12-17 17:46:20 +08:00
blackjok3r
867f785370
fix
2018-12-17 17:40:35 +08:00
blackjok3r
7a7ae42ab6
fix?
2018-12-17 17:36:30 +08:00
blackjok3r
1d1b1290e7
try this
2018-12-17 17:23:30 +08:00
blackjok3r
cacd2c7c02
fix prints and revert mempool error.
2018-12-17 16:24:29 +08:00
blackjok3r
02efca37ae
revert this change it is wrong, they need to be OR here.
2018-12-17 13:04:04 +08:00
blackjok3r
7ff077b410
Merge branch 'FSM' of https://github.com/blackjok3rtt/komodo into blackjok3rtt-FSM
...
a
2018-12-17 12:40:45 +08:00
blackjok3r
45bbd04fb2
cleanwallettransactions
2018-12-17 12:34:40 +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
blackjok3rtt
4a2ea81f3c
Merge branch 'master' into FSM
2018-12-17 11:49:30 +08:00
blackjok3r
2ebdae67e8
fix setgenerate better, bug on deamon stop it was starting another staking thread.
2018-12-17 11:41:26 +08:00
jl777
c4e6e8b377
Merge pull request #1104 from jl777/beta
...
Beta
2018-12-16 11:05: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
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
fe32a3be6c
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:39:54 -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
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
blackjok3r
3028d884e5
Major rebase and fix staking.
2018-12-16 23:04:45 +08: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
6955ce6de7
Prevent fractional migrate
2018-12-16 03:31:35 -11:00
blackjok3rtt
5c4fe22eb4
Merge pull request #62 from jl777/FSM
...
Fsm
2018-12-16 22:07:46 +08: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