4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-04 23:51:08 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

clean-up

Browse Source
This commit is contained in:
SNeedlewoods 2024-12-02 16:19:32 +01:00
parent 087b925eda
commit e077fd39a3
4 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wallet/api/enote_details.h
View File

@ -97,9 +97,9 @@ private:
// track uses of this enote in the blockchain in the format [ [block_height, tx_id], ... ] if `wallet2::m_track_uses` is true (default is false) // track uses of this enote in the blockchain in the format [ [block_height, tx_id], ... ] if `wallet2::m_track_uses` is true (default is false)
std::vector<std::pair<std::uint64_t, std::string>> m_uses; std::vector<std::pair<std::uint64_t, std::string>> m_uses;
// QUESTION : Any input on these multisig members? I'd ignore them for now.
// Multisig // Multisig
bool m_key_image_partial; bool m_key_image_partial;
// NOTE : These multisig members are part of wallet2 transfer_details and may need to get added here.
/* /*
std::vector<rct::key> m_multisig_k; std::vector<rct::key> m_multisig_k;
std::vector<multisig_info> m_multisig_info; // one per other participant std::vector<multisig_info> m_multisig_info; // one per other participant

4
src/wallet/api/wallet.cpp
View File

@ -1184,7 +1184,7 @@ bool WalletImpl::submitTransaction(const string &fileName) {
bool r = m_wallet->load_tx(fileName, transaction->m_pending_tx); bool r = m_wallet->load_tx(fileName, transaction->m_pending_tx);
if (!r) { if (!r) {
setStatus(Status_Ok, tr("Failed to load transaction from file")); setStatusError(tr("Failed to load transaction from file"));
return false; return false;
} }
@ -3582,7 +3582,7 @@ std::uint64_t WalletImpl::importKeyImages(const std::vector<std::pair<std::strin
return false; return false;
} }
//------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------
bool WalletImpl::importKeyImages(std::vector<std::string> key_images, std::size_t offset, std::unordered_set<std::size_t> selected_enotes_indices) bool WalletImpl::importKeyImages(const std::vector<std::string> &key_images, std::size_t offset, const std::unordered_set<std::size_t> &selected_enotes_indices)
{ {
clearStatus(); clearStatus();

2
src/wallet/api/wallet.h
View File

@ -277,7 +277,7 @@ public:
std::vector<std::tuple<std::string, std::uint16_t, std::uint64_t>> getPublicNodes(bool white_only = true) const override; std::vector<std::tuple<std::string, std::uint16_t, std::uint64_t>> getPublicNodes(bool white_only = true) const override;
std::pair<std::size_t, std::uint64_t> estimateTxSizeAndWeight(bool use_rct, int n_inputs, int ring_size, int n_outputs, std::size_t extra_size) const override; std::pair<std::size_t, std::uint64_t> estimateTxSizeAndWeight(bool use_rct, int n_inputs, int ring_size, int n_outputs, std::size_t extra_size) const override;
std::uint64_t importKeyImages(const std::vector<std::pair<std::string, std::string>> &signed_key_images, std::size_t offset, std::uint64_t &spent, std::uint64_t &unspent, bool check_spent = true) override; std::uint64_t importKeyImages(const std::vector<std::pair<std::string, std::string>> &signed_key_images, std::size_t offset, std::uint64_t &spent, std::uint64_t &unspent, bool check_spent = true) override;
bool importKeyImages(std::vector<std::string> key_images, std::size_t offset = 0, std::unordered_set<std::size_t> selected_enotes_indices = {}) override; bool importKeyImages(const std::vector<std::string> &key_images, std::size_t offset = 0, const std::unordered_set<std::size_t> &selected_enotes_indices = {}) override;
bool getAllowMismatchedDaemonVersion() const override; bool getAllowMismatchedDaemonVersion() const override;
void setAllowMismatchedDaemonVersion(bool allow_mismatch) override; void setAllowMismatchedDaemonVersion(bool allow_mismatch) override;
bool setDaemon(const std::string &daemon_address, const std::string &daemon_username = "", const std::string &daemon_password = "", bool trusted_daemon = true, const std::string &ssl_support = "autodetect", const std::string &ssl_private_key_path = "", const std::string &ssl_certificate_path = "", const std::string &ssl_ca_file_path = "", const std::vector<std::string> &ssl_allowed_fingerprints_str = {}, bool ssl_allow_any_cert = false, const std::string &proxy = "") override; bool setDaemon(const std::string &daemon_address, const std::string &daemon_username = "", const std::string &daemon_password = "", bool trusted_daemon = true, const std::string &ssl_support = "autodetect", const std::string &ssl_private_key_path = "", const std::string &ssl_certificate_path = "", const std::string &ssl_ca_file_path = "", const std::vector<std::string> &ssl_allowed_fingerprints_str = {}, bool ssl_allow_any_cert = false, const std::string &proxy = "") override;

23
src/wallet/api/wallet2_api.h
View File

@ -469,20 +469,17 @@ struct WalletListener
* @brief If the listener is created before the wallet this enables to set created wallet object * @brief If the listener is created before the wallet this enables to set created wallet object
*/ */
virtual void onSetWallet(Wallet * wallet) { (void)wallet; }; virtual void onSetWallet(Wallet * wallet) { (void)wallet; };
/** /**
* @brief called on blockchain reorg * brief: onReorg - called on blockchain reorg
*/ */
virtual void onReorg(std::uint64_t height, std::uint64_t blocks_detached, std::size_t transfers_detached) = 0; virtual void onReorg(std::uint64_t height, std::uint64_t blocks_detached, std::size_t transfers_detached) = 0;
/** /**
* @brief called by scan_output() to decrypt keys * brief: onGetPassword - called by scan_output() to decrypt keys
*/ */
virtual optional<std::string> onGetPassword(const char *reason) = 0; virtual optional<std::string> onGetPassword(const char *reason) = 0;
/** /**
* @brief called when obsolete pool transactions get removed * brief: onPoolTxRemoved - when obsolete pool transactions get removed
*/ */
virtual void onPoolTxRemoved(const std::string &txid) = 0; virtual void onPoolTxRemoved(const std::string &txid) = 0;
}; };
@ -1456,12 +1453,6 @@ struct Wallet
* note: sets status error on fail * note: sets status error on fail
*/ */
virtual std::vector<std::pair<std::uint64_t, std::uint64_t>> estimateBacklog(const std::vector<std::pair<double, double>> &fee_levels) const = 0; virtual std::vector<std::pair<std::uint64_t, std::uint64_t>> estimateBacklog(const std::vector<std::pair<double, double>> &fee_levels) const = 0;
// TODO : mms::multisig_wallet_state - from a quick search for get_multisig_wallet_state in simplewallet.cpp this will be complicated to replace
/**
* brief: getMultisigWalletState -
* return:
*/
// virtual mms::multisig_wallet_state getMultisigWalletState() const = 0;
/** /**
* brief: saveToFile - save hex string to file * brief: saveToFile - save hex string to file
* param: path_to_file - file name * param: path_to_file - file name
@ -1531,7 +1522,7 @@ struct Wallet
* return: true if succeeded * return: true if succeeded
* note: sets status error on fail * note: sets status error on fail
*/ */
virtual bool importKeyImages(std::vector<std::string> key_images, std::size_t offset = 0, std::unordered_set<std::size_t> selected_enotes_indices = {}) = 0; virtual bool importKeyImages(const std::vector<std::string> &key_images, std::size_t offset = 0, const std::unordered_set<std::size_t> &selected_enotes_indices = {}) = 0;
/** /**
* brief: getAllowMismatchedDaemonVersion - * brief: getAllowMismatchedDaemonVersion -
*/ */