Commit Graph

111 Commits

Author SHA1 Message Date
jl777
06e57ee1ba Add boolean CCflag to all SetCCunspents/txids 2019-04-11 21:49:28 -11:00
dimxy
de6828ec7c tokens blob support 2019-02-28 00:07:08 +05:00
dimxy
0b16f3942c added non-fungible eval code param 2019-02-13 17:45:45 +05:00
dimxy
1446f33ba8 corr cp init 2019-02-13 14:36:15 +05:00
dimxy
ea78447b3b corr if selecting ordertx 2019-02-13 13:49:04 +05:00
dimxy
3774bde4bb added mytokenorders rpc 2019-02-13 13:15:10 +05:00
dimxy
e583658d14 removed non-fungible data from 't' opret
added fieldId for non-fungible data in 'c' opret
changed to cc marker int tokencreate, added in rogue_finishgame
(tokenlist supports old and new markers)
2019-02-11 19:04:52 +05: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
dd8f2697b7 Many changes 2019-02-05 19:25:32 -11:00
Mihailo Milenkovic
a34fc26098 Fix canceling partially filled orders by anyone. (#11)
* Fix

* Fix
2019-01-21 11:57:52 +01:00
dimxy
0455243118 more debug logging removed 2019-01-18 01:10:53 +05:00
dimxy
c51e239400 corr FillSell self now single-eval token addr 2019-01-18 01:10:52 +05:00
dimxy
9657b5ce43 added CCaddr2set to CancelSell 2019-01-18 01:10:48 +05:00
dimxy
f79531a29a corr asset unspents addr in AssetOrders 2019-01-18 01:10:47 +05:00
dimxy
9584d6db7f corr cond (single tokens) for buy in GetAssetorigaddrs 2019-01-18 01:10:47 +05:00
dimxy
c18a655baf corr uninited cpAssets var in FillBuyOffer 2019-01-18 01:10:45 +05:00
dimxy
06e5d6fc6e corr dualUnspendable use in AssetOrders 2019-01-18 01:10:44 +05:00
dimxy
029d3af05a add logging origpubkey to FillSell 2019-01-18 01:10:37 +05:00
dimxy
f67a849be0 corr CCaddr2set for tokens support in FillSell 2019-01-18 01:10:35 +05:00
dimxy
406fc53925 removed extra CCaddr2set 2019-01-18 01:10:33 +05:00
dimxy
a7833f272f added othertokenscond to FinalizeCCtx 2019-01-18 01:10:32 +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
0a76f9d897 AssetXXX() changed to GetTokenBalance, TokenInfo, TokenList
added processing of incorrect tokenid to GetTokenBalance
2019-01-18 01:07:59 +05:00
dimxy
90f682f022 Heir corrected for Tokens contract 2019-01-18 01:04:35 +05:00
dimxy
a0fc5d6ae4 Corrected both Cancels, 'B' and TokenTransfer 2019-01-18 01:04:34 +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
0ea9ae3c05 Update copyright to 2019 2018-12-31 21:41:05 -11:00
dim71
933e1b4220 added check for bad tx (sending from normal vins to cc vouts) to asset validation and tx creation code 2018-12-01 03:08:24 +05:00
jl777
a0e51c46b1 Sapling CC tx support 2018-11-27 23:00:15 -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
de7200a2ab Fix CCassetstx 2018-11-09 01:49:48 -11:00
jl777
ce99447bb4 Threshold check in all CC addinputs 2018-11-06 11:54:11 -11:00
jl777
68da1c69bd Test 2018-09-20 03:50:58 -11:00
jl777
ff3116ce3c Chance for AssetConvert to validate 2018-09-20 02:55:45 -11:00
jl777
541e5e9249 Token convert 2018-09-19 21:51:56 -11:00
jl777
f44cd67e82 Prices stub 2018-09-19 21:04:47 -11:00
jl777
79d79ead57 Test 2018-09-11 22:43:49 -11:00
jl777
32bf34f0ca Test 2018-09-11 22:16:12 -11:00
jl777
019206ff84 Filter addassetinputs with signable addresses 2018-09-11 22:14:18 -11:00
jl777
3515c101d4 Initial gateways CC 2018-09-09 21:07:02 -11:00
jl777
58a6817159 Fix 2018-08-28 02:25:28 -11:00
Jonathan "Duke" Leto
e4f4e63bf5 Merge remote-tracking branch 'origin/jl777' into cctests
Tests failing right now due to change in behavior:

CC Eval EVAL_FAUCET Invalid: faucet is only for brand new addresses
2018-08-16 17:40:57 +02:00
Jonathan "Duke" Leto
8a3e1884d6 More token tests and more error checking and better errors from internals 2018-08-16 17:17:54 +02:00
jl777
6ca2e99883 Backwards compatibility breaking changes
Assets:
change tokeninfo to return "supply" in satoshis
Max description length to 4096

Rewards:
Fix  rewardsunlock without giving it a locked txid always gives error
Fix (nonconsensus) allow anybody to unlock only AFTER maxtime
Fix rewards unlock to use mempool
fix could you add a locked_funds value to rewardsinfo?
Fix i deposited 100000 at 20% apr for one day i only got back
100000.01140669 seems like too little for 20% APR

Faucet:
Fix txid with 0x00 at beginning and end required for faucetget txid
(65536 average iterations needed)
Change reduce faucet get to 0.1 coins
Can’t reproduce: it seems that if you re-run faucetget twice in the
same block is when it pegs the cpu to max

Dice:
fix Dice status always returning loss
Wont fix Profit margin for dice plan sounds good. -> use -ac_commission
2018-08-15 00:18:13 -11:00