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

Fix tokeninfo

Browse Source
This commit is contained in:
jl777
2019-07-12 03:29:06 -11:00
parent a599f49bc4
commit 5f60266446
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cc/CCtokens.cpp
View File

@@ -870,11 +870,11 @@ std::string TokenTransfer(int64_t txfee, uint256 tokenid, vscript_t destpubkey,
if (txfee == 0) if (txfee == 0)
txfee = 10000; txfee = 10000;
mypk = pubkey2pk(Mypubkey()); mypk = pubkey2pk(Mypubkey());
if ( cp->tokens1of2addr[0] == 0 ) /*if ( cp->tokens1of2addr[0] == 0 )
{ {
GetTokensCCaddress(cp, cp->tokens1of2addr, mypk); GetTokensCCaddress(cp, cp->tokens1of2addr, mypk);
fprintf(stderr,"set tokens1of2addr <- %s\n",cp->tokens1of2addr); fprintf(stderr,"set tokens1of2addr <- %s\n",cp->tokens1of2addr);
} }*/
if (AddNormalinputs(mtx, mypk, txfee, 3) > 0) if (AddNormalinputs(mtx, mypk, txfee, 3) > 0)
{ {
mask = ~((1LL << mtx.vin.size()) - 1); // seems, mask is not used anymore mask = ~((1LL << mtx.vin.size()) - 1); // seems, mask is not used anymore
@@ -957,7 +957,7 @@ UniValue TokenInfo(uint256 tokenid)
result.push_back(Pair("error", "cant find tokenid")); result.push_back(Pair("error", "cant find tokenid"));
return(result); return(result);
} }
if (hashBlock.IsNull()) { if ( KOMODO_NSPV == 0 && hashBlock.IsNull()) {
result.push_back(Pair("result", "error")); result.push_back(Pair("result", "error"));
result.push_back(Pair("error", "the transaction is still in mempool")); result.push_back(Pair("error", "the transaction is still in mempool"));
return(result); return(result);

8
src/cc/CCtx.cpp
View File

@@ -279,12 +279,12 @@ fprintf(stderr,"FinalizeCCTx() matched %s cp->tokens1of2addr!\n", cp->tokens1of2
} }
} }
uint256 sighash = SignatureHash(CCPubKey(cond), mtx, i, SIGHASH_ALL,utxovalues[i],consensusBranchId, &txdata); uint256 sighash = SignatureHash(CCPubKey(cond), mtx, i, SIGHASH_ALL,utxovalues[i],consensusBranchId, &txdata);
int32_t z;
for (z=0; z<32; z++)
fprintf(stderr,"%02x",((uint8_t *)sighash.begin())[z]);
fprintf(stderr," sighash [%d] %.8f %x\n",i,(double)utxovalues[i]/COIN,consensusBranchId);
if ( cc_signTreeSecp256k1Msg32(cond,privkey,sighash.begin()) != 0 ) if ( cc_signTreeSecp256k1Msg32(cond,privkey,sighash.begin()) != 0 )
{ {
//int32_t z;
//for (z=0; z<32; z++)
// fprintf(stderr,"%02x",((uint8_t *)sighash.begin())[z]);
//fprintf(stderr," sighash [%d] %.8f %x\n",i,(double)utxovalues[i]/COIN,consensusBranchId);
//for (z=0; z<32; z++) //for (z=0; z<32; z++)
// fprintf(stderr,"%02x",privkey[z]); // fprintf(stderr,"%02x",privkey[z]);
//fprintf(stderr," signed with privkey\n"); //fprintf(stderr," signed with privkey\n");