Fix typos
This commit is contained in:
4 files changed
+5
-5
No files matched your search
@@ -84,7 +84,7 @@ static feebumper::Result CheckFeeRate(const CWallet& wallet, const CMutableTrans
|
|||||||
|
|
||||||
std::optional<CAmount> combined_bump_fee = wallet.chain().calculateCombinedBumpFee(reused_inputs, newFeerate);
|
std::optional<CAmount> combined_bump_fee = wallet.chain().calculateCombinedBumpFee(reused_inputs, newFeerate);
|
||||||
if (!combined_bump_fee.has_value()) {
|
if (!combined_bump_fee.has_value()) {
|
||||||
errors.push_back(Untranslated(strprintf("Failed to calculate bump fees, because unconfirmed UTXOs depend on enormous cluster of unconfirmed transactions.")));
|
errors.push_back(Untranslated(strprintf("Failed to calculate bump fees, because unconfirmed UTXOs depend on an enormous cluster of unconfirmed transactions.")));
|
||||||
}
|
}
|
||||||
CAmount new_total_fee = newFeerate.GetFee(maxTxSize) + combined_bump_fee.value();
|
CAmount new_total_fee = newFeerate.GetFee(maxTxSize) + combined_bump_fee.value();
|
||||||
|
|
||||||
|
|||||||
@@ -762,7 +762,7 @@ util::Result<SelectionResult> ChooseSelectionResult(interfaces::Chain& chain, co
|
|||||||
}
|
}
|
||||||
std::optional<CAmount> combined_bump_fee = chain.calculateCombinedBumpFee(outpoints, coin_selection_params.m_effective_feerate);
|
std::optional<CAmount> combined_bump_fee = chain.calculateCombinedBumpFee(outpoints, coin_selection_params.m_effective_feerate);
|
||||||
if (!combined_bump_fee.has_value()) {
|
if (!combined_bump_fee.has_value()) {
|
||||||
return util::Error{_("Failed to calculate bump fees, because unconfirmed UTXOs depend on enormous cluster of unconfirmed transactions.")};
|
return util::Error{_("Failed to calculate bump fees, because unconfirmed UTXOs depend on an enormous cluster of unconfirmed transactions.")};
|
||||||
}
|
}
|
||||||
CAmount bump_fee_overestimate = summed_bump_fees - combined_bump_fee.value();
|
CAmount bump_fee_overestimate = summed_bump_fees - combined_bump_fee.value();
|
||||||
if (bump_fee_overestimate) {
|
if (bump_fee_overestimate) {
|
||||||
|
|||||||
@@ -2847,7 +2847,7 @@ std::shared_ptr<CWallet> CWallet::Create(WalletContext& context, const std::stri
|
|||||||
rescan_required = true;
|
rescan_required = true;
|
||||||
} else if (nLoadWalletRet == DBErrors::UNKNOWN_DESCRIPTOR) {
|
} else if (nLoadWalletRet == DBErrors::UNKNOWN_DESCRIPTOR) {
|
||||||
error = strprintf(_("Unrecognized descriptor found. Loading wallet %s\n\n"
|
error = strprintf(_("Unrecognized descriptor found. Loading wallet %s\n\n"
|
||||||
"The wallet might had been created on a newer version.\n"
|
"The wallet might have been created on a newer version.\n"
|
||||||
"Please try running the latest software version.\n"), walletFile);
|
"Please try running the latest software version.\n"), walletFile);
|
||||||
return nullptr;
|
return nullptr;
|
||||||
} else if (nLoadWalletRet == DBErrors::UNEXPECTED_LEGACY_ENTRY) {
|
} else if (nLoadWalletRet == DBErrors::UNEXPECTED_LEGACY_ENTRY) {
|
||||||
@@ -3149,7 +3149,7 @@ bool CWallet::AttachChain(const std::shared_ptr<CWallet>& walletInstance, interf
|
|||||||
// but fail the rescan with a generic error.
|
// but fail the rescan with a generic error.
|
||||||
|
|
||||||
error = chain.havePruned() ?
|
error = chain.havePruned() ?
|
||||||
_("Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)") :
|
_("Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of a pruned node)") :
|
||||||
strprintf(_(
|
strprintf(_(
|
||||||
"Error loading wallet. Wallet requires blocks to be downloaded, "
|
"Error loading wallet. Wallet requires blocks to be downloaded, "
|
||||||
"and software does not currently support loading wallets while "
|
"and software does not currently support loading wallets while "
|
||||||
|
|||||||
@@ -791,7 +791,7 @@ static DBErrors LoadDescriptorWalletRecords(CWallet* pwallet, DatabaseBatch& bat
|
|||||||
value >> desc;
|
value >> desc;
|
||||||
} catch (const std::ios_base::failure& e) {
|
} catch (const std::ios_base::failure& e) {
|
||||||
strErr = strprintf("Error: Unrecognized descriptor found in wallet %s. ", pwallet->GetName());
|
strErr = strprintf("Error: Unrecognized descriptor found in wallet %s. ", pwallet->GetName());
|
||||||
strErr += (last_client > CLIENT_VERSION) ? "The wallet might had been created on a newer version. " :
|
strErr += (last_client > CLIENT_VERSION) ? "The wallet might have been created on a newer version. " :
|
||||||
"The database might be corrupted or the software version is not compatible with one of your wallet descriptors. ";
|
"The database might be corrupted or the software version is not compatible with one of your wallet descriptors. ";
|
||||||
strErr += "Please try running the latest software version";
|
strErr += "Please try running the latest software version";
|
||||||
// Also include error details
|
// Also include error details
|
||||||
|
|||||||
Reference in new issue
Block a user