2a38bf2961
* cleanup patches
* fix polyseed patch
* Fix iOS builds
* fix polyseed dependencies
* fix polyseed patch for macOS
* update ledger patch
* update wownero patches and version
* update checksums
* wip"
* update gitmodules
* update boost build script
* update build_single.sh
* vix verbosey_copy
* fix __clear_cache bug on wownero
* update randomwow
* migrate build system
* fix cross compilation issues
* some more build issue
* update polyseed
* cleanup cmakelists
* fix toolchain.cmake.in
* add ssp
* another attempt at building windows on CI
* fix package name
* migrate mirror to my own hosting
* change download mirror priority (fallback first)
* link ssp in monero module as well by using CMAKE_{C,CXX}_FLAGS
* fix android builds
* update polyseed source
* 13 -> trixie
* fix package name conflicts, update runner to sid
* update boost to 1_84_0, disable patch that's no longer needed
* switch to ubuntu:24.04
* add POLYSEED_STATIC to toolchain.cmake.in in order to properly link
* drop patches
* fixes to darwin
* link missing wowner-seed library
* a litte bit more of experiments
* build locale only on windows
* update iconv
* update definitions
* update ci builds
* update my progress
* ios fix, update depends, ci
* multithread build system
* fix android, mingw and linux build issues
* remove dependency check
* update Dockerfile to include pigz
* show a message when pigz is missing
* fix devcontainer mingw setup (missing ENV)
* update android build runner
* sailfishos dropped (you better go behave yourself and run actual linux programs)
* fiz pigz issues
* install llvm-ranlib for android
* fix iOS build issues
* fix dummy ledger patch
* fix macos and darwin
* fix macos ci
* fix macos build command
* install autoconf
* add automake
* add libtool
* macos fixes, wownero fixes, idk what else, please help me
* fix wownero iOS build
* Cleanup patches
* add try-catch into monero code
* fix error handling
* update checksums
69 lines
2.3 KiB
Diff
69 lines
2.3 KiB
Diff
From 7c4f0b36d627bf4d1ce198240c1e974eff27bbec Mon Sep 17 00:00:00 2001
|
|
From: M <m@cakewallet.com>
|
|
Date: Fri, 21 Apr 2023 15:43:47 -0400
|
|
Subject: [PATCH 11/15] 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 9c3c26ee5..1f714d229 100644
|
|
--- a/src/wallet/api/pending_transaction.cpp
|
|
+++ b/src/wallet/api/pending_transaction.cpp
|
|
@@ -80,6 +80,22 @@ std::vector<std::string> PendingTransactionImpl::txid() const
|
|
return txid;
|
|
}
|
|
|
|
+std::vector<std::string> PendingTransactionImpl::hex() const
|
|
+{
|
|
+ std::vector<std::string> 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<std::string> PendingTransactionImpl::txKey() const
|
|
+{
|
|
+ std::vector<std::string> 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 403bfe281..0cc6c58e9 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<std::string> signersKeys() const override;
|
|
+ std::vector<std::string> hex() const override;
|
|
+ std::vector<std::string> txKey() const override;
|
|
|
|
private:
|
|
friend class WalletImpl;
|
|
diff --git a/src/wallet/api/wallet2_api.h b/src/wallet/api/wallet2_api.h
|
|
index 013b5bcba..f421fdc05 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<std::string> signersKeys() const = 0;
|
|
+ virtual std::vector<std::string> hex() const = 0;
|
|
+ virtual std::vector<std::string> txKey() const = 0;
|
|
};
|
|
|
|
/**
|
|
--
|
|
2.39.5 (Apple Git-154)
|
|
|