DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #1246 from dimxy/tokenorders-fix

Browse Source 
Tokenorders fix
This commit is contained in:
jl777
2019-02-13 02:26:53 -11:00
committed by GitHub
parent 7a8fafbb4a 9e855f8224
commit 90fbeef954
3 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cc/CCassets.h
View File

@@ -47,7 +47,7 @@ bool AssetCalcAmounts(struct CCcontract_info *cpAssets, int64_t &inputs, int64_t
//int64_t GetAssetBalance(CPubKey pk,uint256 tokenid); // --> GetTokenBalance() //int64_t GetAssetBalance(CPubKey pk,uint256 tokenid); // --> GetTokenBalance()
int64_t AddAssetInputs(struct CCcontract_info *cp, CMutableTransaction &mtx, CPubKey pk, uint256 assetid, int64_t total, int32_t maxinputs); int64_t AddAssetInputs(struct CCcontract_info *cp, CMutableTransaction &mtx, CPubKey pk, uint256 assetid, int64_t total, int32_t maxinputs);
UniValue AssetOrders(uint256 tokenid, CPubKey pubkey); UniValue AssetOrders(uint256 tokenid, CPubKey pubkey, uint8_t additionalEvalCode);
//UniValue AssetInfo(uint256 tokenid); //UniValue AssetInfo(uint256 tokenid);
//UniValue AssetList(); //UniValue AssetList();
//std::string CreateAsset(int64_t txfee,int64_t assetsupply,std::string name,std::string description); //std::string CreateAsset(int64_t txfee,int64_t assetsupply,std::string name,std::string description);

23
src/cc/CCassetstx.cpp
View File

@@ -66,7 +66,7 @@ int64_t AddAssetInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,CPubK
} }
*/ */
UniValue AssetOrders(uint256 refassetid, CPubKey pk) UniValue AssetOrders(uint256 refassetid, CPubKey pk, uint8_t additionalEvalCode)
{ {
static uint256 zero; static uint256 zero;
UniValue result(UniValue::VARR); UniValue result(UniValue::VARR);
@@ -161,7 +161,7 @@ UniValue AssetOrders(uint256 refassetid, CPubKey pk)
} }
}; };
std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputsTokens, unspentOutputsCoins; std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputsTokens, unspentOutputsDualEvalTokens, unspentOutputsCoins;
char assetsUnspendableAddr[64]; char assetsUnspendableAddr[64];
GetCCaddress(cpAssets, assetsUnspendableAddr, GetUnspendable(cpAssets, NULL)); GetCCaddress(cpAssets, assetsUnspendableAddr, GetUnspendable(cpAssets, NULL));
@@ -177,18 +177,31 @@ UniValue AssetOrders(uint256 refassetid, CPubKey pk)
GetTokensCCaddress(cpAssets, assetsTokensUnspendableAddr, GetUnspendable(cpAssets, NULL)); GetTokensCCaddress(cpAssets, assetsTokensUnspendableAddr, GetUnspendable(cpAssets, NULL));
SetCCunspents(unspentOutputsTokens, assetsTokensUnspendableAddr); SetCCunspents(unspentOutputsTokens, assetsTokensUnspendableAddr);
// tokenasks: // tokenbids:
for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator itCoins = unspentOutputsCoins.begin(); for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator itCoins = unspentOutputsCoins.begin();
itCoins != unspentOutputsCoins.end(); itCoins != unspentOutputsCoins.end();
itCoins++) itCoins++)
addOrders(cpAssets, itCoins); addOrders(cpAssets, itCoins);
// tokenbids: // tokenasks:
for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator itTokens = unspentOutputsTokens.begin(); for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator itTokens = unspentOutputsTokens.begin();
itTokens != unspentOutputsTokens.end(); itTokens != unspentOutputsTokens.end();
itTokens++) itTokens++)
addOrders(cpAssets, itTokens); addOrders(cpAssets, itTokens);
if (additionalEvalCode != 0) { //this would be mytokenorders
char assetsDualEvalTokensUnspendableAddr[64];
// try also dual eval tokenasks (and we do not need bids):
cpAssets->additionalTokensEvalcode2 = additionalEvalCode;
GetTokensCCaddress(cpAssets, assetsDualEvalTokensUnspendableAddr, GetUnspendable(cpAssets, NULL));
SetCCunspents(unspentOutputsDualEvalTokens, assetsDualEvalTokensUnspendableAddr);
for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator itDualEvalTokens = unspentOutputsDualEvalTokens.begin();
itDualEvalTokens != unspentOutputsDualEvalTokens.end();
itDualEvalTokens++)
addOrders(cpAssets, itDualEvalTokens);
}
return(result); return(result);
} }

12
src/wallet/rpcwallet.cpp
View File

@@ -7052,21 +7052,25 @@ UniValue tokenorders(const UniValue& params, bool fHelp)
// memset(&tokenid, 0, sizeof(tokenid)); // memset(&tokenid, 0, sizeof(tokenid));
throw runtime_error("no tokenid\n"); throw runtime_error("no tokenid\n");
} }
return(AssetOrders(tokenid, CPubKey())); return AssetOrders(tokenid, CPubKey(), 0);
} }
UniValue mytokenorders(const UniValue& params, bool fHelp) UniValue mytokenorders(const UniValue& params, bool fHelp)
{ {
uint256 tokenid; uint256 tokenid;
if (fHelp || params.size() > 1) if (fHelp || params.size() > 2)
throw runtime_error("mytokenorders\n"); throw runtime_error("mytokenorders [evalcode]\n");
if (ensure_CCrequirements(EVAL_ASSETS) < 0 || ensure_CCrequirements(EVAL_TOKENS) < 0) if (ensure_CCrequirements(EVAL_ASSETS) < 0 || ensure_CCrequirements(EVAL_TOKENS) < 0)
throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n"); throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
const CKeyStore& keystore = *pwalletMain; const CKeyStore& keystore = *pwalletMain;
LOCK2(cs_main, pwalletMain->cs_wallet); LOCK2(cs_main, pwalletMain->cs_wallet);
return(AssetOrders(zeroid, Mypubkey())); uint8_t additionalEvalCode = 0;
if (params.size() == 1)
additionalEvalCode = strtol(params[0].get_str().c_str(), NULL, 0); // supports also 0xEE-like values
return AssetOrders(zeroid, Mypubkey(), additionalEvalCode);
} }
UniValue tokenbalance(const UniValue& params, bool fHelp) UniValue tokenbalance(const UniValue& params, bool fHelp)