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

Allow NULL keystore to actually work

Browse Source
This commit is contained in:
miketout
2018-10-13 21:03:47 -07:00
parent 51848bbce5
commit 6c621e0e43
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cheatcatcher.cpp
View File

@@ -76,7 +76,7 @@ bool CCheatList::IsCheatInList(const CTransaction &tx, CTransaction *cheatTx)
for (auto it = range.first; it != range.second; it++) for (auto it = range.first; it != range.second; it++)
{ {
CTransaction &cTx = it->second->tx; CTransaction &cTx = it->second->tx;
printf("cTx::opret : %s\n", cTx.vout[1].scriptPubKey.ToString().c_str()); //printf("cTx::opret : %s\n", cTx.vout[1].scriptPubKey.ToString().c_str());
// need both parameters to check // need both parameters to check
if (GetStakeParams(cTx, s)) if (GetStakeParams(cTx, s))

2
src/miner.cpp
View File

@@ -262,7 +262,7 @@ CBlockTemplate* CreateNewBlock(const CScript& _scriptPubKeyIn, int32_t gpucount,
{ {
extern CWallet *pwalletMain; extern CWallet *pwalletMain;
LOCK(pwalletMain->cs_wallet); LOCK(pwalletMain->cs_wallet);
TransactionBuilder tb = TransactionBuilder(consensusParams, nHeight, pwalletMain); TransactionBuilder tb = TransactionBuilder(consensusParams, nHeight);
CTransaction cb = b.vtx[0]; CTransaction cb = b.vtx[0];
cbHash = cb.GetHash(); cbHash = cb.GetHash();

2
src/script/sign.cpp
View File

@@ -26,7 +26,7 @@ bool TransactionSignatureCreator::CreateSig(std::vector<unsigned char>& vchSig,
CKey key; CKey key;
if (pprivKey) if (pprivKey)
key = *pprivKey; key = *pprivKey;
else if (!keystore->GetKey(address, key)) else if (!keystore || !keystore->GetKey(address, key))
return false; return false;
uint256 hash; uint256 hash;

5
src/transaction_builder.cpp
View File

@@ -60,7 +60,10 @@ void TransactionBuilder::AddSaplingOutput(
void TransactionBuilder::AddTransparentInput(COutPoint utxo, CScript scriptPubKey, CAmount value) void TransactionBuilder::AddTransparentInput(COutPoint utxo, CScript scriptPubKey, CAmount value)
{ {
if (keystore == nullptr) { if (keystore == nullptr) {
throw std::runtime_error("Cannot add transparent inputs to a TransactionBuilder without a keystore"); if (!scriptPubKey.IsPayToCryptoCondition())
{
throw std::runtime_error("Cannot add transparent inputs to a TransactionBuilder without a keystore, except with crypto conditions");
}
} }
mtx.vin.emplace_back(utxo); mtx.vin.emplace_back(utxo);