Merge branch 'release/0.3.5'

uport-project · Sep 25, 2019 · 4a9e48b · 4a9e48b
2 parents f5758b2 + fa65606
commit 4a9e48b
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git a/Readme.md b/Readme.md
@@ -159,6 +159,9 @@ UportHDSigner().signJwtBundle(activity, seedHandle, derivationPath, data, prompt
 
 ### Changelog
 
+#### 0.3.5
+* [feat] add `suspend` extension for `UportHDSigner.signTransaction()` (#21)
+
 #### 0.3.4
 * [support] upgrade to kethereum 0.76.1 (#19)
 

diff --git a/build.gradle b/build.gradle
@@ -28,7 +28,7 @@ buildscript {
         kotlin_common_version = "0.3.1"
         jacoco_version = "0.8.4"
 
-        current_release_version = "0.3.4"
+        current_release_version = "0.3.5"
     }
 
     repositories {

diff --git a/signer/src/main/java/com/uport/sdk/signer/UportHDSignerExtensions.kt b/signer/src/main/java/com/uport/sdk/signer/UportHDSignerExtensions.kt
@@ -2,6 +2,7 @@ package com.uport.sdk.signer
 
 import android.content.Context
 import com.uport.sdk.signer.encryption.KeyProtection
+import org.kethereum.model.SignatureData
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 import kotlin.coroutines.suspendCoroutine
@@ -24,6 +25,9 @@ suspend fun UportHDSigner.createHDSeed(
     }
 }
 
+/**
+ * Extension function that wraps the `UportHDSigner.importHDSeed()` as a coroutine
+ */
 suspend fun UportHDSigner.importHDSeed(
         context: Context,
         level: KeyProtection.Level,
@@ -38,6 +42,26 @@ suspend fun UportHDSigner.importHDSeed(
     }
 }
 
+/**
+ * Extension function that wraps the `UportHDSigner.signTransaction()` as a coroutine
+ */
+
+suspend fun UportHDSigner.signTransaction(
+    context: Context,
+    rootAddress: String,
+    derivationPath: String,
+    txPayload: String,
+    prompt: String): SignatureData = suspendCoroutine {
+
+    this.signTransaction(context, rootAddress, derivationPath, txPayload, prompt) { err, sigData ->
+        if (err != null) {
+            it.resumeWithException(err)
+        } else {
+            it.resume(sigData)
+        }
+    }
+}
+
 /**
  * Extension function that wraps the `computeAddressForPath` as a coroutine
  */
@@ -56,6 +80,9 @@ suspend fun UportHDSigner.computeAddressForPath(
     }
 }
 
+/**
+ * Extension function that wraps the `UportHDSigner.showHDSeed()` as a coroutine
+ */
 suspend fun UportHDSigner.showHDSeed(
         context: Context,
         rootAddress: String,