Commit Graph

127 Commits

Author SHA1 Message Date
jl777
3ba832b6bc Pending object 2019-01-29 21:48:26 -11:00
jl777
ff22a1aedb Priv2addr 2019-01-28 21:30:42 -11:00
jl777
7cfb6293c6 komodo_defs a lot more 2019-01-21 00:31:14 -11:00
jl777
53b2d35da7 Bit256 2019-01-20 00:03:36 -11:00
jl777
0ceca4c745 komodo_cJSON.h 2019-01-20 00:01:18 -11:00
jl777
887f6cb2ab Test 2019-01-20 00:00:51 -11:00
jl777
01d2fa36a2 UniValue CClib_info(struct CCcontract_info *cp) 2019-01-19 23:38:48 -11:00
jl777
62322eb589 struct CCcontract_info 2019-01-19 23:31:12 -11:00
jl777
c4d932a318 Partial revert 2019-01-19 23:23:08 -11:00
jl777
10528424f9 CC_info * 2019-01-19 22:48:46 -11:00
jl777
cc1d119144 Test 2019-01-19 02:34:33 -11:00
jl777
6e40c81b94 uint8_t 2019-01-19 00:39:53 -11:00
jl777
539b6dd1a9 -ac_ccenable[] 2019-01-19 00:38:55 -11:00
jl777
1e058154e3 Merge branch 'FSM' into jl777 2019-01-17 23:22:48 -11:00
Mihailo Milenkovic
6915c400e3 Fix ChannelsPayment when destpub issues payment,add check_signing_pubkey 2019-01-18 11:14:40 +01:00
jl777
8aa8284e61 Merge branch 'FSM' into jl777
# Conflicts:
#	src/cc/CCtx.cpp
2019-01-17 20:24:28 -11:00
dimxy
0455243118 more debug logging removed 2019-01-18 01:10:53 +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
8d8b253138 first time changed eval usage and MakeTokenCCcond.. for assets 2019-01-18 01:08:35 +05:00
dimxy
41da2aed5f corr call to EncodeAssetOpRet 2019-01-18 01:08:33 +05:00
dimxy
2d8027854d first changes in assets for 2-eval vouts 2019-01-18 01:08:31 +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
034198730a changed vcontractOpret in IsTokensVout
remove extra param from IsTokensVout
2019-01-18 01:08:03 +05:00
dimxy
c4c58b484a heir modified for two eval Tokens
changed to new 2-opret format
2019-01-18 01:07:57 +05:00
dimxy
6d509d5293 added MakeTokensCCcond1 and MakeTokensCCvout1 2019-01-18 01:04:48 +05:00
dimxy
c2942d60a4 Tokens CC cond test code added to HeirClaim TokenValidate 2019-01-18 01:04:42 +05:00
dimxy
1f6d62e7c8 MakeTokensCC1of2vout MakeTokensCCcond1of2 test code added
gateways partially adapted for tokens
2019-01-18 01:04:39 +05:00
dimxy
675787d676 Asset contract modified to support the Tokens contract 2019-01-18 01:04:32 +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
d42000a838 extern std::vector<CPubKey> NULL_pubkeys; 2019-01-16 21:48:21 -11:00
jl777
8ef1410d28 Cast 2019-01-16 21:46:39 -11:00
jl777
dc737540cf NULL 2019-01-16 21:43:20 -11:00
jl777
1f3dd2947c Pubkeys vector 2019-01-16 21:42:08 -11:00
jl777
6873cb6653 Get credit loop 2019-01-15 00:09:07 -11:00
jl777
920a182c2b marmarainfo firstheight lastheight minamount maxamount [currency issuerpk] 2019-01-14 21:21:37 -11:00
jl777
857bf5f4e6 UniValue ValueFromAmount(const CAmount& amount) 2019-01-12 16:13:54 -11:00
jl777
0ea9ae3c05 Update copyright to 2019 2018-12-31 21:41:05 -11:00
blackjok3r
94c37803df Final fix for mempool 2018-12-16 21:06:17 +08:00
jl777
b7ad65f3e2 AddNormalinputs2 bypass bitcoin wallet 2018-12-01 01:50:35 -11:00
jl777
7eaff5d90a Possible fix for sapling CC 2018-11-27 08:31:51 -11:00
Mihailo Milenkovic
16f5598f36 Gateways (#3)
- Changed gateways withdrawal flow
- Added txnotarizedconfirmed function to check if transaction is confirmed/notarized
- Fixed max number of inputs when adding in varuous CC functions
- Added TESTMODE to set CC confirmation tx to 2 blocks instead of 60
2018-11-26 20:32:57 +01:00
jl777
7d54574d4c komodo_getblockindex instead of mapblockindex[] to prevent creation of new entry on miss 2018-11-23 04:17:34 -11:00
miketout
b3b44e80e1 Latest Komodo changes 2018-11-17 17:28:45 -08:00
miketout
6e2a502b0e Merge of Komodo and Verus Technologies Post Sapling, Pre-VerusPoP with Support for Time locked coinbases 2018-11-14 16:40:10 -08:00
jl777
3424c9cb28 DEALER NODE 2018-11-11 08:41:29 -11:00
jl777
bd19a3867b Usevout 2018-11-10 05:14:50 -11:00
jl777
9841d2984e Test 2018-11-10 03:10:10 -11:00
jl777
80c20a679a Test 2018-11-08 05:37:43 -11:00
jl777
ef1cd183f2 Test 2018-11-08 00:39:37 -11:00