rename and support export_key_images(bool all=false)

This commit is contained in:
woodser
2021-03-07 14:33:01 -05:00
parent b8198f5357
commit 981451c42c
3 changed files with 9 additions and 8 deletions
+5 -4
View File
@@ -750,7 +750,7 @@ namespace monero {
/**
* Export outputs in hex format.
*
* @param all exports all outputs if true, else only the outputs since the last export
* @param all - export all outputs if true, else export outputs since the last export
* @return outputs in hex format, empty std::string if no outputs
*/
virtual std::string export_outputs(bool all = false) const {
@@ -768,12 +768,13 @@ namespace monero {
}
/**
* Get all signed key images.
* Export signed key images.
*
* @param all - export all key images if true, else export key images since the last export
* @return the wallet's signed key images
*/
virtual std::vector<std::shared_ptr<monero_key_image>> get_key_images() const {
throw std::runtime_error("get_key_images() not supported");
virtual std::vector<std::shared_ptr<monero_key_image>> export_key_images(bool all = false) const {
throw std::runtime_error("export_key_images() not supported");
}
/**
+3 -3
View File
@@ -1675,12 +1675,12 @@ namespace monero {
return m_w2->import_outputs_from_str(blob);
}
std::vector<std::shared_ptr<monero_key_image>> monero_wallet_full::get_key_images() const {
MTRACE("monero_wallet_full::get_key_images()");
std::vector<std::shared_ptr<monero_key_image>> monero_wallet_full::export_key_images(bool all) const {
MTRACE("monero_wallet_full::export_key_images()");
// build key images from wallet2 types
std::vector<std::shared_ptr<monero_key_image>> key_images;
std::pair<uint64_t, std::vector<std::pair<crypto::key_image, crypto::signature>>> ski = m_w2->export_key_images(true);
std::pair<uint64_t, std::vector<std::pair<crypto::key_image, crypto::signature>>> ski = m_w2->export_key_images(all);
for (uint64_t n = 0; n < ski.second.size(); ++n) {
std::shared_ptr<monero_key_image> key_image = std::make_shared<monero_key_image>();
key_images.push_back(key_image);
+1 -1
View File
@@ -226,7 +226,7 @@ namespace monero {
std::vector<std::shared_ptr<monero_output_wallet>> get_outputs(const monero_output_query& query) const override;
std::string export_outputs(bool all = false) const override;
int import_outputs(const std::string& outputs_hex) override;
std::vector<std::shared_ptr<monero_key_image>> get_key_images() const override;
std::vector<std::shared_ptr<monero_key_image>> export_key_images(bool all = false) const override;
std::shared_ptr<monero_key_image_import_result> import_key_images(const std::vector<std::shared_ptr<monero_key_image>>& key_images) override;
std::vector<std::shared_ptr<monero_tx_wallet>> create_txs(const monero_tx_config& config) override;
std::vector<std::shared_ptr<monero_tx_wallet>> sweep_unlocked(const monero_tx_config& config) override;