fix: payment address parsing

CMakeLists.txt

@@ -19,6 +19,7 @@ option(WITH_ICU "Compile with International Components for Unicode." OFF)
 option(WITH_PNG "Compile with Libpng support." OFF)
 option(WITH_QRENCODE "Compile with QREncode." OFF)
 option(JUST_KTH_SOURCES "Just Knuth source code to be linted." OFF)
+option(WITH_CONSOLE "Compile console application." OFF)
 
 option(GLOBAL_BUILD "" OFF)
 
@@ -461,6 +462,55 @@ endif()
 
 _group_sources(${PROJECT_NAME} "${CMAKE_CURRENT_LIST_DIR}")
 
+# Console
+# ------------------------------------------------------------------------------
+message(STATUS "Knuth: WITH_CONSOLE ${WITH_CONSOLE}")
+if (WITH_CONSOLE)
+    set(_test_console_sources
+      console/main.cpp
+    )
+
+  add_executable(kth_domain_console ${_test_console_sources})
+
+  target_link_libraries(kth_domain_console ${PROJECT_NAME})
+
+  set_target_properties(
+          kth_domain_console PROPERTIES
+          FOLDER "domain"
+          OUTPUT_NAME kth_domain_console)
+
+
+  # Enable sanitizers and other debug options only in debug mode
+  if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+      message(STATUS "Activating sanitizers and debug options")
+      message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+      message(STATUS "APPLE: ${APPLE}")
+
+      if (APPLE)
+          # In macOS, use only AddressSanitizer and UndefinedBehaviorSanitizer
+          target_compile_options(kth_domain_console PRIVATE
+              -fsanitize=address,undefined
+              -fno-omit-frame-pointer
+              -g
+          )
+          target_link_options(kth_domain_console PRIVATE
+              -fsanitize=address,undefined
+          )
+      else()
+          # In other operating systems (like Linux), add LeakSanitizer also
+          target_compile_options(kth_domain_console PRIVATE
+              -fsanitize=address,undefined,leak
+              -fno-omit-frame-pointer
+              -g
+          )
+          target_link_options(kth_domain_console PRIVATE
+              -fsanitize=address,undefined,leak
+          )
+      endif()
+
+  endif()
+endif()
+
 # Tests
 # ------------------------------------------------------------------------------
 if (WITH_TESTS)

console/main.cpp

@@ -0,0 +1,16 @@
+#include <iostream>
+#include <kth/domain/wallet/payment_address.hpp>
+
+int main() {
+    using kth::domain::wallet::payment_address;
+
+    std::cout << "start" << std::endl;
+    payment_address const address("bitcoincash:pvstqkm54dtvnpyqxt5m5n7sjsn4enrlxc526xyxlnjkaycdzfeu69reyzmqx");
+    std::cout << "address created" << std::endl;
+    std::cout << "address is valid: " << bool(address) << std::endl;
+    std::cout << "address encoded cashaddr:      " << address.encoded_cashaddr(false) << std::endl;
+    std::cout << "address encoded token address: " << address.encoded_cashaddr(true) << std::endl;
+    std::cout << "address encoded legacy:        " << address.encoded_legacy() << std::endl;
+
+    return 0;
+}

include/kth/domain/wallet/payment_address.hpp

@@ -60,6 +60,7 @@ class KD_API payment_address {
     payment_address(ec_private const& secret);
     payment_address(std::string const& address);
     payment_address(short_hash const& hash, uint8_t version = mainnet_p2kh);
+    payment_address(hash_digest const& hash, uint8_t version = mainnet_p2kh);
     payment_address(ec_public const& point, uint8_t version = mainnet_p2kh);
     payment_address(chain::script const& script, uint8_t version = mainnet_p2sh);
 
@@ -165,8 +166,9 @@ template <>
 struct hash<kth::domain::wallet::payment_address> {
     size_t operator()(kth::domain::wallet::payment_address const& address) const {
         //TODO(fernando): re-enable this
-        // return std::hash<kth::byte_span>()(address.hash());
-        return std::hash<kth::short_hash>()(address.hash20());
+        // return std::hash<kth::byte_span>()(address.hash32());
+        // return std::hash<kth::short_hash>()(address.hash20());
+        return std::hash<kth::hash_digest>()(address.hash32());
     }
 };
 } // namespace std

