1 files changed, 9 insertions, 1 deletions

diff --git a/src/device_trezor/device_trezor_base.hpp b/src/device_trezor/device_trezor_base.hpp
index a4e92bf78..4d205ad7a 100644
--- a/src/device_trezor/device_trezor_base.hpp
+++ b/src/device_trezor/device_trezor_base.hpp
@@ -71,6 +71,7 @@ namespace trezor {
       i_device_callback * m_callback;
 
       std::string full_name;
+      std::vector<unsigned int> m_wallet_deriv_path;
 
       cryptonote::network_type network_type;
 
@@ -81,6 +82,7 @@ namespace trezor {
       void require_connected();
       void call_ping_unsafe();
       void test_ping();
+      void ensure_derivation_path() noexcept;
 
       // Communication methods
 
@@ -176,9 +178,13 @@ namespace trezor {
             msg->add_address_n(x);
           }
         } else {
+          ensure_derivation_path();
           for (unsigned int i : DEFAULT_BIP44_PATH) {
             msg->add_address_n(i);
           }
+          for (unsigned int i : m_wallet_deriv_path) {
+            msg->add_address_n(i);
+          }
         }
 
         if (network_type){
@@ -201,7 +207,7 @@ namespace trezor {
     bool reset();
 
     // Default derivation path for Monero
-    static const uint32_t DEFAULT_BIP44_PATH[3];
+    static const uint32_t DEFAULT_BIP44_PATH[2];
 
     std::shared_ptr<Transport> getTransport(){
       return m_transport;
@@ -215,6 +221,8 @@ namespace trezor {
       return m_callback;
     }
 
+    void set_derivation_path(const std::string &deriv_path) override;
+
     /* ======================================================================= */
     /*                              SETUP/TEARDOWN                             */
     /* ======================================================================= */