 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 |
|
|
jl777
|
8aa8284e61
|
Merge branch 'FSM' into jl777
# Conflicts:
# src/cc/CCtx.cpp
|
2019-01-17 20:24:28 -11: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 |
|
|
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
|
ee848abde9
|
corr mysingletokenscond in FinalizeCCtx
(corr err message in rpc call)
|
2019-01-18 01:10:32 +05:00 |
|
|
dimxy
|
ec954480a8
|
added more variants checking vouts in IsTokenVout
corr vouts1 in Heir.cpp to single-eval token
changed result type for HeirFund
|
2019-01-18 01:08:26 +05:00 |
|
|
dimxy
|
15c71c69f1
|
corrected GetCCaddress call in get TokenBalance
|
2019-01-18 01:08:00 +05:00 |
|
|
dimxy
|
0a76f9d897
|
AssetXXX() changed to GetTokenBalance, TokenInfo, TokenList
added processing of incorrect tokenid to GetTokenBalance
|
2019-01-18 01:07:59 +05:00 |
|
|
dimxy
|
884c58e3cf
|
removed test CCerror code
|
2019-01-18 01:04:38 +05:00 |
|
|
dimxy
|
be71d108b2
|
Added CCaddr1of2set and FinalizeCCtx modified to support it
(small test CCerror code added - temp)
|
2019-01-18 01:04:31 +05:00 |
|
|
dimxy
|
8e8a94404f
|
Split Asset contract into Tokens and Assets
|
2019-01-18 01:04:29 +05:00 |
|
|
jl777
|
8099e3af55
|
Test
|
2019-01-16 22:46:45 -11:00 |
|
|
jl777
|
41b29fcc39
|
Automatic flag -> lsb of matures
|
2019-01-16 22:07:30 -11:00 |
|
|
jl777
|
e1037c704c
|
Prepare to create settlement tx
|
2019-01-15 23:22:00 -11:00 |
|
|
jl777
|
88e77b7851
|
Allow null batontxid for issue
|
2019-01-15 20:56:41 -11:00 |
|
|
jl777
|
0609869874
|
Ise fixes
|
2019-01-15 20:26:02 -11:00 |
|
|
jl777
|
f1971e0054
|
Test
|
2019-01-15 04:26:59 -11:00 |
|
|
jl777
|
fa75602795
|
Test
|
2019-01-15 04:24:30 -11:00 |
|
|
jl777
|
e1e112fc24
|
Set three
|
2019-01-15 04:19:16 -11:00 |
|
|
jl777
|
6620e4cec2
|
marmara_settlement skeleton
|
2019-01-15 04:04:00 -11:00 |
|
|
jl777
|
41ed37e969
|
Funcid
|
2019-01-15 00:50:18 -11:00 |
|
|
jl777
|
389e07d1fb
|
marmara_creditloop
|
2019-01-15 00:46:27 -11:00 |
|
|
jl777
|
6873cb6653
|
Get credit loop
|
2019-01-15 00:09:07 -11:00 |
|
|
jl777
|
9755dbc647
|
Print batontxid
|
2019-01-14 23:25:17 -11:00 |
|
|
jl777
|
cc839d6f77
|
Approvaltxid
|
2019-01-14 23:10:21 -11:00 |
|
|
jl777
|
3c03185b00
|
Add batontxid to transfer
|
2019-01-14 23:09:04 -11:00 |
|
|
jl777
|
52c163fe45
|
Dont increment matures on non-1st 'R'
|
2019-01-14 23:05:27 -11:00 |
|
|
jl777
|
fccecf9b31
|
Total amount
|
2019-01-14 22:54:40 -11:00 |
|
|
jl777
|
98a81709d7
|
Test
|
2019-01-14 22:13:46 -11:00 |
|
|
jl777
|
3246b4306b
|
Allow 'R'
|
2019-01-14 22:07:24 -11:00 |
|
|
jl777
|
362a279cb7
|
Fix
|
2019-01-14 21:32:18 -11:00 |
|
|
jl777
|
920a182c2b
|
marmarainfo firstheight lastheight minamount maxamount [currency issuerpk]
|
2019-01-14 21:21:37 -11:00 |
|
|
blackjok3r
|
c2ce7ca9ce
|
add segid to listunspent
|
2019-01-14 13:23:31 +08:00 |
|
|
jl777
|
cf9f6577fc
|
Adjust assert
|
2019-01-13 14:10:11 -11:00 |
|
|
jl777
|
e06138fecf
|
Cap -ac_perc to be based on million max
|
2019-01-13 05:34:42 -11:00 |
|
|
jl777
|
c334d5c2e4
|
Marmara transfer
|
2019-01-13 03:36:14 -11:00 |
|
|
jl777
|
8ae7b65569
|
Off by 1
|
2019-01-13 03:26:43 -11:00 |
|
|
jl777
|
c10dfbb858
|
marmara_issue
|
2019-01-13 03:21:20 -11:00 |
|
|
jl777
|
2084694843
|
Syntax
|
2019-01-13 03:08:37 -11:00 |
|
|
jl777
|
908ee69451
|
Marmarareceive roc
|
2019-01-13 03:04:34 -11:00 |
|
|
jl777
|
7949fcb648
|
Tweak perc calc
|
2019-01-12 15:51:07 -11:00 |
|
|
jl777
|
fefe5dbd24
|
Args 3
|
2019-01-12 08:59:23 -11:00 |
|
|
jl777
|
c31f8ea3d5
|
Test
|
2019-01-12 08:52:30 -11:00 |
|
|
jl777
|
7ebf1d8176
|
+print
|
2019-01-12 08:41:23 -11:00 |
|
|
jl777
|
3fb0d3a82a
|
Test
|
2019-01-12 08:24:41 -11:00 |
|
|
jl777
|
4c900a4708
|
Son
|
2019-01-12 08:21:57 -11:00 |
|
|
jl777
|
dda3ecd759
|
Connect marmara_poolpayout
|
2019-01-12 06:58:58 -11:00 |
|
|
blackjok3r
|
94593ce8fd
|
CheckTransaction does not call overwinter checks
|
2019-01-12 01:15:19 +08:00 |
|
|
blackjok3r
|
a963718c7c
|
tx-overwinter-active skip check on wallet load
|
2019-01-12 00:35:39 +08:00 |
|