Updates for lwk 0.8.2-1

android/build.gradle

@@ -58,5 +58,5 @@ dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-android:0.75.2'
     implementation 'com.facebook.react:hermes-android:0.75.2'
-    implementation 'com.blockstream:lwk_bindings:test'
+    implementation 'com.blockstream:lwk_bindings:0.8.2'
 }

android/src/main/java/io/lwkrn/LwkRnModule.kt

@@ -37,6 +37,7 @@ class LwkRnModule(reactContext: ReactApplicationContext) :
   private var _signers = mutableMapOf<String, Signer>()
   private var _txBuilders = mutableMapOf<String, TxBuilder>()
   private var _contracts = mutableMapOf<String, Contract>()
+  private var _bips = mutableMapOf<String, Bip>()
 
   /* Descriptor */
 
@@ -61,6 +62,47 @@ class LwkRnModule(reactContext: ReactApplicationContext) :
     result.resolve(_descriptors[keyId]!!.toString())
   }
 
+  /* Bip */
+
+  @ReactMethod
+  fun newBip49(
+    result: Promise
+  ) {
+    try {
+      val id = randomId()
+      _bips[id] = Bip.newBip49()
+      result.resolve(id)
+    } catch (error: Throwable) {
+      result.reject("Bip newBip49 error", error.localizedMessage, error)
+    }
+  }
+
+  @ReactMethod
+  fun newBip84(
+    result: Promise
+  ) {
+    try {
+      val id = randomId()
+      _bips[id] = Bip.newBip84()
+      result.resolve(id)
+    } catch (error: Throwable) {
+      result.reject("Bip newBip84 error", error.localizedMessage, error)
+    }
+  }
+
+  @ReactMethod
+  fun newBip87(
+    result: Promise
+  ) {
+    try {
+      val id = randomId()
+      _bips[id] = Bip.newBip87()
+      result.resolve(id)
+    } catch (error: Throwable) {
+      result.reject("Bip newBip87 error", error.localizedMessage, error)
+    }
+  }
+
   /* Signer */
 
   @ReactMethod
@@ -112,6 +154,53 @@ class LwkRnModule(reactContext: ReactApplicationContext) :
     }
   }
 
+  @ReactMethod
+  fun keyoriginXpub(
+    signerId: String,
+    bipId: String,
+    result: Promise
+  ) {
+    try {
+      val id = randomId()
+      val signer = _signers[signerId]
+      val bip = _bips[bipId]
+      val res = signer!!.keyoriginXpub(bip!!)
+      result.resolve(res)
+    } catch (error: Throwable) {
+      result.reject("Signer keyoriginXpub error", error.localizedMessage, error)
+    }
+  }
+
+  @ReactMethod
+  fun mnemonic(
+    signerId: String,
+    result: Promise
+  ) {
+    try {
+      val id = randomId()
+      val signer = _signers[signerId]
+      val res = signer!!.mnemonic()
+      result.resolve(res)
+    } catch (error: Throwable) {
+      result.reject("Signer mnemonic error", error.localizedMessage, error)
+    }
+  }
+
+  @ReactMethod
+  fun createRandomSigner(
+    network: String,
+    result: Promise
+  ) {
+    try {
+      val id = randomId()
+      val networkObj = setNetwork(network)
+      _signers[id] = Signer.random(networkObj)
+      result.resolve(id)
+    } catch (error: Throwable) {
+      result.reject("Signer createRandomSigner error", error.localizedMessage, error)
+    }
+  }
+
   /* Electrum client */
 
   @ReactMethod

ios/LwkRnModule.mm

@@ -3,6 +3,20 @@
 
 @interface RCT_EXTERN_MODULE(LwkRnModule, NSObject)
 
