Merge pull request #115 from LtbLightning/macOS

macOS support

.metadata

@@ -4,7 +4,7 @@
 # This file should be version controlled.
 
 version:
-  revision: 4d9e56e694b656610ab87fcf2efbcd226e0ed8cf
+  revision: 796c8ef79279f9c774545b3771238c3098dbefab
   channel: stable
 
 project_type: plugin
@@ -13,17 +13,17 @@ project_type: plugin
 migration:
   platforms:
     - platform: root
-      create_revision: 4d9e56e694b656610ab87fcf2efbcd226e0ed8cf
-      base_revision: 4d9e56e694b656610ab87fcf2efbcd226e0ed8cf
+      create_revision: 796c8ef79279f9c774545b3771238c3098dbefab
+      base_revision: 796c8ef79279f9c774545b3771238c3098dbefab
     - platform: android
-      create_revision: 4d9e56e694b656610ab87fcf2efbcd226e0ed8cf
-      base_revision: 4d9e56e694b656610ab87fcf2efbcd226e0ed8cf
+      create_revision: 796c8ef79279f9c774545b3771238c3098dbefab
+      base_revision: 796c8ef79279f9c774545b3771238c3098dbefab
     - platform: ios
-      create_revision: 4d9e56e694b656610ab87fcf2efbcd226e0ed8cf
-      base_revision: 4d9e56e694b656610ab87fcf2efbcd226e0ed8cf
+      create_revision: 796c8ef79279f9c774545b3771238c3098dbefab
+      base_revision: 796c8ef79279f9c774545b3771238c3098dbefab
     - platform: macos
-      create_revision: 4d9e56e694b656610ab87fcf2efbcd226e0ed8cf
-      base_revision: 4d9e56e694b656610ab87fcf2efbcd226e0ed8cf
+      create_revision: 796c8ef79279f9c774545b3771238c3098dbefab
+      base_revision: 796c8ef79279f9c774545b3771238c3098dbefab
 
   # User provided section
 

CHANGELOG.md

@@ -1,8 +1,17 @@
+## [0.29.2]
+Support macOs and unit testing.
+
+Updated flutter dependencies.
+
 ## [0.29.1]
-Strongly typed exceptions
+
+Updated Rust and Flutter dependencies.
+
+Exposed strongly-typed exceptions.
 
 ## [0.29.0]
 Support Dart 3.
+
 Updated Rust and Flutter dependencies.
 #### APIs added
 - Add `isMine` method to `Wallet`.

README.md

@@ -39,7 +39,7 @@ To use the `bdk_flutter` package in your project, add it as a dependency in your
 
 ```dart
 dependencies:
-  bdk_flutter: ^0.29.1
+  bdk_flutter: ^0.29.2
 ```
 
 ### Examples
@@ -109,7 +109,7 @@ final feeRate = await estimateFeeRate(25);
 final txBuilderResult = await txBuilder.feeRate( feeRate.asSatPerVb() )
                                        .addRecipient( script, 2000 )
                                        .finish( bdkWallet );
-                           
+
 final serializedPsbt = await txBuilderResult.psbt.jsonSerialize();
 final jsonObject = json.decode(serializedPsbt);
 final outputs = jsonObject['unsigned_tx']['output'] as List;
@@ -120,13 +120,13 @@ debugPrint("=========Inputs=====");
       debugPrint("amount: ${e['value']}");
       debugPrint("script_pubkey: ${e['script_pubkey']}");
     }
-    
+
 debugPrint("=========Outputs=====");
     for (var e in outputs) {
       debugPrint("amount: ${e['value']}");
       debugPrint("script_pubkey: ${e['script_pubkey']}");
     }
-    
+
 ```
 
 ### Create an `internal` and `extarnal` wallet descriptors from derivation path.
@@ -169,7 +169,7 @@ final address =
         await bdkWallet.getAddress(addressIndex: const AddressIndex());
 final internalAddress =
         await bdkWallet.getInternalAddress(addressIndex: const AddressIndex());
-    
+
 ```
 
 ### API Documentation
