From e8f31b40ca376a4f18e1a52463f73d9a70527ecd Mon Sep 17 00:00:00 2001 From: Khushboo Mehta Date: Fri, 6 Mar 2026 00:19:53 +0000 Subject: [PATCH] fix: sync to block fixes --- flake.lock | 204 ++++++++++++++++++++++++++++----------- src/LEZWalletBackend.cpp | 8 +- src/LEZWalletBackend.h | 12 +-- 3 files changed, 160 insertions(+), 64 deletions(-) diff --git a/flake.lock b/flake.lock index 3954010..5fb4d06 100644 --- a/flake.lock +++ b/flake.lock @@ -498,11 +498,11 @@ "nixpkgs": "nixpkgs_29" }, "locked": { - "lastModified": 1770132997, - "narHash": "sha256-Iv0QMXMD6kf+y2Qx37jXR7Ik6h1dqOzuxBzCdc5S6KA=", + "lastModified": 1772028960, + "narHash": "sha256-BDWFjaKeoJW8oWDlPphNINt5U3P1xt1z1Y4f9jyC7uU=", "owner": "logos-co", "repo": "logos-cpp-sdk", - "rev": "30ef7986f4b65b7dcf43af84bb073233b1b77821", + "rev": "95f763b48d74bcdc63093b05159f43500cab139e", "type": "github" }, "original": { @@ -552,11 +552,11 @@ "nixpkgs": "nixpkgs_32" }, "locked": { - "lastModified": 1767724329, - "narHash": "sha256-UPkqxqxbKwU5Dmu00TnjiJVXUmfVylF3p1qziEuYwIE=", + "lastModified": 1772028960, + "narHash": "sha256-BDWFjaKeoJW8oWDlPphNINt5U3P1xt1z1Y4f9jyC7uU=", "owner": "logos-co", "repo": "logos-cpp-sdk", - "rev": "32f1d7080d784ff044d91d076ef2f0c7305d4784", + "rev": "95f763b48d74bcdc63093b05159f43500cab139e", "type": "github" }, "original": { @@ -585,7 +585,7 @@ }, "logos-cpp-sdk_26": { "inputs": { - "nixpkgs": "nixpkgs_34" + "nixpkgs": "nixpkgs_36" }, "locked": { "lastModified": 1761230734, @@ -603,7 +603,7 @@ }, "logos-cpp-sdk_27": { "inputs": { - "nixpkgs": "nixpkgs_35" + "nixpkgs": "nixpkgs_37" }, "locked": { "lastModified": 1761230734, @@ -621,7 +621,7 @@ }, "logos-cpp-sdk_28": { "inputs": { - "nixpkgs": "nixpkgs_36" + "nixpkgs": "nixpkgs_38" }, "locked": { "lastModified": 1767724329, @@ -639,7 +639,7 @@ }, "logos-cpp-sdk_29": { "inputs": { - "nixpkgs": "nixpkgs_37" + "nixpkgs": "nixpkgs_39" }, "locked": { "lastModified": 1767724329, @@ -675,7 +675,7 @@ }, "logos-cpp-sdk_30": { "inputs": { - "nixpkgs": "nixpkgs_40" + "nixpkgs": "nixpkgs_42" }, "locked": { "lastModified": 1761230734, @@ -693,7 +693,7 @@ }, "logos-cpp-sdk_31": { "inputs": { - "nixpkgs": "nixpkgs_41" + "nixpkgs": "nixpkgs_43" }, "locked": { "lastModified": 1761230734, @@ -711,7 +711,7 @@ }, "logos-cpp-sdk_32": { "inputs": { - "nixpkgs": "nixpkgs_42" + "nixpkgs": "nixpkgs_44" }, "locked": { "lastModified": 1767724329, @@ -729,7 +729,7 @@ }, "logos-cpp-sdk_33": { "inputs": { - "nixpkgs": "nixpkgs_43" + "nixpkgs": "nixpkgs_45" }, "locked": { "lastModified": 1767724329, @@ -908,11 +908,11 @@ ] }, "locked": { - "lastModified": 1772547606, - "narHash": "sha256-l/kus40fdENA3kXS7oWnMfFFv69SDEvOBaOzwNvSBZQ=", + "lastModified": 1772755844, + "narHash": "sha256-N0TBNiGiD95OwTgDVc4Ka48G9KiOCgoA7jaJBbmOImc=", "owner": "logos-blockchain", "repo": "logos-execution-zone-module", - "rev": "f20ef94e35c3deb806479ececcf11087729c452e", + "rev": "1f04c5e6990f1fd8d20003f9e7e52134662dd137", "type": "github" }, "original": { @@ -950,6 +950,8 @@ "logos-capability-module": "logos-capability-module_6", "logos-cpp-sdk": "logos-cpp-sdk_24", "logos-module": "logos-module_4", + "nix-bundle-appimage": "nix-bundle-appimage_3", + "nix-bundle-dir": "nix-bundle-dir_6", "nixpkgs": [ "logos-package-manager", "logos-liblogos", @@ -958,11 +960,11 @@ ] }, "locked": { - "lastModified": 1771871578, - "narHash": "sha256-6Mu3cmdhd8e7i+n8OWcaIBye+i12gwlwt1fhd9QCbCI=", + "lastModified": 1772115748, + "narHash": "sha256-sPdAuYiLOjsulrk+uKMT7EG05ZlGT7OYEpgUh+f0nME=", "owner": "logos-co", "repo": "logos-liblogos", - "rev": "19d29d4ef99292d9285b3a561cb7ea8029be3b74", + "rev": "07780444deb99f10e600247e3696ba495f2f071a", "type": "github" }, "original": { @@ -1431,11 +1433,11 @@ ] }, "locked": { - "lastModified": 1770062426, - "narHash": "sha256-zc7ZxDTlqOCYGyEHhrTA/7GS1EWh7+4amdPUKh+gGds=", + "lastModified": 1770999556, + "narHash": "sha256-anpsEniGTTwUAwknRxjaT9GP4avHzIsolEHdHDTV9rM=", "owner": "logos-co", "repo": "logos-module", - "rev": "f7ee69d9ad9f27c84f04f59896e9194125e951dc", + "rev": "d1b35f335f938bb5de21a2a6010f1104075bdb1c", "type": "github" }, "original": { @@ -1546,8 +1548,8 @@ "logos-cpp-sdk": "logos-cpp-sdk_21", "logos-liblogos": "logos-liblogos_10", "logos-package": "logos-package_2", - "nix-bundle-appimage": "nix-bundle-appimage_3", - "nix-bundle-dir": "nix-bundle-dir_6", + "nix-bundle-appimage": "nix-bundle-appimage_4", + "nix-bundle-dir": "nix-bundle-dir_8", "nixpkgs": [ "logos-package-manager", "logos-liblogos", @@ -1555,11 +1557,11 @@ ] }, "locked": { - "lastModified": 1772062300, - "narHash": "sha256-4a5Xspql1NU/JhXoppeOxsLN3Heceemj1xFuEsjMESc=", + "lastModified": 1772720108, + "narHash": "sha256-KlNiJAjXiN90D+6i1pUoFIZWNYO77vj1dxC00sjnZvs=", "owner": "logos-co", "repo": "logos-package-manager-module", - "rev": "fc5e236b6a1c994c57d21f6e9937ce3dbfbe11e6", + "rev": "352317e12fc3d298ff1874c03caf9d7b21c5bfac", "type": "github" }, "original": { @@ -1579,11 +1581,11 @@ ] }, "locked": { - "lastModified": 1771887671, - "narHash": "sha256-eIzmR3N5QnR5lcBT3N58v49ggl9MzUYSRgQznex1ayM=", + "lastModified": 1772710235, + "narHash": "sha256-QJgetqq0PWKbQXuMw8Z+SHqyk+40P3830lUhgVVL4Kc=", "owner": "logos-co", "repo": "logos-package", - "rev": "d9a741359b17b928afae59cf3c6ee00057b7d93e", + "rev": "02fae070cc5e404f6447cc57760b748d246357ab", "type": "github" }, "original": { @@ -1657,7 +1659,26 @@ "nix-bundle-appimage_3": { "inputs": { "nix-bundle-dir": "nix-bundle-dir_5", - "nixpkgs": "nixpkgs_38" + "nixpkgs": "nixpkgs_34" + }, + "locked": { + "lastModified": 1772047346, + "narHash": "sha256-RUsTUxKCxuQ3+D2LfBbK0EX1vF7HNMkpWgOGFfZbrEg=", + "owner": "logos-co", + "repo": "nix-bundle-appimage", + "rev": "4d68437c97ac59c3c70c1b2b116235c434d571a8", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "nix-bundle-appimage", + "type": "github" + } + }, + "nix-bundle-appimage_4": { + "inputs": { + "nix-bundle-dir": "nix-bundle-dir_7", + "nixpkgs": "nixpkgs_40" }, "locked": { "lastModified": 1772063926, @@ -1758,6 +1779,7 @@ "inputs": { "nixpkgs": [ "logos-package-manager", + "logos-liblogos", "nix-bundle-appimage", "nixpkgs" ] @@ -1778,7 +1800,7 @@ }, "nix-bundle-dir_6": { "inputs": { - "nixpkgs": "nixpkgs_39" + "nixpkgs": "nixpkgs_35" }, "locked": { "lastModified": 1771971384, @@ -1796,7 +1818,47 @@ }, "nix-bundle-dir_7": { "inputs": { - "nixpkgs": "nixpkgs_44" + "nixpkgs": [ + "logos-package-manager", + "nix-bundle-appimage", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1771971384, + "narHash": "sha256-fq0H+sxQhkGN054jdN+ZfHZibbOjHA+KD5SpRH78T1g=", + "owner": "logos-co", + "repo": "nix-bundle-dir", + "rev": "1ecb9662145a1ad84007a970b4bef50a4af159c9", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "nix-bundle-dir", + "type": "github" + } + }, + "nix-bundle-dir_8": { + "inputs": { + "nixpkgs": "nixpkgs_41" + }, + "locked": { + "lastModified": 1771971384, + "narHash": "sha256-fq0H+sxQhkGN054jdN+ZfHZibbOjHA+KD5SpRH78T1g=", + "owner": "logos-co", + "repo": "nix-bundle-dir", + "rev": "1ecb9662145a1ad84007a970b4bef50a4af159c9", + "type": "github" + }, + "original": { + "owner": "logos-co", + "repo": "nix-bundle-dir", + "type": "github" + } + }, + "nix-bundle-dir_9": { + "inputs": { + "nixpkgs": "nixpkgs_46" }, "locked": { "lastModified": 1771971384, @@ -1815,8 +1877,8 @@ "nix-bundle-lgx": { "inputs": { "logos-package": "logos-package_3", - "nix-bundle-dir": "nix-bundle-dir_7", - "nixpkgs": "nixpkgs_45" + "nix-bundle-dir": "nix-bundle-dir_9", + "nixpkgs": "nixpkgs_47" }, "locked": { "lastModified": 1772710643, @@ -2266,11 +2328,11 @@ }, "nixpkgs_34": { "locked": { - "lastModified": 1759036355, - "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "lastModified": 1771848320, + "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "rev": "2fc6539b481e1d2569f25f8799236694180c0993", "type": "github" }, "original": { @@ -2282,11 +2344,11 @@ }, "nixpkgs_35": { "locked": { - "lastModified": 1759036355, - "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", "type": "github" }, "original": { @@ -2330,11 +2392,11 @@ }, "nixpkgs_38": { "locked": { - "lastModified": 1771848320, - "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fc6539b481e1d2569f25f8799236694180c0993", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", "type": "github" }, "original": { @@ -2346,11 +2408,11 @@ }, "nixpkgs_39": { "locked": { - "lastModified": 1770562336, - "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", "type": "github" }, "original": { @@ -2378,11 +2440,11 @@ }, "nixpkgs_40": { "locked": { - "lastModified": 1759036355, - "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "lastModified": 1771848320, + "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "rev": "2fc6539b481e1d2569f25f8799236694180c0993", "type": "github" }, "original": { @@ -2394,11 +2456,11 @@ }, "nixpkgs_41": { "locked": { - "lastModified": 1759036355, - "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", "type": "github" }, "original": { @@ -2441,6 +2503,38 @@ } }, "nixpkgs_44": { + "locked": { + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_45": { + "locked": { + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_46": { "locked": { "lastModified": 1770562336, "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", @@ -2456,7 +2550,7 @@ "type": "github" } }, - "nixpkgs_45": { + "nixpkgs_47": { "locked": { "lastModified": 1772542754, "narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=", diff --git a/src/LEZWalletBackend.cpp b/src/LEZWalletBackend.cpp index 4e5b7e3..a14e4b0 100644 --- a/src/LEZWalletBackend.cpp +++ b/src/LEZWalletBackend.cpp @@ -137,6 +137,8 @@ void LEZWalletBackend::refreshAccounts() void LEZWalletBackend::refreshBalances() { + refreshBlockHeights(); + syncToBlock(m_currentBlockHeight); if (!m_walletClient || !m_accountModel) return; for (int i = 0; i < m_accountModel->count(); ++i) { const QModelIndex idx = m_accountModel->index(i, 0); @@ -149,8 +151,8 @@ void LEZWalletBackend::refreshBalances() void LEZWalletBackend::fetchAndUpdateBlockHeights() { if (!m_walletClient) return; - const quint64 lastVal = m_walletClient->invokeRemoteMethod(WALLET_MODULE_NAME, "get_last_synced_block").toULongLong(); - const quint64 currentVal = m_walletClient->invokeRemoteMethod(WALLET_MODULE_NAME, "get_current_block_height").toULongLong(); + const int lastVal = m_walletClient->invokeRemoteMethod(WALLET_MODULE_NAME, "get_last_synced_block").toInt(); + const int currentVal = m_walletClient->invokeRemoteMethod(WALLET_MODULE_NAME, "get_current_block_height").toInt(); if (m_lastSyncedBlock != lastVal) { m_lastSyncedBlock = lastVal; emit lastSyncedBlockChanged(); @@ -266,7 +268,7 @@ QString LEZWalletBackend::transferPrivate( } QVariant result = m_walletClient->invokeRemoteMethod( - WALLET_MODULE_NAME, "transfer_private", fromHex, keysPayload, amountHex); + WALLET_MODULE_NAME, "transfer_private", fromHex, keysPayload, amountHex, Timeout(6*60*1000)); // 6 minutes timeout return result.isValid() ? result.toString() : QStringLiteral("Error: Call failed."); } diff --git a/src/LEZWalletBackend.h b/src/LEZWalletBackend.h index 16242aa..d4e2cb5 100644 --- a/src/LEZWalletBackend.h +++ b/src/LEZWalletBackend.h @@ -18,8 +18,8 @@ public: Q_PROPERTY(QString storagePath READ storagePath WRITE setStoragePath NOTIFY storagePathChanged) Q_PROPERTY(LEZWalletAccountModel* accountModel READ accountModel NOTIFY accountModelChanged) Q_PROPERTY(LEZAccountFilterModel* filteredAccountModel READ filteredAccountModel NOTIFY filteredAccountModelChanged) - Q_PROPERTY(quint64 lastSyncedBlock READ lastSyncedBlock NOTIFY lastSyncedBlockChanged) - Q_PROPERTY(quint64 currentBlockHeight READ currentBlockHeight NOTIFY currentBlockHeightChanged) + Q_PROPERTY(int lastSyncedBlock READ lastSyncedBlock NOTIFY lastSyncedBlockChanged) + Q_PROPERTY(int currentBlockHeight READ currentBlockHeight NOTIFY currentBlockHeightChanged) Q_PROPERTY(QString sequencerAddr READ sequencerAddr NOTIFY sequencerAddrChanged) explicit LEZWalletBackend(LogosAPI* logosAPI = nullptr, QObject* parent = nullptr); @@ -30,8 +30,8 @@ public: QString storagePath() const { return m_storagePath; } LEZWalletAccountModel* accountModel() const { return m_accountModel; } LEZAccountFilterModel* filteredAccountModel() const { return m_filteredAccountModel; } - quint64 lastSyncedBlock() const { return m_lastSyncedBlock; } - quint64 currentBlockHeight() const { return m_currentBlockHeight; } + int lastSyncedBlock() const { return m_lastSyncedBlock; } + int currentBlockHeight() const { return m_currentBlockHeight; } QString sequencerAddr() const { return m_sequencerAddr; } void setConfigPath(const QString& path); @@ -82,8 +82,8 @@ private: QString m_storagePath; LEZWalletAccountModel* m_accountModel; LEZAccountFilterModel* m_filteredAccountModel; - quint64 m_lastSyncedBlock; - quint64 m_currentBlockHeight; + int m_lastSyncedBlock; + int m_currentBlockHeight; QString m_sequencerAddr; LogosAPI* m_logosAPI;