fix conflicts with main

2025-01-18 16:55:58 +00:00 · 2023-11-27 17:44:40 +02:00 · 2023-11-27 17:44:40 +02:00 · 2c03f858bc
commit 2c03f858bc
parent 7b20ff0223
10 changed files with 188 additions and 2 deletions
--- a/cw_bitcoin/pubspec.lock
+++ b/cw_bitcoin/pubspec.lock
@ -164,6 +164,15 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "8.4.3"
+  cake_backup:
+    dependency: transitive
+    description:
+      path: "."
+      ref: main
+      resolved-ref: "3aba867dcab6737f6707782f5db15d71f303db38"
+      url: "https://github.com/cake-tech/cake_backup.git"
+    source: git
+    version: "1.0.0+1"
  characters:
    dependency: transitive
    description:
@ -228,6 +237,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.0.5"
+  cupertino_icons:
+    dependency: transitive
+    description:
+      name: cupertino_icons
+      sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.6"
  cw_core:
    dependency: "direct main"
    description:
@ -707,6 +724,14 @@ packages:
      url: "https://github.com/cake-tech/tor.git"
    source: git
    version: "0.0.1"
+  tuple:
+    dependency: transitive
+    description:
+      name: tuple
+      sha256: a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
  typed_data:
    dependency: transitive
    description:
--- a/cw_core/pubspec.lock
+++ b/cw_core/pubspec.lock
@ -113,6 +113,15 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "8.4.3"
+  cake_backup:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: main
+      resolved-ref: "3aba867dcab6737f6707782f5db15d71f303db38"
+      url: "https://github.com/cake-tech/cake_backup.git"
+    source: git
+    version: "1.0.0+1"
  characters:
    dependency: transitive
    description:
@ -169,6 +178,22 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "3.0.2"
+  cryptography:
+    dependency: transitive
+    description:
+      name: cryptography
+      sha256: df156c5109286340817d21fa7b62f9140f17915077127dd70f8bd7a2a0997a35
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.0"
+  cupertino_icons:
+    dependency: transitive
+    description:
+      name: cupertino_icons
+      sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.6"
  dart_style:
    dependency: transitive
    description:
@ -625,6 +650,14 @@ packages:
      url: "https://github.com/cake-tech/tor.git"
    source: git
    version: "0.0.1"
+  tuple:
+    dependency: transitive
+    description:
+      name: tuple
+      sha256: a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
  typed_data:
    dependency: transitive
    description:
--- a/cw_haven/pubspec.lock
+++ b/cw_haven/pubspec.lock
@ -113,6 +113,15 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "8.4.3"
+  cake_backup:
+    dependency: transitive
+    description:
+      path: "."
+      ref: main
+      resolved-ref: "3aba867dcab6737f6707782f5db15d71f303db38"
+      url: "https://github.com/cake-tech/cake_backup.git"
+    source: git
+    version: "1.0.0+1"
  characters:
    dependency: transitive
    description:
@ -169,6 +178,22 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "3.0.2"
+  cryptography:
+    dependency: transitive
+    description:
+      name: cryptography
+      sha256: df156c5109286340817d21fa7b62f9140f17915077127dd70f8bd7a2a0997a35
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.0"
+  cupertino_icons:
+    dependency: transitive
+    description:
+      name: cupertino_icons
+      sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.6"
  cw_core:
    dependency: "direct main"
    description:
@ -632,6 +657,14 @@ packages:
      url: "https://github.com/cake-tech/tor.git"
    source: git
    version: "0.0.1"
+  tuple:
+    dependency: transitive
+    description:
+      name: tuple
+      sha256: a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
  typed_data:
    dependency: transitive
    description:
--- a/cw_monero/example/linux/flutter/generated_plugins.cmake
+++ b/cw_monero/example/linux/flutter/generated_plugins.cmake
@ -7,6 +7,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
 )

 list(APPEND FLUTTER_FFI_PLUGIN_LIST
+  tor
 )

 set(PLUGIN_BUNDLED_LIBRARIES)
--- a/cw_monero/example/pubspec.lock
+++ b/cw_monero/example/pubspec.lock
@ -33,6 +33,15 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.1.1"
+  cake_backup:
+    dependency: transitive
+    description:
+      path: "."
+      ref: main
+      resolved-ref: "3aba867dcab6737f6707782f5db15d71f303db38"
+      url: "https://github.com/cake-tech/cake_backup.git"
+    source: git
+    version: "1.0.0+1"
  characters:
    dependency: transitive
    description:
