Merge pull request #259 from layters/backup

backup

README.md

@@ -25,8 +25,6 @@ NeroShop is a decentralized peer-to-peer marketplace for trading goods and servi
 
 
 ## Demo
-https://user-images.githubusercontent.com/58671384/219222567-f170f728-be31-43d5-b412-1f456a682bd3.mp4
-
 <details>
 <summary>Click to load images</summary>
     

qml/pages/MainPage.qml

@@ -534,7 +534,7 @@ Page {
                             id: walletRestoreHeightField
                             Layout.fillWidth: true
                             Layout.preferredHeight: 50
-                            placeholderText: qsTr("Restore Height (default: 1570000)"); placeholderTextColor: (NeroshopComponents.Style.darkTheme) ? "#a9a9a9" : "#696969"
+                            placeholderText: qsTr("Restore Height (default: 1580000)"); placeholderTextColor: (NeroshopComponents.Style.darkTheme) ? "#a9a9a9" : "#696969"
                             color: (NeroshopComponents.Style.darkTheme) ? "#ffffff" : "#000000" // textColor
                             selectByMouse: true
                             validator: RegExpValidator{ regExp: /[0-9]*/ }

src/core/wallet/monero/monero.cpp

@@ -427,6 +427,10 @@ std::string neroshop::MoneroWallet::get_seed_language() const {
     return monero_wallet_obj->get_seed_language();
 }
 //-------------------------------------------------------
+std::vector<std::string> neroshop::MoneroWallet::get_seed_languages() const {
+    return monero::monero_wallet_full::get_seed_languages();
+}
+//-------------------------------------------------------
 //-------------------------------------------------------
 std::string neroshop::MoneroWallet::get_path() const {
     if(!monero_wallet_obj.get()) throw std::runtime_error("monero_wallet_full is not opened");

src/core/wallet/monero/monero.hpp

@@ -60,6 +60,7 @@ public:
     
     std::string get_seed() const override;
     std::string get_seed_language() const override;
+    std::vector<std::string> get_seed_languages() const override;
     
     std::string get_path() const override;
     

src/core/wallet/wallet.cpp

@@ -138,7 +138,7 @@ int neroshop::Wallet::restore_from_seed(const std::string& seed, uint64_t restor
     wallet_config_obj.m_password = "";
     wallet_config_obj.m_network_type = static_cast<monero::monero_network_type>(Wallet::network_type);
     wallet_config_obj.m_seed = seed;
-    wallet_config_obj.m_restore_height = (restore_height == 0) ? 1570000 : restore_height;//1570000 (stagenet);3120000 (mainnet)
+    wallet_config_obj.m_restore_height = (restore_height == 0) ? 1580000 : restore_height;//1580000 (stagenet);3120000 (mainnet)
     
     try {
         monero_wallet_obj = std::unique_ptr<monero_wallet_full>(monero_wallet_full::create_wallet (wallet_config_obj, nullptr));
@@ -1140,8 +1140,15 @@ std::string neroshop::Wallet::get_seed_language() const {
     }
 }
 //-------------------------------------------------------
-std::vector<std::string> neroshop::Wallet::get_seed_languages() {
-    return monero::monero_wallet_full::get_seed_languages();
+std::vector<std::string> neroshop::Wallet::get_seed_languages() const {
+    switch(wallet_type) {
+        case WalletType::Monero:
+            return monero::monero_wallet_full::get_seed_languages();
+        case WalletType::Wownero:
+            return {};
+        default:
+            return {};
+    }
 }
 //-------------------------------------------------------
 //-------------------------------------------------------

src/core/wallet/wallet.hpp

@@ -164,7 +164,7 @@ public:
     
     virtual std::string get_seed() const;
     virtual std::string get_seed_language() const;
-    static std::vector<std::string> get_seed_languages();
+    virtual std::vector<std::string> get_seed_languages() const;
     
     virtual std::string get_path() const;
     std::string get_type() const; // "wallet_info": Normal, HW