Merge pull request #23 from SatoshiPortal/develop

Prepare publication on pub.dev

.github/workflows/precompiled_binaries.yml

@@ -0,0 +1,44 @@
+on:
+  push:
+    branches: [ trunk ]
+
+name: Precompile Binaries
+jobs:
+  Precompile:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-20.04
+          - macOS-latest
+          - windows-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dart-lang/setup-dart@v1
+
+      - name: Install GTK
+        if: (matrix.os == 'ubuntu-latest')
+        run: sudo apt-get update && sudo apt-get install libgtk-3-dev
+      - name: Set up Android SDK
+        if: (matrix.os == 'ubuntu-20.04')
+        uses: android-actions/setup-android@v2 
+
+      - name: Install Specific NDK
+        if: (matrix.os == 'ubuntu-20.04')
+        run: sdkmanager --install "ndk;24.0.8215888" 
+      - name: Precompile
+        if: (matrix.os == 'macOS-latest') || (matrix.os == 'windows-latest')
+        run: dart run build_tool precompile-binaries -v --manifest-dir=../../rust --repository=SatoshiPortal/boltz-dart
+        working-directory: cargokit/build_tool
+        env:
+          GITHUB_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
+          PRIVATE_KEY: ${{ secrets.RELEASE_PRIVATE_KEY }}
+
+      - name: Precompile (with Android)
+        if: (matrix.os == 'ubuntu-latest')
+        run: dart run build_tool precompile-binaries -v --manifest-dir=../../rust --repository=SatoshiPortal/boltz-dart --android-sdk-location=/usr/local/lib/android/sdk --android-ndk-version=24.0.8215888 --android-min-sdk-version=23
+        working-directory: cargokit/build_tool
+        env:
+          GITHUB_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
+          PRIVATE_KEY: ${{ secrets.RELEASE_PRIVATE_KEY }}

analysis_options.yaml

@@ -15,6 +15,6 @@ linter:
 
 analyzer:
   exclude:
-    - lib/src/generated/bindings.dart
-    - lib/src/generated/bridge_definitions.dart
+    - cargokit/
+    - lib/src/generated/
     - README.md

cargokit/build_tool/lib/src/options.dart

@@ -298,7 +298,10 @@ class CargokitUserOptions {
       }
       userProjectDir = userProjectDir.parent;
     }
-    return CargokitUserOptions._();
+    return CargokitUserOptions(
+      usePrecompiledBinaries: true,
+      verboseLogging: false,
+    );
   }
 
   final bool usePrecompiledBinaries;

cargokit_options.yaml

@@ -0,0 +1,8 @@
+# Enables verbose logging of cargokit during build
+verbose_logging: false
+
+# Opts out of using precompiled binaries. If crate has configured
+# and deployed precompiled binaries, these will be by default used whenever Rustup
+# is not installed. With `use_precompiled_binaries` set to false, the build will
+# instead be aborted prompting user to install Rustup.
+use_precompiled_binaries: true

example/.gitignore

@@ -5,9 +5,11 @@
 *.swp
 .DS_Store
 .atom/
+.build/
 .buildlog/
 .history
 .svn/
+.swiftpm/
 migrate_working_dir/
 
 # IntelliJ related

example/ios/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - boltz (0.0.1)
+  - boltz (0.1.6)
   - Flutter (1.0.0)
 
 DEPENDENCIES:
@@ -13,9 +13,9 @@ EXTERNAL SOURCES:
     :path: Flutter
 
 SPEC CHECKSUMS:
-  boltz: bcf0b514037c50afbba8a67ea01317a6f34cd145
+  boltz: 6388ec2412f3753b63a9e65c97f87ea26f43bddc
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
 
 PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2

example/ios/Runner/AppDelegate.swift

@@ -1,7 +1,7 @@
 import Flutter
 import UIKit
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,

example/lib/main.dart

@@ -12,8 +12,8 @@ Future test() async {
     const boltzUrl = 'https://api.testnet.boltz.exchange/v2';
     // const amount = 100000;
     final fees = await const bltz.Fees(boltzUrl: boltzUrl).chain();
-    print('FEES:${fees}');
+    print('FEES:$fees');
   } catch (e) {
-    print('\n\nERRRR: ' + e.toString() + '\n\n');
+    print('\n\nERRRR: $e\n\n');
   }
 }

lib/src/types/swap.dart

@@ -107,9 +107,6 @@ extension SwapStatusX on SwapStatus {
 
       case SwapStatus.minerfeePaid:
         return 'minerfee.paid';
-
-      default:
-        throw ArgumentError('Invalid SwapStatus: $this');
     }
   }
 
@@ -157,9 +154,6 @@ extension SwapStatusX on SwapStatus {
 
       case SwapStatus.minerfeePaid:
         return 'Minerfee paid';
-
-      default:
-        throw ArgumentError('Invalid SwapStatus: $this');
     }
   }
 }

pubspec.yaml

@@ -11,7 +11,7 @@ dependencies:
   flutter:
     sdk: flutter
   cupertino_icons: ^1.0.2
-  flutter_rust_bridge: 2.0.0
+  flutter_rust_bridge: ^2.0.0
   ffi: ^2.0.1
   meta: ^1.8.0
   uuid: ^4.1.0

rust/cargokit.yaml

@@ -0,0 +1,13 @@
+cargo:
+  debug:
+    toolchain: stable
+  release:
+    toolchain: nightly
+    extra_flags:
+      - -Z
+      - build-std=panic_abort,std
+precompiled_binaries:
+  # Uri prefix used when downloading precompiled binaries.
+  url_prefix: https://github.com/SatoshiPortal/boltz-dart/releases/download/precompiled_
+  # Public key for verifying downloaded precompiled binaries.
+  public_key: 496885349368a850fa21668c1d0af5f9aa0748415be20a11545695383ef7851b