@ -73,6 +82,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "3.0.2"
+  cryptography:
+    dependency: transitive
+    description:
+      name: cryptography
+      sha256: df156c5109286340817d21fa7b62f9140f17915077127dd70f8bd7a2a0997a35
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.0"
  cupertino_icons:
    dependency: "direct main"
    description:
@ -392,6 +409,14 @@ packages:
      url: "https://github.com/cake-tech/tor.git"
    source: git
    version: "0.0.1"
+  tuple:
+    dependency: transitive
+    description:
+      name: tuple
+      sha256: a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
  typed_data:
    dependency: transitive
    description:
--- a/cw_monero/lib/monero_wallet_service.dart
+++ b/cw_monero/lib/monero_wallet_service.dart
@ -293,7 +293,10 @@ class MoneroWalletService extends WalletService<
        restoreHeight: height,
        spendKey: spendKey);
    final wallet = MoneroWallet(
-        walletInfo: walletInfo, unspentCoinsInfo: unspentCoinsInfoSource);
+      walletInfo: walletInfo,
+      unspentCoinsInfo: unspentCoinsInfoSource,
+      password: password,
+    );
    await wallet.init();

    return wallet;
--- a/cw_monero/pubspec.lock
+++ b/cw_monero/pubspec.lock
@ -113,6 +113,15 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "8.4.3"
+  cake_backup:
+    dependency: transitive
+    description:
+      path: "."
+      ref: main
+      resolved-ref: "3aba867dcab6737f6707782f5db15d71f303db38"
+      url: "https://github.com/cake-tech/cake_backup.git"
+    source: git
+    version: "1.0.0+1"
  characters:
    dependency: transitive
    description:
@ -169,6 +178,22 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "3.0.2"
+  cryptography:
+    dependency: transitive
+    description:
+      name: cryptography
+      sha256: df156c5109286340817d21fa7b62f9140f17915077127dd70f8bd7a2a0997a35
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.0"
+  cupertino_icons:
+    dependency: transitive
+    description:
+      name: cupertino_icons
+      sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.6"
  cw_core:
    dependency: "direct main"
    description:
@ -641,6 +666,14 @@ packages:
      url: "https://github.com/cake-tech/tor.git"
    source: git
    version: "0.0.1"
+  tuple:
+    dependency: transitive
+    description:
+      name: tuple
+      sha256: a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
  typed_data:
    dependency: transitive
    description:
--- a/cw_nano/pubspec.lock
+++ b/cw_nano/pubspec.lock
@ -137,6 +137,15 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "8.6.1"
+  cake_backup:
+    dependency: transitive
+    description:
+      path: "."
+      ref: main
+      resolved-ref: "3aba867dcab6737f6707782f5db15d71f303db38"
+      url: "https://github.com/cake-tech/cake_backup.git"
+    source: git
+    version: "1.0.0+1"
  characters:
    dependency: transitive
    description:
@ -193,6 +202,22 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "3.0.3"
+  cryptography:
+    dependency: transitive
+    description:
+      name: cryptography
+      sha256: df156c5109286340817d21fa7b62f9140f17915077127dd70f8bd7a2a0997a35
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.0"
+  cupertino_icons:
+    dependency: transitive
+    description:
+      name: cupertino_icons
+      sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.6"
  cw_core:
    dependency: "direct main"
    description:
@ -773,6 +798,14 @@ packages:
      url: "https://github.com/cake-tech/tor.git"
    source: git
    version: "0.0.1"
+  tuple:
+    dependency: transitive
+    description:
+      name: tuple
+      sha256: a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
  typed_data:
    dependency: transitive
    description:
--- a/lib/di.dart
+++ b/lib/di.dart
@ -26,7 +26,6 @@ import 'package:cake_wallet/src/screens/anonpay_details/anonpay_details_page.dar
 import 'package:cake_wallet/src/screens/buy/buy_options_page.dart';
 import 'package:cake_wallet/src/screens/buy/webview_page.dart';
 import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart';
-import 'package:cake_wallet/src/screens/dashboard/widgets/transactions_page.dart';
 import 'package:cake_wallet/src/screens/dashboard/desktop_dashboard_page.dart';
 import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart';
 import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart';
--- a/linux/flutter/generated_plugins.cmake
+++ b/linux/flutter/generated_plugins.cmake
@ -10,6 +10,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
 )

 list(APPEND FLUTTER_FFI_PLUGIN_LIST
+  tor
 )

 set(PLUGIN_BUNDLED_LIBRARIES)