src/wallet/payment_address.cpp

@@ -58,6 +58,12 @@ payment_address::payment_address(short_hash const& hash, uint8_t version)
     std::copy_n(hash.begin(), hash.size(), hash_data_.begin());
 }
 
+payment_address::payment_address(hash_digest const& hash, uint8_t version)
+    : valid_(true), version_(version), hash_span_{hash_data_.begin(), hash.size()}
+{
+    std::copy_n(hash.begin(), hash.size(), hash_data_.begin());
+}
+
 // Validators.
 // ----------------------------------------------------------------------------
 
@@ -160,13 +166,34 @@ payment_address payment_address::from_string_cashaddr(std::string const& address
         return {};
     }
 
-    short_hash hash;
-    std::copy(std::begin(data) + 1, std::end(data), std::begin(hash));
+    if (data.size() == short_hash_size + 1) {
+        short_hash hash;
+        if ((data.size() - 1) != hash.size()) {
+            return {};
+        }
+        std::copy(std::begin(data) + 1, std::end(data), std::begin(hash));
 
-    if (prefix == payment_address::cashaddr_prefix_mainnet) {
-        return {hash, type == PUBKEY_TYPE ? payment_address::mainnet_p2kh : payment_address::mainnet_p2sh};
+        if (prefix == payment_address::cashaddr_prefix_mainnet) {
+            return {hash, type == PUBKEY_TYPE ? payment_address::mainnet_p2kh : payment_address::mainnet_p2sh};
+        }
+        return {hash, type == PUBKEY_TYPE ? payment_address::testnet_p2kh : payment_address::testnet_p2sh};
+    }
+
+    if (data.size() == hash_size + 1) {
+        hash_digest hash;
+        if ((data.size() - 1) != hash.size()) {
+            return {};
+        }
+        std::copy(std::begin(data) + 1, std::end(data), std::begin(hash));
+
+        if (prefix == payment_address::cashaddr_prefix_mainnet) {
+            return {hash, type == PUBKEY_TYPE ? payment_address::mainnet_p2kh : payment_address::mainnet_p2sh};
+        }
+        return {hash, type == PUBKEY_TYPE ? payment_address::testnet_p2kh : payment_address::testnet_p2sh};
     }
-    return {hash, type == PUBKEY_TYPE ? payment_address::testnet_p2kh : payment_address::testnet_p2sh};
+
+    // Invalid address.
+    return {};
 }
 
 #endif  //KTH_CURRENCY_BCH

test/wallet/payment_address.cpp

@@ -276,6 +276,18 @@ TEST_CASE("payment address cashAddr testnet from string", "[payment address]") {
     REQUIRE(address.encoded_cashaddr(false) == "bchtest:qpzz8n7jp6847yyx8t33matrgcsdx6c0cvleatp707");
     REQUIRE(address.encoded_legacy() == "mmjF9M1saNs7vjCGaSDaDHvFAtTgUNtfrJ");
 }
+
+TEST_CASE("payment address token address from string", "[payment address]") {
+    std::cout << "start" << std::endl;
+    payment_address const address("bitcoincash:pvstqkm54dtvnpyqxt5m5n7sjsn4enrlxc526xyxlnjkaycdzfeu69reyzmqx");
+    std::cout << "address created" << std::endl;
+    REQUIRE(address);
+    std::cout << "address is valid" << std::endl;
+    REQUIRE(address.encoded_cashaddr(false) == "bitcoincash:pvstqkm54dtvnpyqxt5m5n7sjsn4enrlxc526xyxlnjkaycdzfeu69reyzmqx");
+    std::cout << "address encoded cashaddr" << std::endl;
+    REQUIRE(address.encoded_legacy() == "17DHrHvtmMRs9ciersFCPNhvJtryd5NWbT");
+    std::cout << "address encoded legacy" << std::endl;
+}
 #endif
 
 // End Test Suite