diff --git a/.gitignore b/.gitignore index 32cfb25..88c53ff 100644 --- a/.gitignore +++ b/.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 diff --git a/example/lib/main.dart b/example/lib/main.dart index 0fe5d94..ffb8415 100644 --- a/example/lib/main.dart +++ b/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 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, diff --git a/example/macos/Podfile.lock b/example/macos/Podfile.lock new file mode 100644 index 0000000..264eb78 --- /dev/null +++ b/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 diff --git a/ffigen.yaml b/ffigen.yaml index e4fd06e..b968069 100644 --- a/ffigen.yaml +++ b/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' diff --git a/lib/flutter_libsparkmobile.dart b/lib/flutter_libsparkmobile.dart index e50a154..a7f3175 100644 --- a/lib/flutter_libsparkmobile.dart +++ b/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/"; diff --git a/lib/extensions.dart b/lib/src/extensions.dart similarity index 100% rename from lib/extensions.dart rename to lib/src/extensions.dart diff --git a/lib/flutter_libsparkmobile_bindings_generated.dart b/lib/src/flutter_libsparkmobile_bindings_generated.dart similarity index 100% rename from lib/flutter_libsparkmobile_bindings_generated.dart rename to lib/src/flutter_libsparkmobile_bindings_generated.dart diff --git a/test/flutter_libsparkmobile_test.dart b/test/flutter_libsparkmobile_test.dart index 586a9e6..66dc925 100644 --- a/test/flutter_libsparkmobile_test.dart +++ b/test/flutter_libsparkmobile_test.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,