Commit Graph

128 Commits

Author SHA1 Message Date
jl777
0a87322d84 Merge branch 'FSM' into jl777
# Conflicts:
#	src/cc/CCinclude.h
#	src/cc/CCtokens.cpp
#	src/cc/CCtx.cpp
#	src/wallet/rpcwallet.cpp
2019-02-10 02:24:24 -11:00
dimxy
14f1da959c non-fungible tokens support (three-eval token vouts) added in CCtokens (additional opret data)
non-fungible tokens support added in assets
logging changed in CCtokens.cpp for bitcon LogPrintStr with -debug=<category> support
2019-02-10 17:04:55 +05:00
jl777
2fcf3f3f0f 1of2 signing 2019-02-05 21:29:18 -11:00
jl777
ff22a1aedb Priv2addr 2019-01-28 21:30:42 -11:00
jl777
bd35ed03ba Merge pull request #1193 from jl777/jl777
Jl777
2019-01-21 01:53:25 -11:00
jl777
3ad4ad82e2 Merge pull request #1192 from Mixa84/FSM
Channel close fix. Fix canceling partially filled orders by anyone.
2019-01-21 01:52:40 -11:00
Mihailo Milenkovic
a34fc26098 Fix canceling partially filled orders by anyone. (#11)
* Fix

* Fix
2019-01-21 11:57:52 +01:00
jl777
7bf38b4fdb Pass in height to cclib_validate 2019-01-20 06:54:59 -11:00
jl777
fc50652458 Change error handling 2019-01-20 06:24:55 -11:00
jl777
1cf8cec018 Item 2019-01-19 23:58:36 -11:00
jl777
62322eb589 struct CCcontract_info 2019-01-19 23:31:12 -11:00
jl777
b1ec7e5afa Test 2019-01-19 22:55:19 -11:00
jl777
df02d14c65 Test 2019-01-19 22:53:15 -11:00
jl777
0b911c18ac Fix 2019-01-19 22:52:13 -11:00
jl777
df2c10a6d7 CC_info 2019-01-19 22:50:26 -11:00
jl777
10528424f9 CC_info * 2019-01-19 22:48:46 -11:00
jl777
6a696bdecf +print 2019-01-19 21:32:52 -11:00
Mihailo Milenkovic
6915c400e3 Fix ChannelsPayment when destpub issues payment,add check_signing_pubkey 2019-01-18 11:14:40 +01:00
dimxy
65dfecadf8 corr userCCaddr calc 2019-01-18 01:10:51 +05:00
dimxy
6065a6dec4 corrected -> no token vout pubkey validation for 'c'
modified MakeTokenCCcond1 and 1of2 to eliminate duplicate evals
2019-01-18 01:07:58 +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
d67ca1779a MakeTokensCCcond1of2 corrrected and simplified 2019-01-18 01:04:46 +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
jl777
0ea9ae3c05 Update copyright to 2019 2018-12-31 21:41:05 -11:00
Mihailo Milenkovic
09ba3bfc9d Fix tx_notarizedconfirmed 2018-11-26 22:19:15 +01:00
jl777
488c443890 MIN_NON_NOTARIZED_CONFIRMS -> 101 2018-11-26 09:17:49 -11:00
jl777
0820a58565 init notarized 2018-11-26 09:00:55 -11:00
jl777
760ed567cd Fix case 2018-11-26 08:58:41 -11:00
jl777
0b71e4822a Fix komodo_txnotarizedconfirmed 2018-11-26 08:50:44 -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
3e5a1aba52 Revert Getscriptaddress and set COINBASE_MATURITY to 1 on chains with less than one era 2018-11-18 08:20:34 -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
30a8281f2f -print 2018-11-11 00:43:49 -11:00
jl777
0ba20c202a Test 2018-11-08 04:46:51 -11:00
jl777
7fe7c22158 fix Compiler warnings 2018-11-01 07:11:29 -11:00
jl777
79429720dc -prints 2018-10-29 07:09:21 -11:00
miketout
51848bbce5 Remove debug outs 2018-10-13 19:46:30 -07:00
miketout
26bf01e90e Correct script serialization 2018-10-13 18:21:44 -07:00
Michael Toutonghi
60b798c4b7 Update stake cheat spend 2018-10-13 14:23:20 -07:00
miketout
281a5e2eec Confirm positive and negative spends with and without priv keys 2018-10-07 14:21:43 -07:00
miketout
191f3bbddd Complete nothing at stake solution, waiting for confirm of masks 2018-10-06 21:28:51 -07:00
miketout
68b9a352da Change behavior of ExtractDestination, Solver, and GetscriptAddress for crypto conditions 2018-10-06 00:36:21 -07:00
miketout
905fe35e50 More work on CoinbaseGuard and validation 2018-10-03 16:26:41 -07:00
miketout
8a727a26a7 Beginning of N@S solution using CoinbaseGuard CC 2018-10-02 19:49:54 -07:00
Mihailo Milenkovic
78086bc3bf - fix 2018-10-01 18:52:21 +02:00