Commit Graph

938 Commits

Author SHA1 Message Date
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
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
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
jl777
5b6a65f30a -prints 2019-01-10 07:30:00 -11:00
jl777
3e5cfdc24b Merge pull request #1146 from jl777/jl777
Jl777
2019-01-07 04:14:57 -11:00
Jonathan "Duke" Leto
5d5af91e5d Add dpowconfs to z_listreceivedbyaddress 2019-01-06 14:00:09 -08:00
Jonathan "Duke" Leto
18b0a92c3e Add confirmations to z_listreceivedbyaddress 2019-01-06 13:40:04 -08:00
Jonathan "Duke" Leto
5070f4397a cleanup 2019-01-05 17:02:20 -08:00
Jonathan "Duke" Leto
dda20b2760 Correctly lookup height of joinsplits in z_listunspent 2019-01-06 01:39:04 +01:00
Jonathan "Duke" Leto
f24ae214d2 Add dpowconfs to z_listunspent + listreceivedbyaddress and other small fixes 2019-01-05 19:24:14 +01:00
Mihailo Milenkovic
1db43ae672 Oracles data and format check (#8)
- Sanity check of oracle data

- Fix oracle format check
2019-01-03 11:55:48 +01:00
jl777
6392d7f9a0 Marmara files 2019-01-02 19:13:02 -11:00
jl777
31e466f6c7 Triggers -> Marmara stubs 2019-01-02 19:10:10 -11:00