From a4e1f00993ec3831bb034c6cce62aee9540e58ab Mon Sep 17 00:00:00 2001 From: SChernykh <15806605+SChernykh@users.noreply.github.com> Date: Sun, 21 Sep 2025 15:50:08 +0200 Subject: [PATCH] Wallet: added subaddress detection --- src/params.cpp | 5 ++++ src/pool_block_parser.inl | 2 +- src/wallet.cpp | 18 +++++++++++---- src/wallet.h | 4 +++- tests/src/wallet_tests.cpp | 47 ++++++++++++++++++++++++-------------- 5 files changed, 52 insertions(+), 24 deletions(-) diff --git a/src/params.cpp b/src/params.cpp index 77953ed..c80e275 100644 --- a/src/params.cpp +++ b/src/params.cpp @@ -314,6 +314,11 @@ bool Params::valid() const return false; } + if (m_wallet.is_subaddress()) { + LOGERR(1, "Wallet address must be a main address (starting with 4...). Try \"p2pool --help\"."); + return false; + } + if (m_mergeMiningHosts.size() > 10) { LOGERR(1, "Too many merge mining blockchains."); return false; diff --git a/src/pool_block_parser.inl b/src/pool_block_parser.inl index a0e0066..3b31f52 100644 --- a/src/pool_block_parser.inl +++ b/src/pool_block_parser.inl @@ -284,7 +284,7 @@ int PoolBlock::deserialize(const uint8_t* data, size_t size, const SideChain& si hash view_pub_key; READ_BUF(spend_pub_key.h, HASH_SIZE); READ_BUF(view_pub_key.h, HASH_SIZE); - if (!m_minerWallet.assign(spend_pub_key, view_pub_key, sidechain.network_type())) { + if (!m_minerWallet.assign(spend_pub_key, view_pub_key, sidechain.network_type(), false)) { return __LINE__; } diff --git a/src/wallet.cpp b/src/wallet.cpp index 6c36b4a..1724a23 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -33,6 +33,8 @@ namespace { // Values taken from cryptonote_config.h (CRYPTONOTE_PUBLIC_ADDRESS_BASE58_PREFIX) constexpr uint64_t valid_prefixes[] = { 18, 53, 24 }; +constexpr uint64_t valid_prefixes_subaddress[] = { 42, 63, 36 }; + constexpr std::array block_sizes{ 0, 2, 3, 5, 6, 7, 9, 10, 11 }; constexpr int num_full_blocks = p2pool::Wallet::ADDRESS_LENGTH / block_sizes.back(); constexpr int last_block_size = p2pool::Wallet::ADDRESS_LENGTH % block_sizes.back(); @@ -77,7 +79,7 @@ static_assert(rev_alphabet.num_symbols == 58, "Check alphabet"); namespace p2pool { -Wallet::Wallet(const char* address) : m_prefix(0), m_checksum(0), m_type(NetworkType::Invalid) +Wallet::Wallet(const char* address) : m_prefix(0), m_checksum(0), m_type(NetworkType::Invalid), m_subaddress(false) { decode(address); } @@ -98,6 +100,7 @@ Wallet& Wallet::operator=(const Wallet& w) m_viewPublicKey = w.m_viewPublicKey; m_checksum = w.m_checksum; m_type = w.m_type; + m_subaddress = w.m_subaddress; return *this; } @@ -152,6 +155,10 @@ bool Wallet::decode(const char* address) case valid_prefixes[1]: m_type = NetworkType::Testnet; break; case valid_prefixes[2]: m_type = NetworkType::Stagenet; break; + case valid_prefixes_subaddress[0]: m_type = NetworkType::Mainnet; m_subaddress = true; break; + case valid_prefixes_subaddress[1]: m_type = NetworkType::Testnet; m_subaddress = true; break; + case valid_prefixes_subaddress[2]: m_type = NetworkType::Stagenet; m_subaddress = true; break; + default: return false; } @@ -175,7 +182,7 @@ bool Wallet::decode(const char* address) return valid(); } -bool Wallet::assign(const hash& spend_pub_key, const hash& view_pub_key, NetworkType type) +bool Wallet::assign(const hash& spend_pub_key, const hash& view_pub_key, NetworkType type, bool subaddress) { ge_p3 point; if ((ge_frombytes_vartime(&point, spend_pub_key.h) != 0) || (ge_frombytes_vartime(&point, view_pub_key.h) != 0)) { @@ -184,9 +191,9 @@ bool Wallet::assign(const hash& spend_pub_key, const hash& view_pub_key, Network switch (type) { - case NetworkType::Mainnet: m_prefix = valid_prefixes[0]; break; - case NetworkType::Testnet: m_prefix = valid_prefixes[1]; break; - case NetworkType::Stagenet: m_prefix = valid_prefixes[2]; break; + case NetworkType::Mainnet: m_prefix = subaddress ? valid_prefixes_subaddress[0] : valid_prefixes[0]; break; + case NetworkType::Testnet: m_prefix = subaddress ? valid_prefixes_subaddress[1] : valid_prefixes[1]; break; + case NetworkType::Stagenet: m_prefix = subaddress ? valid_prefixes_subaddress[2] : valid_prefixes[2]; break; default: m_prefix = 0; break; } @@ -204,6 +211,7 @@ bool Wallet::assign(const hash& spend_pub_key, const hash& view_pub_key, Network memcpy(&m_checksum, md, sizeof(m_checksum)); m_type = type; + m_subaddress = subaddress; return true; } diff --git a/src/wallet.h b/src/wallet.h index b5ff4f2..5a4dfa5 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -37,7 +37,7 @@ public: FORCEINLINE bool valid() const { return m_type != NetworkType::Invalid; } bool decode(const char* address); - bool assign(const hash& spend_pub_key, const hash& view_pub_key, NetworkType type); + bool assign(const hash& spend_pub_key, const hash& view_pub_key, NetworkType type, bool subaddress); void encode(char (&buf)[ADDRESS_LENGTH]) const; @@ -58,6 +58,7 @@ public: FORCEINLINE const hash& view_public_key() const { return m_viewPublicKey; } FORCEINLINE uint32_t checksum() const { return m_checksum; } FORCEINLINE NetworkType type() const { return m_type; } + FORCEINLINE bool is_subaddress() const { return m_subaddress; } private: uint64_t m_prefix; @@ -65,6 +66,7 @@ private: hash m_viewPublicKey; uint32_t m_checksum; NetworkType m_type; + bool m_subaddress; }; } // namespace p2pool diff --git a/tests/src/wallet_tests.cpp b/tests/src/wallet_tests.cpp index beb2f38..9099e95 100644 --- a/tests/src/wallet_tests.cpp +++ b/tests/src/wallet_tests.cpp @@ -53,17 +53,13 @@ TEST(wallet, input_output) ASSERT_EQ(w.valid(), false); } - // Subaddress (not supported) - { - Wallet w("8BE7uo9kWR6fFekhGHKJt87pkTzzNj2ikZMNmN7DUJf81y6Zygzbsk1CFzGMbS7fB7E2qr6A6EZfLYgxUfYvdDxEHrMPMA5"); - ASSERT_EQ(w.valid(), false); - } - - auto check = [](NetworkType t, uint64_t prefix, uint32_t checksum, const char* address, const char* spendkey, const char* viewkey) + auto check = [](NetworkType t, bool subaddress, uint64_t prefix, uint32_t checksum, const char* address, const char* spendkey, const char* viewkey) { // Test Wallet::decode() Wallet w(address); + ASSERT_TRUE(w.valid()); ASSERT_EQ(w.type(), t); + ASSERT_EQ(w.is_subaddress(), subaddress); ASSERT_EQ(w.prefix(), prefix); ASSERT_EQ(w.checksum(), checksum); @@ -85,16 +81,18 @@ TEST(wallet, input_output) ASSERT_EQ(w1.view_public_key(), w.view_public_key()); ASSERT_EQ(w1.checksum(), w.checksum()); ASSERT_EQ(w1.type(), w.type()); + ASSERT_EQ(w1.is_subaddress(), w.is_subaddress()); // Test Wallet::assign() Wallet w2(nullptr); - w2.assign(w.spend_public_key(), w.view_public_key(), w.type()); + w2.assign(w.spend_public_key(), w.view_public_key(), w.type(), w.is_subaddress()); ASSERT_EQ(w2.prefix(), w.prefix()); ASSERT_EQ(w2.spend_public_key(), w.spend_public_key()); ASSERT_EQ(w2.view_public_key(), w.view_public_key()); ASSERT_EQ(w2.checksum(), w.checksum()); ASSERT_EQ(w2.type(), w.type()); + ASSERT_EQ(w2.is_subaddress(), w.is_subaddress()); // Test Wallet::encode() const std::string s0 = address; @@ -115,51 +113,66 @@ TEST(wallet, input_output) // Correct mainnet addresses check( - NetworkType::Mainnet, 18, 0xA345C1C9UL, "49ccoSmrBTPJd5yf8VYCULh4J5rHQaXP1TeC8Cnqhd5H9Y2cMwkJ9w42euLmMghKtCiQcgZEiGYW1K6Ae4biZ7w1HLSexS6", + NetworkType::Mainnet, false, 18, 0xA345C1C9UL, "49ccoSmrBTPJd5yf8VYCULh4J5rHQaXP1TeC8Cnqhd5H9Y2cMwkJ9w42euLmMghKtCiQcgZEiGYW1K6Ae4biZ7w1HLSexS6", "d2e232e441546a695b27187692d035ef7be5c54692700c9f470dcd706753a833", "06f68970da46f709e2b4d0ffabd0d1f78ea6717786b5766c25c259111f212490" ); check( - NetworkType::Mainnet, 18, 0x8C8FB6E6UL, "45JHuqGBSqUXUyZx95H4C2J5aEL4zFjM3jpTmMTESPXPa3jmtSQWYezHX7r4A2xPQNBGsQupJqmPhRZb2QgBcEWRDQ9ywwR", + NetworkType::Mainnet, false, 18, 0x8C8FB6E6UL, "45JHuqGBSqUXUyZx95H4C2J5aEL4zFjM3jpTmMTESPXPa3jmtSQWYezHX7r4A2xPQNBGsQupJqmPhRZb2QgBcEWRDQ9ywwR", "60fe176eaf3cffb63df130bc25036b661b947900941052fffe6ff4b51fc4f2c5", "9387910b0a2e4f62c32621b77ddbeb3d6c0054e5ed9bc492d87bab1a1eef366d" ); check( - NetworkType::Mainnet, 18, 0x0E705A56UL, "43S5vhReDY4fJs99DBZtFS8JoJVNG17iaAVAARvRT8xzSYZqnJfXfTACLrZUzoBHQKhiJZCWCpqB4Kf3c64CEagdSRXd5D7", + NetworkType::Mainnet, false, 18, 0x0E705A56UL, "43S5vhReDY4fJs99DBZtFS8JoJVNG17iaAVAARvRT8xzSYZqnJfXfTACLrZUzoBHQKhiJZCWCpqB4Kf3c64CEagdSRXd5D7", "2fc2f902659541e50753853ddb96912baf55f26bebe7d338b5c2239c437ddb98", "b814951166253543cfb0e1b8bdea58f366de824fddb8ef6f895fcf631873f6e1" ); + check( + NetworkType::Mainnet, true, 42, 0x832DB4D1UL, "86eQxzSW4AZfvsWRSop755WZUsog6L3x32NRZukeeShnS4mBGVpcqQhS6pCNxj44usPKNwesZ45ooHyjDku6nVZdT3Q9qrz", + "6ea1b3ea41038ee8bd793d4d31851cb0ba4e4605213fe8082fdb51393c51b995", "da5d41e01f57c6961083bd6a0f779e856c8054e7cea82265815714b0bd7aece6" + ); + // Correct testnet addresses check( - NetworkType::Testnet, 53, 0x6F896672UL, "9x6aEN1yd2WhPMPw89LV5LLK1ZFe6N8xiAm18Ay4q1U4LKMde7MpDdPRN6GiiGCJMVTHuptGGmfj2Qfp2vcKSRSG79HJrQn", + NetworkType::Testnet, false, 53, 0x6F896672UL, "9x6aEN1yd2WhPMPw89LV5LLK1ZFe6N8xiAm18Ay4q1U4LKMde7MpDdPRN6GiiGCJMVTHuptGGmfj2Qfp2vcKSRSG79HJrQn", "821623ac165f07f172c86980254a43737332fd89ca36d33a57dc02d8026d9173", "7c55413e672f8691a9211eac6003109d2fdf224ba72c4d8d82353427a02bc136" ); check( - NetworkType::Testnet, 53, 0x4124092AUL, "9zsJP6KFF6ZGern5UkR7gyRXHFRTba6jG8JKnfzDySeqEdwPZaD8MNYGkjyADdVpWs7rXgyeu712JdxhX2k7d9SNB4TdRdS", + NetworkType::Testnet, false, 53, 0x4124092AUL, "9zsJP6KFF6ZGern5UkR7gyRXHFRTba6jG8JKnfzDySeqEdwPZaD8MNYGkjyADdVpWs7rXgyeu712JdxhX2k7d9SNB4TdRdS", "cb366a3b44f6aa5d94e03db06325b6929b9e75dbf19dcf2ba2d14eb2efa53651", "8789afa33dca295e301baef826cec028fa22b831822c1bdcf8a847a43a3bff59" ); check( - NetworkType::Testnet, 53, 0x0AC6459FUL, "A1SqL5oPjh8Km1At7mao7U1fNjWkzeSwvQ39GimMqvhBF3FUoJhx1zxL2i6XbHzzAXDhKetiwSmYQeVwG6sUgwJuEqPyjWq", + NetworkType::Testnet, false, 53, 0x0AC6459FUL, "A1SqL5oPjh8Km1At7mao7U1fNjWkzeSwvQ39GimMqvhBF3FUoJhx1zxL2i6XbHzzAXDhKetiwSmYQeVwG6sUgwJuEqPyjWq", "da78298fb6eb8f702698bec873bad703f4a51e1377a66d89ba977ca7f43b8e53", "eeb348f70afad971c50aa062f1d1544be64ef9cdc12475e030f2d295305e6e7a" ); + check( + NetworkType::Testnet, true, 63, 0x2232C90AUL, "BfPfAxrFBbLJiMzVGyNmgJbejtcZEMELsbWSv5h3xTc3LSvKpwJetPrNk4fMSZ4bYCA4o93yGdVqjUpZSqUGxWkZ5HwBzrM", + "be4e4f17b8e00f69e661683116f7bfcf29b2c96fccbe84ce4ede5e58de0fd074", "43ecfeedf706b181fd5e5a321db3f13632df743113480aa6532973bf06b5da26" + ); + // Correct stagenet addresses check( - NetworkType::Stagenet, 24, 0x36E99D1DUL, "55AJ4jJBhV6JsoqrEsAazTLrJjg9SA1SFReLUoXDudrsA9tdL9i2VkJefEbx3zrFRt6swuibPVySPGNzsNvyshrRNZbSDnD", + NetworkType::Stagenet, false, 24, 0x36E99D1DUL, "55AJ4jJBhV6JsoqrEsAazTLrJjg9SA1SFReLUoXDudrsA9tdL9i2VkJefEbx3zrFRt6swuibPVySPGNzsNvyshrRNZbSDnD", "57e0c2fef80a1d6adfa3189134009076ad0ddc4c4668709355cea98524e9fc36", "b94fafe59d5037e126557665f76cd3232504ebd82500e05bf25801d853d182bf" ); check( - NetworkType::Stagenet, 24, 0x16DF3958UL, "5BQqg4HTWuN3j4NzBHTK31eTaygRXYxWRQW9dTD7qMuJSiVtskraSErXQ24FUBeifiV6NaQPmxLS559vbUT4xYUoF2fiGvH", + NetworkType::Stagenet, false, 24, 0x16DF3958UL, "5BQqg4HTWuN3j4NzBHTK31eTaygRXYxWRQW9dTD7qMuJSiVtskraSErXQ24FUBeifiV6NaQPmxLS559vbUT4xYUoF2fiGvH", "fcd35a53cef9a1104ae556f01cee0cdff2f18f2f2f6bde8c833d5bd980fe8999", "be2b1142a046bfb5bb21e1f2a49bd1a7f46e1c18b009b218d5962f663938707c" ); check( - NetworkType::Stagenet, 24, 0xF17D6524UL, "53CFYfjzcouW95hQ7AHvqS3GZ2UAAaRLKc1ymmhHATQTZxhtakpYcfjiRVzrRdxVZ5F8p61KSpPEmFu9DVRULRDkK4v1TCU", + NetworkType::Stagenet, false, 24, 0xF17D6524UL, "53CFYfjzcouW95hQ7AHvqS3GZ2UAAaRLKc1ymmhHATQTZxhtakpYcfjiRVzrRdxVZ5F8p61KSpPEmFu9DVRULRDkK4v1TCU", "23fdd143264794ae367083791bb8fd0d8f719b27b7b858d15a2b67d6eddd60c5", "0ebafc1284ab1af7a5ff4ade682bcc54817a319a00eede591344855c420beba0" ); + + check( + NetworkType::Stagenet, true, 36, 0xE5250D95UL, "77jhPoqpvTnGqds2oAWGVmiZv5fiQb2E8BizTL3oh7ia54sQRSEQ7SAAyRj9TpvwgHGuX1cYNDCHP7WHJCBXHcLqSnmApfe", + "90e6541963cd1d5eb1459f6f546db8f8840fa31ea09cfd401d4d519f48e56318", "50317de0182c133b9fb6958d1787f65f17b5366aff7b9226e3d205cf22844ae4" + ); } }