+    /** Bip Methods */
+    RCT_EXTERN_METHOD(
+                      newBip49: (RCTPromiseResolveBlock)resolve
+                      reject: (RCTPromiseRejectBlock)reject
+                      )
+    RCT_EXTERN_METHOD(
+                      newBip84: (RCTPromiseResolveBlock)resolve
+                      reject: (RCTPromiseRejectBlock)reject
+                      )
+    RCT_EXTERN_METHOD(
+                      newBip87: (RCTPromiseResolveBlock)resolve
+                      reject: (RCTPromiseRejectBlock)reject
+                      )
+
     /** Signers Methods */
     RCT_EXTERN_METHOD(
                       createSigner: (nonnull NSString)mnemonic
@@ -21,6 +35,22 @@ @interface RCT_EXTERN_MODULE(LwkRnModule, NSObject)
                       resolve: (RCTPromiseResolveBlock)resolve
                       reject: (RCTPromiseRejectBlock)reject
                       )
+    RCT_EXTERN_METHOD(
+                      keyoriginXpub: (nonnull NSString)signerId
+                      bipId: (nonnull NSString)bipId
+                      resolve: (RCTPromiseResolveBlock)resolve
+                      reject: (RCTPromiseRejectBlock)reject
+                      )
+    RCT_EXTERN_METHOD(
+                      mnemonic: (nonnull NSString)signerId
+                      resolve: (RCTPromiseResolveBlock)resolve
+                      reject: (RCTPromiseRejectBlock)reject
+                      )
+    RCT_EXTERN_METHOD(
+                      createRandomSigner: (nonnull NSString)network
+                      resolve: (RCTPromiseResolveBlock)resolve
+                      reject: (RCTPromiseRejectBlock)reject
+                      )
 
     /** Descriptors Methods */
 

ios/LwkRnModule.swift

@@ -15,6 +15,7 @@
     var _psets: [String: Pset] = [:]
     var _txBuilders: [String: TxBuilder] = [:]
     var _contracts: [String: Contract] = [:]
+    var _bips: [String: Bip] = [:]
 
     /* WolletDescriptor */
     @objc
@@ -40,7 +41,48 @@
         resolve(_descriptors[keyId]!.description)
     }
 
+    /* Bip */
+    @objc
+    func newBip49(
+        resolve: RCTPromiseResolveBlock,
+        reject: RCTPromiseRejectBlock
+    ) -> Void {
+        do {
+            let id = randomId()
+            _bips[id] = try Bip.newBip49()
+            resolve(id)
+        } catch {
+            reject("Bip newBip49 error", error.localizedDescription, error)
+        }
+    }
 
+    @objc
+    func newBip84(
+        resolve: RCTPromiseResolveBlock,
+        reject: RCTPromiseRejectBlock
+    ) -> Void {
+        do {
+            let id = randomId()
+            _bips[id] = try Bip.newBip84()
+            resolve(id)
+        } catch {
+            reject("Bip newBip84 error", error.localizedDescription, error)
+        }
+    }
+
+    @objc
+    func newBip87(
+        resolve: RCTPromiseResolveBlock,
+        reject: RCTPromiseRejectBlock
+    ) -> Void {
+        do {
+            let id = randomId()
+            _bips[id] = try Bip.newBip87()
+            resolve(id)
+        } catch {
+            reject("Bip newBip87 error", error.localizedDescription, error)
+        }
+    }
 
     /* Signer */
     @objc
@@ -94,6 +136,54 @@
             reject("Signer wpkhSlip77Descriptor error", error.localizedDescription, error)
         }
     }
+
+    @objc
+    func keyoriginXpub(
+        _ signerId: String,
+        _ bipId: String,
+        resolve: RCTPromiseResolveBlock,
+        reject: RCTPromiseRejectBlock
+    ) -> Void {
+        do {
+            let signer = _signers[signerId]
+            let bip = _bips[bipId]
+            let res = try signer?.keyoriginXpub(bip)
+            resolve(res)
+        } catch {
+            reject("Signer keyoriginXpub error", error.localizedDescription, error)
+        }
+    }
+
+    @objc
+    func mnemonic(
+        _ signerId: String,
+        resolve: RCTPromiseResolveBlock,
+        reject: RCTPromiseRejectBlock
+    ) -> Void {
+        do {
+            let signer = _signers[signerId]
+            let res = try signer?.mnemonic()
+            resolve(res)
+        } catch {
+            reject("Signer mnemonic error", error.localizedDescription, error)
+        }
+    }
+
+    @objc
+    func createRandomSigner(
+        _ network: String,
+        resolve: RCTPromiseResolveBlock,
+        reject: RCTPromiseRejectBlock
+    ) -> Void {
+        do {
+            let id = randomId()
+            let network = setNetwork(networkStr: network)
+            _signers[id] = try Signer.random(network: network)
+            resolve(id)
+        } catch {
+            reject("Signer createRandomSigner error", error.localizedDescription, error)
+        }
+    }
 
     /* Electrum client */
 
