layter
/
neroshop
mirror of https://github.com/layters/testshop
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clean up wallet code

Browse Source
pull/257/head
larteyoh 1 month ago
parent 12b7f34740
commit 538fc81c51
2 changed files with 27 additions and 65 deletions
Show Stats Download Patch File Download Diff File

55
src/core/wallet/wallet.cpp
Unescape View File

@ -406,36 +406,34 @@ void neroshop::Wallet::set_network_type_by_string(const std::string& network_typ
//-------------------------------------------------------
std::string neroshop::Wallet::address_new() const {
if(!monero_wallet_obj.get()) throw std::runtime_error("monero_wallet_full is not opened");
// Create a subaddress within an account (account_0 to be specific).
monero_subaddress subaddress = monero_wallet_obj->create_subaddress(0);//monero_subaddress monero::monero_wallet_full::create_subaddress ( uint32_t account_idx,const std::string & label = "" )
// Create a subaddress within an account (account 0 to be specific).
monero_subaddress subaddress = monero_wallet_obj->create_subaddress(0);
#ifdef NEROSHOP_DEBUG
std::cout << "address_new: " << subaddress.m_address.get() << " (account_idx: " << subaddress.m_account_index.get() << ", subaddress_idx: " << subaddress.m_index.get() << ")" << std::endl;
#endif
//if subaddress has already been used
if(subaddress.m_is_used.get()) { std::cout << "subaddress " << subaddress.m_address.get() << " already in use!" << std::endl; return ""; }
return subaddress.m_address.get();// return the newly created subaddress
// store new subaddress//subaddress_list.push_back(subaddress.m_address.get());
} // generates a new subaddress from main account // "address new"
//subaddress_list.push_back(subaddress.m_address.get());
}
//-------------------------------------------------------
unsigned int neroshop::Wallet::address_book_add(const std::string& address, std::string description) {
if(!monero_wallet_obj.get()) throw std::runtime_error("monero_wallet_full is not opened");
return monero_wallet_obj->add_address_book_entry(address, description);//unsigned int index = monero::monero_wallet_full::add_address_book_entry ( address, const std::string & description ); // adds an address book entry and returns the index of the added entry
return monero_wallet_obj->add_address_book_entry(address, description);
}
//-------------------------------------------------------
void neroshop::Wallet::address_book_delete(unsigned int index) {
if(!monero_wallet_obj.get()) throw std::runtime_error("monero_wallet_full is not opened");
monero_wallet_obj->delete_address_book_entry(index);//void monero::monero_wallet_full::delete_address_book_entry ( uint64_t index );
monero_wallet_obj->delete_address_book_entry(index);
}
//-------------------------------------------------------
//void neroshop::Wallet::explore(const std::string& address) {} // will detect address before opening explorer
//-------------------------------------------------------
std::vector<monero::monero_subaddress> neroshop::Wallet::get_addresses_all(unsigned int account_idx) {
if(!monero_wallet_obj.get()) throw std::runtime_error("monero_wallet_full is not opened");
if(!monero_wallet_obj.get()->is_synced()) throw std::runtime_error("wallet is not synced with a daemon");
std::vector<monero::monero_subaddress> addresses = {};
std::vector<unsigned int> subaddress_indices = {};
for(int i = 0; i < monero_wallet_obj->get_account(account_idx, true).m_subaddresses.size(); i++) {
addresses = monero_wallet_obj->get_subaddresses(account_idx, subaddress_indices); // retrieve subaddress from account at 'account_idx'
addresses = monero_wallet_obj->get_subaddresses(account_idx, subaddress_indices);
std::cout << addresses[i].m_index.get() << " " << addresses[i].m_address.get() << (addresses[i].m_is_used.get() ? " (used)" : "") << std::endl;
}
return addresses;
@ -447,7 +445,7 @@ std::vector<monero::monero_subaddress> neroshop::Wallet::get_addresses_used(unsi
std::vector<monero::monero_subaddress> addresses = {};
std::vector<unsigned int> subaddress_indices = {};
for(int i = 0; i < monero_wallet_obj->get_account(account_idx, true).m_subaddresses.size(); i++) {
addresses = monero_wallet_obj->get_subaddresses(account_idx, subaddress_indices); // retrieve subaddress from account at 'account_idx'
addresses = monero_wallet_obj->get_subaddresses(account_idx, subaddress_indices);
if(addresses[i].m_is_used.get()) {
std::cout << addresses[i].m_index.get() << " " << addresses[i].m_address.get() << std::endl;
}
@ -461,7 +459,7 @@ std::vector<monero::monero_subaddress> neroshop::Wallet::get_addresses_unused(un
std::vector<monero::monero_subaddress> addresses = {};
std::vector<unsigned int> subaddress_indices = {};
for(int i = 0; i < monero_wallet_obj->get_account(account_idx, true).m_subaddresses.size(); i++) {
std::vector<monero::monero_subaddress> unused_addresses = monero_wallet_obj->get_subaddresses(account_idx, subaddress_indices); // retrieve subaddress from account at 'account_idx'
std::vector<monero::monero_subaddress> unused_addresses = monero_wallet_obj->get_subaddresses(account_idx, subaddress_indices);
if(!unused_addresses[i].m_is_used.get()) {
std::cout << ((std::find(recent_address_list.begin(), recent_address_list.end(), unused_addresses[i].m_address.get()) != recent_address_list.end()) ? "\033[91m" : "\033[0m") << unused_addresses[i].m_index.get() << " " << unused_addresses[i].m_address.get() << "\033[0m" << std::endl;// if subaddress is found in recent_address_list, mark it red
// skip any recently used subaddress (to ensure the uniqueness of a subaddress)
@ -733,7 +731,7 @@ void neroshop::Wallet::wallet_info() {
//-------------------------------------------------------
// setters
//-------------------------------------------------------
void neroshop::Wallet::set_tx_note(const std::string& txid, const std::string& tx_note) {} // "set_tx_note <txid> [free note text here]" - useful for filling address information
void neroshop::Wallet::set_tx_note(const std::string& txid, const std::string& tx_note) {}
//-------------------------------------------------------
//-------------------------------------------------------
// getters
@ -1018,7 +1016,7 @@ std::vector<std::string> neroshop::Wallet::get_transactions() const {
}
*/
return txs_list;
} // "show_transfers"
}
//-------------------------------------------------------
unsigned int neroshop::Wallet::get_transactions_count() const {return 0;}
//-------------------------------------------------------
@ -1037,14 +1035,6 @@ std::string neroshop::Wallet::get_last_subaddress() const
}
//-------------------------------------------------------
//-------------------------------------------------------
//-------------------------------------------------------
//-------------------------------------------------------
//-------------------------------------------------------
//-------------------------------------------------------
//-------------------------------------------------------
// proof (proving the transaction was submitted) - https://web.getmonero.org/resources/user-guides/prove-payment.html
//std::string neroshop::Wallet::get_tx_note(const std::string& txid) const {return "";} // "get_tx_note <txid>" - useful for retrieving address information
//-------------------------------------------------------
std::string neroshop::Wallet::get_private_view_key() const {
switch(wallet_type) {
case WalletType::Monero:
@ -1141,15 +1131,10 @@ std::string neroshop::Wallet::get_path() const {
}
}
//-------------------------------------------------------
/*std::string neroshop::Wallet::get_description() const {
if(!monero_wallet_obj.get()) throw std::runtime_error("monero_wallet_full is not opened");
return "";
}*/
//-------------------------------------------------------
std::string neroshop::Wallet::get_type() const {
if(!monero_wallet_obj.get()) throw std::runtime_error("monero_wallet_full is not opened");
return "";
} // "wallet_info": Normal, HW
}
//-------------------------------------------------------
unsigned int neroshop::Wallet::get_daemon_height() const {
switch(wallet_type) {
@ -1187,18 +1172,6 @@ unsigned int neroshop::Wallet::get_height_by_date(int year, int month, int day)
}
}
//-------------------------------------------------------
std::string neroshop::Wallet::get_status() const {
switch(wallet_type) {
case WalletType::Monero:
if(!monero_wallet_obj.get()) throw std::runtime_error("monero_wallet_full is not opened");
return "";
case WalletType::Wownero:
return "";
default:
return "";
}
}
//-------------------------------------------------------
std::string neroshop::Wallet::get_version() const {
switch(wallet_type) {
case WalletType::Monero:
@ -1299,12 +1272,10 @@ bool neroshop::Wallet::is_valid_address(const std::string& address) const {
}
//-------------------------------------------------------
bool neroshop::Wallet::is_valid_monero_address(const std::string& address) {
auto network_type = get_network_type();
return monero_utils::is_valid_address(address, static_cast<monero::monero_network_type>(network_type));
return monero_utils::is_valid_address(address, static_cast<monero::monero_network_type>(Wallet::network_type));
}
//-------------------------------------------------------
/*bool neroshop::Wallet::is_valid_wownero_address(const std::string& address) {
auto network_type = get_network_type();
return ;
}*/
//-------------------------------------------------------

37
src/core/wallet/wallet.hpp
Unescape View File

@ -3,7 +3,7 @@
#ifndef WALLET_HPP_NEROSHOP
#define WALLET_HPP_NEROSHOP
#define PICONERO 0.000000000001 // the smallest unit of a monero (monero has 12 decimal places) // https://web.getmonero.org/resources/moneropedia/denominations.html
#define PICONERO 0.000000000001 // https://github.com/monero-project/monero/blob/master/src/cryptonote_config.h#L65 // https://web.getmonero.org/resources/moneropedia/denominations.html
#define WOWOSHI 0.00000000001 // https://git.wownero.com/wownero/wownero/src/branch/master/src/cryptonote_config.h#L68
#include <daemon/monero_daemon.h>
@ -78,14 +78,14 @@ public:
bool verify_password(const std::string& password);
// todo: create a function that connects a hardware wallet
monero::monero_subaddress create_subaddress(unsigned int account_idx, const std::string & label = "") const; // generates a new subaddress from main account // monero addresses start with 4 or 8
monero::monero_subaddress create_subaddress(unsigned int account_idx, const std::string & label = "") const; // generates a new subaddress from main account
virtual void transfer(const std::string& address, double amount); // "transfer" will be used for sending refunds
virtual void transfer(const std::string& address, double amount);
virtual void transfer(const std::vector<std::pair<std::string, double>>& payment_addresses);
std::string address_new() const; // this function has been replaced by create_subaddress() and is deprecated. Will be removed soon
unsigned int address_book_add(const std::string& address, std::string description = ""); // "address_book add <address> <description>"
void address_book_delete(unsigned int index); // "address_book delete 0"
unsigned int address_book_add(const std::string& address, std::string description = "");
void address_book_delete(unsigned int index);
static std::string generate_uri(const std::string& payment_address, double amount = 0.000000000000, const std::string& description = "", const std::string& recipient = ""); // Generates a monero uri for qr code with the amount embedded into it
@ -116,7 +116,7 @@ public:
virtual void set_network_type(WalletNetworkType network_type);
void set_network_type_by_string(const std::string& network_type);
void set_tx_note(const std::string& txid, const std::string& tx_note); // "set_tx_note <txid> [free note text here]" - useful for filling address information
void set_tx_note(const std::string& txid, const std::string& tx_note);
// getters
WalletType get_wallet_type() const;
virtual WalletNetworkType get_wallet_network_type() const;
@ -133,7 +133,7 @@ public:
std::string get_sync_message() const;
virtual std::string get_primary_address() const;
virtual std::string get_address(unsigned int index) const; // returns address at "index"'s string (primary address is index 0) // "address all"
virtual std::string get_address(unsigned int index) const; // returns address at index (primary address is index 0)
unsigned int get_address_count() const;
virtual uint64_t get_balance_raw() const;
@ -154,25 +154,22 @@ public:
unsigned int get_transactions_count() const;
// subaddress
std::string get_last_subaddress() const; // returns the last subaddress to be created
// NOTE: use address_new to automatically generate a unique subaddress for each customer to make it easier to track who and where the payments are coming from
virtual std::string get_private_view_key() const; // secret view key
virtual std::string get_public_view_key() const;
virtual std::pair<std::string, std::string> get_view_keys() const; // secret, public // "viewkey"
virtual std::pair<std::string, std::string> get_view_keys() const; // secret, public
virtual std::string get_private_spend_key() const; // secret spend key
virtual std::string get_public_spend_key() const;
virtual std::pair<std::string, std::string> get_spend_keys() const; // secret, public // "spendkey"
virtual std::pair<std::string, std::string> get_spend_keys() const; // secret, public
virtual std::string get_seed() const; // "seed"
virtual std::string get_seed() const;
virtual std::string get_path() const;
//std::string get_description() const;
std::string get_type() const; // "wallet_info": Normal, HW
virtual unsigned int get_daemon_height() const;
virtual unsigned int get_height() const;
virtual unsigned int get_height_by_date(int year, int month, int day) const;
std::string get_status() const; // "status" - Check current status of wallet.
std::string get_version() const; // "version" - Check software version.
std::string get_version() const;
// get wallet handles (monero, wownero, etc.)
virtual void * get_handle() const;
monero_wallet_full * get_monero_wallet() const;
@ -192,24 +189,18 @@ public:
// friends
friend class Seller; // seller can access wallet private members
friend class WalletController;
private:
void set_daemon(); // "set_daemon <host>[:<port>] [trusted|untrusted|this-is-probably-a-spy-node]" - connects to a daemon
void refresh(); // "refresh" - Synchronize wallet with the Monero network.
void config(); // loads a config file (wallet_config.txt) with wallet settings
// callbacks
void load_from_config(std::string/*const std::string&*/ password = "supersecretpassword123");
protected:
WalletType wallet_type; // can switch between different wallets
static WalletNetworkType network_type;
std::unique_ptr<monero::monero_wallet_full> monero_wallet_obj; // monero wallet
std::unique_ptr<monero::monero_wallet_full> monero_wallet_obj;
//std::unique_ptr<wownero::wownero_wallet_full> wownero_wallet_obj;
std::unique_ptr<Process> process; // monerod process // every wallet will have its own process
std::unique_ptr<Process> process; // monerod process - every wallet will have its own process
volatile double percentage; // sync progress
mutable std::mutex wallet_data_mutex;
volatile unsigned int height, start_height, end_height;
/*volatile */std::string message;
uint64_t/*unsigned long long*/ restore_height;
std::string password_hash; // pw hash that is only stored in memory
std::string password_hash;
};
}

Write Preview
Loading…
Cancel
Save