Commit Graph

20063 Commits

Author SHA1 Message Date
blackjok3r
b6cfefce0b prevent STREAM and PERC being used at the same time 2018-10-16 13:07:30 +08:00
blackjok3r
4e9596efea fix commission 2018-10-16 13:02:16 +08:00
blackjok3r
0cf52141ef give this a go 2018-10-16 12:58:43 +08:00
jl777
fb207182c8 Dpowconfs default 0 for VRSC 2018-10-15 16:24:23 -11:00
jl777
e2ad1fedd3 Test 2018-10-14 21:21:27 -11:00
jl777
a14f4bfe51 Msig prints 2018-10-14 21:09:45 -11:00
Alrighttt
d47913a492 Merge branch 'jl777-FSM' into blackjok3r 2018-10-15 03:29:31 +02:00
Alrighttt
31b6ef8e17 merge latest FSM to blackjok3r 2018-10-15 03:29:06 +02:00
jl777
cd91f5d473 -dpowconfs 2018-10-14 12:47:14 -11:00
jl777
ade1fc54a8 KOMODO_DPOWCONFS 2018-10-14 12:44:34 -11:00
jl777
a079cdbc6c rawconfirmations 2018-10-14 12:39:06 -11:00
jl777
20523c958c Test 2018-10-14 12:00:58 -11:00
jl777
956a638a60 Test 2018-10-14 11:59:55 -11:00
jl777
c606ce6925 Backward compatible dPoW enforcement! 2018-10-14 11:56:06 -11:00
jl777
01ba6d10d3 Merge pull request #907 from jl777/kolo
PGT
2018-10-11 23:54:35 -11:00
blackjok3r
b9b7f12d84 fix edgcase where eras before current get chosen out of order and
prevent later ones being activated.
2018-10-12 14:06:26 +08:00
Mihail Fedorov
3cc05dc7b8 PGT 2018-10-11 04:07:04 +03:00
jl777
68fd571656 Merge pull request #906 from Mixa84/channelCCFSM
Channel CC
2018-10-09 03:50:34 -11:00
Mihailo Milenkovic
702658f047 Code clean up 2018-10-09 16:22:36 +02:00
jl777
e3eea61546 -dpowassets 2018-10-08 09:09:23 -11:00
Mihailo Milenkovic
30743f7333 Add checks for correct input data 2018-10-08 17:45:53 +02:00
jl777
0de9262b57 Change prints 2018-10-08 00:00:46 -11:00
jl777
ad0e6b93b8 Merge pull request #905 from DeckerSU/dev
+ freq:5 for EMC2
2018-10-07 03:07:19 -11:00
DeckerSU
eb94acf733 + freq:5 for EMC2 2018-10-07 17:06:27 +03:00
blackjok3rtt
0cfd7009d7 Merge pull request #21 from StakedChain/master
merge master down
2018-10-07 00:23:08 +08: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
jl777
35cb5f61d9 Merge pull request #903 from Mixa84/channelCCFSM
Updated channel CC docs
2018-10-02 02:35:52 -11:00
jl777
374dbd844c Fix destination confusion 2018-10-02 02:23:35 -11:00
jl777
cc2cd73ae0 Merge pull request #904 from himu007/patch-7
Update dpowassets
2018-10-02 02:14:27 -11:00
SHossain
4c95cd4c6f Update dpowassets 2018-10-02 14:13:58 +01:00
Mihailo Milenkovic
0cb59663e2 - Updated channel CC docs 2018-10-02 15:08:36 +02: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
jl777
ae6574ee79 Merge pull request #902 from Mixa84/channelCCFSM
Channel CC
2018-10-01 06:01:06 -11:00
blackjok3r
0367b1a685 < 2018-10-02 00:53:28 +08:00
Mihailo Milenkovic
78086bc3bf - fix 2018-10-01 18:52:21 +02:00
blackjok3r
478370fd6c numutxos < 2 instead of 0... cant merge 1 utxo 2018-10-02 00:52:12 +08:00
blackjok3r
f882623570 remove prints and fix utxo counter in wrong place 2018-10-02 00:42:14 +08:00
Mihailo Milenkovic
7f0ed443f1 -modified ChannelsExactAmount
-fixes
2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
bd632043f2 -fix 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
2ca1bcbe21 -fix 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
001d7ea101 -fix 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
5e1984d0d2 -fix 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
d68350535d - updated validation
- added secret parameter to payment
- reused marker for sender to validate creator of tx
2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
b32b682ae9 -fix 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
fea4c38edd -fix 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
21eb7fa7d2 -fix 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
e5e3d065f3 -fix 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
5628e37d9e -fix 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
7340ace3b1 test 2018-10-01 18:27:07 +02:00