carrot+fcmp: hot/cold wallet support

Author: jeffro256

src/carrot_core/config.h

@@ -71,4 +71,10 @@ static constexpr const unsigned int CARROT_MIN_TX_OUTPUTS = 2;
 static constexpr const unsigned int CARROT_MAX_TX_OUTPUTS = 8;
 static constexpr const unsigned int CARROT_MIN_TX_INPUTS = 1;
 static constexpr const unsigned int CARROT_MAX_TX_INPUTS = 8;
+
+// Downstream hot/cold protocol domain separators
+static constexpr const unsigned char HOT_COLD_DOMAIN_SEP_NORMAL_JANUS_ANCHOR[] = "Carrot Hot-cold normal janus anchor";
+static constexpr const unsigned char HOT_COLD_DOMAIN_SEP_SPECIAL_EPHEM[] = "Carrot Hot-cold special ephemeral privkey";
+static constexpr const unsigned char HOT_COLD_DOMAIN_SEP_DUMMY_PID[] = "Carrot Hot-cold dummy encrypted payment id";
+static constexpr const unsigned char HOT_COLD_DOMAIN_SEP_RERANDOMIZATION[] = "Carrot Hot-cold rerandomization scalar";
 } //namespace carrot

src/carrot_impl/CMakeLists.txt

@@ -28,7 +28,7 @@
 
 set(carrot_impl_sources
   address_device_ram_borrowed.cpp
-  address_utils_compat.cpp
+  address_utils.cpp
   format_utils.cpp
   input_selection.cpp
   key_image_device_composed.cpp

src/carrot_impl/address_device_ram_borrowed.cpp

@@ -30,7 +30,7 @@
 #include "address_device_ram_borrowed.h"
 
 //local headers
-#include "address_utils_compat.h"
+#include "address_utils.h"
 #include "carrot_core/address_utils.h"
 
 //third party headers

src/carrot_impl/address_utils_compat.cpp src/carrot_impl/address_utils.cppsrc/carrot_impl/address_utils_compat.cpp renamed to src/carrot_impl/address_utils.cpp

@@ -27,9 +27,11 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 //paired header
-#include "address_utils_compat.h"
+#include "address_utils.h"
 
 //local headers
+#include "address_device.h"
+#include "crypto/generators.h"
 #include "cryptonote_config.h"
 #include "int-util.h"
 #include "ringct/rctOps.h"
@@ -87,4 +89,39 @@ void make_legacy_subaddress_spend_pubkey(const crypto::secret_key &legacy_subadd
     legacy_subaddress_spend_pubkey_out = rct::rct2pk(res_k);
 }
 //-------------------------------------------------------------------------------------------------------------------
+void make_legacy_subaddress_spend_pubkey(const cryptonote_hierarchy_address_device &addr_dev,
+    const std::uint32_t major_index,
+    const std::uint32_t minor_index,
+    crypto::public_key &legacy_subaddress_spend_pubkey_out)
+{
+    // k^j_subext = ScalarDeriveLegacy("SubAddr" || IntToBytes8(0) || k_v || IntToBytes32(j_major) || IntToBytes32(j_minor))
+    crypto::secret_key legacy_subaddress_extension;
+    addr_dev.make_legacy_subaddress_extension(major_index, minor_index, legacy_subaddress_extension);
+
+    // K^j_s = K_s + k^j_subext G
+    make_legacy_subaddress_spend_pubkey(legacy_subaddress_extension,
+        addr_dev.get_cryptonote_account_spend_pubkey(),
+        legacy_subaddress_spend_pubkey_out);
+}
+//-------------------------------------------------------------------------------------------------------------------
+void make_legacy_subaddress_pubkeys(const cryptonote_hierarchy_address_device &addr_dev,
+    const std::uint32_t major_index,
+    const std::uint32_t minor_index,
+    crypto::public_key &legacy_subaddress_spend_pubkey_out,
+    crypto::public_key &legacy_subaddress_view_pubkey_out)
+{
+    // K^j_s = K_s + k^j_subext G
+    make_legacy_subaddress_spend_pubkey(addr_dev,
+        major_index,
+        minor_index,
+        legacy_subaddress_spend_pubkey_out);
+
+    // K^j_base = G if j=0, else K^j_s
+    const bool is_subaddress = major_index || minor_index;
+    const crypto::public_key base_pubkey = is_subaddress ? legacy_subaddress_spend_pubkey_out :  crypto::get_G();
+
+    // K^j_v = k_v K^j_base
+    addr_dev.view_key_scalar_mult_ed25519(base_pubkey, legacy_subaddress_view_pubkey_out);
+}
+//-------------------------------------------------------------------------------------------------------------------
 } //namespace carrot

