Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ack/dev #336

Closed
wants to merge 2 commits into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion src/CryptoNoteCore/TransactionExtra.cpp
Original file line number Diff line number Diff line change
@@ -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)