diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/common/dns_utils.h | 1 | ||||
| -rw-r--r-- | src/common/updates.cpp | 1 | ||||
| -rw-r--r-- | src/wallet/api/pending_transaction.cpp | 2 | ||||
| -rw-r--r-- | src/wallet/api/wallet.h | 1 | ||||
| -rw-r--r-- | src/wallet/wallet2_api.h | 6 |
6 files changed, 14 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 45745abee..3d53e049e 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() diff --git a/src/common/dns_utils.h b/src/common/dns_utils.h index 61e1358ca..f19584516 100644 --- a/src/common/dns_utils.h +++ b/src/common/dns_utils.h @@ -29,6 +29,7 @@ #include <vector> #include <string> +#include <functional> namespace tools { diff --git a/src/common/updates.cpp b/src/common/updates.cpp index 5b1acf5fa..8a057b1cf 100644 --- a/src/common/updates.cpp +++ b/src/common/updates.cpp @@ -26,6 +26,7 @@ // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#include "misc_log_ex.h" #include "util.h" #include "dns_utils.h" #include "updates.h" diff --git a/src/wallet/api/pending_transaction.cpp b/src/wallet/api/pending_transaction.cpp index 9798d66c6..c98a599e7 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; } diff --git a/src/wallet/api/wallet.h b/src/wallet/api/wallet.h index e9e2cc580..07b0f063b 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 a136954f0..27ad79816 100644 --- a/src/wallet/wallet2_api.h +++ b/src/wallet/wallet2_api.h @@ -380,6 +380,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 * * \param recoveringFromSeed - true/false |