Merge branch 'mweb' of https://github.com/cake-tech/cake_wallet into mweb-bg-sync

2024-11-17 09:47:35 +00:00 · 2024-07-26 10:46:36 -05:00 · 2024-07-26 10:46:36 -05:00 · 083810be99
commit 083810be99
parent d8309abb00 13aeaf2c01
6 changed files with 53 additions and 20 deletions
--- a/cw_bitcoin/lib/electrum_wallet.dart
+++ b/cw_bitcoin/lib/electrum_wallet.dart
@ -261,6 +261,7 @@ abstract class ElectrumWalletBase
  void Function(FlutterErrorDetails)? _onError;
  Timer? _autoSaveTimer;
  static const int _autoSaveInterval = 30;
+  StreamSubscription<dynamic>? _receiveStream;

  Future<void> init() async {
    await walletAddresses.init();
@ -312,7 +313,8 @@ abstract class ElectrumWalletBase
          isSingleScan: doSingleScan ?? false,
        ));

-    await for (var message in receivePort) {
+    _receiveStream?.cancel();
+    _receiveStream = receivePort.listen((var message) async {
      if (message is Map<String, ElectrumTransactionInfo>) {
        for (final map in message.entries) {
          final txid = map.key;
@ -378,7 +380,7 @@ abstract class ElectrumWalletBase
        syncStatus = message.syncStatus;
        await walletInfo.updateRestoreHeight(message.height);
      }
-    }
+    });
  }

  void _updateSilentAddressRecord(BitcoinSilentPaymentsUnspent unspent) {
@ -455,6 +457,7 @@ abstract class ElectrumWalletBase
    try {
      syncStatus = ConnectingSyncStatus();

+      await _receiveStream?.cancel();
      await electrumClient.close();

      electrumClient.onConnectionStatusChange = _onConnectionStatusChange;
@ -1141,6 +1144,7 @@ abstract class ElectrumWalletBase
  @override
  Future<void> close() async {
    try {
+      await _receiveStream?.cancel();
      await electrumClient.close();
    } catch (_) {}
    _autoSaveTimer?.cancel();
--- a/cw_mweb/lib/cw_mweb.dart
+++ b/cw_mweb/lib/cw_mweb.dart
@ -4,22 +4,30 @@ import 'cw_mweb_platform_interface.dart';
 import 'mwebd.pbgrpc.dart';

 class CwMweb {
+  static RpcClient? _rpcClient;
+  static ClientChannel? _clientChannel;
+
  static Future<RpcClient> stub() async {
    final appDir = await getApplicationSupportDirectory();
    int port = await CwMwebPlatform.instance.start(appDir.path) ?? 0;
-    return RpcClient(
-      ClientChannel('127.0.0.1',
-          port: port,
-          options: const ChannelOptions(
-            credentials: ChannelCredentials.insecure(),
-            keepAlive: ClientKeepAliveOptions(permitWithoutCalls: true),
-          ), channelShutdownHandler: () {
-        print("SHUTDOWN HANDLER CALLED @@@@@@@@@@@@@@@@@");
-      }),
-    );
+    _clientChannel = ClientChannel('127.0.0.1',
+        port: port,
+        options: const ChannelOptions(
+          credentials: ChannelCredentials.insecure(),
+          keepAlive: ClientKeepAliveOptions(permitWithoutCalls: true),
+        ));
+    _rpcClient = RpcClient(_clientChannel!);
+    return _rpcClient!;
  }

  static Future<void> stop() async {
    await CwMwebPlatform.instance.start("stop");
+    await cleanup();
+  }
+
+  static Future<void> cleanup() async {
+    await _clientChannel?.terminate();
+    _rpcClient = null;
+    _clientChannel = null;
  }
 }
--- a/ios/.gitignore
+++ b/ios/.gitignore
@ -30,3 +30,5 @@ Runner/GeneratedPluginRegistrant.*
 !default.mode2v3
 !default.pbxuser
 !default.perspectivev3
+
+Mwebd.xcframework
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -8,6 +8,8 @@ PODS:
    - Flutter
    - ReachabilitySwift
  - CryptoSwift (1.8.2)
+  - cw_mweb (0.0.1):
+    - Flutter
  - device_display_brightness (0.0.1):
    - Flutter
  - device_info_plus (0.0.1):
@ -94,6 +96,8 @@ PODS:
  - shared_preferences_foundation (0.0.1):
    - Flutter
    - FlutterMacOS
+  - sp_scanner (0.0.1):
+    - Flutter
  - SwiftProtobuf (1.26.0)
  - SwiftyGif (5.4.5)
  - Toast (4.1.1)
@ -113,6 +117,7 @@ DEPENDENCIES:
  - barcode_scan2 (from `.symlinks/plugins/barcode_scan2/ios`)
  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
  - CryptoSwift
+  - cw_mweb (from `.symlinks/plugins/cw_mweb/ios`)
  - device_display_brightness (from `.symlinks/plugins/device_display_brightness/ios`)
  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
  - devicelocale (from `.symlinks/plugins/devicelocale/ios`)
@ -132,6 +137,7 @@ DEPENDENCIES:
  - sensitive_clipboard (from `.symlinks/plugins/sensitive_clipboard/ios`)
  - share_plus (from `.symlinks/plugins/share_plus/ios`)
  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
+  - sp_scanner (from `.symlinks/plugins/sp_scanner/ios`)
  - uni_links (from `.symlinks/plugins/uni_links/ios`)
  - UnstoppableDomainsResolution (~> 4.0.0)
  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
@ -159,6 +165,8 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/barcode_scan2/ios"
  connectivity_plus:
    :path: ".symlinks/plugins/connectivity_plus/ios"
+  cw_mweb:
+    :path: ".symlinks/plugins/cw_mweb/ios"
  device_display_brightness:
    :path: ".symlinks/plugins/device_display_brightness/ios"
  device_info_plus:
@ -197,6 +205,8 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/share_plus/ios"
  shared_preferences_foundation:
    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
+  sp_scanner:
+    :path: ".symlinks/plugins/sp_scanner/ios"
  uni_links:
    :path: ".symlinks/plugins/uni_links/ios"
  url_launcher_ios:
@ -211,6 +221,7 @@ SPEC CHECKSUMS:
  BigInt: f668a80089607f521586bbe29513d708491ef2f7
  connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d
  CryptoSwift: c63a805d8bb5e5538e88af4e44bb537776af11ea
+  cw_mweb: 87af74f9659fed0c1a2cbfb44413f1070e79e3ae
  device_display_brightness: 1510e72c567a1f6ce6ffe393dcd9afd1426034f7
  device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
  devicelocale: b22617f40038496deffba44747101255cee005b0
@ -237,6 +248,7 @@ SPEC CHECKSUMS:
  sensitive_clipboard: d4866e5d176581536c27bb1618642ee83adca986
  share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
+  sp_scanner: eaa617fa827396b967116b7f1f43549ca62e9a12
  SwiftProtobuf: 5e8349171e7c2f88f5b9e683cb3cb79d1dc780b3
  SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
  Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@ -28,6 +28,9 @@
 		A3D5E17CC53DF13FA740DEFA /* RedeemSwap.swift in Resources */ = {isa = PBXBuildFile; fileRef = 9D2F2C9F2555316C95EE7EA3 /* RedeemSwap.swift */; settings = {ASSET_TAGS = (BreezSDK, ); }; };
 		B6C6E59403ACDE44724C12F4 /* ServiceConfig.swift in Resources */ = {isa = PBXBuildFile; fileRef = B3D5E78267F5F18D882FDC3B /* ServiceConfig.swift */; settings = {ASSET_TAGS = (BreezSDK, ); }; };
 		CE291CFE2C15DB9A00B9F709 /* WowneroWallet.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE291CFD2C15DB9A00B9F709 /* WowneroWallet.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		CEAFE49E2C539250009FF3AD /* Mwebd.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEAFE49D2C539250009FF3AD /* Mwebd.xcframework */; };
+		CEAFE49F2C539250009FF3AD /* Mwebd.xcframework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CEAFE49D2C539250009FF3AD /* Mwebd.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		CEAFE4A02C53926F009FF3AD /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = C58D93382C00FAC6004BCF69 /* libresolv.tbd */; };
 		CFEFC24F82F78FE747DF1D22 /* LnurlPayInfo.swift in Resources */ = {isa = PBXBuildFile; fileRef = 58C22CBD8C22B9D6023D59F8 /* LnurlPayInfo.swift */; settings = {ASSET_TAGS = (BreezSDK, ); }; };
 		D0D7A0D4E13F31C4E02E235B /* ReceivePayment.swift in Resources */ = {isa = PBXBuildFile; fileRef = 91C524F800843E0A3F17E004 /* ReceivePayment.swift */; settings = {ASSET_TAGS = (BreezSDK, ); }; };
 		D3AD73A327249AFE8F016A51 /* BreezSDK.swift in Resources */ = {isa = PBXBuildFile; fileRef = ABD6FCBB0F4244B090459128 /* BreezSDK.swift */; settings = {ASSET_TAGS = (BreezSDK, ); }; };
@ -43,6 +46,7 @@
 			files = (
 				CE291CFE2C15DB9A00B9F709 /* WowneroWallet.framework in CopyFiles */,
 				0C50DFB92BF3CB56002B0EB3 /* MoneroWallet.framework in CopyFiles */,
+				CEAFE49F2C539250009FF3AD /* Mwebd.xcframework in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -83,9 +87,10 @@
 		9F46EE5D2BC11178009318F5 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		ABD6FCBB0F4244B090459128 /* BreezSDK.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BreezSDK.swift; path = "../.symlinks/plugins/breez_sdk/ios/bindings-swift/Sources/BreezSDK/BreezSDK.swift"; sourceTree = "<group>"; };
 		AD0937B0140D5A4C24E73BEA /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
-		C58D93382C00FAC6004BCF69 /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; };
 		B3D5E78267F5F18D882FDC3B /* ServiceConfig.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ServiceConfig.swift; path = "../.symlinks/plugins/breez_sdk/ios/bindings-swift/Sources/BreezSDK/ServiceConfig.swift"; sourceTree = "<group>"; };
+		C58D93382C00FAC6004BCF69 /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; };
 		CE291CFD2C15DB9A00B9F709 /* WowneroWallet.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WowneroWallet.framework; sourceTree = "<group>"; };
+		CEAFE49D2C539250009FF3AD /* Mwebd.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = Mwebd.xcframework; sourceTree = "<group>"; };
 		DCEA540E3586164FB47AD13E /* LnurlPayInvoice.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LnurlPayInvoice.swift; path = "../.symlinks/plugins/breez_sdk/ios/bindings-swift/Sources/BreezSDK/Task/LnurlPayInvoice.swift"; sourceTree = "<group>"; };
 		F42258C3697CFE3C8C8D1933 /* ServiceLogger.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ServiceLogger.swift; path = "../.symlinks/plugins/breez_sdk/ios/bindings-swift/Sources/BreezSDK/ServiceLogger.swift"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@ -96,6 +101,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				4DFD1BB54A3A50573E19A583 /* Pods_Runner.framework in Frameworks */,
+				CEAFE49E2C539250009FF3AD /* Mwebd.xcframework in Frameworks */,
+				CEAFE4A02C53926F009FF3AD /* libresolv.tbd in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -105,6 +112,7 @@
 		06957875428D0F5AAE053765 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				CEAFE49D2C539250009FF3AD /* Mwebd.xcframework */,
 				C58D93382C00FAC6004BCF69 /* libresolv.tbd */,
 				0C9986A3251A932F00D566FD /* CryptoSwift.framework */,
 				3C663361C56EBB242598F609 /* Pods_Runner.framework */,
@ -485,7 +493,7 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				MARKETING_VERSION = 1.0.1;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.fotolockr.cakewallet";
+				PRODUCT_BUNDLE_IDENTIFIER = com.fotolockr.cakewallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@ -631,7 +639,7 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				MARKETING_VERSION = 1.0.1;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.fotolockr.cakewallet";
+				PRODUCT_BUNDLE_IDENTIFIER = com.fotolockr.cakewallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@ -669,7 +677,7 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				MARKETING_VERSION = 1.0.1;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.fotolockr.cakewallet";
+				PRODUCT_BUNDLE_IDENTIFIER = com.fotolockr.cakewallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
--- a/scripts/ios/build_mwebd.sh
+++ b/scripts/ios/build_mwebd.sh
@ -1,7 +1,6 @@
+#!/bin/bash
 # install go > 1.21:
-wget https://go.dev/dl/go1.22.4.linux-amd64.tar.gz
-sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.22.4.linux-amd64.tar.gz
-export PATH=$PATH:/usr/local/go/bin
+brew install go
 export PATH=$PATH:~/go/bin
 go install golang.org/x/mobile/cmd/gomobile@latest
 gomobile init
@ -9,7 +8,7 @@ gomobile init
 git clone https://github.com/ltcmweb/mwebd
 cd mwebd
 gomobile bind -target=ios .
-mv ./Mwebd.xcframework ../../../ios/
+mv -fn ./Mwebd.xcframework ../../../ios/
 # cleanup:
 cd ..
 rm -rf mwebd