#345 added ability to rescan utxo

BeamMW · Jan 19, 2019 · 025e9e6 · 025e9e6
1 parent 4971eef
commit 025e9e6
Show file tree

Hide file tree

Showing 12 changed files with 104 additions and 10 deletions.
diff --git a/android/jni.cpp b/android/jni.cpp
@@ -339,6 +339,8 @@ namespace
         }
 
         void getNetworkStatus() override {}
+
+        void refresh() override {}
     };
 
     static JavaVM* JVM = NULL;
@@ -621,6 +623,7 @@ namespace
         void setNodeAddress(const std::string& addr) override {}
         void changeWalletPassword(const beam::SecString& password) override {}
         void getNetworkStatus() override {}
+        void refresh() override {}
 
         ///////////////////////////////////////////////
         // callbacks

diff --git a/ui/model/wallet_model.cpp b/ui/model/wallet_model.cpp
@@ -208,6 +208,14 @@ struct WalletModelBridge : public Bridge<IWalletModelAsync>
             receiver_.getNetworkStatus();
         });
     }
+
+    void refresh() override
+    {
+        tx.send([](BridgeInterface& receiver_) mutable
+        {
+            receiver_.refresh();
+        });
+    }
 };
 
 WalletModel::WalletModel(IWalletDB::Ptr walletDB, const std::string& nodeAddr)
@@ -677,6 +685,23 @@ void WalletModel::getNetworkStatus()
     emit nodeConnectionChanged(_isConnected);
 }
 
+void WalletModel::refresh()
+{
+    try
+    {
+        assert(!_wallet.expired());
+        auto s = _wallet.lock();
+        if (s)
+        {
+            s->Refresh();
+        }
+    }
+    catch (...)
+    {
+
+    }
+}
+
 bool WalletModel::check_receiver_address(const std::string& addr)
 {
     WalletID walletID;

diff --git a/ui/model/wallet_model.h b/ui/model/wallet_model.h
@@ -99,6 +99,7 @@ class WalletModel
     void setNodeAddress(const std::string& addr) override;
     void changeWalletPassword(const beam::SecString& password) override;
     void getNetworkStatus() override;
+    void refresh() override;
 
     void onNodeConnectedStatusChanged(bool isNodeConnected);
     void onNodeConnectionFailed(const beam::proto::NodeConnection::DisconnectReason&);

diff --git a/ui/view/settings.qml b/ui/view/settings.qml
@@ -356,6 +356,20 @@ Rectangle {
                     }
                 }
 
+                ConfirmationDialog {
+                    id: confirmRefreshDialog
+                    property bool canRefresh: true
+                    okButtonText: qsTr("yes")
+                    okButtonIconSource: "qrc:/assets/icon-done.svg"
+                    cancelVisible: false
+                    width: 460
+                    text: qsTr("Rescan will update transaction and UTXO data in your wallet and get latest information from the blockchain. Are you sure?")
+                    onAccepted: {
+                        canRefresh = false;
+                        viewModel.refreshWallet();
+                    }
+                }
+
                 ColumnLayout {
                     Layout.fillWidth: true
                     Layout.fillHeight: true
@@ -489,12 +503,26 @@ Rectangle {
                                     wrapMode: Text.WordWrap
                                 }
                             }                        
