Added the following signatures in the mention files:
wallet/wallet2.h
+ std::string export_key_images_string(bool all = false) const;
+ uint64_t import_key_images_string(const std::string &data, uint64_t &spent, uint64_t &unspent);
M bool wallet2::export_key_images(const std::string &filename, bool all) const
wallet/api/pending_transaction.h
+ std::string commit_string() override;
wallet/api/unsigned_transaction.h
+ std::string signAsString() override;
wallet/api/wallet.h:
+ bool submitTransactionFromString(const std::string &fileName) override;
+ virtual UnsignedTransaction * loadUnsignedTxFromString(const std::string &unsigned_filename) override;
+ std::string exportKeyImagesAsString(bool all = false) override;
+ bool importKeyImagesFromString(const std::string &data) override;
+ std::string exportOutputsAsString(bool all = false) override;
+ bool importOutputsFromString(const std::string &data) override;
wallet/api/wallet2_api.h
+ virtual std::string commit_string() = 0;
+ virtual std::string signAsString() = 0;
+ virtual UnsignedTransaction * loadUnsignedTxFromString(const std::string &unsigned_filename) = 0;
+ virtual bool submitTransactionFromString(const std::string &fileName) = 0;
+ virtual bool importKeyImagesFromString(const std::string &data) = 0;
+ virtual std::string exportOutputsAsString(bool all = false) = 0;
+ virtual bool importOutputsFromString(const std::string &data) = 0;
+ uint64_t import_key_images_string(const std::string &data, uint64_t &spent, uint64_t &unspent);
And the implementations in:
wallet/wallet2.cpp
wallet/api/pending_transaction.cpp
wallet/api/unsigned_transaction.cpp
wallet/api/wallet.cpp
The method `bool wallet2::export_key_images(const std::string &filename, bool all) const` is modified to
use `std::string export_key_images_string(bool all = false) const;` to get the string to write to the file.
IMO that would be the perfect way to do it everywhere, but in the other methods it would require more modifications, so the other I duplicated and removed the part writing to the file and return instead a std::string, or
use a std::string for the actual payload instead of a file path.
One thing to mention is I remove in one or two log messages the filename, and the other is in `export_key_images` probably(almost sure) is now the performance messed up.
This modifications was done to get all the necessary data for offline signing via UR or any other channel not
using files as medium. IMO it had been better to not implement the filehandling direct in wallet2 or in the wallet api but rather in monero-wallet-cli and monero-gui itself, but it is like it is.
exchange.
Added the following signatures in the mention files:
wallet/wallet2.h
+ std::string export_key_images_string(bool all = false) const;
+ uint64_t import_key_images_string(const std::string &data, uint64_t &spent, uint64_t &unspent);
M bool wallet2::export_key_images(const std::string &filename, bool all) const
wallet/api/pending_transaction.h
+ std::string commit_string() override;
wallet/api/unsigned_transaction.h
+ std::string signAsString() override;
wallet/api/wallet.h:
+ bool submitTransactionFromString(const std::string &fileName) override;
+ virtual UnsignedTransaction * loadUnsignedTxFromString(const std::string &unsigned_filename) override;
+ std::string exportKeyImagesAsString(bool all = false) override;
+ bool importKeyImagesFromString(const std::string &data) override;
+ std::string exportOutputsAsString(bool all = false) override;
+ bool importOutputsFromString(const std::string &data) override;
wallet/api/wallet2_api.h
+ virtual std::string commit_string() = 0;
+ virtual std::string signAsString() = 0;
+ virtual UnsignedTransaction * loadUnsignedTxFromString(const std::string &unsigned_filename) = 0;
+ virtual bool submitTransactionFromString(const std::string &fileName) = 0;
+ virtual bool importKeyImagesFromString(const std::string &data) = 0;
+ virtual std::string exportOutputsAsString(bool all = false) = 0;
+ virtual bool importOutputsFromString(const std::string &data) = 0;
+ uint64_t import_key_images_string(const std::string &data, uint64_t &spent, uint64_t &unspent);
And the implementations in:
wallet/wallet2.cpp
wallet/api/pending_transaction.cpp
wallet/api/unsigned_transaction.cpp
wallet/api/wallet.cpp
The method `bool wallet2::export_key_images(const std::string &filename, bool all) const` is modified to
use `std::string export_key_images_string(bool all = false) const;` to get the string to write to the file.
IMO that would be the perfect way to do it everywhere, but in the other methods it would require more modifications, so the other I duplicated and removed the part writing to the file and return instead a std::string, or
use a std::string for the actual payload instead of a file path.
One thing to mention is I remove in one or two log messages the filename, and the other is in `export_key_images` probably(almost sure) is now the performance messed up.
This modifications was done to get all the necessary data for offline signing via UR or any other channel not
using files as medium. IMO it had been better to not implement the filehandling direct in wallet2 or in the wallet api but rather in monero-wallet-cli and monero-gui itself, but it is like it is.
1. Use `std::is_standard_layout` and `std::is_trivially_copyable` instead of `std::is_pod` for KV byte-wise serialization, which fixes compile issue for Boost UUIDs
2. Use `std::has_unique_object_representations` instead of `alignof(T) == 1` for epee byte spans and epee hex functions
3. Removed reimplementation of `std::hash` for `boost::uuids::uuid
4. Removed `<<` operator overload for `crypto::secret_key`
5. Removed instances in code where private view key was dumped to the log in plaintext
This PR is upstreaming changes in the Seraphis lib here: https://github.com/UkoeHB/monero/pull/39. The changes to the serialization header allow clean passing
of extra arguments to field serialization in the DSL. This is used mainly to pass implied sizes of containers during deserialization to make the format more
compact. For example, if my object has two containers A & B which must be the same size, I can serialize only the size of container A. Then, during
deserialization, when I deserialize A, I can then use A's size to deserialize B.
Depends on #9286.
This PR is upstreaming changes in the Seraphis lib here: https://github.com/UkoeHB/monero/pull/39. This header adds a macro `VA_ARGS_COMMAPREFIX`
which, when passed `__VA_ARGS__`, expands to `, __VA_ARGS__` unless the length of `__VA_ARGS__` is 0, in which case it expands to nothing. This
macro is useful for passing/declaring optional function arguments.