@@ -219,10 +219,10 @@ _Note that Flutter version `3.0` or later is required to build the plugin._
 
 Please use the [Dart documentation generator](https://pub.dev/packages/dartdoc) to generate the API documentation.
 
-
 ### References:
+
 - Setting up a local Esplora instance for testing:
-https://bitcoin.stackexchange.com/questions/116937/how-do-i-setup-an-esplora-instance-for-local-testing/116938#116938
+  https://bitcoin.stackexchange.com/questions/116937/how-do-i-setup-an-esplora-instance-for-local-testing/116938#116938
 
 _Note: Caution this is Beta at this stage
 Please consider reviewing, experimenting, and contributing ⚡️_

analysis_options.yaml

@@ -18,3 +18,4 @@ analyzer:
     - lib/src/generated/bindings.dart
     - lib/src/generated/bridge_definitions.dart
     - lib/src/generated/bridge_definitions.freezed.dart
+    - README.md

example/android/build.gradle

@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

example/lib/bdk_library.dart

@@ -136,19 +136,19 @@ class BdkLibrary {
     try {
       final txBuilder = TxBuilder();
       final address = await Address.create(address: addressStr);
+
       final script = await address.scriptPubKey();
       final feeRate = await estimateFeeRate(25, blockchain);
       final txBuilderResult = await txBuilder
           .addRecipient(script, 750)
           .feeRate(feeRate.asSatPerVb())
           .finish(aliceWallet);
       getInputOutPuts(txBuilderResult, blockchain);
-
       final aliceSbt = await aliceWallet.sign(psbt: txBuilderResult.psbt);
       final tx = await aliceSbt.extractTx();
       Isolate.run(() async => {await blockchain.broadcast(tx)});
-    } on FormatException catch (e) {
-      debugPrint(e.message);
+    } on Exception catch (_) {
+      rethrow;
     }
   }
 }

example/macos/.gitignore

@@ -0,0 +1,7 @@
+# Flutter-related
+**/Flutter/ephemeral/
+**/Pods/
+
+# Xcode-related
+**/dgph
+**/xcuserdata/

example/macos/Flutter/Flutter-Debug.xcconfig

@@ -0,0 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
+#include "ephemeral/Flutter-Generated.xcconfig"

example/macos/Flutter/Flutter-Release.xcconfig

@@ -0,0 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
+#include "ephemeral/Flutter-Generated.xcconfig"

example/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -0,0 +1,10 @@
+//
+//  Generated file. Do not edit.
+//
+
+import FlutterMacOS
+import Foundation
+
+
+func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+}

example/macos/Podfile

@@ -0,0 +1,43 @@
+platform :osx, '10.14'
+
+# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
+ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+
+project 'Runner', {
+  'Debug' => :debug,
+  'Profile' => :release,
+  'Release' => :release,
+}
+
+def flutter_root
+  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__)
+  unless File.exist?(generated_xcode_build_settings_path)
+    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first"
+  end
+
+  File.foreach(generated_xcode_build_settings_path) do |line|
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
+    return matches[1].strip if matches
+  end
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\""
+end
+
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
+
+flutter_macos_podfile_setup
+
+target 'Runner' do
+  use_frameworks!
+  use_modular_headers!
+
+  flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
+  target 'RunnerTests' do
+    inherit! :search_paths
+  end
+end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    flutter_additional_macos_build_settings(target)
+  end
+end

example/macos/Podfile.lock

@@ -0,0 +1,16 @@
+PODS:
+  - FlutterMacOS (1.0.0)
+
+DEPENDENCIES:
+  - FlutterMacOS (from `Flutter/ephemeral`)
+
+EXTERNAL SOURCES:
+  FlutterMacOS:
+    :path: Flutter/ephemeral
+
+SPEC CHECKSUMS:
+  FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
+
+PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367
+
+COCOAPODS: 1.11.3