-
-                            CustomButton {
-                                text: "save wallet logs"
-                                palette.buttonText : "white"
-                                palette.button: "#708090"
-                                onClicked: viewModel.reportProblem()
+                            RowLayout {
+                                Layout.fillWidth: true
+                                CustomButton {
+                                    text: "save wallet logs"
+                                    palette.buttonText : "white"
+                                    palette.button: "#708090"
+                                    onClicked: viewModel.reportProblem()
+                                }
+                                spacing: 30
+                                CustomButton {
+                                    icon.source: "qrc:/assets/icon-restore.svg"
+                                    Layout.alignment: Qt.AlignRight
+				                    text: qsTr("rescan")
+                                    palette.button: "#708090"
+                                    palette.buttonText : localNodeRun.checked ? Style.white : Style.disable_text_color
+                                    enabled: localNodeRun.checked && confirmRefreshDialog.canRefresh
+                                    onClicked: {
+                                        confirmRefreshDialog.open();
+                                    }
+                                }
                             }
 
                             SFText {

diff --git a/ui/viewmodel/settings_view.cpp b/ui/viewmodel/settings_view.cpp
@@ -229,6 +229,11 @@ bool SettingsViewModel::hasSupportedGpu()
 #endif
 }
 
+void SettingsViewModel::refreshWallet()
+{
+    AppModel::getInstance()->getWallet()->getAsync()->refresh();
+}
+
 #ifdef BEAM_USE_GPU
 
 vector<int32_t> SettingsViewModel::getSelectedDevice() const

diff --git a/ui/viewmodel/settings_view.h b/ui/viewmodel/settings_view.h
@@ -96,6 +96,7 @@ class SettingsViewModel : public QObject
     Q_INVOKABLE void copyToClipboard(const QString& text);
     Q_INVOKABLE bool showUseGpu() const;
     Q_INVOKABLE bool hasSupportedGpu();
+    Q_INVOKABLE void refreshWallet();
 
 private:
 #ifdef BEAM_USE_GPU

diff --git a/utility/options.cpp b/utility/options.cpp
@@ -91,6 +91,7 @@ namespace beam
         const char* WALLET_ADDR = "address";
         const char* CHANGE_ADDRESS_EXPIRATION = "change_address_expiration";
         const char* WALLET_ADDRESS_LIST = "address_list";
+        const char* WALLET_REFRESH = "refresh";
 #if defined(BEAM_USE_GPU)
         const char* MINER_TYPE = "miner_type";
 #endif
@@ -185,7 +186,7 @@ namespace beam
             (cli::WALLET_ADDR, po::value<string>()->default_value("*"), "wallet address")
 			(cli::PAYMENT_PROOF_DATA, po::value<string>(), "payment proof data to verify")
 			(cli::PAYMENT_PROOF_REQUIRED, po::value<bool>(), "Set to disallow outgoing payments if the receiver doesn't supports the payment proof (older wallets)")
-            (cli::COMMAND, po::value<string>(), "command to execute [new_addr|send|receive|listen|init|restore|info|export_miner_key|export_owner_key|generate_phrase|change_address_expiration|address_list]");
+            (cli::COMMAND, po::value<string>(), "command to execute [new_addr|send|receive|listen|init|restore|info|export_miner_key|export_owner_key|generate_phrase|change_address_expiration|address_list|refresh]");
 
         po::options_description wallet_treasury_options("Wallet treasury options");
         wallet_treasury_options.add_options()

diff --git a/utility/options.h b/utility/options.h
@@ -90,6 +90,7 @@ namespace beam
         extern const char* WALLET_ADDR;
         extern const char* CHANGE_ADDRESS_EXPIRATION;
         extern const char* WALLET_ADDRESS_LIST;
+        extern const char* WALLET_REFRESH;
 #if defined(BEAM_USE_GPU)
         extern const char* MINER_TYPE;
 #endif

diff --git a/wallet/cli.cpp b/wallet/cli.cpp
@@ -603,7 +603,8 @@ int main_impl(int argc, char* argv[])
                             && command != cli::PAYMENT_PROOF_EXPORT
                             && command != cli::PAYMENT_PROOF_VERIFY
                             && command != cli::GENERATE_PHRASE
-                            && command != cli::WALLET_ADDRESS_LIST)
+                            && command != cli::WALLET_ADDRESS_LIST
+                            && command != cli::WALLET_REFRESH)
                         {
                             LOG_ERROR() << "unknown command: \'" << command << "\'";
                             return -1;
@@ -981,6 +982,11 @@ int main_impl(int argc, char* argv[])
                             }
                         }
 
+                        if (command == cli::WALLET_REFRESH)
+                        {
+                            wallet.Refresh();
+                        }
+
                         io::Reactor::get_Current().run();
 
                     }

diff --git a/wallet/wallet.cpp b/wallet/wallet.cpp
@@ -283,6 +283,26 @@ namespace beam
         return txID;
     }
 
+    void Wallet::Refresh()
+    {
+        SetUtxoEventsHeight(0);
+        RequestUtxoEvents();
+    }
+
+    void Wallet::RefreshTransactions()
+    {
+  /*      auto txs = m_WalletDB->getTxHistory();
+        for (auto& tx : txs)
+        {
+            if (m_Transactions.find(tx.m_txId) == m_Transactions.end())
+            {
+                auto t = constructTransaction(tx.m_txId, TxType::Simple);
+                if (t->GetParameter())
+                m_Transactions.emplace(tx.m_txId, t);
+            }
+        }*/
+    }
+
     void Wallet::ResumeTransaction(const TxDescription& tx)
     {
         if (tx.canResume() && m_Transactions.find(tx.m_txId) == m_Transactions.end())

diff --git a/wallet/wallet.h b/wallet/wallet.h
@@ -66,8 +66,7 @@ namespace beam
         boost::optional<TxID> transfer_money(const WalletID& from, const WalletID& to, const AmountList& amountList, Amount fee = 0, bool sender = true, Height lifetime = 120, ByteBuffer&& message = {});
         boost::optional<TxID> split_coins(const WalletID& from, const AmountList& amountList, Amount fee = 0, bool sender = true, Height lifetime = 120, ByteBuffer&& message = {});
         TxID swap_coins(const WalletID& from, const WalletID& to, Amount amount, Amount fee, wallet::AtomicSwapCoin swapCoin, Amount swapAmount);
-        void ResumeTransaction(const TxDescription& tx);
-        void ResumeAllTransactions();
+        void Refresh();
 
         // IWallet
         void subscribe(IWalletObserver* observer) override;
@@ -76,6 +75,9 @@ namespace beam
         void delete_tx(const TxID& txId) override;
 
     private:
+        void RefreshTransactions();
+        void ResumeTransaction(const TxDescription& tx);
+        void ResumeAllTransactions();
         void on_tx_completed(const TxID& txID) override;
 
         void confirm_outputs(const std::vector<Coin>&) override;

diff --git a/wallet/wallet_model_async.h b/wallet/wallet_model_async.h
@@ -42,6 +42,7 @@ struct IWalletModelAsync
     virtual void changeWalletPassword(const beam::SecString& password) = 0;
 
     virtual void getNetworkStatus() = 0;
+    virtual void refresh() = 0;
 
     virtual ~IWalletModelAsync() {}
 };