From 991a0d0c97bce6ae8671dc763dd03876dfa9ea8a Mon Sep 17 00:00:00 2001 From: cyan Date: Thu, 20 Feb 2025 15:12:58 +0100 Subject: [monero] update to latest v0.18 (#122) * monero update * update checksum --- ...oding-and-tx-key-getter-for-PendingTransc.patch | 68 ---------------------- 1 file changed, 68 deletions(-) delete mode 100644 patches/monero/0010-Add-hex-encoding-and-tx-key-getter-for-PendingTransc.patch (limited to 'patches/monero/0010-Add-hex-encoding-and-tx-key-getter-for-PendingTransc.patch') diff --git a/patches/monero/0010-Add-hex-encoding-and-tx-key-getter-for-PendingTransc.patch b/patches/monero/0010-Add-hex-encoding-and-tx-key-getter-for-PendingTransc.patch deleted file mode 100644 index 6917daa..0000000 --- a/patches/monero/0010-Add-hex-encoding-and-tx-key-getter-for-PendingTransc.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 42aca87b69ecdc9fb24d14dd947f8bbffc7f3500 Mon Sep 17 00:00:00 2001 -From: M -Date: Fri, 21 Apr 2023 15:43:47 -0400 -Subject: [PATCH 10/14] Add hex encoding and tx key getter for - PendingTransction in wallet api. - ---- - src/wallet/api/pending_transaction.cpp | 16 ++++++++++++++++ - src/wallet/api/pending_transaction.h | 2 ++ - src/wallet/api/wallet2_api.h | 2 ++ - 3 files changed, 20 insertions(+) - -diff --git a/src/wallet/api/pending_transaction.cpp b/src/wallet/api/pending_transaction.cpp -index 9c3c26e..1f714d2 100644 ---- a/src/wallet/api/pending_transaction.cpp -+++ b/src/wallet/api/pending_transaction.cpp -@@ -80,6 +80,22 @@ std::vector PendingTransactionImpl::txid() const - return txid; - } - -+std::vector PendingTransactionImpl::hex() const -+{ -+ std::vector hexs; -+ for (const auto &pt: m_pending_tx) -+ hexs.push_back(epee::string_tools::buff_to_hex_nodelimer(cryptonote::tx_to_blob(pt.tx))); -+ return hexs; -+} -+ -+std::vector PendingTransactionImpl::txKey() const -+{ -+ std::vector keys; -+ for (const auto& pt: m_pending_tx) -+ keys.push_back(epee::string_tools::pod_to_hex(pt.tx_key)); -+ return keys; -+} -+ - bool PendingTransactionImpl::commit(const std::string &filename, bool overwrite) - { - -diff --git a/src/wallet/api/pending_transaction.h b/src/wallet/api/pending_transaction.h -index 403bfe2..0cc6c58 100644 ---- a/src/wallet/api/pending_transaction.h -+++ b/src/wallet/api/pending_transaction.h -@@ -59,6 +59,8 @@ public: - std::string multisigSignData() override; - void signMultisigTx() override; - std::vector signersKeys() const override; -+ std::vector hex() const override; -+ std::vector txKey() const override; - - private: - friend class WalletImpl; -diff --git a/src/wallet/api/wallet2_api.h b/src/wallet/api/wallet2_api.h -index 013b5bc..f421fdc 100644 ---- a/src/wallet/api/wallet2_api.h -+++ b/src/wallet/api/wallet2_api.h -@@ -127,6 +127,8 @@ struct PendingTransaction - * @return vector of base58-encoded signers' public keys - */ - virtual std::vector signersKeys() const = 0; -+ virtual std::vector hex() const = 0; -+ virtual std::vector txKey() const = 0; - }; - - /** --- -2.39.5 (Apple Git-154) - -- cgit v1.2.3