From 9f927d1af549bcc7e025f10b0d93f58d767295d4 Mon Sep 17 00:00:00 2001 From: Matthew Fosse Date: Tue, 16 Apr 2024 15:23:48 -0700 Subject: [PATCH] updates for lightning and new flutter version --- android/app/build.gradle | 1 + android/build.gradle | 3 +- cw_lightning/lib/lightning_wallet.dart | 8 ++- cw_lightning/pubspec.lock | 82 ++++++++++++++++-------- cw_lightning/pubspec.yaml | 5 +- lib/view_model/lightning_view_model.dart | 10 +-- pubspec_base.yaml | 6 +- 7 files changed, 76 insertions(+), 39 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 5e27aeb9e..263c47105 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -23,6 +23,7 @@ if (flutterVersionName == null) { apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" +apply plugin: 'kotlinx-serialization' def keystoreProperties = new Properties() def keystorePropertiesFile = rootProject.file('key.properties') diff --git a/android/build.gradle b/android/build.gradle index e182e39af..82d3b6f03 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.8.10' + ext.kotlin_version = '1.8.20' repositories { google() jcenter() @@ -9,6 +9,7 @@ buildscript { classpath 'com.android.tools.build:gradle:7.3.0' classpath 'com.google.gms:google-services:4.3.8' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" } } diff --git a/cw_lightning/lib/lightning_wallet.dart b/cw_lightning/lib/lightning_wallet.dart index a407a2a0e..a32ba6f15 100644 --- a/cw_lightning/lib/lightning_wallet.dart +++ b/cw_lightning/lib/lightning_wallet.dart @@ -6,7 +6,6 @@ import 'package:bitcoin_base/bitcoin_base.dart'; import 'package:breez_sdk/breez_sdk.dart'; import 'package:breez_sdk/bridge_generated.dart'; import 'package:cw_bitcoin/bitcoin_mnemonic.dart'; -import 'package:cw_bitcoin/electrum_balance.dart'; import 'package:cw_bitcoin/electrum_wallet_snapshot.dart'; import 'package:cw_core/crypto_currency.dart'; import 'package:cw_core/node.dart'; @@ -183,7 +182,12 @@ abstract class LightningWalletBase extends ElectrumWallet with Store { } catch (_) {} try { - await sdk.connect(config: breezConfig, seed: seedBytes); + await sdk.connect( + req: ConnectRequest( + config: breezConfig, + seed: seedBytes, + ), + ); } catch (e) { print("Error connecting to Breez: $e"); } diff --git a/cw_lightning/pubspec.lock b/cw_lightning/pubspec.lock index 5fb7e429a..4136218f0 100644 --- a/cw_lightning/pubspec.lock +++ b/cw_lightning/pubspec.lock @@ -121,11 +121,11 @@ packages: dependency: "direct main" description: path: "." - ref: "v0.3.8" - resolved-ref: "34b4e5e2a8398ffad32834864d4a8cc130364e74" + ref: "v0.4.0-rc2" + resolved-ref: "8762a59b1f823d3c37ee04b95bfe4eb88ea4eb6c" url: "https://github.com/breez/breez-sdk-flutter.git" source: git - version: "0.3.8" + version: "0.4.0-rc2" bs58check: dependency: transitive description: @@ -242,10 +242,10 @@ packages: dependency: transitive description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.18.0" convert: dependency: transitive description: @@ -312,10 +312,10 @@ packages: dependency: transitive description: name: ffi - sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878" + sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.2" file: dependency: transitive description: @@ -478,6 +478,30 @@ packages: url: "https://pub.dev" source: hosted version: "4.8.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + url: "https://pub.dev" + source: hosted + version: "10.0.0" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + url: "https://pub.dev" + source: hosted + version: "2.0.1" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + url: "https://pub.dev" + source: hosted + version: "2.0.1" logging: dependency: transitive description: @@ -490,26 +514,26 @@ packages: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.11.0" mime: dependency: transitive description: @@ -546,10 +570,10 @@ packages: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" path_provider: dependency: "direct main" description: @@ -735,10 +759,10 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" sprintf: dependency: transitive description: @@ -751,18 +775,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" stream_transform: dependency: transitive description: @@ -791,10 +815,10 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.6.1" timing: dependency: transitive description: @@ -843,6 +867,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + url: "https://pub.dev" + source: hosted + version: "13.0.0" watcher: dependency: transitive description: @@ -884,5 +916,5 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=3.0.0 <4.0.0" - flutter: ">=3.10.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.19.0" diff --git a/cw_lightning/pubspec.yaml b/cw_lightning/pubspec.yaml index bc8b4168c..ee54d8547 100644 --- a/cw_lightning/pubspec.yaml +++ b/cw_lightning/pubspec.yaml @@ -32,7 +32,7 @@ dependencies: breez_sdk: git: url: https://github.com/breez/breez-sdk-flutter.git - ref: v0.3.8 + ref: v0.4.0-rc2 rxdart: ^0.27.5 unorm_dart: ^0.2.0 cryptography: ^2.0.5 @@ -49,6 +49,9 @@ dev_dependencies: mobx_codegen: ^2.0.7 hive_generator: ^2.0.1 +dependency_overrides: + watcher: ^1.1.0 + # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/lib/view_model/lightning_view_model.dart b/lib/view_model/lightning_view_model.dart index 626ac5cd0..ea573785f 100644 --- a/lib/view_model/lightning_view_model.dart +++ b/lib/view_model/lightning_view_model.dart @@ -1,13 +1,8 @@ import 'dart:async'; import 'package:breez_sdk/breez_sdk.dart'; import 'package:breez_sdk/bridge_generated.dart' as BZG; -import 'package:cake_wallet/entities/calculate_fiat_amount_raw.dart'; -import 'package:cake_wallet/entities/fiat_currency.dart'; -import 'package:cake_wallet/lightning/lightning.dart'; -import 'package:cake_wallet/store/dashboard/fiat_conversion_store.dart'; -import 'package:cake_wallet/store/settings_store.dart'; -import 'package:cw_core/crypto_currency.dart'; import 'package:mobx/mobx.dart'; +import 'package:cw_lightning/.secrets.g.dart' as secrets; part 'lightning_view_model.g.dart'; @@ -95,7 +90,8 @@ abstract class LightningViewModelBase with Store { Future serviceHealthCheck() async { try { final sdk = await BreezSDK(); - BZG.ServiceHealthCheckResponse response = await sdk.serviceHealthCheck(); + BZG.ServiceHealthCheckResponse response = + await sdk.serviceHealthCheck(apiKey: secrets.breezApiKey); return response.status; } catch (_) { return BZG.HealthCheckStatus.ServiceDisruption; diff --git a/pubspec_base.yaml b/pubspec_base.yaml index 2eee79986..14d32cb3d 100644 --- a/pubspec_base.yaml +++ b/pubspec_base.yaml @@ -26,7 +26,7 @@ dependencies: path_provider: ^2.0.11 mobx: ^2.1.4 flutter_mobx: ^2.0.6+5 - flutter_slidable: ^2.0.0 + flutter_slidable: ^3.0.1 share_plus: ^4.0.10 # date_range_picker: ^1.0.6 #https://api.flutter.dev/flutter/material/showDateRangePicker.html @@ -115,13 +115,13 @@ dependencies: breez_sdk: git: url: https://github.com/breez/breez-sdk-flutter.git - ref: v0.3.8 + ref: v0.4.0-rc2 dev_dependencies: flutter_test: sdk: flutter - build_runner: ^2.3.3 + build_runner: ^2.4.7 logging: ^1.2.0 mobx_codegen: ^2.1.1 build_resolvers: ^2.0.9