@@ -464,7 +554,7 @@
             try _txBuilders[id]?.addLbtcRecipient(address: try Address(s: address), satoshi: satoshi.uint64Value)
             resolve(nil)
         } catch {
             reject("TxBuilder addLbtcRecipient error", error.localizedDescription, error)
         }
     }
     @objc
@@ -486,7 +576,7 @@
     @objc
     func txBuilderDrainLbtcTo(_
                               id: String,
                               address: String,
                               resolve: RCTPromiseResolveBlock,
                               reject: RCTPromiseRejectBlock
     ) -> Void {

lwk-rn.podspec

@@ -16,8 +16,8 @@ Pod::Spec.new do |s|
 
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
-  s.dependency 'lwkFFI', '0.8.2'
-  s.dependency 'LiquidWalletKit', '0.8.2'
+  s.dependency 'lwkFFI', '0.8.2-1'
+  s.dependency 'LiquidWalletKit', '0.8.2-1'
 
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
   # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.

src/classes/Bip.ts

@@ -0,0 +1,18 @@
+import { NativeLoader } from './NativeLoader';
+
+export class Bip extends NativeLoader {
+  id: string = '';
+
+  async newBip49(): Promise<Bip> {
+    this.id = await this._lwk.newBip49();
+    return this;
+  }
+  async newBip84(): Promise<Bip> {
+    this.id = await this._lwk.newBip84();
+    return this;
+  }
+  async newBip87(): Promise<Bip> {
+    this.id = await this._lwk.newBip87();
+    return this;
+  }
+}

src/classes/NativeLoader.ts

@@ -26,6 +26,9 @@ export interface NativeLwk {
   createSigner(mnemonic: string, network: Network): string;
   sign(signerId: string, psetId: string): string;
   wpkhSlip77Descriptor(signerId: string): string;
+  keyoriginXpub(signerId: string, bipId: string): string;
+  createRandomSigner(network: Network): string;
+  mnemonic(signerId: string): string;
 
   // Wollet
   createWollet(
@@ -94,6 +97,11 @@ export interface NativeLwk {
     version: number
   ): string;
   contractAsString(id: string): string;
+
+  // Bip
+  newBip49(): string;
+  newBip84(): string;
+  newBip87(): string;
 }
 
 export class NativeLoader {

src/classes/Signer.ts

@@ -2,6 +2,7 @@ import { NativeLoader } from './NativeLoader';
 import { Pset } from './Pset';
 import { Network } from '../lib/enums';
 import { Descriptor } from './Descriptor';
+import { Bip } from './Bip';
 
 export class Signer extends NativeLoader {
   id: string = '';
@@ -23,4 +24,20 @@ export class Signer extends NativeLoader {
     let newId = await this._lwk.wpkhSlip77Descriptor(this.id);
     return new Descriptor().from(newId);
   }
+
+  async createRandomSigner(network: Network): Promise<Signer> {
+    if (!Object.values(Network).includes(network)) {
+      throw `Invalid network passed. Allowed values are ${Object.values(Network)}`;
+    }
+    this.id = await this._lwk.createRandomSigner(network);
+    return this;
+  }
+
+  async keyoriginXpub(bip: Bip): Promise<string> {
+    return await this._lwk.keyoriginXpub(this.id, bip.id);
+  }
+
+  async mnemonic(): Promise<string> {
+    return await this._lwk.mnemonic(this.id);
+  }
 }