From c6cc470710199335df184e12d2d9e8c579d5c5a9 Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Wed, 4 Sep 2019 15:14:08 -0400
Subject: [PATCH] update uints

---
 src/daemon/monero_daemon_model.h | 10 +++++-----
 src/wallet/monero_wallet_model.h |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/daemon/monero_daemon_model.h b/src/daemon/monero_daemon_model.h
index 8c881a0..21f793c 100644
--- a/src/daemon/monero_daemon_model.h
+++ b/src/daemon/monero_daemon_model.h
@@ -124,7 +124,7 @@ namespace monero {
     boost::optional<uint64_t> m_cumulative_difficulty;
     boost::optional<uint32_t> m_major_version;
     boost::optional<uint32_t> m_minor_version;
-    boost::optional<uint64_t> m_nonce;
+    boost::optional<uint32_t> m_nonce;
     boost::optional<string> m_miner_tx_id;
     boost::optional<uint32_t> m_num_txs;
     boost::optional<bool> m_orphan_status;
@@ -176,8 +176,8 @@ namespace monero {
     boost::optional<string> m_pruned_hex;
     boost::optional<string> m_prunable_hex;
     boost::optional<string> m_prunable_hash;
-    boost::optional<uint32_t> m_size;
-    boost::optional<uint32_t> m_weight;
+    boost::optional<uint64_t> m_size;
+    boost::optional<uint64_t> m_weight;
     vector<shared_ptr<monero_output>> m_vins;
     vector<shared_ptr<monero_output>> m_vouts;
     vector<uint32_t> m_output_indices;
@@ -188,9 +188,9 @@ namespace monero {
     boost::optional<string> m_rct_sig_prunable;  // TODO: implement
     boost::optional<bool> m_is_kept_by_block;
     boost::optional<bool> m_is_failed;
-    boost::optional<uint32_t> m_last_failed_height;
+    boost::optional<uint64_t> m_last_failed_height;
     boost::optional<string> m_last_failed_id;
-    boost::optional<uint32_t> m_max_used_block_height;
+    boost::optional<uint64_t> m_max_used_block_height;
     boost::optional<string> m_max_used_block_id;
     vector<string> m_signatures;
 
diff --git a/src/wallet/monero_wallet_model.h b/src/wallet/monero_wallet_model.h
index 3a8698b..9487eb2 100644
--- a/src/wallet/monero_wallet_model.h
+++ b/src/wallet/monero_wallet_model.h
@@ -84,7 +84,7 @@ namespace monero {
     boost::optional<uint64_t> m_unlocked_balance;
     boost::optional<uint32_t> m_num_unspent_outputs;
     boost::optional<bool> m_is_used;
-    boost::optional<uint32_t> m_num_blocks_to_unlock;
+    boost::optional<uint64_t> m_num_blocks_to_unlock;
 //    BEGIN_KV_SERIALIZE_MAP()
 //      KV_SERIALIZE(m_account_index)
 //      KV_SERIALIZE(index)
@@ -149,7 +149,7 @@ namespace monero {
     shared_ptr<monero_tx_wallet> m_tx;
     boost::optional<uint64_t> m_amount;
     boost::optional<uint32_t> m_account_index;
-    boost::optional<uint32_t> m_num_suggested_confirmations;
+    boost::optional<uint64_t> m_num_suggested_confirmations;
 
     virtual boost::optional<bool> is_incoming() const = 0;  // derived class must implement
     shared_ptr<monero_transfer> copy(const shared_ptr<monero_transfer>& src, const shared_ptr<monero_transfer>& tgt) const;