Commit Graph
27609 Commits
Author SHA1 Message Date
jl777 e36488682e Merge pull request #1502 from jl777/dev
Dev
2019-05-25 22:02:06 -11:00
jl777 99b03d9965 Merge branch 'beta' into dev 2019-05-25 22:01:28 -11:00
jl777 47636ebb57 Merge pull request #1501 from jl777/FSM
FSM
2019-05-25 22:00:54 -11:00
jl777 dd2ab01c82 Merge pull request #1500 from jl777/jl777
Jl777
2019-05-25 21:59:49 -11:00
jl777 3925dd94ea Merge pull request #1499 from KMDLabs/master
LABS to  jl777
2019-05-25 21:42:58 -11:00
blackjok3r 1874ca7284 undo build changes 2019-05-26 14:54:59 +08:00
blackjok3r eaca3f2137 fix 2019-05-26 14:38:31 +08:00
blackjok3r 61283f29ac last_notarized_height to getrawtransaction 2019-05-26 14:35:59 +08:00
blackjok3r 12678a579c fix notaryname in getinfo? 2019-05-25 13:54:22 +08:00
blackjok3r 25eec688e8 min sig =7, and change iguana port 2019-05-25 00:42:57 +08:00
blackjok3r 7bb9ee7ffa fix 2019-05-25 00:02:31 +08:00
blackjok3r 90f310f41a fix 2019-05-25 00:00:58 +08:00
Alrighttt d6b6112104 change Alright key 2019-05-24 17:09:06 +02:00
blackjok3r b818907066 update 2019-05-24 22:56:51 +08:00
blackjok3r 13c186acdb update 2019-05-24 22:40:25 +08:00
blackjok3r 80de737568 fix 2019-05-24 22:19:04 +08:00
blackjok3r b54e05cf17 change blackjoker 2019-05-24 21:45:39 +08:00
blackjok3r 39b3ea7062 fix CrisF 2019-05-24 21:43:26 +08:00
blackjok3r a8680fed32 kill RCTEST, update pubkeys 2019-05-24 21:39:14 +08:00
blackjok3rtt e2ca41626f Merge pull request #118 from gcharang/patch-1
Update pubkey
2019-05-24 21:28:16 +08:00
blackjok3rtt 4b04e7f6bb Merge pull request #119 from KMDLabs/smk762-patch-1
updated addr and pubkey
2019-05-24 21:27:55 +08:00
blackjok3rtt e1effd6795 Merge pull request #122 from gtmatcha/patch-1
update pub
2019-05-24 21:27:11 +08:00
blackjok3rtt 88070d7f38 Merge pull request #125 from NOCTLJRNE/master
Update notaries_staked.h
2019-05-24 21:26:58 +08:00
blackjok3rtt da500d2857 Merge pull request #126 from jl777/FSM
Prep for Tony's prices comp - DO NOT MERGE
2019-05-24 21:26:27 +08:00
PHBA2061 e7cf45efbe Update notaries_staked.h
Adding PHBA2061's publey & address
2019-05-23 21:55:55 +02:00
jl777 19658b647e Merge branch 'FSM' into jl777 2019-05-23 05:35:09 -11:00
jl777 dc00d329ed Merge pull request #1498 from dimxy/prices-rpc
Prices rpc initial version
2019-05-23 05:02:06 -11:00
dimxy 9553165287 remove rekt txid validation 2019-05-23 19:35:51 +05:00
dimxy 74c29d0df7 added validation for rekt txid 2019-05-23 19:35:50 +05:00
dimxy bf3874ef76 simplified rekt hash check 2019-05-23 19:35:49 +05:00
dimxy 661fe34571 added pow to rekt txid 2019-05-23 19:35:49 +05:00
dimxy 669645b4d4 corr rekt fee for big leverages 2019-05-23 19:35:48 +05:00
dimxy e1bd5163cb added lastprice to orderbook print 2019-05-23 19:35:47 +05:00
dimxy c054a5abdc logging added 2019-05-23 19:35:46 +05:00
dimxy 18452ff4a9 updated rekt fee calculation 2019-05-23 19:35:45 +05:00
dimxy 3e43396242 added check for isrekt set by final tx 2019-05-23 19:35:44 +05:00
dimxy 0816d0e7c2 returned scan chain for finalized for getinfo to work 2019-05-23 19:35:43 +05:00
dimxy 8531278b34 corr isrekt to true for'R' funcid 2019-05-23 19:35:42 +05:00
dimxy 6a23133b42 removed extra logging 2019-05-23 19:35:42 +05:00
dimxy 2117941bb3 corr start scan h 2019-05-23 19:35:41 +05:00
dimxy 1a5f486916 logging added for cb 2019-05-23 19:35:40 +05:00
dimxy 7e57b812a8 added zero prices err code 2019-05-23 19:35:39 +05:00
dimxy 8914898d43 corr liq price calc 2019-05-23 19:35:38 +05:00
dimxy b932d0fab5 corr bet and add tx validation
added min margin
2019-05-23 19:35:37 +05:00
dimxy e9fd323fb5 set PRICES_DAYWINDOW to orig 2019-05-23 19:35:36 +05:00
blackjok3rtt fae3b45346 payments CC changes (#6)
* add oracles non-final oracle changes

* undo stuff

* fixes

* bug fixes paymentsinfo, getCCopret

* prepare tokens airdrop

* fix pricesbet

* add utxos to paymentsinfo

* tokens airdrop RPC

* fix

* try this

* fix payments release

* fix reindex

* fix getaddresstxids help

* syntax

* fix payments allocation for alright

* Try to fix allocations

* prints

* Fix paymentsCC, add skipminimum to validation and paymentsrelease

* change snapshot allocations to function

* revert labs exemption

* revert short reorg limit. Add some comments to dailysnapshot

* fix payments balance
2019-05-23 19:35:36 +05:00
dimxy 0e61558b43 daywindow = 7 2019-05-23 19:35:35 +05:00
dimxy 7c31159a1d removed base chain height 2019-05-23 19:35:34 +05:00
dimxy b80c8710f2 added default err report in info 2019-05-23 19:35:33 +05:00
dimxy 51f32c8b8c restored PRICES_DAYWINDOW to original 2019-05-23 19:35:32 +05:00