Merge pull request #17 from cypherstack/staging

Staging

Author: julian-CStack

cw_monero/ios/Classes/monero_api.cpp

@@ -358,23 +358,23 @@ int storeTime = 0;
 bool priorityInQueue = false;
 
 Future<bool> store({bool prioritySave = false}) async {
-  if (priorityInQueue) {
-    return false;
-  }
-  print(
-      "${DateTime.now().millisecondsSinceEpoch} $prioritySave $priorityInQueue");
-  if (DateTime.now().millisecondsSinceEpoch < storeTime + 90000 &&
-      prioritySave) {
-    priorityInQueue = true;
-    await Future.delayed(Duration(seconds: 1));
-    priorityInQueue = false;
-    return store(prioritySave: prioritySave);
-  } else if (DateTime.now().millisecondsSinceEpoch < storeTime + 90000 &&
-      !prioritySave) {
-    return false;
-  }
-  print("released $storeTime");
-  storeTime = DateTime.now().millisecondsSinceEpoch;
+  // if (priorityInQueue) {
+  //   return false;
+  // }
+  // print(
+  //     "${DateTime.now().millisecondsSinceEpoch} $prioritySave $priorityInQueue");
+  // if (DateTime.now().millisecondsSinceEpoch < storeTime + 90000 &&
+  //     prioritySave) {
+  //   priorityInQueue = true;
+  //   await Future.delayed(Duration(seconds: 1));
+  //   priorityInQueue = false;
+  //   return store(prioritySave: prioritySave);
+  // } else if (DateTime.now().millisecondsSinceEpoch < storeTime + 90000 &&
+  //     !prioritySave) {
+  //   return false;
+  // }
+  // print("released $storeTime");
+  // storeTime = DateTime.now().millisecondsSinceEpoch;
   await compute<int, void>(_storeSync, 0);
   return true;
 }

cw_monero/lib/api/wallet.dart

@@ -89,6 +89,18 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
   late bool _hasSyncAfterStartup;
   Timer? _autoSaveTimer;
 
+  void Function()? _onNewBlock1;
+  void Function()? _onNewTransaction1;
+  void Function()? _syncStatusChanged1;
+
+  void Function()? get onNewBlock => _onNewBlock1;
+  void Function()? get onNewTransaction => _onNewTransaction1;
+  void Function()? get syncStatusChanged => _syncStatusChanged1;
+
+  set onNewBlock(void Function()? cb) => _onNewBlock1 = cb;
+  set onNewTransaction(void Function()? cb) => _onNewTransaction1 = cb;
+  set syncStatusChanged(void Function()? cb) => _syncStatusChanged1 = cb;
+
   Future<void> init() async {
     await walletAddresses.init();
     balance = ObservableMap<CryptoCurrency?, MoneroBalance>.of(<CryptoCurrency?,
@@ -126,15 +138,18 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
   Future<void> connectToNode({required Node node}) async {
     try {
       syncStatus = ConnectingSyncStatus();
+      syncStatusChanged?.call();
       await monero_wallet.setupNode(
           address: node.uri.toString(),
           login: node.login,
           password: node.password,
           useSSL: node.isSSL,
           isLightWallet: false); // FIXME: hardcoded value
       syncStatus = ConnectedSyncStatus();
+      syncStatusChanged?.call();
     } catch (e) {
       syncStatus = FailedSyncStatus();
+      syncStatusChanged?.call();
       print(e);
     }
   }
@@ -150,8 +165,10 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
       monero_wallet.startRefresh();
       _setListeners();
       _listener?.start();
+      syncStatusChanged?.call();
     } catch (e) {
       syncStatus = FailedSyncStatus();
+      syncStatusChanged?.call();
       print(e);
       rethrow;
     }
@@ -404,6 +421,7 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
         _askForUpdateBalance();
         walletAddresses.accountList.update();
         syncStatus = SyncedSyncStatus();
+        syncStatusChanged?.call();
 
         if (!_hasSyncAfterStartup) {
           _hasSyncAfterStartup = true;
@@ -415,10 +433,12 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
         }
       } else {
         syncStatus = SyncingSyncStatus(blocksLeft, ptc, height);
+        syncStatusChanged?.call();
       }
     } catch (e) {
       print(e.toString());
     }
+    onNewBlock?.call();
   }
 
   void _onNewTransaction() async {
@@ -429,5 +449,6 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
     } catch (e) {
       print(e.toString());
     }
+    onNewTransaction?.call();
   }
 }