update parse extra handling

Acktarius · Jan 20, 2025 · 55dd43f · 55dd43f
1 parent 52950f0
commit 55dd43f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "cryptonote"]
+	path = cryptonote
+	url = [email protected]:Acktarius/cryptonote.git
+	branch = ack/fix-paimentId
diff --git a/cryptonote b/cryptonote
diff --git a/src/CryptoNoteCore/TransactionExtra.cpp b/src/CryptoNoteCore/TransactionExtra.cpp
@@ -310,7 +310,22 @@ namespace cn
 
   bool parsePaymentId(const std::string &paymentIdString, Hash &paymentId)
   {
-    return common::podFromHex(paymentIdString, paymentId);
+    // If input looks like transaction extra data (35 bytes)
+    if (paymentIdString.length() == 35) {
+        std::vector<uint8_t> extraNonce;
+        extraNonce.resize(paymentIdString.length() - 2); // Skip TX_EXTRA_NONCE tag
+        memcpy(extraNonce.data(), paymentIdString.data() + 2, paymentIdString.length() - 2);
+
+        if (getPaymentIdFromTransactionExtraNonce(extraNonce, paymentId)) {
+            return true;
+        }
+    }
+    // Try parsing as hex string
+    if (paymentIdString.length() == 64) {
+        return common::podFromHex(paymentIdString, paymentId);
+    }
+
+    return false;
   }
 
   bool createTxExtraWithPaymentId(const std::string &paymentIdString, std::vector<uint8_t> &extra)