get_subaccount_full_path: add is_internal

Author: LeoComandini

src/ga_rust.cpp

@@ -326,9 +326,13 @@ namespace sdk {
         return call_session("get_subaccount_root_path", nlohmann::json({ { "subaccount", subaccount } })).at("path");
     }
 
-    std::vector<uint32_t> ga_rust::get_subaccount_full_path(uint32_t subaccount, uint32_t pointer)
+    std::vector<uint32_t> ga_rust::get_subaccount_full_path(uint32_t subaccount, uint32_t pointer, bool is_internal)
     {
-        throw std::runtime_error("get_subaccount_full_path not implemented");
+        // FIXME: do everything on the rust side
+        std::vector<uint32_t> path = get_subaccount_root_path(subaccount);
+        path.push_back(is_internal ? 1 : 0);
+        path.push_back(pointer);
+        return path;
     }
 
     nlohmann::json ga_rust::get_available_currencies() const

src/ga_rust.hpp

@@ -44,7 +44,7 @@ namespace sdk {
         void rename_subaccount(uint32_t subaccount, const std::string& new_name);
         void set_subaccount_hidden(uint32_t subaccount, bool is_hidden);
         std::vector<uint32_t> get_subaccount_root_path(uint32_t subaccount);
-        std::vector<uint32_t> get_subaccount_full_path(uint32_t subaccount, uint32_t pointer);
+        std::vector<uint32_t> get_subaccount_full_path(uint32_t subaccount, uint32_t pointer, bool is_internal);
 
         nlohmann::json get_available_currencies() const;
 

src/ga_session.cpp

@@ -3137,7 +3137,8 @@ namespace sdk {
         return ga_user_pubkeys::get_ga_subaccount_root_path(subaccount);
     }
 
-    std::vector<uint32_t> ga_session::get_subaccount_full_path(uint32_t subaccount, uint32_t pointer)
+    std::vector<uint32_t> ga_session::get_subaccount_full_path(
+        uint32_t subaccount, uint32_t pointer, bool /*is_internal*/)
     {
         if (m_user_pubkeys) {
             locker_t locker(m_mutex);

src/ga_session.hpp

@@ -155,7 +155,7 @@ namespace sdk {
         ga_user_pubkeys& get_recovery_pubkeys();
         bool has_recovery_pubkeys_subaccount(uint32_t subaccount);
         std::vector<uint32_t> get_subaccount_root_path(uint32_t subaccount);
-        std::vector<uint32_t> get_subaccount_full_path(uint32_t subaccount, uint32_t pointer);
+        std::vector<uint32_t> get_subaccount_full_path(uint32_t subaccount, uint32_t pointer, bool is_internal);
         std::string get_service_xpub(uint32_t subaccount);
         std::string get_recovery_xpub(uint32_t subaccount);
 

src/ga_tx.cpp

@@ -43,10 +43,11 @@ namespace sdk {
         {
             const uint32_t subaccount = json_get_value(utxo, "subaccount", 0u);
             const uint32_t pointer = utxo.at("pointer");
+            const bool is_internal = utxo.value("is_internal", false);
 
             if (utxo.find("user_path") == utxo.end()) {
                 // Populate the full user path for h/w signing
-                utxo["user_path"] = session.get_subaccount_full_path(subaccount, pointer);
+                utxo["user_path"] = session.get_subaccount_full_path(subaccount, pointer, is_internal);
             }
 
             if (utxo.find("service_xpub") == utxo.end()) {
@@ -887,6 +888,7 @@ namespace sdk {
             const uint32_t subaccount = json_get_value(u, "subaccount", 0u);
             const uint32_t pointer = json_get_value(u, "pointer", 0u);
             const auto type = script_type(u.at("script_type"));
+            const bool is_internal = json_get_value(u, "is_internal", false);
             const auto script = h2b(u.at("prevout_script"));
             const std::string private_key = json_get_value(u, "private_key");
             auto signer = session.get_nonnull_signer();
@@ -903,7 +905,7 @@ namespace sdk {
                 tx_set_input_script(tx, index, scriptsig_p2pkh_from_der(h2b(u.at("public_key")), der));
                 return b2h(der);
             } else {
-                const auto path = session.get_subaccount_full_path(subaccount, pointer);
+                const auto path = session.get_subaccount_full_path(subaccount, pointer, is_internal);
                 const auto user_sig = signer->sign_hash(path, tx_hash);
                 const auto der = ec_sig_to_der(user_sig, true);
 

src/session_impl.hpp

@@ -110,7 +110,8 @@ namespace sdk {
         virtual void rename_subaccount(uint32_t subaccount, const std::string& new_name) = 0;
         virtual void set_subaccount_hidden(uint32_t subaccount, bool is_hidden) = 0;
         virtual std::vector<uint32_t> get_subaccount_root_path(uint32_t subaccount) = 0;
-        virtual std::vector<uint32_t> get_subaccount_full_path(uint32_t subaccount, uint32_t pointer) = 0;
+        virtual std::vector<uint32_t> get_subaccount_full_path(uint32_t subaccount, uint32_t pointer, bool is_internal)
+            = 0;
 
         virtual nlohmann::json get_available_currencies() const = 0;