Merge remote-tracking branch 'origin_SW/staging' into wallets_refactor

crypto_plugins/flutter_libmonero

@@ -1 +1 @@
-Subproject commit 8a46a5d0984cf7fbc1ce5d77cbb74dc6933da59c
+Subproject commit 34a20002095cda70b81460d2aa4654a8280fbf0c

lib/pages/settings_views/global_settings_view/tor_settings/tor_settings_view.dart

@@ -246,9 +246,17 @@ class _TorAnimatedButtonState extends ConsumerState<TorAnimatedButton>
     }
   }
 
-  Future<void> _playConnecting() async {
+  Future<void> _playPlug() async {
     await _play(
-      from: "connecting-start",
+      from: "0.0",
+      to: "connecting-start",
+      repeat: false,
+    );
+  }
+
+  Future<void> _playConnecting({double? start}) async {
+    await _play(
+      from: start?.toString() ?? "connecting-start",
       to: "connecting-end",
       repeat: true,
     );
@@ -256,7 +264,7 @@ class _TorAnimatedButtonState extends ConsumerState<TorAnimatedButton>
 
   Future<void> _playConnectingDone() async {
     await _play(
-      from: "connecting-end",
+      from: "${controller1.value}",
       to: "connected-start",
       repeat: false,
     );
@@ -285,7 +293,7 @@ class _TorAnimatedButtonState extends ConsumerState<TorAnimatedButton>
     required bool repeat,
   }) async {
     final composition = await _completer.future;
-    final start = composition.getMarker(from)!.start;
+    final start = double.tryParse(from) ?? composition.getMarker(from)!.start;
     final end = composition.getMarker(to)!.start;
 
     controller1.value = start;
@@ -326,7 +334,6 @@ class _TorAnimatedButtonState extends ConsumerState<TorAnimatedButton>
 
   @override
   Widget build(BuildContext context) {
-    // TODO: modify size (waiting for updated onion lottie animation file)
     final width = MediaQuery.of(context).size.width / 1.5;
 
     return TorSubscription(
@@ -343,6 +350,7 @@ class _TorAnimatedButtonState extends ConsumerState<TorAnimatedButton>
             break;
 
           case TorConnectionStatus.connecting:
+            await _playPlug();
             await _playConnecting();
             break;
         }

lib/widgets/onetime_popups/tor_has_been_add_dialog.dart

@@ -145,6 +145,16 @@ class _TorHasBeenAddedDialogState extends State<_TorHasBeenAddedDialog> {
                   ? STextStyles.desktopTextMedium(context)
                   : STextStyles.smallMed14(context),
             ),
+            SizedBox(
+              height: Util.isDesktop ? 24 : 16,
+            ),
+            Text(
+              "Note: Tor does NOT yet work for Monero or Epic Cash wallets. "
+              "Opening one of these will leak your IP address.",
+              style: Util.isDesktop
+                  ? STextStyles.desktopTextMedium(context)
+                  : STextStyles.smallMed14(context),
+            ),
           ],
         ),
       ),

pubspec.lock

@@ -1656,8 +1656,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "7123505a9e5f702dba1c0c9aa12b289b5dfbb3bf"
+      ref: c8b97bc118c7bbfe1027d0442cfadea44dc285aa
-      resolved-ref: "7123505a9e5f702dba1c0c9aa12b289b5dfbb3bf"
+      resolved-ref: c8b97bc118c7bbfe1027d0442cfadea44dc285aa
       url: "https://github.com/cypherstack/tor.git"
     source: git
     version: "0.0.1"

pubspec.yaml

@@ -11,7 +11,7 @@ description: Stack Wallet
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.7.20+188
+version: 1.8.0+191
 
 environment:
   sdk: ">=3.0.2 <4.0.0"
@@ -60,7 +60,7 @@ dependencies:
   tor_ffi_plugin:
     git:
       url: https://github.com/cypherstack/tor.git
-      ref: 7123505a9e5f702dba1c0c9aa12b289b5dfbb3bf
+      ref: c8b97bc118c7bbfe1027d0442cfadea44dc285aa
 
   # Utility plugins
   http: ^0.13.0

scripts/android/build_all.sh

@@ -4,7 +4,7 @@ set -e
 
 # libepiccash requires old rust
 source ../rust_version.sh
-set_rust_to_1680
+set_rust_to_1671
 
 mkdir build
 . ./config.sh

scripts/ios/build_all.sh

@@ -4,7 +4,11 @@ set -e
 
 # libepiccash requires old rust
 source ../rust_version.sh
-set_rust_to_1680
+set_rust_to_1671
+
+# ensure ios rust triples are there
+rustup target add aarch64-apple-ios
+rustup target add x86_64-apple-ios
 
 # ensure ios rust triples are there
 rustup target add aarch64-apple-ios

scripts/linux/build_all.sh

@@ -4,7 +4,7 @@ set -e
 
 # libepiccash requires old rust
 source ../rust_version.sh
-set_rust_to_1680
+set_rust_to_1671
 
 # for arm
 # flutter-elinux clean

scripts/macos/build_all.sh

@@ -4,7 +4,7 @@ set -e
 
 # libepiccash requires old rust
 source ../rust_version.sh
-set_rust_to_1680
+set_rust_to_1671
 
 (cd ../../crypto_plugins/flutter_liblelantus/scripts/macos && ./build_all.sh ) &
 (cd ../../crypto_plugins/flutter_libepiccash/scripts/macos && ./build_all.sh )  &

scripts/rust_version.sh

@@ -1,10 +1,10 @@
 #!/bin/sh
 
-set_rust_to_1680() {
+set_rust_to_1671() {
-  if rustup toolchain list | grep -q "1.68.0"; then
+  if rustup toolchain list | grep -q "1.67.1"; then
-    rustup default 1.68.0
+    rustup default 1.67.1
   else
-    echo "Rust version 1.68.0 is not installed. Please install it using 'rustup install 1.68.0'." >&2
+    echo "Rust version 1.67.1 is not installed. Please install it using 'rustup install 1.67.1'." >&2
     exit 1
   fi
 }

scripts/windows/build_all.sh

@@ -4,7 +4,7 @@ set -e
 
 # libepiccash requires old rust
 source ../rust_version.sh
-set_rust_to_1680
+set_rust_to_1671
 
 mkdir -p build
 (cd ../../crypto_plugins/flutter_libepiccash/scripts/windows && ./build_all.sh )  &