 blackjok3rtt
|
85250d52fa
|
Merge pull request #11 from jl777/FSM
Fix rounding error: + 0.00000000499999
|
2018-11-14 18:08:52 +08:00 |
|
|
blackjok3rtt
|
4632956f4a
|
Merge pull request #9 from jl777/FSM
Fsm
|
2018-11-13 23:10:07 +08:00 |
|
|
blackjok3rtt
|
4de1a81b3a
|
Merge pull request #8 from jl777/FSM
Fsm
|
2018-11-12 18:57:14 +08:00 |
|
|
blackjok3rtt
|
e4e541e347
|
Merge pull request #46 from StakedChain/master
merge master updates to test branch
|
2018-11-11 17:05:37 +08:00 |
|
|
blackjok3rtt
|
0026050cfb
|
Merge pull request #45 from blackjok3rtt/cleanwalletnotarisations
Cleanwalletnotarisations
|
2018-11-11 16:25:36 +08:00 |
|
|
blackjok3rtt
|
62fa9bddbb
|
Merge pull request #44 from StakedChain/pool_test
Pool test
|
2018-11-11 13:02:34 +08:00 |
|
|
blackjok3rtt
|
0e29c2219e
|
Merge pull request #5 from jl777/FSM
Fsm
|
2018-11-10 11:34:51 +08:00 |
|
|
blackjok3rtt
|
8cd4e220ec
|
Merge pull request #43 from StakedChain/mastertest
Mastertest
|
2018-11-09 20:46:24 +08:00 |
|
|
blackjok3rtt
|
85f207e10c
|
Merge pull request #42 from StakedChain/dwy_mitigation
Test merge dwy_mitigation into master
|
2018-11-09 18:29:39 +08:00 |
|
|
blackjok3rtt
|
ad7b12d2ad
|
Merge branch 'mastertest' into dwy_mitigation
|
2018-11-09 18:29:26 +08:00 |
|
|
blackjok3rtt
|
af5144e2ae
|
Merge pull request #4 from jl777/FSM
Fsm merge in upstream
|
2018-11-09 18:09:42 +08:00 |
|
|
blackjok3rtt
|
70999bc672
|
Merge pull request #41 from blackjok3rtt/cleanwalletnotarisations
Cleanwalletnotarisations
|
2018-11-09 17:53:41 +08:00 |
|
|
blackjok3rtt
|
4e72b45fb9
|
Merge pull request #3 from jl777/dev
Merge dev upstream in
|
2018-11-09 14:04:38 +08:00 |
|
|
blackjok3rtt
|
5fe4e9d6f3
|
Merge pull request #40 from blackjok3rtt/fixgettransactioncrash
Fixgettransactioncrash
|
2018-11-03 21:13:22 +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 |
|
|
blackjok3rtt
|
e955c22d23
|
Merge pull request #37 from StakedChain/master
Era fix and print
|
2018-11-02 16:47:54 +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 |
|
|
blackjok3rtt
|
3cf81c0753
|
Merge pull request #29 from StakedChain/ac_address
Merge in the streamer
|
2018-11-01 13:48:47 +08:00 |
|
|
blackjok3rtt
|
e4e1c3874e
|
Merge branch 'momom_printsonly' into master
|
2018-10-31 12:05:38 +08:00 |
|
|
blackjok3rtt
|
2d5ed3ee6a
|
Merge pull request #27 from StakedChain/streamer_recv
merge streamer branch into copy of master to check conflicts
|
2018-10-30 22:39:50 +08:00 |
|
|
blackjok3rtt
|
1abcc36518
|
Merge branch 'ac_address' into streamer_recv
|
2018-10-30 22:39:30 +08:00 |
|
|
blackjok3rtt
|
f4a4641c56
|
Merge pull request #1 from jl777/FSM
Fsm
|
2018-10-28 05:35:56 +08:00 |
|
|
blackjok3rtt
|
0cfd7009d7
|
Merge pull request #21 from StakedChain/master
merge master down
|
2018-10-07 00:23:08 +08:00 |
|
|
blackjok3rtt
|
99dad8d238
|
Merge pull request #18 from StakedChain/min_merge_address
Upgrade z_mergetoaddress to take an extra prameter for utxo size
|
2018-10-02 01:39:14 +08:00 |
|
|
blackjok3rtt
|
3aee2fae5e
|
hopefully fixed that lol
|
2018-09-25 17:38:18 +08:00 |
|
|
blackjok3rtt
|
93e35be732
|
Merge pull request #13 from StakedChain/blackjok3r3
Height Activation
|
2018-09-25 16:41:11 +08:00 |
|
|
blackjok3rtt
|
c0128ed414
|
fix issue where if there are not two notarisations the MoMoM is indeterninate
|
2018-09-15 14:17:18 +08:00 |
|
|
blackjok3rtt
|
36f90242d0
|
Merge pull request #7 from StakedChain/web
update webworker keys
|
2018-09-11 22:12:09 +08:00 |
|