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

Sudokupk signing

Browse Source
This commit is contained in:
jl777
2019-01-29 01:45:41 -11:00
parent 21ee88562c
commit 823017c122
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/cc/sudoku.cpp
View File

@@ -502,7 +502,7 @@ CScript sudoku_genopret(uint8_t unsolved[9][9])
UniValue sudoku_generate(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) UniValue sudoku_generate(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
{ {
CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), komodo_nextheight()); CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), komodo_nextheight());
UniValue result(UniValue::VOBJ); CPubKey sudokupk,pk; uint8_t privkey[32],unsolved[9][9],pub33[33]; uint32_t srandi; uint256 hash; char coinaddr[64]; uint64_t inputsum,amount; std::string rawtx; UniValue result(UniValue::VOBJ); CPubKey sudokupk,pk; uint8_t privkey[32],unsolved[9][9],pub33[33]; uint32_t srandi; uint256 hash; char coinaddr[64]; uint64_t inputsum,amount,change=0; std::string rawtx;
if ( params != 0 ) if ( params != 0 )
{ {
printf("params.(%s)\n",jprint(params,0)); printf("params.(%s)\n",jprint(params,0));
@@ -523,7 +523,12 @@ UniValue sudoku_generate(uint64_t txfee,struct CCcontract_info *cp,cJSON *params
if ( (inputsum= AddCClibInputs(cp,mtx,sudokupk,amount+2*txfee,16)) >= amount+2*txfee ) if ( (inputsum= AddCClibInputs(cp,mtx,sudokupk,amount+2*txfee,16)) >= amount+2*txfee )
{ {
mtx.vout.push_back(MakeCC1vout(cp->evalcode,txfee,sudokupk)); mtx.vout.push_back(MakeCC1vout(cp->evalcode,txfee,sudokupk));
mtx.vout.push_back(MakeCC1vout(cp->evalcode,inputsum - 2*txfee,pk)); mtx.vout.push_back(MakeCC1vout(cp->evalcode,amount,pk));
if ( inputsum > amount + 2*txfee )
change = (inputsum - amount - 2*txfee);
if ( change > txfee )
mtx.vout.push_back(MakeCC1vout(cp->evalcode,change,sudokupk));
CCaddr2set(cp,cp->evalcode,sudokupk,cp->CCpriv,cp->CCaddr);
rawtx = FinalizeCCTx(0,cp,mtx,sudokupk,txfee,sudoku_genopret(unsolved)); rawtx = FinalizeCCTx(0,cp,mtx,sudokupk,txfee,sudoku_genopret(unsolved));
result.push_back(Pair("hex",rawtx)); result.push_back(Pair("hex",rawtx));
} else result.push_back(Pair("error","not enough SUDOKU funds")); } else result.push_back(Pair("error","not enough SUDOKU funds"));

3
src/wallet/rpcwallet.cpp
View File

@@ -5240,7 +5240,10 @@ UniValue CCaddress(struct CCcontract_info *cp,char *name,std::vector<unsigned ch
result.push_back(Pair("myCCbalance",ValueFromAmount(CCaddress_balance(destaddr)))); result.push_back(Pair("myCCbalance",ValueFromAmount(CCaddress_balance(destaddr))));
} }
if ( Getscriptaddress(destaddr,(CScript() << Mypubkey() << OP_CHECKSIG)) != 0 ) if ( Getscriptaddress(destaddr,(CScript() << Mypubkey() << OP_CHECKSIG)) != 0 )
{
result.push_back(Pair("myaddress",destaddr)); result.push_back(Pair("myaddress",destaddr));
result.push_back(Pair("mybalance",ValueFromAmount(CCaddress_balance(destaddr))));
}
return(result); return(result);
} }