 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 |
|
|
dimxy
|
029d3af05a
|
add logging origpubkey to FillSell
|
2019-01-18 01:10:37 +05:00 |
|
|
dimxy
|
457b9aff54
|
more corr othertokenscond, set cp->unspendable
|
2019-01-18 01:10:36 +05:00 |
|
|
dimxy
|
f67a849be0
|
corr CCaddr2set for tokens support in FillSell
|
2019-01-18 01:10:35 +05:00 |
|
|
dimxy
|
a16e80dac4
|
more corr in tokensunspendable
|
2019-01-18 01:10:35 +05:00 |
|
|
dimxy
|
4903298fc3
|
corr tokesnunspenable priv and pk
|
2019-01-18 01:10:34 +05:00 |
|
|
dimxy
|
406fc53925
|
removed extra CCaddr2set
|
2019-01-18 01:10:33 +05:00 |
|
|
dimxy
|
a7833f272f
|
added othertokenscond to FinalizeCCtx
|
2019-01-18 01:10:32 +05:00 |
|
|
dimxy
|
ee848abde9
|
corr mysingletokenscond in FinalizeCCtx
(corr err message in rpc call)
|
2019-01-18 01:10:32 +05:00 |
|
|
dimxy
|
dddda4e32b
|
corr logging in IsTokensVout
|
2019-01-18 01:10:30 +05:00 |
|
|
dimxy
|
c66787ada6
|
added support for 2 check pubkeys for single-eval token vouts
|
2019-01-18 01:10:30 +05:00 |
|
|
dimxy
|
114d7779d6
|
added support for 2 check pubkeys in IsTokenVout
|
2019-01-18 01:10:29 +05:00 |
|
|
dimxy
|
ffba12b55b
|
added single-eval token cond to FinalizeCCtx
|
2019-01-18 01:10:28 +05:00 |
|
|
dimxy
|
8d8b253138
|
first time changed eval usage and MakeTokenCCcond.. for assets
|
2019-01-18 01:08:35 +05:00 |
|
|
dimxy
|
4379cffe74
|
corr call to EncodeAssetOpet in prices.cpp
|
2019-01-18 01:08:34 +05:00 |
|
|
dimxy
|
41da2aed5f
|
corr call to EncodeAssetOpRet
|
2019-01-18 01:08:33 +05:00 |
|
|
dimxy
|
a7d7451c88
|
corr call to DecodeAssetTokenOpRet
|
2019-01-18 01:08:32 +05:00 |
|