Commit Graph
23796 Commits
Author SHA1 Message Date
jl777 81df6aeabd Sort utxo gals 2019-01-18 01:16:41 -11:00
jl777 951c9af6ff Test 2019-01-18 01:11:44 -11:00
jl777 bb41418f23 Get total 2019-01-18 01:06:25 -11:00
jl777 64726e1e21 activated16 2019-01-18 01:04:09 -11:00
jl777 9419e1034f top16 2019-01-18 01:02:06 -11:00
jl777 619958c2a4 Merge earlier to expire locked funds 2019-01-18 00:59:14 -11:00
jl777 d13264a169 Merge pull request #1185 from tonymorony/FSM
fixed existing token tests
2019-01-18 00:02:41 -11:00
Anton Lysakov 5a4fd8b15e fixed token tests 2019-01-18 17:56:59 +07:00
jl777 1e058154e3 Merge branch 'FSM' into jl777 2019-01-17 23:22:48 -11:00
jl777 901c795204 Test 2019-01-17 23:22:46 -11:00
jl777 bfccd586f8 Merge pull request #1184 from Mixa84/FSM
Fix ChannelsPayment when destpub issues payment,add check_signing_pubkey
2019-01-17 23:21:48 -11:00
Mihailo Milenkovic 6ab5254887 Fix 2019-01-18 11:18:38 +01:00
Mihailo Milenkovic 6915c400e3 Fix ChannelsPayment when destpub issues payment,add check_signing_pubkey 2019-01-18 11:14:40 +01:00
jl777 68597fa670 Add CC out 2019-01-17 22:56:06 -11:00
jl777 bc04276465 refmatures 2019-01-17 22:49:41 -11:00
jl777 6e4d54fb7b Refunlockht 2019-01-17 22:48:50 -11:00
jl777 e555995f19 Marmaralock 2019-01-17 22:46:56 -11:00
jl777 81c866f1e8 Merge branch 'FSM' into jl777 2019-01-17 22:10:38 -11:00
jl777 cd45dbdf25 Merge pull request #1182 from blackjok3rtt/FSM
Corrupt tx in wallet fix.
2019-01-17 22:10:22 -11:00
blackjok3r 06ff993abd Fix rescan entire wallet when finding corrupt transaction on load. Now removes corrupt tx and re adds it with GetTransaction. 2019-01-18 17:06:30 +08:00
blackjok3rtt cad982a5b9 Merge pull request #11 from jl777/FSM
Fsm
2019-01-18 16:59:56 +08:00
jl777 0b257f6dfa Add 1of2 add and coin balances 2019-01-17 21:49:55 -11:00
jl777 8aa8284e61 Merge branch 'FSM' into jl777
# Conflicts:
#	src/cc/CCtx.cpp
2019-01-17 20:24:28 -11:00
jl777 6ab103a5bc Merge branch 'FSM' into jl777 2019-01-17 20:21:43 -11:00
jl777 f5344fd3bd Merge pull request #1181 from dimxy/heir-tokens-cherpick4
Heir tokens cherpick4
2019-01-17 20:21:33 -11:00
dimxy d9de6b7cde extra logging disabled in validator 2019-01-18 01:11:03 +05:00
dimxy d63d43c8ef heir funcs changed to one set 2019-01-18 01:11:02 +05:00
dimxy 80a1ef04f2 added proc of incorrect tokenid to tokenorders 2019-01-18 01:11:00 +05:00
dimxy 4b71e62557 disabled debug loggin in FinalizeCCtx 2019-01-18 01:10:58 +05:00
dimxy 9dc403f331 corr call to IsTokenVout in heir 2019-01-18 01:10:55 +05:00
dimxy 0455243118 more debug logging removed 2019-01-18 01:10:53 +05:00
dimxy 7c16ba9ca2 some debug loggin removed 2019-01-18 01:10:52 +05:00
dimxy c51e239400 corr FillSell self now single-eval token addr 2019-01-18 01:10:52 +05:00
dimxy 65dfecadf8 corr userCCaddr calc 2019-01-18 01:10:51 +05:00
dimxy a645af7ee4 corrected user cc addr for 'x' 2019-01-18 01:10:50 +05:00
dimxy 29052b0790 corr 'x' validation code
corr logging in FinalizeCCtx
2019-01-18 01:10:49 +05:00
dimxy 9657b5ce43 added CCaddr2set to CancelSell 2019-01-18 01:10:48 +05:00
dimxy f79531a29a corr asset unspents addr in AssetOrders 2019-01-18 01:10:47 +05:00
dimxy 9584d6db7f corr cond (single tokens) for buy in GetAssetorigaddrs 2019-01-18 01:10:47 +05:00
dimxy a99fd7502d added conds for ask/bid in GetAssetorigaddrs 2019-01-18 01:10:46 +05:00
dimxy 9293af0f1b added conditions for x S o B in AssetValidateCCvin 2019-01-18 01:10:45 +05:00
dimxy c18a655baf corr uninited cpAssets var in FillBuyOffer 2019-01-18 01:10:45 +05:00
dimxy 06e5d6fc6e corr dualUnspendable use in AssetOrders 2019-01-18 01:10:44 +05:00
dimxy 0588f5dc67 corr unspendable addr for 'S' 2019-01-18 01:10:43 +05:00
dimxy 401737d208 corr dualevalUnspendableAddr in AssetValidateCCvin 2019-01-18 01:10:42 +05:00
dimxy 778bc04009 corr cpAssets use for 'S' in AssetValidate 2019-01-18 01:10:41 +05:00
Mihailo Milenkovic e23073fff5 Channels adaptation to TokensCC (#3)
* Initial changes

* ChannelsCC adaptation

* Fix

* Fix

* Fix

* Fix

* Fix

* Fix

* Fix

* Fix

* Fix

* Fix
2019-01-18 01:10:40 +05:00
dimxy dae431eaa5 corr vopretStripped use in DecodeAssetsTokenOpret 2019-01-18 01:10:39 +05:00
dimxy 830b54cf20 corr unmarshal vopretStripped 2019-01-18 01:10:38 +05:00
dimxy b807d8eb29 corr dummy evalcode in DecodeAssetTokenOpRet 2019-01-18 01:10:38 +05:00