mirror of
https://git.wownero.com/wownero/wownero.git
synced 2024-08-15 01:03:23 +00:00
Correct spelling mistakes.
This commit is contained in:
parent
c7ace5fa3d
commit
fbcc91c2a4
19 changed files with 28 additions and 28 deletions
|
@ -298,7 +298,7 @@ if(SANITIZE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Set default blockchain storage location:
|
# Set default blockchain storage location:
|
||||||
# memory was the default in Cryptonote before Monero implimented LMDB, it still works but is unneccessary.
|
# memory was the default in Cryptonote before Monero implemented LMDB, it still works but is unnecessary.
|
||||||
# set(DATABASE memory)
|
# set(DATABASE memory)
|
||||||
set(DATABASE lmdb)
|
set(DATABASE lmdb)
|
||||||
|
|
||||||
|
|
|
@ -472,7 +472,7 @@ void BlockchainLMDB::do_resize(uint64_t increase_size)
|
||||||
// add 1Gb per resize, instead of doing a percentage increase
|
// add 1Gb per resize, instead of doing a percentage increase
|
||||||
uint64_t new_mapsize = (double) mei.me_mapsize + add_size;
|
uint64_t new_mapsize = (double) mei.me_mapsize + add_size;
|
||||||
|
|
||||||
// If given, use increase_size intead of above way of resizing.
|
// If given, use increase_size instead of above way of resizing.
|
||||||
// This is currently used for increasing by an estimated size at start of new
|
// This is currently used for increasing by an estimated size at start of new
|
||||||
// batch txn.
|
// batch txn.
|
||||||
if (increase_size > 0)
|
if (increase_size > 0)
|
||||||
|
|
|
@ -45,7 +45,7 @@
|
||||||
* is as follows: Strip the msb of each byte, then from left to right,
|
* is as follows: Strip the msb of each byte, then from left to right,
|
||||||
* read in what remains, placing it in reverse, into the buffer. Thus,
|
* read in what remains, placing it in reverse, into the buffer. Thus,
|
||||||
* the following bit stream: 0xff02 would return 0x027f. 0xff turns
|
* the following bit stream: 0xff02 would return 0x027f. 0xff turns
|
||||||
* into 0x7f, is placed on the beggining of the buffer, then 0x02 is
|
* into 0x7f, is placed on the beginning of the buffer, then 0x02 is
|
||||||
* unchanged, since its msb is not set, and placed at the end of the
|
* unchanged, since its msb is not set, and placed at the end of the
|
||||||
* buffer.
|
* buffer.
|
||||||
*/
|
*/
|
||||||
|
@ -108,7 +108,7 @@ namespace tools {
|
||||||
return EVARINT_REPRESENT;
|
return EVARINT_REPRESENT;
|
||||||
}
|
}
|
||||||
|
|
||||||
write |= static_cast<T>(byte & 0x7f) << shift; /* Does the actualy placing into write, stripping the first bit */
|
write |= static_cast<T>(byte & 0x7f) << shift; /* Does the actually placing into write, stripping the first bit */
|
||||||
|
|
||||||
/* If there is no next */
|
/* If there is no next */
|
||||||
if ((byte & 0x80) == 0) {
|
if ((byte & 0x80) == 0) {
|
||||||
|
|
|
@ -107,7 +107,7 @@ namespace crypto {
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* generate public and secret keys from a random 256-bit integer
|
* generate public and secret keys from a random 256-bit integer
|
||||||
* TODO: allow specifiying random value (for wallet recovery)
|
* TODO: allow specifying random value (for wallet recovery)
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
secret_key crypto_ops::generate_keys(public_key &pub, secret_key &sec, const secret_key& recovery_key, bool recover) {
|
secret_key crypto_ops::generate_keys(public_key &pub, secret_key &sec, const secret_key& recovery_key, bool recover) {
|
||||||
|
|
|
@ -602,7 +602,7 @@ namespace cryptonote
|
||||||
// this should take care of the case where mining is started with bg-enabled,
|
// this should take care of the case where mining is started with bg-enabled,
|
||||||
// and then the user decides to un-check background mining, and just do
|
// and then the user decides to un-check background mining, and just do
|
||||||
// regular full-speed mining. I might just be over-doing it and thinking up
|
// regular full-speed mining. I might just be over-doing it and thinking up
|
||||||
// non-existant use-cases, so if the concensus is to simplify, we can remove all this fluff.
|
// non-existant use-cases, so if the consensus is to simplify, we can remove all this fluff.
|
||||||
/*
|
/*
|
||||||
while( !m_is_background_mining_enabled )
|
while( !m_is_background_mining_enabled )
|
||||||
{
|
{
|
||||||
|
|
|
@ -2739,7 +2739,7 @@ bool Blockchain::check_tx_inputs(transaction& tx, tx_verification_context &tvc,
|
||||||
case rct::RCTTypeSimple:
|
case rct::RCTTypeSimple:
|
||||||
case rct::RCTTypeSimpleBulletproof:
|
case rct::RCTTypeSimpleBulletproof:
|
||||||
{
|
{
|
||||||
// check all this, either recontructed (so should really pass), or not
|
// check all this, either reconstructed (so should really pass), or not
|
||||||
{
|
{
|
||||||
if (pubkeys.size() != rv.mixRing.size())
|
if (pubkeys.size() != rv.mixRing.size())
|
||||||
{
|
{
|
||||||
|
@ -2797,7 +2797,7 @@ bool Blockchain::check_tx_inputs(transaction& tx, tx_verification_context &tvc,
|
||||||
case rct::RCTTypeFull:
|
case rct::RCTTypeFull:
|
||||||
case rct::RCTTypeFullBulletproof:
|
case rct::RCTTypeFullBulletproof:
|
||||||
{
|
{
|
||||||
// check all this, either recontructed (so should really pass), or not
|
// check all this, either reconstructed (so should really pass), or not
|
||||||
{
|
{
|
||||||
bool size_matches = true;
|
bool size_matches = true;
|
||||||
for (size_t i = 0; i < pubkeys.size(); ++i)
|
for (size_t i = 0; i < pubkeys.size(); ++i)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/// @file
|
/// @file
|
||||||
/// @author rfree (current maintainer/user in monero.cc project - most of code is from CryptoNote)
|
/// @author rfree (current maintainer/user in monero.cc project - most of code is from CryptoNote)
|
||||||
/// @brief This is the orginal cryptonote protocol network-events handler, modified by us
|
/// @brief This is the original cryptonote protocol network-events handler, modified by us
|
||||||
|
|
||||||
// Copyright (c) 2014-2018, The Monero Project
|
// Copyright (c) 2014-2018, The Monero Project
|
||||||
//
|
//
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/// @file
|
/// @file
|
||||||
/// @author rfree (current maintainer/user in monero.cc project - most of code is from CryptoNote)
|
/// @author rfree (current maintainer/user in monero.cc project - most of code is from CryptoNote)
|
||||||
/// @brief This is the orginal cryptonote protocol network-events handler, modified by us
|
/// @brief This is the original cryptonote protocol network-events handler, modified by us
|
||||||
|
|
||||||
// Copyright (c) 2014-2018, The Monero Project
|
// Copyright (c) 2014-2018, The Monero Project
|
||||||
//
|
//
|
||||||
|
|
|
@ -82,7 +82,7 @@ protected:
|
||||||
|
|
||||||
/* \struct binary_archive
|
/* \struct binary_archive
|
||||||
*
|
*
|
||||||
* \brief the actualy binary archive type
|
* \brief the actually binary archive type
|
||||||
*
|
*
|
||||||
* \detailed The boolean template argument /a W is the is_saving
|
* \detailed The boolean template argument /a W is the is_saving
|
||||||
* parameter for binary_archive_base.
|
* parameter for binary_archive_base.
|
||||||
|
|
|
@ -87,7 +87,7 @@ struct variant_reader
|
||||||
};
|
};
|
||||||
|
|
||||||
// This one just fails when you call it.... okay
|
// This one just fails when you call it.... okay
|
||||||
// So the TEnd parameter must be specified/differnt from TBegin
|
// So the TEnd parameter must be specified/different from TBegin
|
||||||
template <class Archive, class Variant, class TBegin>
|
template <class Archive, class Variant, class TBegin>
|
||||||
struct variant_reader<Archive, Variant, TBegin, TBegin>
|
struct variant_reader<Archive, Variant, TBegin, TBegin>
|
||||||
{
|
{
|
||||||
|
|
|
@ -2589,7 +2589,7 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
year = boost::lexical_cast<uint16_t>(heightstr.substr(0,4));
|
year = boost::lexical_cast<uint16_t>(heightstr.substr(0,4));
|
||||||
// lexical_cast<uint8_t> won't work becasue uint8_t is treated as character type
|
// lexical_cast<uint8_t> won't work because uint8_t is treated as character type
|
||||||
month = boost::lexical_cast<uint16_t>(heightstr.substr(5,2));
|
month = boost::lexical_cast<uint16_t>(heightstr.substr(5,2));
|
||||||
day = boost::lexical_cast<uint16_t>(heightstr.substr(8,2));
|
day = boost::lexical_cast<uint16_t>(heightstr.substr(8,2));
|
||||||
m_restore_height = m_wallet->get_blockchain_height_by_date(year, month, day);
|
m_restore_height = m_wallet->get_blockchain_height_by_date(year, month, day);
|
||||||
|
|
|
@ -1746,7 +1746,7 @@ void WalletImpl::doRefresh()
|
||||||
m_synchronized = true;
|
m_synchronized = true;
|
||||||
}
|
}
|
||||||
// assuming if we have empty history, it wasn't initialized yet
|
// assuming if we have empty history, it wasn't initialized yet
|
||||||
// for futher history changes client need to update history in
|
// for further history changes client need to update history in
|
||||||
// "on_money_received" and "on_money_sent" callbacks
|
// "on_money_received" and "on_money_sent" callbacks
|
||||||
if (m_history->count() == 0) {
|
if (m_history->count() == 0) {
|
||||||
m_history->refresh();
|
m_history->refresh();
|
||||||
|
|
|
@ -685,7 +685,7 @@ struct Wallet
|
||||||
* \brief setUserNote - attach an arbitrary string note to a txid
|
* \brief setUserNote - attach an arbitrary string note to a txid
|
||||||
* \param txid - the transaction id to attach the note to
|
* \param txid - the transaction id to attach the note to
|
||||||
* \param note - the note
|
* \param note - the note
|
||||||
* \return true if succesful, false otherwise
|
* \return true if successful, false otherwise
|
||||||
*/
|
*/
|
||||||
virtual bool setUserNote(const std::string &txid, const std::string ¬e) = 0;
|
virtual bool setUserNote(const std::string &txid, const std::string ¬e) = 0;
|
||||||
/*!
|
/*!
|
||||||
|
@ -827,7 +827,7 @@ struct WalletManager
|
||||||
const std::string &spendKeyString = "") = 0;
|
const std::string &spendKeyString = "") = 0;
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* \brief Closes wallet. In case operation succeded, wallet object deleted. in case operation failed, wallet object not deleted
|
* \brief Closes wallet. In case operation succeeded, wallet object deleted. in case operation failed, wallet object not deleted
|
||||||
* \param wallet previously opened / created wallet instance
|
* \param wallet previously opened / created wallet instance
|
||||||
* \return None
|
* \return None
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -383,7 +383,7 @@ std::unique_ptr<tools::wallet2> generate_from_json(const std::string& json_file,
|
||||||
|
|
||||||
if (field_spendkey.empty())
|
if (field_spendkey.empty())
|
||||||
{
|
{
|
||||||
// if we have an addres but no spend key, we can deduce the spend public key
|
// if we have an address but no spend key, we can deduce the spend public key
|
||||||
// from the address
|
// from the address
|
||||||
if (field_address_found)
|
if (field_address_found)
|
||||||
{
|
{
|
||||||
|
@ -5305,7 +5305,7 @@ void wallet2::light_wallet_get_outs(std::vector<std::vector<tools::wallet2::get_
|
||||||
bool r = epee::net_utils::invoke_http_json("/get_random_outs", oreq, ores, m_http_client, rpc_timeout, "POST");
|
bool r = epee::net_utils::invoke_http_json("/get_random_outs", oreq, ores, m_http_client, rpc_timeout, "POST");
|
||||||
m_daemon_rpc_mutex.unlock();
|
m_daemon_rpc_mutex.unlock();
|
||||||
THROW_WALLET_EXCEPTION_IF(!r, error::no_connection_to_daemon, "get_random_outs");
|
THROW_WALLET_EXCEPTION_IF(!r, error::no_connection_to_daemon, "get_random_outs");
|
||||||
THROW_WALLET_EXCEPTION_IF(ores.amount_outs.empty() , error::wallet_internal_error, "No outputs recieved from light wallet node. Error: " + ores.Error);
|
THROW_WALLET_EXCEPTION_IF(ores.amount_outs.empty() , error::wallet_internal_error, "No outputs received from light wallet node. Error: " + ores.Error);
|
||||||
|
|
||||||
// Check if we got enough outputs for each amount
|
// Check if we got enough outputs for each amount
|
||||||
for(auto& out: ores.amount_outs) {
|
for(auto& out: ores.amount_outs) {
|
||||||
|
@ -5529,7 +5529,7 @@ void wallet2::get_outs(std::vector<std::vector<tools::wallet2::get_outs_entry>>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// sort the subsection, to ensure the daemon doesn't know wich output is ours
|
// sort the subsection, to ensure the daemon doesn't know which output is ours
|
||||||
std::sort(req.outputs.begin() + start, req.outputs.end(),
|
std::sort(req.outputs.begin() + start, req.outputs.end(),
|
||||||
[](const get_outputs_out &a, const get_outputs_out &b) { return a.index < b.index; });
|
[](const get_outputs_out &a, const get_outputs_out &b) { return a.index < b.index; });
|
||||||
}
|
}
|
||||||
|
@ -6156,7 +6156,7 @@ bool wallet2::light_wallet_login(bool &new_address)
|
||||||
cryptonote::COMMAND_RPC_LOGIN::response response;
|
cryptonote::COMMAND_RPC_LOGIN::response response;
|
||||||
request.address = get_account().get_public_address_str(m_testnet);
|
request.address = get_account().get_public_address_str(m_testnet);
|
||||||
request.view_key = string_tools::pod_to_hex(get_account().get_keys().m_view_secret_key);
|
request.view_key = string_tools::pod_to_hex(get_account().get_keys().m_view_secret_key);
|
||||||
// Always create account if it doesnt exist.
|
// Always create account if it doesn't exist.
|
||||||
request.create_account = true;
|
request.create_account = true;
|
||||||
m_daemon_rpc_mutex.lock();
|
m_daemon_rpc_mutex.lock();
|
||||||
bool connected = epee::net_utils::invoke_http_json("/login", request, response, m_http_client, rpc_timeout, "POST");
|
bool connected = epee::net_utils::invoke_http_json("/login", request, response, m_http_client, rpc_timeout, "POST");
|
||||||
|
@ -6169,7 +6169,7 @@ bool wallet2::light_wallet_login(bool &new_address)
|
||||||
MDEBUG("New wallet: " << response.new_address);
|
MDEBUG("New wallet: " << response.new_address);
|
||||||
if(m_light_wallet_connected)
|
if(m_light_wallet_connected)
|
||||||
{
|
{
|
||||||
// Clear old data on successfull login.
|
// Clear old data on successful login.
|
||||||
// m_transfers.clear();
|
// m_transfers.clear();
|
||||||
// m_payments.clear();
|
// m_payments.clear();
|
||||||
// m_unconfirmed_payments.clear();
|
// m_unconfirmed_payments.clear();
|
||||||
|
@ -6541,7 +6541,7 @@ void wallet2::light_wallet_get_address_txs()
|
||||||
|
|
||||||
// Calculate wallet balance
|
// Calculate wallet balance
|
||||||
m_light_wallet_balance = ires.total_received-wallet_total_sent;
|
m_light_wallet_balance = ires.total_received-wallet_total_sent;
|
||||||
// MyMonero doesnt send unlocked balance
|
// MyMonero doesn't send unlocked balance
|
||||||
if(ires.total_received_unlocked > 0)
|
if(ires.total_received_unlocked > 0)
|
||||||
m_light_wallet_unlocked_balance = ires.total_received_unlocked-wallet_total_sent;
|
m_light_wallet_unlocked_balance = ires.total_received_unlocked-wallet_total_sent;
|
||||||
else
|
else
|
||||||
|
@ -6818,7 +6818,7 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions_2(std::vector<cryp
|
||||||
{
|
{
|
||||||
string s;
|
string s;
|
||||||
for (auto i: preferred_inputs) s += boost::lexical_cast<std::string>(i) + " (" + print_money(m_transfers[i].amount()) + ") ";
|
for (auto i: preferred_inputs) s += boost::lexical_cast<std::string>(i) + " (" + print_money(m_transfers[i].amount()) + ") ";
|
||||||
LOG_PRINT_L1("Found prefered rct inputs for rct tx: " << s);
|
LOG_PRINT_L1("Found preferred rct inputs for rct tx: " << s);
|
||||||
|
|
||||||
// bring the list of available outputs stored by the same subaddress index to the front of the list
|
// bring the list of available outputs stored by the same subaddress index to the front of the list
|
||||||
uint32_t index_minor = m_transfers[preferred_inputs[0]].m_subaddr_index.minor;
|
uint32_t index_minor = m_transfers[preferred_inputs[0]].m_subaddr_index.minor;
|
||||||
|
|
|
@ -192,7 +192,7 @@ class GTEST_API_ FilePath {
|
||||||
|
|
||||||
void Normalize();
|
void Normalize();
|
||||||
|
|
||||||
// Returns a pointer to the last occurence of a valid path separator in
|
// Returns a pointer to the last occurrence of a valid path separator in
|
||||||
// the FilePath. On Windows, for example, both '/' and '\' are valid path
|
// the FilePath. On Windows, for example, both '/' and '\' are valid path
|
||||||
// separators. Returns NULL if no path separator was found.
|
// separators. Returns NULL if no path separator was found.
|
||||||
const char* FindLastPathSeparator() const;
|
const char* FindLastPathSeparator() const;
|
||||||
|
|
|
@ -130,7 +130,7 @@ FilePath FilePath::RemoveExtension(const char* extension) const {
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Returns a pointer to the last occurence of a valid path separator in
|
// Returns a pointer to the last occurrence of a valid path separator in
|
||||||
// the FilePath. On Windows, for example, both '/' and '\' are valid path
|
// the FilePath. On Windows, for example, both '/' and '\' are valid path
|
||||||
// separators. Returns NULL if no path separator was found.
|
// separators. Returns NULL if no path separator was found.
|
||||||
const char* FilePath::FindLastPathSeparator() const {
|
const char* FilePath::FindLastPathSeparator() const {
|
||||||
|
|
|
@ -841,7 +841,7 @@ struct MyWalletListener : public Monero::WalletListener
|
||||||
{
|
{
|
||||||
std::cout << "wallet: " << wallet->mainAddress() << "**** just received unconfirmed money ("
|
std::cout << "wallet: " << wallet->mainAddress() << "**** just received unconfirmed money ("
|
||||||
<< txId << ", " << wallet->displayAmount(amount) << ")" << std::endl;
|
<< txId << ", " << wallet->displayAmount(amount) << ")" << std::endl;
|
||||||
// Don't trigger recieve until tx is mined
|
// Don't trigger receive until tx is mined
|
||||||
// total_rx += amount;
|
// total_rx += amount;
|
||||||
// receive_triggered = true;
|
// receive_triggered = true;
|
||||||
// cv_receive.notify_one();
|
// cv_receive.notify_one();
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
## Environment for the tests
|
## Environment for the tests
|
||||||
* Running monero node, linked to private/public testnet.
|
* Running monero node, linked to private/public testnet.
|
||||||
By default, tests expect daemon running at ```localhost:38081```,
|
By default, tests expect daemon running at ```localhost:38081```,
|
||||||
can we overriden with enviroment variable ```TESTNET_DAEMON_ADDRESS=<your_daemon_address>```
|
can we overriden with environment variable ```TESTNET_DAEMON_ADDRESS=<your_daemon_address>```
|
||||||
[Manual](https://github.com/moneroexamples/private-testnet) explaining how to run private testnet.
|
[Manual](https://github.com/moneroexamples/private-testnet) explaining how to run private testnet.
|
||||||
|
|
||||||
* Directory with pre-generated wallets
|
* Directory with pre-generated wallets
|
||||||
|
|
|
@ -132,7 +132,7 @@ TEST(ringct, MG_sigs)
|
||||||
}
|
}
|
||||||
sk[j] = xx[ind][j];
|
sk[j] = xx[ind][j];
|
||||||
}
|
}
|
||||||
sk[2] = skGen();//asume we don't know one of the private keys..
|
sk[2] = skGen();//assume we don't know one of the private keys..
|
||||||
IIccss = MLSAG_Gen(message, P, sk, NULL, NULL, ind, R, hw::get_device("default"));
|
IIccss = MLSAG_Gen(message, P, sk, NULL, NULL, ind, R, hw::get_device("default"));
|
||||||
ASSERT_FALSE(MLSAG_Ver(message, P, IIccss, R));
|
ASSERT_FALSE(MLSAG_Ver(message, P, IIccss, R));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue