From f233c01c8f5af94a15fed93b0612b9069e17d172 Mon Sep 17 00:00:00 2001 From: Jaquee Date: Fri, 23 Jun 2017 10:02:07 +0200 Subject: [PATCH 1/3] CMakeLists.txt - ios/xcode fix --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 45745abe..3d53e049 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -392,6 +392,9 @@ else() set(ARCH_FLAG "") elseif(PPC64LE) set(ARCH_FLAG "-mcpu=${ARCH}") + elseif(IOS AND ARCH STREQUAL "arm64") + message(STATUS "IOS: Changing arch from arm64 to armv8") + set(ARCH_FLAG "-march=armv8") else() set(ARCH_FLAG "-march=${ARCH}") endif() From 48c0cb1ba6b231205c2660bdcb5911fab6328c68 Mon Sep 17 00:00:00 2001 From: Jaquee Date: Fri, 4 Aug 2017 23:20:59 +0200 Subject: [PATCH 2/3] wallet api: pause refresh while commiting tx --- src/wallet/api/pending_transaction.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/wallet/api/pending_transaction.cpp b/src/wallet/api/pending_transaction.cpp index 9798d66c..c98a599e 100644 --- a/src/wallet/api/pending_transaction.cpp +++ b/src/wallet/api/pending_transaction.cpp @@ -102,6 +102,7 @@ bool PendingTransactionImpl::commit(const std::string &filename, bool overwrite) } // Commit tx else { + m_wallet.pauseRefresh(); while (!m_pending_tx.empty()) { auto & ptx = m_pending_tx.back(); m_wallet.m_wallet->commit_tx(ptx); @@ -133,6 +134,7 @@ bool PendingTransactionImpl::commit(const std::string &filename, bool overwrite) m_status = Status_Error; } + m_wallet.startRefresh(); return m_status == Status_Ok; } From e31aac80e557cf2c1270f4a80c9890c427b6f45f Mon Sep 17 00:00:00 2001 From: Jaquee Date: Sat, 5 Aug 2017 00:09:06 +0200 Subject: [PATCH 3/3] walletAPI: add getRefreshFromBlockHeight() --- src/wallet/api/wallet.h | 1 + src/wallet/wallet2_api.h | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/src/wallet/api/wallet.h b/src/wallet/api/wallet.h index e9e2cc58..07b0f063 100644 --- a/src/wallet/api/wallet.h +++ b/src/wallet/api/wallet.h @@ -98,6 +98,7 @@ public: void setAutoRefreshInterval(int millis); int autoRefreshInterval() const; void setRefreshFromBlockHeight(uint64_t refresh_from_block_height); + uint64_t getRefreshFromBlockHeight() const { return m_wallet->get_refresh_from_block_height(); }; void setRecoveringFromSeed(bool recoveringFromSeed); bool watchOnly() const; bool rescanSpent(); diff --git a/src/wallet/wallet2_api.h b/src/wallet/wallet2_api.h index a136954f..27ad7981 100644 --- a/src/wallet/wallet2_api.h +++ b/src/wallet/wallet2_api.h @@ -379,6 +379,12 @@ struct Wallet */ virtual void setRefreshFromBlockHeight(uint64_t refresh_from_block_height) = 0; + /*! + * \brief getRestoreHeight - get wallet creation height + * + */ + virtual uint64_t getRefreshFromBlockHeight() const = 0; + /*! * \brief setRecoveringFromSeed - set state recover form seed *