blackjok3rtt
|
ad7b12d2ad
|
Merge branch 'mastertest' into dwy_mitigation
|
2018-11-09 18:29:26 +08:00 |
|
blackjok3r
|
8d687f0312
|
add num notaris golbal, and reset notaries on era 0
|
2018-11-05 17:11:32 +08:00 |
|
blackjok3r
|
2c795c0f1c
|
fix
|
2018-11-05 16:30:08 +08:00 |
|
blackjok3r
|
f0b07a30a7
|
fix notaryaddrs var ?
|
2018-11-05 16:16:49 +08:00 |
|
blackjok3r
|
623ec77877
|
more
|
2018-11-05 16:06:53 +08:00 |
|
blackjok3rtt
|
7258003351
|
Merge branch 'dwy_mitigation2' into fixgettransactioncrash
|
2018-11-03 21:13:11 +08:00 |
|
blackjok3rtt
|
969689713d
|
Merge branch 'libscottFIX' into fixgettransactioncrash
|
2018-11-03 20:58:06 +08:00 |
|
blackjok3r
|
f8889dbe6d
|
main.h?
|
2018-11-03 01:46:19 +08:00 |
|
blackjok3r
|
3dfe236979
|
oops
|
2018-11-03 01:41:39 +08:00 |
|
blackjok3r
|
43b7d6c90a
|
try again
|
2018-11-03 01:27:11 +08:00 |
|
blackjok3r
|
099b691e24
|
hacky fix
|
2018-11-02 23:33:41 +08:00 |
|
blackjok3r
|
036b494f5f
|
Merge branch 'fixgettransactioncrash' of https://github.com/blackjok3rtt/komodo into blackjok3rtt-fixgettransactioncrash
gettransaction fox
|
2018-11-02 23:19:20 +08:00 |
|
blackjok3r
|
234da7a784
|
fix
|
2018-11-02 18:51:41 +08:00 |
|
blackjok3r
|
85bbfadd2f
|
attempt to add Raddress array
|
2018-11-02 18:40:04 +08:00 |
|
blackjok3r
|
02da812eb6
|
wtf
|
2018-11-02 15:37:11 +08:00 |
|
blackjok3r
|
af21a290f3
|
fix
|
2018-11-02 15:14:11 +08:00 |
|
blackjok3rtt
|
3ecd12ca8b
|
Merge pull request #30 from StakedChain/blackjok3r
merge blackjok3r branch and FSM fixes into master
|
2018-11-01 14:01:09 +08:00 |
|
jl777
|
0af33a3f0d
|
-print, allow ztx to be non 0x00 ends for txpow
|
2018-10-23 08:01:32 -11:00 |
|
jl777
|
a2c93c1f0d
|
Check tx during mining
|
2018-10-22 05:17:51 -11:00 |
|
jl777
|
8551533ace
|
uint256S
|
2018-10-21 12:05:58 -11:00 |
|
jl777
|
de59290f47
|
Exeption for genesis coinbase
|
2018-10-21 12:03:24 -11:00 |
|
jl777
|
b8fefe8a26
|
Syntax
|
2018-10-21 11:17:32 -11:00 |
|
jl777
|
b1c08466e9
|
Initial -ac_txpow 0, 1, 2, 3 with validation, but no txcreation
|
2018-10-21 11:13:35 -11:00 |
|
blackjok3r
|
b66f366d5c
|
next try
|
2018-10-16 16:06:49 +08:00 |
|
blackjok3r
|
45ef1a21c7
|
try this
|
2018-10-16 14:21:23 +08:00 |
|
blackjok3r
|
0cf52141ef
|
give this a go
|
2018-10-16 12:58:43 +08:00 |
|
Alrighttt
|
31b6ef8e17
|
merge latest FSM to blackjok3r
|
2018-10-15 03:29:06 +02:00 |
|
jl777
|
1449ae165f
|
Fix bug in consensus code from miketout for small networks
|
2018-10-05 18:29:39 -11: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 |
|
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 |
|
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 |
|
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 |
|