code cleanup

Author: BitcoinZavior

.gitignore

@@ -24,7 +24,7 @@ migrate_working_dir/
 
 # Flutter/Dart/Pub related
 # Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
-/pubspec.lock
+
 **/doc/api/
 .dart_tool/
 .packages
@@ -33,7 +33,6 @@ bdk.*/
 *.xcframework
 android/src/main/jniLibs/
 rust/target/
-rust/Cargo.lock
 rust/output.log
 
 

CHANGELOG.md

@@ -1,13 +1,17 @@
-## [0.29.3]
+## [0.30.0]
+Updated Rust and Flutter dependencies.
 macOs support bug resolved
 
+#### APIs added
+- Add BIP-86 descriptor template
+
+
 ## [0.29.2]
 Support macOs and unit testing.
 
 Updated flutter dependencies.
 
 ## [0.29.1]
-
 Updated Rust and Flutter dependencies.
 
 Exposed strongly-typed exceptions.

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.3
+  bdk_flutter: ^0.30.0
 ```
 
 ### Examples
@@ -176,7 +176,7 @@ final internalAddress =
 
 The latest API documentation is available [here](https://pub.dev/documentation/bdk_flutter/latest/bdk_flutter/bdk_flutter-library.html)
 
-### Example Projects
+### Example Projects 
 
 - **\*BDK Flutter Demo App:** The [BDK Flutter Demo App](https://github.com/LtbLightning/bdk-flutter-quickstart)
   is a simple bitcoin app built in flutter to serve as a reference app to demonstrate `bdk-flutter` api usage.

assets/release.config.txt

@@ -1,2 +1,2 @@
-TAG_VERSION=0.29.3
-REPOSITORY_URL=https://github.com/LtbLightning/test-pub/releases/download/
+TAG_VERSION=0.30.0
+REPOSITORY_URL=https://github.com/LtbLightning/bdk-flutter/releases/download/

example/ios/Runner.xcodeproj/project.pbxproj

@@ -154,7 +154,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {

example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

example/lib/simple_wallet.dart

@@ -74,7 +74,7 @@ class _SimpleWalletState extends State<SimpleWallet> {
         print(" fee: ${e.fee}");
         print(" received: ${e.received}");
         print(" send: ${e.sent}");
-        print(" output address: ${txOut.last.scriptPubkey.internal}");
+        print(" output address: ${txOut.last.scriptPubkey.inner}");
         print("===========================");
       }
     }
@@ -100,7 +100,7 @@ class _SimpleWalletState extends State<SimpleWallet> {
         }
         print("         =============TxOut==============");
         for (var e in txOut) {
-          print("         script: ${e.scriptPubkey.internal}");
+          print("         script: ${e.scriptPubkey.inner}");
           print("         value: ${e.value}");
         }
         print("========================================");
@@ -129,7 +129,7 @@ class _SimpleWalletState extends State<SimpleWallet> {
         print(
             "outPoint: { txid:${e.outpoint.txid}, vout: ${e.outpoint.vout} } ");
         print(
-            "txout: { address:${e.txout.scriptPubkey.internal.toString()}, value: ${e.txout.value} }");
+            "txout: { address:${e.txout.scriptPubkey.inner.toString()}, value: ${e.txout.value} }");
         print("===========================");
       }
     }
@@ -168,6 +168,7 @@ class _SimpleWalletState extends State<SimpleWallet> {
       debugShowCheckedModeBanner: false,
       home: Scaffold(
         appBar: AppBar(
+          backgroundColor: Colors.blue,
           elevation: 0,
           centerTitle: false,
           title: const Text('Bdk Wallet',

example/macos/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - bdk_flutter (0.29.3)
+  - bdk_flutter (0.30.0)
   - FlutterMacOS (1.0.0)
 
 DEPENDENCIES:
@@ -13,9 +13,9 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral
 
 SPEC CHECKSUMS:
-  bdk_flutter: 97520dcbbc489086a08ada5d2be08c3020563c78
+  bdk_flutter: 0e9b59c086f99106db9ab85bc51495482e4b3653
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
 
 PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367
 
-COCOAPODS: 1.13.0
+COCOAPODS: 1.14.3

example/macos/Runner.xcodeproj/project.pbxproj

@@ -259,7 +259,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					331C80D4294CF70F00263BE5 = {

example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

example/test/bdk_flutter_unit_test.dart

@@ -89,11 +89,11 @@ Future<void> main() async {
     });
     test('verify scriptPubKey ()', () async {
       final res = await address.scriptPubKey();
-      expect(res.internal, script);
+      expect(res.inner, script);
     });
     test('verify scriptPubKey type()', () async {
       final res = await address.scriptPubKey();
-      expect(res.internal, isA<Uint8List>());
+      expect(res.inner, isA<Uint8List>());
     });
     test('verify network()', () async {
       final res = await address.network();

ios/Classes/bindings.h

@@ -76,7 +76,7 @@ typedef struct wire_BlockchainConfig {
 } wire_BlockchainConfig;
 
 typedef struct wire_Script {
-  struct wire_uint_8_list *internal;
+  struct wire_uint_8_list *inner;
 } wire_Script;
 
 typedef struct wire_ScriptAmount {
@@ -341,6 +341,17 @@ void wire_new_bip84_public__static_method__Api(int64_t port_,
                                                int32_t network,
                                                struct wire_uint_8_list *fingerprint);
 
+void wire_new_bip86_descriptor__static_method__Api(int64_t port_,
+                                                   int32_t key_chain_kind,
+                                                   struct wire_uint_8_list *secret_key,
+                                                   int32_t network);
+
+void wire_new_bip86_public__static_method__Api(int64_t port_,
+                                               int32_t key_chain_kind,
+                                               struct wire_uint_8_list *public_key,
+                                               int32_t network,
+                                               struct wire_uint_8_list *fingerprint);
+
 void wire_descriptor_as_string_private__static_method__Api(int64_t port_,
                                                            struct wire_uint_8_list *descriptor,
                                                            int32_t network);
@@ -559,6 +570,8 @@ static int64_t dummy_method_to_enforce_bundling(void) {
     dummy_var ^= ((int64_t) (void*) wire_new_bip49_public__static_method__Api);
     dummy_var ^= ((int64_t) (void*) wire_new_bip84_descriptor__static_method__Api);
     dummy_var ^= ((int64_t) (void*) wire_new_bip84_public__static_method__Api);
+    dummy_var ^= ((int64_t) (void*) wire_new_bip86_descriptor__static_method__Api);
+    dummy_var ^= ((int64_t) (void*) wire_new_bip86_public__static_method__Api);
     dummy_var ^= ((int64_t) (void*) wire_descriptor_as_string_private__static_method__Api);
     dummy_var ^= ((int64_t) (void*) wire_descriptor_as_string__static_method__Api);
     dummy_var ^= ((int64_t) (void*) wire_max_satisfaction_weight__static_method__Api);