some simple reformating

master
moneroexamples 8 years ago
parent 0a415a466c
commit 8b45f9fe49

@ -47,26 +47,26 @@
namespace xmreg {
using namespace cryptonote;
using namespace crypto;
using namespace std;
using namespace cryptonote;
using namespace crypto;
using namespace std;
// define a checker to test if a structure has "tx_blob"
// member variable. I use modified daemon with few extra
// bits and pieces here and there. One of them is
// tx_blob in cryptonote::tx_info structure
// thus I check if I run my version, or just
// generic one
DEFINE_MEMBER_CHECKER(tx_blob)
// define a checker to test if a structure has "tx_blob"
// member variable. I use modified daemon with few extra
// bits and pieces here and there. One of them is
// tx_blob in cryptonote::tx_info structure
// thus I check if I run my version, or just
// generic one
DEFINE_MEMBER_CHECKER(tx_blob)
// define getter to get tx_blob, i.e., get_tx_blob function
// as string if exists. the getter return empty string if
// tx_blob does not exist
DEFINE_MEMBER_GETTER(tx_blob, string)
// define getter to get tx_blob, i.e., get_tx_blob function
// as string if exists. the getter return empty string if
// tx_blob does not exist
DEFINE_MEMBER_GETTER(tx_blob, string)
/**
/**
* Check if a given header filed contains value string
*
* @param req
@ -74,11 +74,11 @@ namespace xmreg {
* @param value
* @return string
*/
string
does_header_has(const crow::request& req,
string
does_header_has(const crow::request& req,
const string& field = "Accept",
const string& value = "q=.2, */*; q=.2")
{
{
string accept = req.get_header_value(field);
if (!accept.empty())
@ -90,18 +90,18 @@ namespace xmreg {
}
return string {};
}
}
/**
/**
* @brief The tx_details struct
*
* Basic information about tx
*
*/
struct tx_details
{
struct tx_details
{
crypto::hash hash;
crypto::public_key pk;
uint64_t xmr_inputs;
@ -228,9 +228,9 @@ namespace xmreg {
return ss.str();
}
};
};
class page {
class page {
// check if we have tx_blob member in tx_info structure
static const bool HAVE_TX_BLOB {
@ -251,7 +251,7 @@ namespace xmreg {
bool testnet;
public:
public:
page(MicroCore* _mcore, Blockchain* _core_storage,
string _deamon_url, string _lmdb2_path, bool _testnet)
@ -2895,7 +2895,7 @@ namespace xmreg {
}
private:
private:
void
@ -3638,8 +3638,7 @@ namespace xmreg {
}};
}
};
};
}

@ -1,5 +1,5 @@
//
// Created by marcin on 5/11/15.
// Created by mwo on 5/11/15.
//
#ifndef XMREG01_TOOLS_H
@ -37,18 +37,19 @@
*/
namespace xmreg
{
using namespace cryptonote;
using namespace crypto;
using namespace std;
namespace bf = boost::filesystem;
namespace pt = boost::posix_time;
namespace gt = boost::gregorian;
namespace lt = boost::local_time;
using namespace cryptonote;
using namespace crypto;
using namespace std;
namespace bf = boost::filesystem;
namespace pt = boost::posix_time;
namespace gt = boost::gregorian;
namespace lt = boost::local_time;
struct outputs_visitor
{
struct outputs_visitor
{
std::vector<crypto::public_key >& m_output_keys;
const Blockchain& m_bch;
@ -60,152 +61,139 @@ namespace xmreg
bool handle_output(uint64_t unlock_time, const crypto::public_key &pubkey)
{
//check tx unlock time
// if (!m_bch.is_tx_spendtime_unlocked(unlock_time))
// {
// LOG_PRINT_L1("One of outputs for one of inputs has wrong tx.unlock_time = " << unlock_time);
// return false;
// }
m_output_keys.push_back(pubkey);
return true;
}
};
};
template <typename T>
bool
parse_str_secret_key(const string& key_str, T& secret_key);
template <typename T>
bool
parse_str_secret_key(const string& key_str, T& secret_key);
bool
get_tx_pub_key_from_str_hash(Blockchain& core_storage,
bool
get_tx_pub_key_from_str_hash(Blockchain& core_storage,
const string& hash_str,
transaction& tx);
bool
parse_str_address(const string& address_str,
bool
parse_str_address(const string& address_str,
account_public_address& address,
bool testnet = false);
inline bool
is_separator(char c);
inline bool
is_separator(char c);
string
print_address(const account_public_address& address,
string
print_address(const account_public_address& address,
bool testnet = false);
string
print_sig (const signature& sig);
string
print_sig (const signature& sig);
string
remove_trailing_path_separator(const string& in_path);
string
remove_trailing_path_separator(const string& in_path);
bf::path
remove_trailing_path_separator(const bf::path& in_path);
bf::path
remove_trailing_path_separator(const bf::path& in_path);
string
timestamp_to_str(time_t timestamp, const char* format = "%F %T");
string
timestamp_to_str(time_t timestamp, const char* format = "%F %T");
ostream&
operator<< (ostream& os, const account_public_address& addr);
ostream&
operator<< (ostream& os, const account_public_address& addr);
string
get_default_lmdb_folder(bool testnet = false);
string
get_default_lmdb_folder(bool testnet = false);
bool
generate_key_image(const crypto::key_derivation& derivation,
bool
generate_key_image(const crypto::key_derivation& derivation,
const std::size_t output_index,
const crypto::secret_key& sec_key,
const crypto::public_key& pub_key,
crypto::key_image& key_img);
bool
get_blockchain_path(const boost::optional<string>& bc_path,
bool
get_blockchain_path(const boost::optional<string>& bc_path,
bf::path& blockchain_path,
bool testnet = false);
uint64_t
sum_money_in_outputs(const transaction& tx);
uint64_t
sum_money_in_outputs(const transaction& tx);
uint64_t
sum_money_in_inputs(const transaction& tx);
uint64_t
sum_money_in_inputs(const transaction& tx);
array<uint64_t, 2>
sum_money_in_tx(const transaction& tx);
array<uint64_t, 2>
sum_money_in_tx(const transaction& tx);
array<uint64_t, 2>
sum_money_in_txs(const vector<transaction>& txs);
array<uint64_t, 2>
sum_money_in_txs(const vector<transaction>& txs);
uint64_t
sum_fees_in_txs(const vector<transaction>& txs);
uint64_t
sum_fees_in_txs(const vector<transaction>& txs);
uint64_t
get_mixin_no(const transaction& tx);
uint64_t
get_mixin_no(const transaction& tx);
vector<uint64_t>
get_mixin_no_in_txs(const vector<transaction>& txs);
vector<uint64_t>
get_mixin_no_in_txs(const vector<transaction>& txs);
vector<pair<txout_to_key, uint64_t>>
get_ouputs(const transaction& tx);
vector<pair<txout_to_key, uint64_t>>
get_ouputs(const transaction& tx);
vector<tuple<txout_to_key, uint64_t, uint64_t>>
get_ouputs_tuple(const transaction& tx);
vector<tuple<txout_to_key, uint64_t, uint64_t>>
get_ouputs_tuple(const transaction& tx);
vector<txin_to_key>
get_key_images(const transaction& tx);
vector<txin_to_key>
get_key_images(const transaction& tx);
bool
get_payment_id(const vector<uint8_t>& extra,
bool
get_payment_id(const vector<uint8_t>& extra,
crypto::hash& payment_id,
crypto::hash8& payment_id8);
bool
get_payment_id(const transaction& tx,
bool
get_payment_id(const transaction& tx,
crypto::hash& payment_id,
crypto::hash8& payment_id8);
inline void
enable_monero_log() {
inline void
enable_monero_log() {
uint32_t log_level = 0;
epee::log_space::get_set_log_detalisation_level(true, log_level);
epee::log_space::log_singletone::add_logger(LOGGER_CONSOLE, NULL, NULL);
}
}
uint64_t
estimate_bc_height(const string& date, const char* format = "%Y-%m-%d");
uint64_t
estimate_bc_height(const string& date, const char* format = "%Y-%m-%d");
inline double
get_xmr(uint64_t core_amount)
{
inline double
get_xmr(uint64_t core_amount)
{
return static_cast<double>(core_amount) / 1e12;
}
}
array<size_t, 5>
timestamp_difference(uint64_t t1, uint64_t t2);
array<size_t, 5>
timestamp_difference(uint64_t t1, uint64_t t2);
string
read(string filename);
string
read(string filename);
/**
/**
* prints an iterable such as vector
*/
template<typename T>
void print_iterable(const T & elems) {
template<typename T>
void print_iterable(const T & elems) {
infix_ostream_iterator<typename T::value_type>
oiter(std::cout, ",");
@ -213,48 +201,48 @@ namespace xmreg
std::cout << "[";
std::copy(elems.begin(), elems.end(),oiter);
std::cout << "]" << std::endl;
}
}
pair<string, double>
timestamps_time_scale(const vector<uint64_t>& timestamps,
pair<string, double>
timestamps_time_scale(const vector<uint64_t>& timestamps,
uint64_t timeN, uint64_t resolution = 80,
uint64_t time0 = 1397818193 /* timestamp of the second block */);
time_t
ptime_to_time_t(const pt::ptime& in_ptime);
time_t
ptime_to_time_t(const pt::ptime& in_ptime);
bool
decode_ringct(const rct::rctSig & rv,
bool
decode_ringct(const rct::rctSig & rv,
const crypto::public_key pub,
const crypto::secret_key &sec,
unsigned int i,
rct::key & mask,
uint64_t & amount);
bool
url_decode(const std::string& in, std::string& out);
bool
url_decode(const std::string& in, std::string& out);
map<std::string, std::string>
parse_crow_post_data(const string& req_body);
map<std::string, std::string>
parse_crow_post_data(const string& req_body);
bool
get_dummy_account_keys(account_keys& dummy_keys, bool testnet = false);
bool
get_dummy_account_keys(account_keys& dummy_keys, bool testnet = false);
// from wallet2::decrypt
string
decrypt(const std::string &ciphertext,
// from wallet2::decrypt
string
decrypt(const std::string &ciphertext,
const crypto::secret_key &skey,
bool authenticated = true);
// based on
// crypto::public_key wallet2::get_tx_pub_key_from_received_outs(const tools::wallet2::transfer_details &td) const
public_key
get_tx_pub_key_from_received_outs(const transaction &tx);
// based on
// crypto::public_key wallet2::get_tx_pub_key_from_received_outs(const tools::wallet2::transfer_details &td) const
public_key
get_tx_pub_key_from_received_outs(const transaction &tx);
date::sys_seconds
parse(const std::string& str, string format="%Y-%m-%d %H:%M:%S");
date::sys_seconds
parse(const std::string& str, string format="%Y-%m-%d %H:%M:%S");
}

Loading…
Cancel
Save