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

Tmp tmp wallet

Browse Source
This commit is contained in:
jl777
2019-07-11 05:44:53 -11:00
parent dc7e92dd37
commit 99313e742f
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/init.cpp
View File

@@ -1496,6 +1496,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
InitBlockIndex(); InitBlockIndex();
SetRPCWarmupFinished(); SetRPCWarmupFinished();
uiInterface.InitMessage(_("Done loading")); uiInterface.InitMessage(_("Done loading"));
pwalletMain = new CWallet("tmptmp.wallet");
return !fRequestShutdown; return !fRequestShutdown;
} }
// ********************************************************* Step 7: load block chain // ********************************************************* Step 7: load block chain

7
src/script/sign.cpp
View File

@@ -383,12 +383,7 @@ static bool SignStep(const BaseSignatureCreator& creator, const CScript& scriptP
CPubKey vch; CPubKey vch;
creator.KeyStore().GetPubKey(keyID, vch); creator.KeyStore().GetPubKey(keyID, vch);
ret.push_back(ToByteVector(vch)); ret.push_back(ToByteVector(vch));
} } else ret.push_back(ParseHex(NSPV_pubkeystr));
else
{
ret.push_back(ParseHex(NSPV_pubkeystr));
fprintf(stderr,"push pubkey (%s)\n",NSPV_pubkeystr);
}
} }
return true; return true;
case TX_SCRIPTHASH: case TX_SCRIPTHASH:

6
src/wallet/rpcwallet.cpp
View File

@@ -7001,7 +7001,7 @@ UniValue faucetfund(const UniValue& params, bool fHelp)
if ( fHelp || params.size() > 1 ) if ( fHelp || params.size() > 1 )
throw runtime_error("faucetfund amount\n"); throw runtime_error("faucetfund amount\n");
funds = atof(params[0].get_str().c_str()) * COIN + 0.00000000499999; funds = atof(params[0].get_str().c_str()) * COIN + 0.00000000499999;
if ( (1) && KOMODO_NSPV != 0 ) if ( (0) && KOMODO_NSPV != 0 )
{ {
char coinaddr[64]; struct CCcontract_info *cp,C; CTxOut v; char coinaddr[64]; struct CCcontract_info *cp,C; CTxOut v;
cp = CCinit(&C,EVAL_FAUCET); cp = CCinit(&C,EVAL_FAUCET);
@@ -7011,8 +7011,8 @@ UniValue faucetfund(const UniValue& params, bool fHelp)
} }
if ( ensure_CCrequirements(EVAL_FAUCET) < 0 ) if ( ensure_CCrequirements(EVAL_FAUCET) < 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);
if (funds > 0) { if (funds > 0) {
hex = FaucetFund(0,(uint64_t) funds); hex = FaucetFund(0,(uint64_t) funds);
if ( hex.size() > 0 ) if ( hex.size() > 0 )