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 |
|
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 |
|
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 |
|
Alrighttt
|
8254f50610
|
Merge pull request #6 from StakedChain/nntest
Nntest
|
2018-09-10 01:11:01 -04:00 |
|
jl777
|
1fcb0c4e4c
|
Merge branch 'dev' into jl777
|
2018-09-05 20:36:25 -11:00 |
|
Scott Sadler
|
52ff32a564
|
put burntx opreturn at end of vout and fix crash with import tx
|
2018-09-06 04:18:44 -03:00 |
|
Scott Sadler
|
4d6cd59768
|
put burntx opreturn at end of vout and fix crash with import tx
|
2018-09-04 05:29:36 -03:00 |
|
jl777
|
bea5d28567
|
Merge
|
2018-08-31 22:08:25 -11:00 |
|
jl777
|
9a44d9ea32
|
Merge branch 'jl777' into FSM
# Conflicts:
# src/cc/rewards.cpp
# src/main.cpp
|
2018-08-31 22:07:10 -11:00 |
|
jl777
|
189117dc76
|
Disable dice status auto entropy
|
2018-08-28 03:07:56 -11:00 |
|
jl777
|
810f63668c
|
Channelsopen
|
2018-08-28 02:18:04 -11:00 |
|
jl777
|
5139ffd321
|
+prints
|
2018-08-27 20:02:42 -11:00 |
|
jl777
|
a5057f7e56
|
Revert most of test changes
|
2018-08-27 09:39:12 -11:00 |
|
jl777
|
2d44c20272
|
Mempool CC test
|
2018-08-27 09:31:56 -11:00 |
|
jl777
|
19107e362e
|
-print
|
2018-08-25 05:56:54 -11:00 |
|
jl777
|
62d82abc4c
|
-print
|
2018-08-25 05:54:33 -11:00 |
|
jl777
|
f4e9f4670c
|
-print
|
2018-08-25 05:50:29 -11:00 |
|