src/carrot_impl/address_utils_compat.h src/carrot_impl/address_utils.hsrc/carrot_impl/address_utils_compat.h renamed to src/carrot_impl/address_utils.h

@@ -37,6 +37,10 @@
 #include <cstdint>
 
 //forward declarations
+namespace carrot
+{
+struct cryptonote_hierarchy_address_device;
+}
 
 namespace carrot
 {
@@ -57,9 +61,32 @@ void make_legacy_subaddress_extension(const crypto::secret_key &k_view,
  *   K^j_s = K_s + k^j_subext G
  * param: legacy_subaddress_extension_out - k^j_subext
  * param: account_spend_pubkey - K_s
+ * param: addr_dev -
+ * param: major_index - j_major
+ * param: minor_index - j_minor
  * outparam: legacy_subaddress_spend_pubkey_out - K^j_s
  */
 void make_legacy_subaddress_spend_pubkey(const crypto::secret_key &legacy_subaddress_extension,
     const crypto::public_key &account_spend_pubkey,
     crypto::public_key &legacy_subaddress_spend_pubkey_out);
+void make_legacy_subaddress_spend_pubkey(const cryptonote_hierarchy_address_device &addr_dev,
+    const std::uint32_t major_index,
+    const std::uint32_t minor_index,
+    crypto::public_key &legacy_subaddress_spend_pubkey_out);
+/**
+ * brief: make_legacy_subaddress_spend_pubkey - K^j_s
+ *   K^j_s = K_s + k^j_subext G
+ *   K^j_v = k_v (G if j=0, else K^j_s)
+ * param: addr_dev
+ * param: major_index - j_major
+ * param: minor_index - j_minor
+ * param: account_spend_pubkey - K_s
+ * outparam: legacy_subaddress_spend_pubkey_out - K^j_s
+ * outparam: legacy_subaddress_view_pubkey_out - K^j_v
+ */
+void make_legacy_subaddress_pubkeys(const cryptonote_hierarchy_address_device &addr_dev,
+    const std::uint32_t major_index,
+    const std::uint32_t minor_index,
+    crypto::public_key &legacy_subaddress_spend_pubkey_out,
+    crypto::public_key &legacy_subaddress_view_pubkey_out);
 } //namespace carrot

src/carrot_impl/carrot_offchain_serialization.h

@@ -48,10 +48,24 @@ BLOB_SERIALIZER(carrot::encrypted_amount_t);
 BLOB_SERIALIZER(carrot::payment_id_t);
 
 BEGIN_SERIALIZE_OBJECT_FN(carrot::CarrotDestinationV1)
+    static constexpr uint8_t flag_is_subaddr = 1 << 0;
+    static constexpr uint8_t flag_has_pid    = 1 << 1;
+    uint8_t flags = 0;
+    if (v.is_subaddress) flags |= flag_is_subaddr;
+    if (v.payment_id != carrot::null_payment_id) flags |= flag_has_pid;
+    FIELD(flags)
+    v.is_subaddress = flags & flag_is_subaddr;
+
     FIELD_F(address_spend_pubkey)
     FIELD_F(address_view_pubkey)
-    FIELD_F(is_subaddress)
-    FIELD_F(payment_id)
+    if (flags & flag_has_pid)
+    {
+        FIELD_F(payment_id)
+    }
+    else // no pid
+    {
+        v.payment_id = carrot::null_payment_id;
+    }
 END_SERIALIZE()
 
 BEGIN_SERIALIZE_OBJECT_FN(carrot::CarrotPaymentProposalV1)

src/carrot_impl/key_image_device_composed.cpp

@@ -127,7 +127,7 @@ crypto::key_image key_image_device_composed::derive_key_image(const OutputOpenin
     // get k^g_o, k^t_o
     crypto::secret_key sender_extension_g;
     crypto::secret_key sender_extension_t;
-    if (!try_scan_opening_hint(opening_hint,
+    if (!try_scan_opening_hint_sender_extensions(opening_hint,
         {&main_address_spend_pubkey, 1},
         m_k_view_incoming_dev,
         m_s_view_balance_dev,