diff --git a/patches/salvium/0007-polyseed.patch b/patches/salvium/0007-polyseed.patch index 2ac605e..71cb0f0 100644 --- a/patches/salvium/0007-polyseed.patch +++ b/patches/salvium/0007-polyseed.patch @@ -234,18 +234,18 @@ index 93d1d28f0..1f76febce 100644 #include "serialization/keyvalue_serialization.h" +#include "polyseed/polyseed.hpp" - namespace cryptonote - { -@@ -45,6 +46,8 @@ namespace cryptonote + #include "carrot_core/account_secrets.h" + #include "carrot_core/address_utils.h" +@@ -52,6 +53,8 @@ namespace cryptonote std::vector m_multisig_keys; hw::device *m_device = &hw::get_device("default"); crypto::chacha_iv m_encryption_iv; + crypto::secret_key m_polyseed; + epee::wipeable_string m_passphrase; // Only used with polyseed - BEGIN_KV_SERIALIZE_MAP() - KV_SERIALIZE(m_account_address) -@@ -53,6 +56,8 @@ namespace cryptonote + // carrot secret keys (minus k_v, which is shared with legacy k_v) + crypto::secret_key s_master; +@@ -71,6 +74,8 @@ namespace cryptonote KV_SERIALIZE_CONTAINER_POD_AS_BLOB(m_multisig_keys) const crypto::chacha_iv default_iv{{0, 0, 0, 0, 0, 0, 0, 0}}; KV_SERIALIZE_VAL_POD_AS_BLOB_OPT(m_encryption_iv, default_iv) @@ -254,7 +254,7 @@ index 93d1d28f0..1f76febce 100644 END_KV_SERIALIZE_MAP() void encrypt(const crypto::chacha_key &key); -@@ -79,6 +84,7 @@ namespace cryptonote +@@ -99,6 +104,7 @@ namespace cryptonote void create_from_device(hw::device &hwdev); void create_from_keys(const cryptonote::account_public_address& address, const crypto::secret_key& spendkey, const crypto::secret_key& viewkey); void create_from_viewkey(const cryptonote::account_public_address& address, const crypto::secret_key& viewkey);