clean up

Author: julian-CStack

.gitignore

@@ -29,6 +29,8 @@ doc/api/
 .idea/
 
 # Ignore build artifacts.
+macos/flutter_libsparkmobile.framework
+scripts/macos/build
 src/deps/sparkmobile/CMakeLists.txt
 src/deps/sparkmobile/secp256k1/CMakeLists.txt
 src/build

example/lib/main.dart

@@ -5,8 +5,8 @@ import 'package:coinlib_flutter/coinlib_flutter.dart' as coinlib;
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_libsparkmobile/extensions.dart';
 import 'package:flutter_libsparkmobile/flutter_libsparkmobile.dart';
+import 'package:flutter_libsparkmobile/src/extensions.dart';
 
 abstract class SparkAddressGenerator {
   /// Generate key data from a mnemonic.
@@ -25,7 +25,7 @@ abstract class SparkAddressGenerator {
   static Future<String> getAddress(
       String keyDataHex, int index, int diversifier, bool isTestnet) async {
     return await LibSpark.getAddress(
-      privateKey: keyDataHex.toBytes32(),
+      privateKey: keyDataHex.to32BytesFromHex(),
       index: index,
       diversifier: diversifier,
       isTestNet: isTestnet,

example/macos/Podfile.lock

@@ -0,0 +1,29 @@
+PODS:
+  - coinlib_flutter (0.3.2):
+    - Flutter
+    - FlutterMacOS
+  - flutter_libsparkmobile (0.0.1):
+    - FlutterMacOS
+  - FlutterMacOS (1.0.0)
+
+DEPENDENCIES:
+  - coinlib_flutter (from `Flutter/ephemeral/.symlinks/plugins/coinlib_flutter/darwin`)
+  - flutter_libsparkmobile (from `Flutter/ephemeral/.symlinks/plugins/flutter_libsparkmobile/macos`)
+  - FlutterMacOS (from `Flutter/ephemeral`)
+
+EXTERNAL SOURCES:
+  coinlib_flutter:
+    :path: Flutter/ephemeral/.symlinks/plugins/coinlib_flutter/darwin
+  flutter_libsparkmobile:
+    :path: Flutter/ephemeral/.symlinks/plugins/flutter_libsparkmobile/macos
+  FlutterMacOS:
+    :path: Flutter/ephemeral
+
+SPEC CHECKSUMS:
+  coinlib_flutter: 6abec900d67762a6e7ccfd567a3cd3ae00bbee35
+  flutter_libsparkmobile: 3c5da510d0fe230e58334c298a7fb29cc90235b2
+  FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
+
+PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367
+
+COCOAPODS: 1.11.3

ffigen.yaml

@@ -4,7 +4,7 @@ description: |
   Bindings for `src/flutter_libsparkmobile.h`.
 
   Regenerate bindings with `flutter pub run ffigen --config ffigen.yaml`.
-output: 'lib/flutter_libsparkmobile_bindings_generated.dart'
+output: 'lib/src/flutter_libsparkmobile_bindings_generated.dart'
 headers:
   entry-points:
     - 'src/flutter_libsparkmobile.h'

lib/flutter_libsparkmobile.dart

@@ -4,9 +4,9 @@ import 'dart:io';
 import 'dart:typed_data';
 
 import 'package:ffi/ffi.dart';
-import 'package:flutter_libsparkmobile/extensions.dart';
 
-import 'flutter_libsparkmobile_bindings_generated.dart';
+import 'src/extensions.dart';
+import 'src/flutter_libsparkmobile_bindings_generated.dart';
 
 const kSparkChain = 6;
 const kSparkBaseDerivationPath = "m/44'/136'/0'/$kSparkChain/";

lib/extensions.dart renamed to lib/src/extensions.dart

@@ -1,4 +1,5 @@
 import 'package:flutter_libsparkmobile/flutter_libsparkmobile.dart';
+import 'package:flutter_libsparkmobile/src/extensions.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
@@ -19,7 +20,7 @@ void main() {
 
     // Derive the address from the key data.
     final address = await LibSpark.getAddress(
-      privateKey: keyDataHex.toBytes32(),
+      privateKey: keyDataHex.to32BytesFromHex(),
       index: 1,
       diversifier: 0,
       isTestNet: false,