DragonX/hush3
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
23,931 Commits 2 Branches 1 Tag
aa26fa0a69c7ba92ab3b2a0ade2c5adf8eac2300
Commit Graph

148 Commits

Author SHA1 Message Date
jl777
5a8b054ede Map R 2019-02-11 15:27:49 -11:00
jl777
4ceb869bef Test 2019-02-11 15:20:54 -11:00
jl777
ad65f834dd +print 2019-02-11 15:15:51 -11:00
jl777
43f0a2ba92 Hardcode address 2019-02-10 05:03:39 -11:00
jl777
73a696f008 Test 2019-02-10 04:23:23 -11:00
jl777
366ade08a0 Merge nonfungible 2019-02-10 02:28:14 -11:00
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
e5198d57b2 -print 2019-02-07 07:31:00 -11:00
jl777
b70e482448 Fix condCC2 2019-02-06 07:51:16 -11:00
jl777
da2b3e31f8 +print 2019-02-06 07:45:01 -11:00
jl777
fdec90dc57 condCC2 2019-02-06 07:41:13 -11:00
jl777
2fcf3f3f0f 1of2 signing 2019-02-05 21:29:18 -11:00
jl777
dd8f2697b7 Many changes 2019-02-05 19:25:32 -11:00
jl777
f3a93ed84b CC_MAXVINS 2019-01-31 09:18:28 -11:00
jl777
6d4d25ca10 Test 2019-01-31 09:15:14 -11:00
Mihailo Milenkovic
38c2c93509 Gateways validation (#16) 
- Validation implemented and enabled
- Fixed partial sign spending marker
- OracleFeed fixes
 2019-01-31 18:44:36 +01:00
jl777
1aefc8dbff Default validation for sudoku 2019-01-29 02:05:22 -11:00
jl777
9de5df85e8 Use mypk 2019-01-29 01:59:32 -11:00
jl777
1a7fbca0da Test 2019-01-29 01:55:20 -11:00
Mihailo Milenkovic
463caf96ec Gateways with new TokensCC (#15) 
- Adapting Gateways to new Tokens
- Making withdraws serialized until solution for parallel is made
 2019-01-28 13:54:21 +01:00
Mihailo Milenkovic
59c67afa11 Fixing FinalizeCCTx to return error if not possible to sign vin. 2019-01-28 13:22:29 +01:00
jl777
62322eb589 struct CCcontract_info 2019-01-19 23:31:12 -11:00
jl777
10528424f9 CC_info * 2019-01-19 22:48:46 -11:00
jl777
8aa8284e61 Merge branch 'FSM' into jl777 
# Conflicts:
#	src/cc/CCtx.cpp
 2019-01-17 20:24:28 -11:00
dimxy
4b71e62557 disabled debug loggin in FinalizeCCtx 2019-01-18 01:10:58 +05:00
dimxy
29052b0790 corr 'x' validation code 
corr logging in FinalizeCCtx
 2019-01-18 01:10:49 +05:00
dimxy
457b9aff54 more corr othertokenscond, set cp->unspendable 2019-01-18 01:10:36 +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
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
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
e1ddbcaf6c corr else if in FinalizeCCtx 2019-01-18 01:08:02 +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
00968fd9cb destaddr logging added 2019-01-18 01:04:41 +05:00
dimxy
1f6d62e7c8 MakeTokensCC1of2vout MakeTokensCCcond1of2 test code added 
gateways partially adapted for tokens
 2019-01-18 01:04:39 +05:00
dimxy
d1bd5b3b6c Squashed commit of the following: 
commit 843168eddff34390f19fa661ac6315e1a51aafe2
Author: dimxy <dimxy@komodoplatform.com>
Date:   Wed Jan 9 14:34:03 2019 +0500

    logging improved for CCtokens.cpp

commit 43c5b3a5c4e36e76a235f987e07fe893d941d95e
Author: dimxy <dimxy@komodoplatform.com>
Date:   Wed Jan 9 14:23:41 2019 +0500

    more extra logging disabled for heir and token

commit a3f7ca963a0042237f4c97d6d89852646b541c6c
Author: dimxy <dimxy@komodoplatform.com>
Date:   Wed Jan 9 14:13:58 2019 +0500

    more extra logging disabled

commit f4dec8f8ad733c5a61dd0fc9f3decd103dd7a0c3
Author: dimxy <dimxy@komodoplatform.com>
Date:   Wed Jan 9 14:05:45 2019 +0500

    more extra logging disabled

commit eb9a41472004ccdacdacfc12b79880ac6da390ee
Author: dimxy <dimxy@komodoplatform.com>
Date:   Wed Jan 9 13:50:11 2019 +0500

    extra logging disabled in heir and tokens

commit 0fe01c8a7b52b03e0c0a3ba5d77f916862031d23
Author: dimxy <dimxy@komodoplatform.com>
Date:   Wed Jan 9 13:15:08 2019 +0500

    heir normal input validator changed to CNullValidator

commit 3b86e87c83b6993d5a3b4c056c10120223e8c9ed
Author: dimxy <dimxy@komodoplatform.com>
Date:   Wed Jan 9 12:58:03 2019 +0500

    enabled logiing in FinalizeCCtx

commit 2ea87c1b3c7967b316d22e2e65fc3c0203cc4b03
Author: dimxy <dimxy@komodoplatform.com>
Date:   Wed Jan 9 12:37:43 2019 +0500

    corrected parameters for tests

commit 216eb4ed84c6fd23e3fc22cd79509a09c8504c0c
Author: dimxy <dimxy@komodoplatform.com>
Date:   Wed Jan 9 12:22:30 2019 +0500

    changed to eval_assets for test

commit 2af850f06a4692200864a316208cdfc0709b1634
Author: dimxy <dimxy@komodoplatform.com>
Date:   Wed Jan 9 02:42:43 2019 +0500

    heiradd loggin vin

commit 28e033d2b2a1a01b2bc9c2d51a81b61ae53f3a29
Author: dimxy <dimxy@komodoplatform.com>
Date:   Wed Jan 9 02:04:33 2019 +0500

    logging added

commit ef1dbc504c5984a4997b5e06e736fa7b5b4e125d
Author: dimxy <dimxy@komodoplatform.com>
Date:   Wed Jan 9 01:29:46 2019 +0500

    logging added and corrected

commit 98c1e5a6896a97667c9d64f347c26b36c6a320a9
Author: dimxy <dimxy@komodoplatform.com>
Date:   Wed Jan 9 01:05:17 2019 +0500

    corrected isHeirSpendingBegan init in _UnmarshalOpret

commit 6006f073bfc136ed06c1636b3e6ffa7b403ce1d9
Author: dimxy <dimxy@komodoplatform.com>
Date:   Wed Jan 9 01:01:18 2019 +0500

    corrected dummyIsHeirSpendingBegan using

commit 9a95edf4e311a80538dd7b13aeeb201e97474ee8
Author: dimxy <dimxy@komodoplatform.com>
Date:   Wed Jan 9 00:53:50 2019 +0500

    isHeirSpendingBegan is put in opret

commit 4bd210709626e2f8b99889e50410eb0f75b3dbda
Author: dimxy <dimxy@komodoplatform.com>
Date:   Tue Jan 8 20:16:20 2019 +0500

    added logging to _FindLastextFundingTx for print C vouts

commit 3603b49c1143b1efe82dd545b9d7dca43f5bcec0
Author: dimxy <dimxy@komodoplatform.com>
Date:   Tue Jan 8 19:25:11 2019 +0500

    corrected isHeirSpendingBegun calc

commit e7d6923d4be080a5e98405634fafb175fa55f801
Author: dimxy <dimxy@komodoplatform.com>
Date:   Tue Jan 8 18:43:35 2019 +0500

    yet another cpToken correction in RunValidators

commit e425dcc4497652a062b45d4a5ce4c137bd2caa3d
Author: dimxy <dimxy@komodoplatform.com>
Date:   Tue Jan 8 18:22:08 2019 +0500

    changed cp param to cpTokens for heir tokens in validation

commit a4420f30d42d93dbc2729db4a5b2895d4b16d22b
Author: dimxy <dimxy@komodoplatform.com>
Date:   Tue Jan 8 17:11:10 2019 +0500

    corrected EVAL_HEIR in create opret

commit 788d75263fd5aaa7b66417441622c9bb6603ab81
Author: dimxy <dimxy@komodoplatform.com>
Date:   Tue Jan 8 16:41:07 2019 +0500

    corrected opret forming for 'F', tokens

commit 92bf6c53b36a5a4450b5c7079383792d634d61a7
Author: dimxy <dimxy@komodoplatform.com>
Date:   Tue Jan 8 16:12:09 2019 +0500

    _UnmarshalOpret corrected for non F

commit e4eb26e875d44f3e4c1d45aff6df8a7026b3329a
Author: dimxy <dimxy@komodoplatform.com>
Date:   Tue Jan 8 15:26:34 2019 +0500

    Revert "CCduration debug logging added"

    This reverts commit 5ffc2b0a8b49d387cd175754738d2c07701c7856.

commit ce97ac88af0b87b304ad1fc9cb29db0803d0bd42
Author: dimxy <dimxy@komodoplatform.com>
Date:   Tue Jan 8 15:17:10 2019 +0500

    changed pindex to pindexTip in CCduration for better reading

commit 5ffc2b0a8b49d387cd175754738d2c07701c7856
Author: dimxy <dimxy@komodoplatform.com>
Date:   Tue Jan 8 14:43:07 2019 +0500

    CCduration debug logging added

commit 34afdd16f0f6b5b97da864f082dcd019a7566da7
Author: dimxy <dimxy@komodoplatform.com>
Date:   Tue Jan 8 12:23:31 2019 +0500

    corrected again order to DecodeOpRet call in heir

commit bba6149969ea23aa4e3c6263a36bae0ba7fa6f5d
Author: dimxy <dimxy@komodoplatform.com>
Date:   Tue Jan 8 12:17:11 2019 +0500

    logging added in IsHeirFundingVout

commit 6c5d4b313ef3e54cb5eb2bf67b2fa78d9ffd0b04
Author: dimxy <dimxy@komodoplatform.com>
Date:   Tue Jan 8 12:02:15 2019 +0500

    logging added to Add1of2AddrInputs

commit 40d6d84971a8ed764523567f08df4c74fda4f12d
Author: dimxy <dimxy@komodoplatform.com>
Date:   Tue Jan 8 11:36:23 2019 +0500

    corrected vopretExtra getting for heir for coins

commit 36061d25fb8992551915afc3dd0600878a64c540
Author: dimxy <dimxy@komodoplatform.com>
Date:   Tue Jan 8 11:13:30 2019 +0500

    corrected CCinit C-param separate

commit 0a6710433868c315afe3f656c1bc5f5138fe5288
Author: dimxy <dimxy@komodoplatform.com>
Date:   Tue Jan 8 10:58:19 2019 +0500

    logging added in decodeheiropret

commit 2503d8cb59b94b024a9ded43a0602f89800a9549
Author: dimxy <dimxy@komodoplatform.com>
Date:   Tue Jan 8 10:39:21 2019 +0500

    corrected decode opret for heir for coins
 2019-01-18 01:04:36 +05:00
Mihailo Milenkovic
da58ead2d3 Prevent sell and buy offers to be canceled by anybody (#9) 
- Prevent sell and buy offers to be canceled by anybody
 2019-01-18 01:04:33 +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
41b29fcc39 Automatic flag -> lsb of matures 2019-01-16 22:07:30 -11:00
jl777
0480189b29 Coinaddr 2019-01-16 21:56:47 -11:00
jl777
9bbfa5e89c Test 2019-01-16 21:56:08 -11:00
jl777
7708731563 Coinaddr 2019-01-16 21:50:39 -11:00
jl777
39a1f86d68 CCpriv 2019-01-16 21:49:31 -11:00
jl777
d42000a838 extern std::vector<CPubKey> NULL_pubkeys; 2019-01-16 21:48:21 -11:00
jl777
1f3dd2947c Pubkeys vector 2019-01-16 21:42:08 -11:00