diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-07-24 14:24:40 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-07-24 14:24:40 -0500 |
| commit | 8ae2681e08de3b18db433758b60bfe69ed6edd16 (patch) | |
| tree | 6c58618fcbaebef6711331f129f98c57949d7665 /src/device | |
| parent | Merge pull request #5591 (diff) | |
| parent | device: show address on device display (diff) | |
| download | monero-8ae2681e08de3b18db433758b60bfe69ed6edd16.tar.xz | |
Merge pull request #5594
f074b6b device: show address on device display (ph4r05)
Diffstat (limited to 'src/device')
| -rw-r--r-- | src/device/device.hpp | 1 | ||||
| -rw-r--r-- | src/device/device_cold.hpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/device/device.hpp b/src/device/device.hpp index 866e2c676..215e97eb6 100644 --- a/src/device/device.hpp +++ b/src/device/device.hpp @@ -236,6 +236,7 @@ namespace hw { virtual bool compute_key_image(const cryptonote::account_keys& ack, const crypto::public_key& out_key, const crypto::key_derivation& recv_derivation, size_t real_output_index, const cryptonote::subaddress_index& received_index, cryptonote::keypair& in_ephemeral, crypto::key_image& ki) { return false; } virtual void computing_key_images(bool started) {}; virtual void set_network_type(cryptonote::network_type network_type) { } + virtual void display_address(const cryptonote::subaddress_index& index, const boost::optional<crypto::hash8> &payment_id) {} protected: device_mode mode; diff --git a/src/device/device_cold.hpp b/src/device/device_cold.hpp index 31b1504ab..22708c46a 100644 --- a/src/device/device_cold.hpp +++ b/src/device/device_cold.hpp @@ -47,6 +47,7 @@ namespace hw { std::vector<cryptonote::address_parse_info> tx_recipients; // as entered by user boost::optional<int> bp_version; // BP version to use boost::optional<unsigned> client_version; // Signing client version to use (testing) + boost::optional<uint8_t> hard_fork; // hard fork being used for the transaction }; class device_cold { |